Merge branch 'Expensify:main' into krishna2323/issue/87734-fix

Author: Krishna2323

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009037302
-        versionName "9.3.73-2"
+        versionCode 1009037401
+        versionName "9.3.74-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"

android/app/build.gradle

@@ -109,8 +109,8 @@
 "../../src/components/MagicCodeInput.tsx"	"react-hooks/refs"	1
 "../../src/components/MagicCodeInput.tsx"	"react-hooks/set-state-in-effect"	3
 "../../src/components/MapView/MapView.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/components/MapView/MapView.website.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/components/MapView/MapViewImpl.website.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/components/MapView/MapView.web.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/components/MapView/MapViewImpl.web.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/MapView/ToggleDistanceUnitButton/index.android.tsx"	"no-restricted-syntax"	1
 "../../src/components/MessagesRow.tsx"	"no-restricted-syntax"	1
 "../../src/components/Modal/BaseModal.tsx"	"react-hooks/set-state-in-effect"	1
@@ -224,7 +224,6 @@
 "../../src/hooks/useNativeCamera.ts"	"react-hooks/refs"	1
 "../../src/hooks/useNewTransactions.ts"	"react-hooks/refs"	2
 "../../src/hooks/useOutstandingBalanceGuard.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
-"../../src/hooks/usePaginatedReportActions.ts"	"react-hooks/refs"	1
 "../../src/hooks/usePaymentOptions.ts"	"react-hooks/refs"	1
 "../../src/hooks/usePrevious.ts"	"react-hooks/refs"	1
 "../../src/hooks/useProactiveAppReview.ts"	"react-hooks/purity"	1
@@ -235,7 +234,6 @@
 "../../src/hooks/useSearchBulkActions.ts"	"react-hooks/preserve-manual-memoization"	2
 "../../src/hooks/useSearchBulkActions.ts"	"react-hooks/refs"	1
 "../../src/hooks/useSearchHighlightAndScroll.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
-"../../src/hooks/useSearchResults.ts"	"react-hooks/set-state-in-effect"	1
 "../../src/hooks/useSearchSelector.native.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/hooks/useSelectionModeReportActions.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	2
 "../../src/hooks/useSidebarOrderedReports.tsx"	"react-hooks/purity"	1
@@ -365,8 +363,8 @@
 "../../src/libs/actions/IOU/index.ts"	"@typescript-eslint/no-deprecated/getPolicyTagsData"	2
 "../../src/libs/actions/IOU/index.ts"	"rulesdir/no-onyx-connect"	10
 "../../src/libs/actions/ImportTransactions.ts"	"no-restricted-syntax"	1
-"../../src/libs/actions/InputFocus/index.website.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
-"../../src/libs/actions/InputFocus/index.website.ts"	"no-restricted-syntax"	1
+"../../src/libs/actions/InputFocus/index.web.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
+"../../src/libs/actions/InputFocus/index.web.ts"	"no-restricted-syntax"	1
 "../../src/libs/actions/Link.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/libs/actions/Link.ts"	"no-restricted-syntax"	3
 "../../src/libs/actions/MapboxToken.ts"	"no-restricted-syntax"	2
@@ -479,11 +477,10 @@
 "../../src/pages/ReportDetailsPage.tsx"	"react-hooks/preserve-manual-memoization"	4
 "../../src/pages/ReportParticipantDetailsPage.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/pages/ReportParticipantsPage.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
-"../../src/pages/ReportParticipantsPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/RoomMemberDetailsPage.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/pages/RoomMembersPage.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/pages/RoomMembersPage.tsx"	"react-hooks/preserve-manual-memoization"	1
-"../../src/pages/RoomMembersPage.tsx"	"react-hooks/set-state-in-effect"	3
+"../../src/pages/RoomMembersPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/ScheduleCall/ScheduleCallPage.tsx"	"react-hooks/preserve-manual-memoization"	1
 "../../src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/Search/SearchMoneyRequestReportPage.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
@@ -492,11 +489,11 @@
 "../../src/pages/Share/ShareRootPage.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/pages/TransactionDuplicate/Confirmation.tsx"	"react-hooks/refs"	12
 "../../src/pages/Travel/TravelUpgrade.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/ValidateLoginPage/index.website.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/ValidateLoginPage/index.web.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/domain/Groups/PreferredWorkspaceToggle.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/pages/domain/Saml/SamlLoginSectionContent.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/pages/inbox/DeleteTransactionNavigateBackHandler.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
-"../../src/pages/inbox/ReportFetchHandler.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	2
+"../../src/pages/inbox/ReportFetchHandler.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	3
 "../../src/pages/inbox/ReportNavigateAwayHandler.tsx"	"react-hooks/exhaustive-deps"	1
 "../../src/pages/inbox/hooks/useReportWasDeleted.ts"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
@@ -505,27 +502,28 @@
 "../../src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx"	"@typescript-eslint/no-deprecated/getReportNameDeprecated"	1
 "../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
-"../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx"	"react-hooks/refs"	29
+"../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx"	"react-hooks/refs"	30
 "../../src/pages/inbox/report/ListBoundaryLoader.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/inbox/report/PureReportActionItem.tsx"	"react-hooks/refs"	2
 "../../src/pages/inbox/report/PureReportActionItem.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/inbox/report/ReactionList/HeaderReactionList.tsx"	"no-restricted-syntax"	1
-"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
-"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx"	"react-hooks/refs"	7
+"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	2
+"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx"	"react-hooks/preserve-manual-memoization"	2
+"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx"	"react-hooks/refs"	8
 "../../src/pages/inbox/report/ReportActionCompose/SuggestionEmoji.tsx"	"react-hooks/refs"	1
 "../../src/pages/inbox/report/ReportActionCompose/SuggestionMention.tsx"	"react-hooks/refs"	3
 "../../src/pages/inbox/report/ReportActionItemMessage.tsx"	"@typescript-eslint/no-deprecated/getReportName"	1
-"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
+"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	2
 "../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"no-restricted-syntax"	1
 "../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"react-hooks/preserve-manual-memoization"	1
-"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"react-hooks/refs"	5
+"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"react-hooks/refs"	6
 "../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/inbox/report/ReportActionsList.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	4
 "../../src/pages/inbox/report/ReportActionsList.tsx"	"react-hooks/refs"	5
 "../../src/pages/inbox/report/ReportActionsList.tsx"	"react-hooks/set-state-in-effect"	3
 "../../src/pages/inbox/report/TripSummary.tsx"	"rulesdir/no-default-id-values"	1
 "../../src/pages/inbox/report/UserTypingEventListener.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	4
-"../../src/pages/inbox/report/shouldUseEmojiPickerSelection/index.website.ts"	"no-restricted-syntax"	1
+"../../src/pages/inbox/report/shouldUseEmojiPickerSelection/index.web.ts"	"no-restricted-syntax"	1
 "../../src/pages/inbox/report/useReportActionsNewActionLiveTail.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/pages/inbox/report/withReportOrNotFound.tsx"	"react-hooks/refs"	3
 "../../src/pages/inbox/sidebar/SidebarLinksData.tsx"	"react-hooks/refs"	1
@@ -694,7 +692,7 @@
 "../../src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	2
 "../../src/stories/ReportActionItemImages.stories.tsx"	"no-restricted-syntax"	1
 "../../src/stories/TextInput.stories.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/styles/utils/autoCompleteSuggestion/index.website.ts"	"no-restricted-syntax"	1
+"../../src/styles/utils/autoCompleteSuggestion/index.web.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/Account.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/AccountData.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/BankAccount.ts"	"no-restricted-syntax"	1

config/eslint/eslint.seatbelt.tsv

@@ -396,10 +396,9 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                 '@selectors': path.resolve(dirname, '../../src/selectors/'),
             },
 
-            // React Native libraries may have web-specific module implementations that appear with the extension `.web.js`
-            // without this, web will try to use native implementations and break in not very obvious ways.
-            // This is also why we have to use .website.js for our own web-specific files...
-            extensions: ['.web.js', '.website.js', '.js', '.jsx', '.web.ts', '.website.ts', '.website.tsx', '.ts', '.web.tsx', '.tsx'],
+            // Resolve web-specific implementations (`.web.*`) before bare files so React Native
+            // libraries and our own app-level overrides both pick up their browser variants.
+            extensions: ['.web.js', '.js', '.jsx', '.web.ts', '.web.tsx', '.ts', '.tsx'],
             fallback: {
                 'process/browser': require.resolve('process/browser'),
                 crypto: false,

config/webpack/webpack.common.ts

@@ -28,11 +28,11 @@ Put all platform specific code in dedicated files and folders (see below) and re
 In most cases, the code written for this repo should be platform-independent. In such cases, each module should have a single file, `index.js`, which defines the module's exports. There are, however, some cases in which a feature is intrinsically tied to the underlying platform. In such cases, the following file extensions can be used to export platform-specific code from a module:
 - Mobile => `index.native.js`
 - iOS Native App/Android Native App => `index.ios.js`/`index.android.js`
-- Web => `index.website.js`
+- Web => `index.web.js`
 
 **Note:** `index.js` should be the default and only platform-specific implementations should be done in their respective files. i.e: If you have mobile-specific implementation in `index.native.js`, then the web implementation can be contained in a shared `index.js`.
 
-`index.ios.js` and `index.android.js` are used when the app is running natively on respective platforms. These files are not used when users access the app through mobile browsers, but `index.website.js` is used instead. `index.native.js` are for both iOS and Android native apps. `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`.
+`index.ios.js` and `index.android.js` are used when the app is running natively on respective platforms. These files are not used when users access the app through mobile browsers, but `index.web.js` is used instead. `index.native.js` are for both iOS and Android native apps. `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`.
 
 ### Supporting Mobile Web
 The above platform-specific files only work because they are compiled when the app is built for the different platforms. This means that a different mechanism needs to be used for Mobile Web (since "mobile web" and "web" are the same at build time).

contributingGuides/philosophies/CROSS-PLATFORM.md

@@ -278,6 +278,7 @@
         "FLJZ",
         "fname",
         "fnames",
+        "focusability",
         "focusvisible",
         "fontawesome",
         "foreignamount",
@@ -325,6 +326,7 @@
         "Highlightable",
         "HKBCCATT",
         "Hoverable",
+        "hrefs",
         "HRMS",
         "HSBCSGS",
         "Humpty",
@@ -333,6 +335,7 @@
         "iaco",
         "IBTA",
         "IDEIN",
+        "idempotently",
         "idfa",
         "Idology",
         "ifdef",

cspell.json

@@ -1,13 +1,11 @@
 ---
 title: Manage Expensify Subscription
-description: Learn how to manage your subscription, update billing details, cancel early, or delete a workspace in New Expensify.
+description: Learn how to manage your subscription, update billing details, request to cancel your subscription, or delete a workspace in New Expensify.
 keywords: [New Expensify, billing owner, manage subscription, update payment card, cancel subscription, delete workspace, billing and subscriptions, subscription settings, can't delete workspace, can't cancel subscription]
 internalScope: Audience is billing owners and Workspace Admins. Covers how to manage a paid subscription in New Expensify, including billing permissions and ownership transfer. Does not cover free workspaces or plan upgrades.
 ---
 
-You can manage your Expensify subscription anytime from your account settings—update your billing info, request early cancellation, or delete a workspace if you're the billing owner.
-
-View and manage your subscription under **Account > Subscription**.
+You can manage your Expensify subscription in **Account > Subscription**. From there, you can update your billing information, request to cancel your subscription, or delete a workspace if you're the billing owner.
 
 ---
 
@@ -16,7 +14,7 @@ View and manage your subscription under **Account > Subscription**.
 Only the **billing owner** can:
 
 - Add or change the payment card
-- Request early cancellation of an annual plan
+- Request to cancel an annual subscription
 - Delete a paid workspace
 
 If you don’t see these options, you’re likely not the billing owner.
@@ -72,14 +70,12 @@ To access the **Subscription** section:
 
 ---
 
-# How to request early cancellation of an annual subscription
-
+# How to request to cancel an annual subscription
+## How to request to cancel an annual subscription
 1. Go to **Account > Subscription**.
-2. Click **Request early cancellation**.
+2. Click **Cancel subscription**.
 3. Follow the prompts. Your request may be processed automatically or reviewed by our team.
 
-**Note:** This option is only available to the billing owner and early cancellation is not available to all members. 
-
 ---
 
 # How to stop billing for a paid workspace
@@ -89,7 +85,7 @@ To stop being charged for Expensify, you’ll need to either:
 - **Delete the paid workspace**, or  
 - **Transfer billing ownership** to another member.
 
-**Note:** If you're on an annual subscription, you can’t delete your last workspace unless you’ve first requested and received early cancellation.
+**Note:** If you’re on an annual subscription, you can’t delete your last workspace unless you’ve first canceled your subscription.
 
 ---
 
@@ -117,8 +113,8 @@ Only Workspace Admins can transfer billing ownership to themselves - it’s not
 
 # What to do if you can’t update a subscription
 
-If you're blocked from updating billing settings, canceling early, or deleting a workspace, it's likely because you’re not the billing owner.
-
+If you’re blocked from updating billing settings, requesting to canceling your subscription, or deleting a workspace, it’s likely because you’re not the billing owner.
+If you're blocked from updating billing settings, requesting to cancel your subscription, or deleting a workspace, it's likely because you're not the billing owner.
 If you are a Workspace Admin, you can transfer billing ownership to yourself by following the steps to [transfer billing ownership](LINK).
 
 ---
@@ -127,13 +123,13 @@ If you are a Workspace Admin, you can transfer billing ownership to yourself by
 
 ## Why don’t I see the option to cancel or delete my workspace?
 
-Only the billing owner can cancel a subscription or delete a workspace. To confirm if you're the billing owner, go to the **Workspaces** tab and check the **Billing owner** column for the relevant workspace.
+Only the billing owner can request to cancel a subscription or delete a workspace. To confirm if you're the billing owner, go to the **Workspaces** tab and check the **Billing owner** column for the relevant workspace.
 
 ---
 
 ## Can I delete a workspace if I’m on an annual subscription?
 
-Only if you’ve been granted early cancellation. Otherwise, you’ll need to either wait for the subscription to end or request early cancellation first.
+Only if your subscription has been canceled. Otherwise, you’ll need to either wait for the subscription to end or cancel your subscription first.
 
 ---
 

docs/articles/new-expensify/billing-and-subscriptions/Add-a-payment-card-and-view-your-subscription.md

@@ -23,10 +23,10 @@ To switch to a different plan:
 If you're on an Annual Subscription (a 12-month commitment), you may be eligible for early cancellation and a switch to a free account:
 
 1. Use the **navigation tabs** (on the left on web, and at the bottom on mobile) to go to **Account > Subscription**.
-2. Select **Request early cancellation**.
+2. Select **Cancel subscription**.
 3. Follow the prompts. Your request may be processed automatically or reviewed by our team.
 
-**Note:** Early cancellations are subject to eligibility review. 
+**Note:** Cancellation requests are subject to eligibility review. 
 
 ---
 

docs/articles/new-expensify/billing-and-subscriptions/Changing-Your-Workspace-Plan.md

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.3.73</string>
+	<string>9.3.74</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.73.2</string>
+	<string>9.3.74.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.3.73</string>
+	<string>9.3.74</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.73.2</string>
+	<string>9.3.74.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>