Merge branch 'main' into fix/94612

Author: dukenv0307

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009042202
-        versionName "9.4.22-2"
+        versionCode 1009042400
+        versionName "9.4.24-0"
         // 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 androidx.multidex.MultiDexApplication
 import com.expensify.chat.bootsplash.BootSplashPackage
 import com.expensify.chat.navbar.NavBarManagerPackage
 import com.expensify.chat.shortcutManagerModule.ShortcutManagerPackage
+import com.margelo.nitro.nitrofetch.AutoPrefetcher
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
@@ -73,6 +74,13 @@ class MainApplication : MultiDexApplication(), ReactApplication {
             return
         }
 
+        // This is the entrypoint for prefetching with `react-native-nitro-fetch`.
+        try {
+            AutoPrefetcher.prefetchOnStart(this)
+        } catch (_: Throwable) {
+            System.err.println("Error initializing Nitro `AutoPrefetcher`")
+        }
+
         loadReactNative(this)
 
         // Force the app to LTR mode.

android/app/src/main/java/com/expensify/chat/MainApplication.kt

@@ -203,6 +203,14 @@ const restrictedPaidGroupPolicyImportPatterns = [
     },
 ];
 
+// Headless email chart CLI cannot use useTheme; charts always render with the light theme.
+const victoryChartRendererRestrictedImportPaths = restrictedImportPaths.filter((restriction) => restriction.name !== '@styles/theme');
+const victoryChartRendererRestrictedImportPatterns = [
+    ...restrictedImportPatterns.filter((restriction) => restriction.group[0] !== '@styles/theme/themes/**'),
+    ...restrictedReportNameImportPatterns,
+    ...restrictedPaidGroupPolicyImportPatterns,
+];
+
 const config = defineConfig([
     expensifyConfig,
     typescriptEslint.configs.recommendedTypeChecked,
@@ -764,6 +772,16 @@ const config = defineConfig([
                 project: path.resolve(projectRoot, 'server/victory-chart-renderer/tsconfig.json'),
             },
         },
+        rules: {
+            // Headless CLI cannot use useTheme; email charts always render with the light theme.
+            'no-restricted-imports': [
+                'error',
+                {
+                    paths: victoryChartRendererRestrictedImportPaths,
+                    patterns: victoryChartRendererRestrictedImportPatterns,
+                },
+            ],
+        },
     },
 
     globalIgnores([

config/eslint/eslint.config.mjs

@@ -379,7 +379,6 @@
 "../../src/components/Search/SearchPageHeader/useSearchPageInput.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchPageHeader/useSearchPageInput.tsx"	"react-hooks/set-state-in-effect"	2
 "../../src/components/Search/SearchQueryProvider.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/components/Search/SearchResultsProvider.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchRouter/SearchRouter.tsx"	"@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions"	1
 "../../src/components/Search/SearchRouter/SearchRouter.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchRouter/SearchRouterUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -736,7 +735,7 @@
 "../../src/libs/ReportPrimaryActionUtils.ts"	"no-restricted-imports"	1
 "../../src/libs/ReportTitleUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-deprecated/getPolicy"	28
-"../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-deprecated/translateLocal"	34
+"../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-deprecated/translateLocal"	30
 "../../src/libs/ReportUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	33
 "../../src/libs/ReportUtils.ts"	"rulesdir/no-onyx-connect"	16
 "../../src/libs/SearchAutocompleteUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
@@ -1774,7 +1773,6 @@
 "../../tests/unit/NextStepUtilsTest.ts"	"@typescript-eslint/no-deprecated/buildNextStepNew"	23
 "../../tests/unit/NextStepUtilsTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../tests/unit/OnboardingSelectorsTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	10
-"../../tests/unit/OnyxDerivedTest.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	8
 "../../tests/unit/OnyxUpdateManagerTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../tests/unit/OptionListContextProviderTest.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	10
 "../../tests/unit/OptionsListUtilsTest.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	50
@@ -1922,7 +1920,6 @@
 "../../tests/unit/hooks/useIsSidebarRouteActive.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../tests/unit/hooks/useLazyAsset.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	5
 "../../tests/unit/hooks/useNonPersonalCardList.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
-"../../tests/unit/hooks/useOdometerReadingsState.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../tests/unit/hooks/useOdometerReceiptStitcherTest.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	5
 "../../tests/unit/hooks/useOtherFeedsForFeedSelector.test.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	16
 "../../tests/unit/hooks/usePendingConciergeResponse.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6
@@ -1934,7 +1931,7 @@
 "../../tests/unit/hooks/useSearchSections.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../tests/unit/hooks/useSearchShouldCalculateTotals.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../tests/unit/hooks/useSelectedTransactionsActions.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../tests/unit/hooks/useSelectionModeReportActions.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6
+"../../tests/unit/hooks/useSelectionModeReportActions.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../tests/unit/hooks/useSplitContextHooks.test.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../tests/unit/hooks/useSplitEffectivePolicy.test.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../tests/unit/hooks/useSplitParticipants.test.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
@@ -1988,7 +1985,6 @@
 "../../tests/unit/sanitizeStringForJSONParseTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../tests/unit/selectors/CardTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	10
 "../../tests/unit/selectors/PolicyTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	16
-"../../tests/unit/selectors/TodosTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	12
 "../../tests/unit/showReportActionNotificationTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../tests/unit/submitDismissStrategiesTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	7
 "../../tests/unit/submitWithDismissFirstTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
@@ -2018,6 +2014,7 @@
 "../../tests/unit/useSubPageTest.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../tests/unit/useSubStepTest.tsx"	"@typescript-eslint/no-deprecated/useSubStep"	13
 "../../tests/unit/useSyncFocusTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../tests/unit/useTodoCountsTest.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../tests/unit/useTodosTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../tests/unit/useTransactionViolationsTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	21
 "../../tests/unit/useWorkspacesTabIndicatorStatusTest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6

config/eslint/eslint.seatbelt.tsv

@@ -830,6 +830,7 @@
         "reimbursability",
         "reimbursementid",
         "reimbursible",
+        "reminted",
         "remotedesktop",
         "remotesync",
         "removeHiddenElems",

cspell.json

@@ -95,7 +95,7 @@ For additional control:
 - **Invite Employees & Set Approvals** – Imports employees and sets workflow
 - **Auto Create Employees/Vendors** – Automatically creates a NetSuite record if one doesn’t exist
 - **Enable Newly Imported Categories** – Activates newly synced Expense Categories
-- **Sync Consolidated Travel Billing Settlements** – If Expensify Travel's Consolidated Travel Billing feature is enabled, turn on this toggle to continuously reconcile Consolidated Travel Billing settlements through NetSuite. When enabled, select a **Reconciliation account** to match your Consolidated Travel Billing settlement account.
+- **Sync Consolidated Travel Billing Settlements** – If Expensify Travel's Consolidated Travel Billing feature is enabled, turn on this toggle to continuously reconcile settlements through NetSuite. When enabled, select a **Reconciliation account** to match your settlement account.
 - **Approval Levels** – Set approval levels for:
   - Expense Reports
   - Vendor Bills

docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md

@@ -2,6 +2,7 @@
  * @format
  */
 // import of polyfills should always be first
+import './src/polyfills/NitroFetch';
 import './src/polyfills/PromiseWithResolvers';
 import './src/polyfills/requestIdleCallback';
 import {AppRegistry} from 'react-native';

index.js

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.4.22</string>
+	<string>9.4.24</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.4.22.2</string>
+	<string>9.4.24.0</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.4.22</string>
+	<string>9.4.24</string>
 	<key>CFBundleVersion</key>
-	<string>9.4.22.2</string>
+	<string>9.4.24.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>