Merge branch 'main' into helpsite-search-operators-updates

Author: stephanieelliott

.github/workflows/test.yml

@@ -31,10 +31,6 @@ jobs:
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
 
-      - name: Get number of CPU cores
-        id: cpu-cores
-        uses: SimenB/github-actions-cpu-cores@31e91de0f8654375a21e8e83078be625380e2b18
-
       - name: Cache Jest cache
         id: cache-jest-cache
         # v5.0.1

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036201
-        versionName "9.3.62-1"
+        versionCode 1009036203
+        versionName "9.3.62-3"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -130,6 +130,9 @@ const metro = {
         production: {
             plugins: [['transform-remove-console', {exclude: ['error', 'warn']}]],
         },
+        test: {
+            plugins: ['@babel/plugin-transform-dynamic-import'],
+        },
     },
 };
 

babel.config.js

@@ -282,7 +282,7 @@ Since our codebase is very complex, it results in a large DOM tree rendered for
 
 One of the most common issues is related to modals, popovers, and tooltips — elements that may appear on the screen. The problem is that they are usually present in the DOM tree even when initially invisible. Because of this, the initial render time of a screen may increase, ultimately slowing down the app.
 
-The solution is better control of invisible elements, making sure they are not included in the first render. This can be done, e.g., by a simple `return null`, smart usage of `lazy loading`, the `useTransition` hook, or the `<Deferred />` component.
+The solution is better control of invisible elements, making sure they are not included in the first render. This can be done, e.g., by a simple `return null`, smart usage of `lazy loading`, the `useTransition` hook, or the [`<NavigationDeferredMount />`](/src/components/NavigationDeferredMount.tsx) component. `<NavigationDeferredMount />` gates a heavy subtree behind navigation transition completion via `TransitionTracker`, rendering a cheap `placeholder` until the nav animation has finished, then mounting its `children` inside `startTransition` — ideal for heavy subtrees (e.g. report headers, page-level secondary actions) mounted during navigation transitions that pull many `useOnyx` subscriptions or heavy hooks but don't need to be interactive on first render.
 
 Another issue worth mentioning is unnecessary code execution, especially for elements that are never shown on a specific platform. In theory, we separate the logic between platforms by using index.tsx/index.native.tsx files, but sometimes platform-specific logic may slip in, causing unnecessary execution. For example, this may happen when logic specific to a wide layout (applicable only for web) is included.
 
@@ -294,6 +294,7 @@ Examples:
 - [PopoverWithMeasuredContent optimization for mobile](https://github.com/Expensify/App/pull/68223) - returns early to avoid unnecessary calculations
 - [Reduce confirm modal initial render count](https://github.com/Expensify/App/pull/67518) - returns early to reduce first load cost
 - [Do not render PopoverMenu until it gets opened](https://github.com/Expensify/App/pull/67877) - adds a wrapper to control if `PopoverMenu` should be rendered
+- [Defer mount of MoneyReportHeaderSecondaryActions](https://github.com/Expensify/App/pull/88522) - introduces `NavigationDeferredMount` and uses it to defer the "More" dropdown subtree (20+ `useOnyx` subscriptions) until the navigation transition completes
 
 # Proposing Performance Improvements
 

contributingGuides/PERFORMANCE.md

@@ -571,9 +571,7 @@ When you change the function id argument type to allow `undefined`, check if it
 
 ```diff
 function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = false, updatedTransaction, isFromReviewDuplicates = false}: MoneyRequestViewProps) {
-    const [parentReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, {
-        canEvict: false,
-    });
+    const [parentReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`);
 -   const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
 +   const parentReportAction = parentReportActions?.[report?.parentReportActionID];
 ```

contributingGuides/STYLE.md

@@ -35,17 +35,7 @@ Different platforms come with varying storage capacities and Onyx has a way to g
 
 **To flag a key as safe for removal:**
 - Add the key to the `evictableKeys` option in `Onyx.init(options)`
-- Implement `canEvict` in the Onyx config for each component subscribing to a key
-- The key will only be deleted when all subscribers return `true` for `canEvict`
-
-Example:
-```js
-Onyx.init({
-    evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
-});
-
-const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {canEvict: !isActiveReport});
-```
+- A least recently accessed key will only be deleted when an Onyx operation retries after failing.
 
 ## Onyx Derived Values
 

contributingGuides/philosophies/ONYX-DATA-MANAGEMENT.md

@@ -912,6 +912,7 @@
         "Zürcher",
         "CARDFROZEN",
         "CARDUNFROZEN",
+        "backgrounded",
         "Kolkata"
     ],
     "ignorePaths": [

cspell.json

@@ -0,0 +1,78 @@
+---
+title: Accounting Search Shortcuts
+description: Use the Accounting search shortcuts on the Spend page to review expense status, prepare for export, and reconcile transactions with your accounting records.
+keywords: [New Expensify, accounting expensify, reconcile expenses, awaiting export, cash accruals, card accruals, card statements, bank reconciliation, month-end close, search shortcut, accounting shortcut]
+internalScope: Audience is Workspace Admins. Covers using the Accounting section to review expense states and support reconciliation workflows. Does not cover exporting or performing reconciliation in detail.
+---
+
+# Accounting Search Shortcuts
+
+The **Accounting** search shortcuts on the **Spend** page bring together the expense views you need to reconcile your records and close your books. It helps you identify what’s ready to export, what still needs attention, and what should be matched against statements or bank data.
+
+Workspace Admins can use these shortcuts to validate totals, track liabilities, and ensure your expenses align with accounting records before and after export.
+
+---
+
+## Who can use Accounting search shortcuts
+
+Workspace Admins with:
+- Approvals turned on
+- Either reimbursements enabled or at least one card feed connected
+
+---
+
+## How to use the Accounting search shortcuts
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile) select **Spend**. 
+2. In the **Accounting** section, choose a search shortcut based on what you need to review.
+3. Use filters like **Date**, **Feed**, or **Posted** to refine your view.
+4. Review the **Total** in the footer to understand the amount for that view.
+
+Once you’ve reviewed the expenses, you can export them to a CSV if you need to share or work with the data outside of Expensify. Learn how to [export expenses to a CSV](/articles/new-expensify/reports-and-expenses/How-to-Export-Expenses#how-to-export-multiple-expenses).
+
+---
+
+## What each Accounting search shortcut shows you
+
+- **Awaiting export**: Reports that are approved and ready to be exported to your accounting system.
+- **Cash accruals**: Reimbursable expenses that are not yet approved and may need to be accrued.
+- **Card accruals**: Imported card expenses that are not yet approved and may need to be accrued.
+- **Card statements**: Credit card expenses grouped by statement periods to help you reconcile against your card statement.
+- **Bank reconciliation**: Reimbursed reports and Expensify Card settlement withdrawals to help you match transactions with your bank data.
+
+---
+
+## What happens after you review expenses with Accounting search shortcuts
+
+ - You can identify reports that are ready to export to your accounting system.
+ - You can account for unapproved expenses as accruals before closing a period.
+ - You can verify imported credit card expense totals against statements and bank data.
+ - You can ensure your records are complete before and after reconciliation.
+
+---
+
+# FAQ
+
+## Why don’t I see all Accounting search shortcuts?
+
+Some search shortcuts only appear when the required features are enabled:
+
+ - **Cash accruals** requires reimbursements
+ - **Card accruals** and **Card statements** require a card feed
+ - **Bank reconciliation** requires a validated business bank account. 
+
+If a feature isn’t enabled, its shortcut won’t appear.
+
+## Can I export expenses from the Accounting search shortcuts?
+
+Yes. You can export expenses from any shortcut to a CSV file if you need to use the data outside of Expensify.
+
+
+## Why does the total change when I apply filters?
+
+The **Total** reflects only the expenses shown in your current shortcut. Changing filters like **Date**, **Feed,** or **Posted** will update the total based on those results.
+
+## Can I filter Card accruals by feed?
+
+Yes. If you have more than one card feed, a **Feed** filter will appear so you can review one account at a time.
+

docs/articles/new-expensify/reports-and-expenses/Accounting-Search-Shortcuts.md

@@ -32,7 +32,7 @@ On any expense submitted on a report, the approver can:
 
 ## How to review and approve a report
 
-When a report is submitted to you for approval it will appear in the **For you** section on **Home**, and on **Reports** in the **Approve** section. 
+When a report is submitted to you for approval it will appear in the **For you** section on **Home**, and under **Spend** in the **Expense reports** section, under **Needs approval**. 
 
 To review and approve a report submitted to you for approval: 
 
@@ -69,7 +69,7 @@ Workspace admins can bypass the approval workflow on a report to final approve i
 
 ## How to hold an expense
 
-1. In the navigation tabs (on the left on web, and at the bottom on mobile), go to **Reports > Expenses**.
+1. In the navigation tabs (on the left on web, and at the bottom on mobile), go to **Spend > All expenses**.
 2. Locate the expense you want to hold. 
 3. Click the expense to open it. 
 4. Click **More** at the top of the expense.
@@ -81,7 +81,7 @@ To take an expense off hold, follow the same steps but select **Unhold**.
 
 ## How to unapprove a report 
 
-1. In the navigation tabs (on the left on web, and at the bottom on mobile), go to **Spend > Reports**.
+1. In the navigation tabs (on the left on web, and at the bottom on mobile), go to **Spend > All reports**.
 2. Locate the Approved report you want to unapprove. 
 3. Click the report to open it. 
 4. Click **More** at the top of the report. 
@@ -93,9 +93,11 @@ Unapproving a report returns it to the Outstanding state. The last approver will
 
 ---
 
-## How to reject a report 
+## How to reject a report
 
-1. In the navigation tabs (on the left on web, and at the bottom on mobile), go to **Spend > Approve**.
+As the assigned approver, you can reject an entire expense report to return it to the submitter or a previous approver while keeping the report's expense grouping intact.
+
+1. In the navigation tabs (on the left on web, and at the bottom on mobile), go to **Spend > Needs approval**.
 2. Locate the Outstanding report you want to reject.
 3. Click the report to open it.
 4. Click **More** at the top of the report.
@@ -113,8 +115,8 @@ Unapproving a report returns it to the Outstanding state. The last approver will
 
 ## How to reject an expense 
 
-1. In the navigation tabs (on the left on web, and at the bottom on mobile), head to **Spend > Expenses**.
-2. Locate the expense using the search bar or filters.
+1. In the navigation tabs (on the left on web, and at the bottom on mobile), head to **Spend > All expenses**.
+2. Locate the expense you want to reject using the search bar or filters.
 3. Click **View**.
 4. Open the **More** dropdown at the top of the expense.
 5. Select **Reject** and enter a reason (this will be added to the report).