Merge remote-tracking branch 'origin' into fix/62703

Eskalifer1 · Eskalifer1 · commit 8f7f50d9daa7 · 2025-07-03T21:12:17.000+03:00
diff --git a/Mobile-Expensify b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 57d9657d93bd5e104d5c6215bab163fd4340b8ad
+Subproject commit ac80a7a725cd505efd2f8bd44788d12762e91b60
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017409
-        versionName "9.1.74-9"
+        versionCode 1009017410
+        versionName "9.1.74-10"
         // 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"
diff --git a/docs/articles/new-expensify/billing-and-subscriptions/Add-a-payment-card-and-view-your-subscription.md b/docs/articles/new-expensify/billing-and-subscriptions/Add-a-payment-card-and-view-your-subscription.md
@@ -2,29 +2,25 @@
 title: Manage Expensify Subscription
 description: Learn how to manage your subscription, update billing details, cancel early, or delete a workspace in New Expensify.
 keywords: [New Expensify, subscription, billing, payment card, cancel subscription, delete workspace, remove workspace, subscription settings]
----
-<div id="new-expensify" markdown="1">
-
-Easily manage your subscription in New Expensify—update payment details, adjust your plan, request early cancellation, or delete a workspace if needed.
 
 ---
 
-# View Subscription and Add a Payment Card
+<div id="new-expensify" markdown="1">
 
-To view your subscription and add a payment card:
+Easily manage your subscription in New Expensify—update payment details, adjust your plan, request early cancellation, or delete a workspace if needed.
 
-1. Navigate to **Account > Subscription**.
-2. Click **Add Payment Card** and enter your card details to ensure uninterrupted billing.
+You can view and manage your subscription under **Account > Subscription**. 
 
 ---
 
-# Manage Subscription Plan
+# Manage Subscription
 
 In the Subscription section, you can view and update your plan details, including:
 
+- **Add a payment card**: Connect the credit card you want to use to pay for Expensify each month. 
 - **Current plan:** View your subscription type and number of seats.
 - **Billing info:** See your payment method and next renewal date.
-- **Auto-renew:** Check when your subscription will automatically renew (e.g., **Renews on Nov 1, 2027**).
+- **Auto-renew:** Check when your subscription will automatically renew (e.g., **Renews on Nov 1, 2026**).
 - **Auto-increase annual seats:** See how much you could save by automatically increasing seats if your team grows.
 
 **Note:** Enabling auto-increase will extend your annual subscription end date.
@@ -35,18 +31,19 @@ In the Subscription section, you can view and update your plan details, includin
 
 To request an early cancellation:
 
-1. Go to the **Subscription** section.
-2. Click **Request Early Cancellation**.
+1. Head to **Account > Subscription**.
+2. Click the **Request early cancellation** button.
+3. Depending on how your subscription is configured, the early cancellation will happen automatically or be sent to our team for review. 
 
 **Note:** Early cancellations aren’t available to all customers.
 
 ---
 
 # Delete a Workspace
 
-To permanently delete a workspace:
+To permanently delete a workspace and downgrade to a free account:
 
-1. Go to **Settings > Workspaces**.
+1. From the left-hand menu, click **Workspaces**.
 2. Click the three dots next to the workspace name.
 3. Select **Delete workspace** from the dropdown.
 4. Confirm the deletion when prompted.
diff --git a/docs/articles/new-expensify/billing-and-subscriptions/Billing-Overview.md b/docs/articles/new-expensify/billing-and-subscriptions/Billing-Overview.md
@@ -43,7 +43,7 @@ For a full breakdown, visit the [Expensify pricing page](https://www.expensify.c
 ## 🧾 Receipts
 
 - Your billing receipts show: `X Collect members @ $5.00`
-- View them in **Workspaces > Subscription**
+- View them in **Account > Subscription**
 
 ---
 
@@ -92,7 +92,7 @@ For a full breakdown, visit the [Expensify pricing page](https://www.expensify.c
 
 ## 🧾 Receipts
 
-- View billing receipts under **Workspaces > Subscription**
+- View billing receipts under **Account > Subscription**
 - Each workspace can only have **one billing owner**
 
 ---
diff --git a/docs/articles/new-expensify/billing-and-subscriptions/Changing-Your-Workspace-Plan.md b/docs/articles/new-expensify/billing-and-subscriptions/Changing-Your-Workspace-Plan.md
@@ -13,7 +13,7 @@ Take a look at this resource to learn how to update your Expensify workspace sub
 
 To update your subscription plan:
 
-1. Use the **left-hand navigation bar (LHB)** to go to **Workspaces > Subscription**.
+1. Use the **left-hand menu** to go to **Account > Subscription**.
 2. Click **Explore all plans** and choose the one that best fits your needs.
 
 ---
@@ -22,7 +22,7 @@ To update your subscription plan:
 
 If you're on an Annual Subscription (a 12-month commitment), you may be eligible to request early cancellation and switch to a free account:
 
-1. Use the **left-hand navigation bar** to go to **Workspaces > Subscription**.
+1. Use the **left-hand navigation bar** to go to **Account > Subscription**.
 2. Click **Request early cancellation**.
 
 **Note:** Early cancellations are subject to eligibility review.
@@ -33,7 +33,7 @@ If you're on an Annual Subscription (a 12-month commitment), you may be eligible
 
 If you're on a Pay-per-use plan and want to switch to a free account:
 
-1. Go to **Workspaces > Subscription**.
+1. Go to **Account > Subscription**.
 2. Click the three dots **(⋮)** next to your workspace name.
 3. Select **Delete workspace**.
 
diff --git a/docs/articles/new-expensify/billing-and-subscriptions/Tax-Exemption.md b/docs/articles/new-expensify/billing-and-subscriptions/Tax-Exemption.md
@@ -20,7 +20,7 @@ If your organization qualifies as tax-exempt, you can request to remove sales ta
 
 **To request tax-exempt status for your Expensify subscription:**
 
-1. Go to **Account > Workspaces > Subscription > Subscription settings**.
+1. Go to **Account > Subscription > Subscription settings**.
 2. Click **Tax exempt status**.
 3. Selecting **Tax exempt status** will begin a chat with Concierge.
 4. From there, communicate that your account is tax-exempt and attach a PDF of your tax-exempt document.
diff --git a/docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md b/docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md
@@ -49,7 +49,7 @@ The **Reports** tab consolidates all filtering and reporting tools:
 
 # Workspaces Page
 
-The **Workspaces** tab helps you manage everything related to your company or personal workspaces. Whether you're creating a new workspace, editing an existing one, or managing features like billing and card connections, this section is your main hub.
+The **Workspaces** tab shows you a clean list of all your workspaces and allows you to manage everything related to your company or personal workspaces. This section is your main hub for workspace management.
 
 From the **Workspaces** tab, you can:
 
@@ -59,10 +59,8 @@ From the **Workspaces** tab, you can:
 - **Enable features** – Turn on or off modules like Company Cards, Workflows, Tags, Distance tracking, and more via the **More features** menu.
 - **Set up accounting connections** – Integrate tools like QuickBooks or NetSuite under **Accounting**.
 - **Edit categories and tags** – Create or disable expense categories and tags to organize expenses.
-- **Track billing and subscription** – Navigate to the **Subscription** section to choose a plan, view billing history, or cancel your subscription.
-- **Access domains** (if applicable) – Allow centralized control over company-wide settings like SAML, domain groups, and company card feeds.
 
-**Tip:** All workspace-specific settings live under this tab, while account specific settings live under the **Account** tab.
+**Tip:** All workspace-specific settings live under this tab, while account-level settings (including billing and subscription management) live under the **Account** tab.
 
 ---
 
@@ -74,6 +72,7 @@ The **Account** tab includes all personal and account-level settings. Here’s w
 - **Wallet** – Add or manage personal payment methods (e.g., cards or bank accounts).
 - **Preferences** – Choose your default payment currency, language, and notification preferences.
 - **Security** – Set up two-factor authentication and manage device access.
+- **Subscription** – Manage your billing, view subscription details, and track usage.
 - **Help** – Access Expensify Help docs and reach out to Concierge.
 - **Switch to Expensify Classic** – Return to the classic layout if needed.
 - **About** – View app version details and system information.
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.74.9</string>
+	<string>9.1.74.10</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.74</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.74.9</string>
+	<string>9.1.74.10</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.74</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.74.9</string>
+	<string>9.1.74.10</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.74-9",
+  "version": "9.1.74-10",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
@@ -109,6 +109,8 @@ function BaseModal(
     const insets = useSafeAreaInsets();
 
     const isVisibleRef = useRef(isVisible);
+    const hideModalCallbackRef = useRef<(callHideCallback: boolean) => void>(undefined);
+
     const wasVisible = usePrevious(isVisible);
 
     const uniqueModalId = useMemo(() => modalId ?? ComposerFocusManager.getId(), [modalId]);
@@ -158,6 +160,22 @@ function BaseModal(
         };
     }, [isVisible, wasVisible, onClose, type]);
 
+    useEffect(() => {
+        hideModalCallbackRef.current = hideModal;
+    }, [hideModal]);
+
+    useEffect(
+        () => () => {
+            // Only trigger onClose and setModalVisibility if the modal is unmounting while visible.
+            if (!isVisibleRef.current) {
+                return;
+            }
+            hideModalCallbackRef.current?.(true);
+        },
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        [],
+    );
+
     const handleShowModal = useCallback(() => {
         if (shouldSetModalVisibility) {
             setModalVisibility(true, type);
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
@@ -1,4 +1,4 @@
-import {useIsFocused, useNavigation} from '@react-navigation/native';
+import {useFocusEffect, useIsFocused, useNavigation} from '@react-navigation/native';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import type {NativeScrollEvent, NativeSyntheticEvent, StyleProp, ViewStyle, ViewToken} from 'react-native';
 import {View} from 'react-native';
@@ -174,10 +174,12 @@ function Search({queryJSON, currentSearchResults, lastNonEmptySearchResults, onS
     const {translate} = useLocalize();
     const searchListRef = useRef<SelectionListHandle | null>(null);
 
-    useEffect(() => {
-        clearSelectedTransactions(hash);
-        setCurrentSearchHash(hash);
-    }, [hash, clearSelectedTransactions, setCurrentSearchHash]);
+    useFocusEffect(
+        useCallback(() => {
+            clearSelectedTransactions(hash);
+            setCurrentSearchHash(hash);
+        }, [hash, clearSelectedTransactions, setCurrentSearchHash]),
+    );
 
     const searchResults = currentSearchResults?.data ? currentSearchResults : lastNonEmptySearchResults;
     const isSearchResultsEmpty = !searchResults?.data || isSearchResultsEmptyUtil(searchResults);
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -885,36 +885,6 @@ describe('getSecondaryAction', () => {
         const result = getSecondaryReportActions({report, chatReport, reportTransactions: [transaction], violations: {}, policy});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(false);
     });
-
-    it('include EXPORT_TO_ACCOUNTING option for settled expense report', async () => {
-        const report = {
-            reportID: REPORT_ID,
-            type: CONST.REPORT.TYPE.EXPENSE,
-            ownerAccountID: EMPLOYEE_ACCOUNT_ID,
-            statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
-            stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-            policyID: POLICY_ID,
-        } as unknown as Report;
-
-        const TRANSACTION_ID = 'TRANSACTION_ID';
-        const transaction = {
-            transactionID: TRANSACTION_ID,
-            reportID: REPORT_ID,
-        } as unknown as Transaction;
-
-        const policy = {
-            connections: {
-                [CONST.POLICY.CONNECTIONS.NAME.XERO]: {},
-            },
-            id: POLICY_ID,
-            role: CONST.POLICY.ROLE.ADMIN,
-        } as Policy;
-
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
-
-        const result = getSecondaryReportActions({report, chatReport, reportTransactions: [transaction], violations: {}, policy});
-        expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
-    });
 });
 
 describe('getSecondaryExportReportActions', () => {
@@ -991,6 +961,30 @@ describe('getSecondaryExportReportActions', () => {
         expect(result.includes(CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION)).toBe(true);
     });
 
+    it('include EXPORT option for settled expense report with integrated policy', async () => {
+        const report = {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: EMPLOYEE_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
+            stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+            policyID: POLICY_ID,
+        } as unknown as Report;
+
+        const policy = {
+            connections: {
+                [CONST.POLICY.CONNECTIONS.NAME.XERO]: {},
+            },
+            id: POLICY_ID,
+            role: CONST.POLICY.ROLE.ADMIN,
+        } as Policy;
+
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        const result = getSecondaryExportReportActions(report, policy);
+        expect(result.includes(CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION)).toBe(true);
+    });
+
     it('includes MARK_AS_EXPORTED option for invoice report sender', async () => {
         const report = {
             reportID: REPORT_ID,
