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

Author: Eskalifer1

.github/actions/javascript/isDeployChecklistLocked/index.js

@@ -11816,8 +11816,8 @@ async function generateDeployChecklistBodyAndAssignees({ tag, PRList, PRListMobi
     const check = (checked) => (checked ? 'x' : ' ');
     sections.push((0, dedent_1.default)(`
             **Deployer verifications:**
-            - [${check(isSentryChecked)}] I checked [Sentry](https://expensify.sentry.io/releases/new.expensify%40${tag}/?project=app&environment=staging) for **this release version** and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).
-            - [${check(isSentryChecked)}] I checked [Sentry](https://expensify.sentry.io/releases/new.expensify%40${previousTag}/?project=app&environment=production) for **the previous release version** and verified that the release did not introduce any new crashes. Because mobile deploys use a phased rollout, completing this checklist will deploy the previous release version to 100% of users. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).
+            - [${check(isSentryChecked)}] I checked [Sentry](https://expensify.sentry.io/releases/new.expensify%40${tag}/?project=4510228107427840&environment=staging) for **this release version** and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).
+            - [${check(isSentryChecked)}] I checked [Sentry](https://expensify.sentry.io/releases/new.expensify%40${previousTag}/?project=4510228107427840&environment=production) for **the previous release version** and verified that the release did not introduce any new crashes. Because mobile deploys use a phased rollout, completing this checklist will deploy the previous release version to 100% of users. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).
             - [${check(isGHStatusChecked)}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.
         `).trimEnd());
     // Footer

.github/libs/DeployChecklistUtils.ts

@@ -249,8 +249,8 @@ async function generateDeployChecklistBodyAndAssignees({
     sections.push(
         dedent(`
             **Deployer verifications:**
-            - [${check(isSentryChecked)}] I checked [Sentry](https://expensify.sentry.io/releases/new.expensify%40${tag}/?project=app&environment=staging) for **this release version** and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).
-            - [${check(isSentryChecked)}] I checked [Sentry](https://expensify.sentry.io/releases/new.expensify%40${previousTag}/?project=app&environment=production) for **the previous release version** and verified that the release did not introduce any new crashes. Because mobile deploys use a phased rollout, completing this checklist will deploy the previous release version to 100% of users. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).
+            - [${check(isSentryChecked)}] I checked [Sentry](https://expensify.sentry.io/releases/new.expensify%40${tag}/?project=4510228107427840&environment=staging) for **this release version** and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).
+            - [${check(isSentryChecked)}] I checked [Sentry](https://expensify.sentry.io/releases/new.expensify%40${previousTag}/?project=4510228107427840&environment=production) for **the previous release version** and verified that the release did not introduce any new crashes. Because mobile deploys use a phased rollout, completing this checklist will deploy the previous release version to 100% of users. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).
             - [${check(isGHStatusChecked)}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.
         `).trimEnd(),
     );

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036803
-        versionName "9.3.68-3"
+        versionCode 1009036904
+        versionName "9.3.69-4"
         // 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

@@ -277,7 +277,6 @@
 "../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx"	"no-restricted-syntax"	1
 "../../src/libs/Navigation/AppNavigator/Navigators/SearchFullscreenNavigator.tsx"	"no-restricted-syntax"	1
 "../../src/libs/Navigation/AppNavigator/Navigators/TestToolsModalNavigator.tsx"	"no-restricted-syntax"	1
-"../../src/libs/Navigation/AppNavigator/UserStatusHandler.tsx"	"no-restricted-syntax"	1
 "../../src/libs/Navigation/helpers/createNormalizedConfigs.ts"	"@typescript-eslint/no-deprecated/escape"	1
 "../../src/libs/Navigation/helpers/dismissModalAndOpenReportInInboxTab.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/libs/Navigation/navigateAfterInteraction/index.ios.ts"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
@@ -316,7 +315,7 @@
 "../../src/libs/ReportUtils.ts"	"rulesdir/no-onyx-connect"	17
 "../../src/libs/SearchUIUtils.ts"	"@typescript-eslint/no-deprecated/getReportName"	1
 "../../src/libs/SearchUIUtils.ts"	"@typescript-eslint/no-deprecated/getSearchReportName"	1
-"../../src/libs/SubscriptionUtils.ts"	"rulesdir/no-onyx-connect"	2
+"../../src/libs/SubscriptionUtils.ts"	"rulesdir/no-onyx-connect"	1
 "../../src/libs/TransactionUtils/index.ts"	"@typescript-eslint/no-deprecated/translateLocal"	5
 "../../src/libs/UnreadIndicatorUpdater/index.ts"	"no-restricted-syntax"	1
 "../../src/libs/Violations/ViolationsUtils.ts"	"no-restricted-syntax"	2
@@ -489,7 +488,6 @@
 "../../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
-"../../src/pages/Search/SearchPage.tsx"	"react-hooks/refs"	31
 "../../src/pages/Search/SearchPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/Search/SearchTransactionsChangeReport.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/pages/Share/ShareRootPage.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
@@ -532,6 +530,7 @@
 "../../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/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
 "../../src/pages/iou/MoneyRequestAmountForm.tsx"	"react-hooks/set-state-in-effect"	3
@@ -548,7 +547,7 @@
 "../../src/pages/iou/request/step/IOURequestStepDistance.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/iou/request/step/IOURequestStepDistanceGPS/BackgroundLocationPermissionsFlow/index.android.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	3
 "../../src/pages/iou/request/step/IOURequestStepDistanceGPS/BackgroundLocationPermissionsFlow/index.ios.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	2
-"../../src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	5
+"../../src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	3
 "../../src/pages/iou/request/step/IOURequestStepDistanceMap.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/pages/iou/request/step/IOURequestStepDistanceOdometer.tsx"	"react-hooks/set-state-in-effect"	1

assets/fonts/NotoSansSC-Months.ttf

@@ -14,6 +14,7 @@ import {fileURLToPath} from 'url';
 import webpack from 'webpack';
 import type {Configuration, WebpackPluginInstance} from 'webpack';
 import {BundleAnalyzerPlugin} from 'webpack-bundle-analyzer';
+import {GenerateSW} from 'workbox-webpack-plugin';
 // Storybook 10 loads TS files directly and requires .ts extension for ESM imports
 // @ts-expect-error -- Can't use .ts extensions without allowImportingTsExtensions in tsconfig
 // eslint-disable-next-line import/extensions
@@ -125,6 +126,40 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
         },
         plugins: [
             new CleanWebpackPlugin(),
+            // Only emit the SW for non-development builds. In dev, webpack-dev-server's HMR
+            // and the SW's caching behavior fight each other and confuse hot reloads.
+            // Remove this guard locally if you want to actually exercise the SW.
+            ...(isDevelopment
+                ? []
+                : [
+                      new GenerateSW({
+                          clientsClaim: true,
+                          skipWaiting: true,
+                          // Cap is generous on purpose: the vendor (~6.5 MiB), main (~5.5 MiB),
+                          // authScreens.prefetch (~6.3 MiB) chunks and canvaskit.wasm (~7.6 MiB) are
+                          // all critical for offline boot, so we precache the lot. Everything in the
+                          // App build is content-hashed, so growth here only costs first-install bytes.
+                          maximumFileSizeToCacheInBytes: 10 * 1024 * 1024,
+                          // Single-page app: any unmatched navigation should serve the cached app shell.
+                          navigateFallback: '/index.html',
+                          // Don't fall back for asset-like or .well-known requests.
+                          navigateFallbackDenylist: [/^\/_/, /^\/\.well-known/, /\/[^/?]+\.[^/]+$/],
+                          runtimeCaching: [
+                              {
+                                  // Same-origin user media (receipts, chat attachments) — cache opportunistically
+                                  // so they're viewable on offline refresh. The function below is serialized into
+                                  // the generated service worker, so it executes in the SW context where
+                                  // `sameOrigin` is the appropriate Workbox match (no need to read `self.location`).
+                                  urlPattern: ({sameOrigin, url, request}) => sameOrigin && (request.destination === 'image' || /\/(receipts|chat-attachments)\//.test(url.pathname)),
+                                  handler: 'StaleWhileRevalidate',
+                                  options: {
+                                      cacheName: 'user-media',
+                                      expiration: {maxEntries: 200, maxAgeSeconds: 7 * 24 * 60 * 60},
+                                  },
+                              },
+                          ],
+                      }),
+                  ]),
             new HtmlWebpackPlugin({
                 template: 'web/index.html',
                 filename: 'index.html',

config/eslint/eslint.seatbelt.tsv

@@ -800,6 +800,7 @@
         "Unmigrated",
         "unmuting",
         "unredacted",
+        "unregisters",
         "unscrollable",
         "unsharing",
         "Unsharing",

config/webpack/webpack.common.ts

@@ -34,8 +34,9 @@ Workspace Admins with an email on a private domain can share a company card feed
 1. Click the navigation tabs (on the left on web, on the bottom on mobile) and select **Workspaces > [Workspace Name]**
 2. Choose **Company cards** to view your company’s card setup page.
  - If you don't see **Company cards**, enable the feature under **More features > Company cards**
-3. Select your existing card connection.
-4. In **From other workspaces**, choose a company card feed to add to the Workspace.
+3. Click **Add cards**.
+4. Select your existing card connection.
+5. In **From other workspaces**, choose a company card feed to add to the Workspace.
 
 ---
 

cspell.json

@@ -14,6 +14,8 @@ From cash-back rewards to discounts on popular services, the Expensify Card offe
 ## Cashback
 Get 1% cash back with every swipe — no minimums necessary — and 2% back if you spend $250k+/month across cards. This applies to US purchases only.
 
+By default, cash back is applied toward your Expensify bill. Workspace Admins can change this in **Workspaces > [Workspace Name] > Expensify Card > Settings** by toggling **Apply cash back to my Expensify bill** off to send cash back to the settlement account instead.
+
 ## Discounts on Monthly Expensify Bill
 Get the Expensify Visa® Commercial Card and use it for at least half of your organization's monthly expenses to save 50% on your monthly Expensify bill.