Merge branch 'main' into refactor-66578-p2

DylanDylann · DylanDylann · commit 1e57c6e6a3a3 · 2026-04-08T17:38:04.000+07:00
diff --git a/Mobile-Expensify b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 37e8f9e619a85009852a458437ff60fb16e4cc3c
+Subproject commit 0782891e535200f105ec5d2d6528a1337cfc90f2
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009035400
-        versionName "9.3.54-0"
+        versionCode 1009035401
+        versionName "9.3.54-1"
         // 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/getting-started/Navigating-New-Expensify.md b/docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md
@@ -98,7 +98,7 @@ From Account, you can manage:
  - **Security** to manage security options and Copilot delegated access
 
 You can also access: 
- - **Help** to browse Expensify's help site
+ - **Help** to access help and support resources, including a link to the help site
  - **What's new** to view product updates
  - **About** to see app details
  - **Troubleshoot** to run diagnostics or switch to Expensify Classic
diff --git a/docs/articles/new-expensify/reports-and-expenses/Using-search-operators.md b/docs/articles/new-expensify/reports-and-expenses/Using-search-operators.md
@@ -58,7 +58,7 @@ type:expense merchant:Starbucks category:Meals amount>20 has:receipt
 - `tag:` – tag or multiple tags
 - `amount:` / `purchase-amount:` – supports `=`, `>`, `<`, `>=`, `<=`
 - `status:` – unreported, draft, outstanding, approved, paid, done
-- `date:` – expense date, supports relative dates like `date:this-month`, `date:last-month`, `date:year-to-date`, `date:this-week`
+- `date:` – expense date, supports relative dates like `date:this-month`, `date:last-month`, `date:year-to-date`, `date:this-week`. Also supports comparisons (`date>=2024-01-01 date<=2024-01-31`) for date ranges
 - `has:` – attachment, receipt, category, tag
 - `expense-type:` – cash, card, distance, per-diem
 - `reimbursable:` and `billable:` – yes or no
@@ -69,7 +69,7 @@ type:expense merchant:Starbucks category:Meals amount>20 has:receipt
 
 - `report-id:` – unique report reference
 - `status:` – draft, outstanding, approved, paid, done
-- `submitted:` / `approved:` / `paid:` / `exported:` – supports absolute or relative dates
+- `submitted:` / `approved:` / `paid:` / `exported:` – supports absolute or relative dates, and comparisons for date ranges (e.g., `submitted>=2024-01-01 submitted<=2024-01-31`)
 - `title:` – report title
 - `total:` – total amount with relative comparisons
 - `withdrawn:` – ACH withdrawal date
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.54.0</string>
+	<string>9.3.54.1</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.3.54</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.54.0</string>
+	<string>9.3.54.1</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.3.54</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.54.0</string>
+	<string>9.3.54.1</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.3.54-0",
+  "version": "9.3.54-1",
   "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/ROUTES.ts b/src/ROUTES.ts
@@ -189,6 +189,8 @@ const DYNAMIC_ROUTES = {
     NOTIFICATION_PREFERENCES: {
         path: 'notification-preferences',
         entryScreens: [SCREENS.REPORT_SETTINGS.ROOT, SCREENS.PROFILE_ROOT],
+        getRoute: (reportID: string) => getUrlWithParams('notification-preferences', {reportID}),
+        queryParams: ['reportID'],
     },
     WORKSPACE_OVERVIEW_PLAN: {
         path: 'plan',
diff --git a/src/components/KYCWall/BaseKYCWall.tsx b/src/components/KYCWall/BaseKYCWall.tsx
@@ -73,6 +73,7 @@ function KYCWall({
     const currentUserDetails = useCurrentUserPersonalDetails();
     const currentUserAccountID = currentUserDetails.accountID;
     const currentUserEmail = currentUserDetails.email ?? '';
+    const localCurrency = currentUserDetails.localCurrencyCode ?? CONST.CURRENCY.USD;
     const reportPreviewAction = useParentReportAction(iouReport);
     const personalDetails = usePersonalDetails();
     const employeeEmail = personalDetails?.[iouReport?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID]?.login ?? '';
@@ -178,6 +179,7 @@ function KYCWall({
                             currentUserEmail,
                             employeeEmail,
                             conciergeReportID,
+                            localCurrency,
                             lastWorkspaceNumber,
                             translate,
                             filteredReportActions,
@@ -236,6 +238,7 @@ function KYCWall({
             isSelfTourViewed,
             betas,
             conciergeReportID,
+            localCurrency,
         ],
     );
 
diff --git a/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx b/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx
@@ -2,6 +2,7 @@ import {hasSeenTourSelector} from '@selectors/Onboarding';
 import {useCallback, useEffect, useRef} from 'react';
 import type {OnyxCollection} from 'react-native-onyx';
 import {useInitialURLActions, useInitialURLState} from '@components/InitialURLContextProvider';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useHasActiveAdminPolicies from '@hooks/useHasActiveAdminPolicies';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -72,9 +73,9 @@ function AuthScreensInitHandler() {
         [currentUrl, session?.email],
     );
     const [lastWorkspaceNumber] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: lastWorkspaceNumberWithEmailSelector});
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const lastUpdateIDAppliedToClientRef = useRef(lastUpdateIDAppliedToClient);
     const isLoadingAppRef = useRef(isLoadingApp);
-
     lastUpdateIDAppliedToClientRef.current = lastUpdateIDAppliedToClient;
     isLoadingAppRef.current = isLoadingApp;
 
@@ -151,7 +152,17 @@ function AuthScreensInitHandler() {
             App.reconnectApp(initialLastUpdateIDAppliedToClient);
         }
 
-        App.setUpPoliciesAndNavigate(session, introSelected, activePolicyID, isSelfTourViewed, betas, hasActiveAdminPolicies, lastWorkspaceNumber, translate);
+        App.setUpPoliciesAndNavigate(
+            session,
+            introSelected,
+            currentUserPersonalDetails.localCurrencyCode ?? CONST.CURRENCY.USD,
+            activePolicyID,
+            isSelfTourViewed,
+            betas,
+            hasActiveAdminPolicies,
+            lastWorkspaceNumber,
+            translate,
+        );
 
         Download.clearDownloads();
 
diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts
@@ -560,7 +560,7 @@ type CreateWorkspaceWithPolicyDraftParams = {
     makeMeAdmin?: boolean;
     backTo?: string;
     policyID?: string;
-    currency?: string;
+    currency: string;
     file?: File;
     routeToNavigateAfterCreate?: Route;
     lastUsedPaymentMethod?: OnyxTypes.LastPaymentMethodType;
@@ -752,6 +752,7 @@ function savePolicyDraftByNewWorkspace({
 function setUpPoliciesAndNavigate(
     session: OnyxEntry<OnyxTypes.Session>,
     introSelected: OnyxEntry<OnyxTypes.IntroSelected>,
+    currency: string,
     activePolicyID: string | undefined,
     isSelfTourViewed: boolean | undefined,
     betas: OnyxEntry<OnyxTypes.Beta[]>,
@@ -781,6 +782,7 @@ function setUpPoliciesAndNavigate(
     if (shouldCreateFreePolicy) {
         createWorkspaceWithPolicyDraftAndNavigateToIt({
             introSelected,
+            currency,
             policyOwnerEmail,
             policyName: policyName || newGenerateDefaultWorkspaceName(policyOwnerEmail, lastWorkspaceNumber, translate),
             transitionFromOldDot: true,
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
@@ -3936,6 +3936,7 @@ function createWorkspaceFromIOUPayment(
     currentUserEmail: string,
     iouReportOwnerEmail: string,
     conciergeReportID: string | undefined,
+    currentUserLocalCurrency: string,
     lastWorkspaceNumber: number | undefined,
     localeTranslate: LocalizedTranslate,
     reportActionsList: OnyxCollection<ReportActions>,
@@ -3949,7 +3950,7 @@ function createWorkspaceFromIOUPayment(
     const policyID = generatePolicyID();
     const workspaceName = newGenerateDefaultWorkspaceName(currentUserEmail, lastWorkspaceNumber, localeTranslate);
     const employeeAccountID = iouReport?.ownerAccountID;
-    const {customUnits, customUnitID, customUnitRateID} = buildOptimisticDistanceRateCustomUnits(iouReport?.currency);
+    const {customUnits, customUnitID, customUnitRateID} = buildOptimisticDistanceRateCustomUnits(iouReport?.currency ?? currentUserLocalCurrency);
     const oldPersonalPolicyID = iouReport?.policyID;
     const iouReportID = iouReport?.reportID;
 
@@ -7088,6 +7089,7 @@ export {
     openPolicyMoreFeaturesPage,
     openPolicyProfilePage,
     openPolicyInitialPage,
+    buildOptimisticDistanceRateCustomUnits,
     generateCustomUnitID,
     clearQBOErrorField,
     clearXeroErrorField,
diff --git a/src/libs/actions/Subscription.ts b/src/libs/actions/Subscription.ts
@@ -1,4 +1,4 @@
-import type {OnyxUpdate} from 'react-native-onyx';
+import type {OnyxCollection, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as API from '@libs/API';
 import type {CancelBillingSubscriptionParams, UpdateSubscriptionAddNewUsersAutomaticallyParams, UpdateSubscriptionAutoRenewParams, UpdateSubscriptionTypeParams} from '@libs/API/parameters';
@@ -7,34 +7,62 @@ import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import CONST from '@src/CONST';
 import type {FeedbackSurveyOptionID, SubscriptionType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {BillingGraceEndPeriod} from '@src/types/onyx';
 import type {OnyxData} from '@src/types/onyx/Request';
 
 /**
  * Fetches data when the user opens the SubscriptionSettingsPage
+ * @param currentGracePeriods - The current billing grace period collection. If provided and non-empty,
+ *                              all entries will be optimistically cleared to handle stale cache when
+ *                              billing was resolved (e.g. owner changed). On failure, previous values are restored.
  */
-function openSubscriptionPage() {
-    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA>> = [
+function openSubscriptionPage(currentGracePeriods?: OnyxCollection<BillingGraceEndPeriod>) {
+    type SubscriptionOnyxKeys = typeof ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA | typeof ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END;
+
+    const optimisticData: Array<OnyxUpdate<SubscriptionOnyxKeys>> = [
         {
             onyxMethod: Onyx.METHOD.SET,
             key: ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA,
             value: true,
         },
     ];
-    const successData: Array<OnyxUpdate<typeof ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA>> = [
+
+    const successData: Array<OnyxUpdate<SubscriptionOnyxKeys>> = [
         {
             onyxMethod: Onyx.METHOD.SET,
             key: ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA,
             value: false,
         },
     ];
-    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA>> = [
+
+    const failureData: Array<OnyxUpdate<SubscriptionOnyxKeys>> = [
         {
             onyxMethod: Onyx.METHOD.SET,
             key: ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA,
             value: false,
         },
     ];
 
+    // Clear ALL billing grace period keys optimistically. If the server still has active
+    // grace periods, they will be restored from the response. This clears the entire
+    // collection rather than a single owner's key, so stale entries from previous owners
+    // are also evicted. On failure, previous values are restored.
+    if (currentGracePeriods) {
+        const keys = Object.keys(currentGracePeriods) as Array<`${typeof ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}${string}`>;
+        for (const key of keys) {
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.SET,
+                key,
+                value: null,
+            });
+            failureData.push({
+                onyxMethod: Onyx.METHOD.SET,
+                key,
+                value: currentGracePeriods[key] ?? null,
+            });
+        }
+    }
+
     API.read(READ_COMMANDS.OPEN_SUBSCRIPTION_PAGE, null, {optimisticData, successData, failureData});
 }
 
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
@@ -261,7 +261,9 @@ function ProfilePage({route}: ProfilePageProps) {
                                 shouldShowRightIcon
                                 title={notificationPreference}
                                 description={translate('notificationPreferencesPage.label')}
-                                onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.NOTIFICATION_PREFERENCES.path))}
+                                onPress={() => {
+                                    Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.NOTIFICATION_PREFERENCES.getRoute(report.reportID)));
+                                }}
                             />
                         )}
                         {!isEmptyObject(report) && !!report.reportID && !isCurrentUser && (
diff --git a/src/pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage.tsx b/src/pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import React, {useEffect, useRef} from 'react';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -30,20 +30,35 @@ function WorkspaceRestrictedActionPage({
     const policy = usePolicy(policyID);
     const styles = useThemeStyles();
     const [isLoadingSubscriptionData] = useOnyx(ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA);
+
+    // Watch billing NVPs so the component re-renders when fresh data arrives from the server.
+    const [userBillingGracePeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
+    const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
+
+    // Track grace periods in a ref so openSubscriptionPage can roll back on failure
+    // without adding the collection to effect dependencies (which would re-trigger the fetch
+    // on every optimistic update).
+    const gracePeriodsRef = useRef(userBillingGracePeriods);
+    useEffect(() => {
+        gracePeriodsRef.current = userBillingGracePeriods;
+    }, [userBillingGracePeriods]);
+
     const {isOffline} = useNetwork({
-        onReconnect: () => openSubscriptionPage(),
+        onReconnect: () => openSubscriptionPage(gracePeriodsRef.current),
     });
 
     // Fetch fresh billing NVPs from the server on mount.
     // The cached billing data may be stale, causing the restriction to persist
     // even after the workspace owner has resolved their billing issue.
+    // Skip when offline since the API call won't go through and the optimistic
+    // clear would incorrectly lift the restriction.
     useEffect(() => {
-        openSubscriptionPage();
-    }, []);
-
-    // Watch billing NVPs so the component re-renders when fresh data arrives from the server.
-    const [userBillingGracePeriods] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
-    const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
+        if (isOffline) {
+            return;
+        }
+        openSubscriptionPage(gracePeriodsRef.current);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [isOffline]);
 
     // Navigate back if the fresh server data shows the restriction no longer applies.
     useEffect(() => {
diff --git a/src/pages/settings/Wallet/PersonalCards/upgrade/PersonalCardUpgradePage.tsx b/src/pages/settings/Wallet/PersonalCards/upgrade/PersonalCardUpgradePage.tsx
@@ -13,6 +13,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
 import {createWorkspaceWithPolicyDraft} from '@userActions/App';
 import {generatePolicyID, newGenerateDefaultWorkspaceName} from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import {lastWorkspaceNumberSelector} from '@src/selectors/Policy';
@@ -33,7 +34,8 @@ function PersonalCardUpgradePage() {
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
 
-    const {accountID, email = ''} = useCurrentUserPersonalDetails();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const {accountID, email = ''} = currentUserPersonalDetails;
     const hasActiveAdminPolicies = useHasActiveAdminPolicies();
 
     const lastWorkspaceNumberWithEmailSelector = (policies: OnyxCollection<Policy>) => lastWorkspaceNumberSelector(policies, email);
@@ -43,6 +45,7 @@ function PersonalCardUpgradePage() {
         createWorkspaceWithPolicyDraft({
             introSelected,
             policyName: newGenerateDefaultWorkspaceName(email, lastWorkspaceNumber, translate),
+            currency: currentUserPersonalDetails.localCurrencyCode ?? CONST.CURRENCY.USD,
             policyOwnerEmail: '',
             transitionFromOldDot: false,
             makeMeAdmin: false,
diff --git a/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx b/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx
@@ -244,7 +244,7 @@ function WorkspaceDuplicateSelectFeaturesForm({policyID}: WorkspaceDuplicateForm
                 codingRules: selectedItems.includes('codingRules'),
             },
             file: duplicatedWorkspaceAvatar,
-            localCurrency: currentUserPersonalDetails?.localCurrencyCode ?? '',
+            localCurrency: currentUserPersonalDetails?.localCurrencyCode ?? CONST.CURRENCY.USD,
         });
         Navigation.closeRHPFlow();
     }, [
diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
diff --git a/tests/actions/SubscriptionTest.ts b/tests/actions/SubscriptionTest.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "new.expensify",`
`3`		`- "version": "9.3.54-0",`
	`3`	`+ "version": "9.3.54-1",`
`4`	`4`	`"author": "Expensify, Inc.",`
`5`	`5`	`"homepage": "https://new.expensify.com",`
`6`	`6`	`"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",`