Merge branch 'main' of https://github.com/Expensify/App into gusto1.12

Author: ShridharGoel

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036900
-        versionName "9.3.69-0"
+        versionCode 1009036902
+        versionName "9.3.69-2"
         // 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

@@ -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',

assets/fonts/NotoSansSC-Months.ttf

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

config/webpack/webpack.common.ts

@@ -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.
 

cspell.json

@@ -84,14 +84,30 @@ You can issue virtual or physical cards to employees:
    - Limit type
    - Card name
    - Deactivation
-4. To change the linked bank account or update settlement frequency, click **Settings**.
+4. To change the linked bank account, update settlement frequency, or manage cash back settings, click **Settings**.
 
 ![Click Expensify Card in the left menu to see a list of cards]({{site.url}}/assets/images/ExpensifyHelp-ExpensifyCard_05.png){:width="100%"}
 
 ![Click the card row to view the card details and make settings adjustments]({{site.url}}/assets/images/ExpensifyHelp-ExpensifyCard_06.png){:width="100%"}
 
 ![Click Settings to adjust the settlement account or frequency]({{site.url}}/assets/images/ExpensifyHelp-ExpensifyCard_08.png){:width="100%"}
 
+---
+
+## How to apply Expensify Card cash back to your Expensify bill
+
+Workspace Admins with a US Expensify Card program can choose whether their Expensify Card cash back is applied toward their Expensify bill or sent to their settlement account. This setting is enabled by default.
+
+1. From the navigation tabs (on the left on web, and at the bottom on mobile), go to **Workspaces > [Workspace Name] > Expensify Card**.
+2. Click **Settings**.
+3. Toggle **Apply cash back to my Expensify bill** on or off.
+
+When enabled, cash back earned from the Expensify Card is automatically applied toward payment for your Expensify bill. When disabled, cash back is sent to your settlement account instead.
+
+**Note:** This setting is only available for US card programs and is not shown for workspaces on an invoiced subscription.
+
+---
+
 If a Single-use card completes its first successful transaction, it automatically deactivates.
 If a card reaches its expiration date, it automatically deactivates and declines new transactions.
 

docs/articles/new-expensify/expensify-card/Expensify-Card-Perks.md

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.69.0</string>
+	<string>9.3.69.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

docs/articles/new-expensify/expensify-card/Set-Up-and-Manage-the-Expensify-Card.md

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.69</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.69.0</string>
+	<string>9.3.69.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.69</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.69.0</string>
+	<string>9.3.69.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>