Merge branch 'main' into write-mute-settings-to-backend

.eslintrc.js

@@ -109,7 +109,6 @@ module.exports = {
         'plugin:prettier/recommended',
     ],
     plugins: ['@typescript-eslint', 'jsdoc', 'you-dont-need-lodash-underscore', 'react-native-a11y', 'react', 'testing-library', 'eslint-plugin-react-compiler', 'lodash', 'deprecation'],
-    ignorePatterns: ['lib/**'],
     parser: '@typescript-eslint/parser',
     parserOptions: {
         project: path.resolve(__dirname, './tsconfig.json'),

.github/workflows/e2ePerformanceTests.yml

@@ -35,8 +35,16 @@ jobs:
       - name: Determine "baseline ref" (prev merge commit)
         id: getBaselineRef
         run: |
-          previous_merge=$(git rev-list --merges HEAD~1 | head -n 1)
-          git checkout "$previous_merge"
+          # Get the name of the current branch
+          current_branch=$(git rev-parse --abbrev-ref HEAD)
+
+          if [ "$current_branch" = "main" ]; then
+            # On the main branch, find the previous merge commit
+            previous_merge=$(git rev-list --merges HEAD~1 | head -n 1)
+          else
+            # On a feature branch, find the common ancestor of the current branch and main
+            previous_merge=$(git merge-base HEAD main)
+          fi
           echo "$previous_merge"
           echo "BASELINE_REF=$previous_merge" >> "$GITHUB_OUTPUT"
 

.prettierignore

@@ -18,8 +18,6 @@ package-lock.json
 *.markdown
 # We need to modify the import here specifically, hence we disable prettier to get rid of the sorted imports
 src/libs/E2E/reactNativeLaunchingTest.ts
-# Temporary while we keep react-compiler in our repo
-lib/**
 
 # Automatically generated files
 src/libs/SearchParser/searchParser.js

README.md

@@ -274,7 +274,7 @@ web: `npm run symbolicate-release:web`
     - Perfetto UI (https://ui.perfetto.dev/)
     - Google Chrome's Tracing UI (chrome://tracing)
 
----
+----
 
 # App Structure and Conventions
 

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009005400
-        versionName "9.0.54-0"
+        versionCode 1009005401
+        versionName "9.0.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"

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

@@ -64,7 +64,7 @@ class MainApplication : MultiDexApplication(), ReactApplication {
         SoLoader.init(this,  /* native exopackage */false)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
-            load()
+            load(bridgelessEnabled = false)
         }
         if (BuildConfig.DEBUG) {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)

babel.config.js

@@ -3,11 +3,14 @@ require('dotenv').config();
 const IS_E2E_TESTING = process.env.E2E_TESTING === 'true';
 
 const ReactCompilerConfig = {
-    runtimeModule: 'react-compiler-runtime',
+    target: '18',
     environment: {
         enableTreatRefLikeIdentifiersAsRefs: true,
     },
+    // We exclude 'tests' directory from compilation, but still compile components imported in test files.
+    sources: (filename) => !filename.includes('tests/') && !filename.includes('node_modules/'),
 };
+
 /**
  * Setting targets to node 20 to reduce JS bundle size
  * It is also recommended by babel:
@@ -52,6 +55,8 @@ const webpack = {
 const metro = {
     presets: [require('@react-native/babel-preset')],
     plugins: [
+        ['babel-plugin-react-compiler', ReactCompilerConfig], // must run first!
+
         // This is needed due to a react-native bug: https://github.com/facebook/react-native/issues/29084#issuecomment-1030732709
         // It is included in metro-react-native-babel-preset but needs to be before plugin-proposal-class-properties or FlatList will break
         '@babel/plugin-transform-flow-strip-types',
@@ -154,11 +159,5 @@ module.exports = (api) => {
     const runningIn = api.caller((args = {}) => args.name);
     console.debug('  - running in: ', runningIn);
 
-    // don't include react-compiler in jest, because otherwise tests will fail
-    if (runningIn !== 'babel-jest') {
-        // must run first!
-        metro.plugins.unshift(['babel-plugin-react-compiler', ReactCompilerConfig]);
-    }
-
     return ['metro', 'babel-jest'].includes(runningIn) ? metro : webpack;
 };

docs/redirects.csv

@@ -585,7 +585,8 @@ https://community.expensify.com/discussion/6699/faq-troubleshooting-known-bank-s
 https://community.expensify.com/discussion/4730/faq-expenses-are-exporting-to-the-wrong-accounts-whys-that,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings
 https://community.expensify.com/discussion/9000/how-to-integrate-with-deel,https://help.expensify.com/articles/expensify-classic/connections/Deel
 https://community.expensify.com/categories/expensify-classroom,https://use.expensify.com
-https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/adding-payment-card-subscription-overview,https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/add-a-payment-card-and-view-your-subscription
+https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/adding-payment-card-subscription-overview,https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/Add-a-payment-card-and-view-your-subscription
 https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Send-Receive-for-Invoices,https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Send-and-Receive-Payment-for-Invoices.md
 https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Bulk-Upload-Multiple-Invoices,https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Add-Invoices-in-Bulk
-https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Create-and-Pay-Bills
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Create-and-Pay-Bills
+https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/add-a-payment-card-and-view-your-subscription,https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/Add-a-payment-card-and-view-your-subscription

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.54.0</string>
+	<string>9.0.54.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.54.0</string>
+	<string>9.0.54.1</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.54</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.54.0</string>
+	<string>9.0.54.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.54-0",
+  "version": "9.0.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.",
@@ -260,7 +260,7 @@
     "babel-jest": "29.4.1",
     "babel-loader": "^9.1.3",
     "babel-plugin-module-resolver": "^5.0.0",
-    "babel-plugin-react-compiler": "0.0.0-experimental-334f00b-20240725",
+    "babel-plugin-react-compiler": "^19.0.0-beta-8a03594-20241020",
     "babel-plugin-react-native-web": "^0.18.7",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "clean-webpack-plugin": "^4.0.0",
@@ -281,7 +281,7 @@
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-jsdoc": "^46.2.6",
     "eslint-plugin-lodash": "^7.4.0",
-    "eslint-plugin-react-compiler": "0.0.0-experimental-9ed098e-20240725",
+    "eslint-plugin-react-compiler": "^19.0.0-beta-8a03594-20241020",
     "eslint-plugin-react-native-a11y": "^3.3.0",
     "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-testing-library": "^6.2.2",
@@ -304,8 +304,8 @@
     "portfinder": "^1.0.28",
     "prettier": "^2.8.8",
     "pusher-js-mock": "^0.3.3",
-    "react-compiler-healthcheck": "^0.0.0-experimental-ab3118d-20240725",
-    "react-compiler-runtime": "file:./lib/react-compiler-runtime",
+    "react-compiler-healthcheck": "^19.0.0-beta-8a03594-20241020",
+    "react-compiler-runtime": "^19.0.0-beta-8a03594-20241020",
     "react-is": "^18.3.1",
     "react-native-clean-project": "^4.0.0-alpha4.0",
     "react-test-renderer": "18.3.1",

patches/@react-native-firebase+app+12.9.3+002+bridgeless.patch

@@ -1,13 +1,13 @@
 diff --git a/node_modules/@react-native-firebase/app/lib/internal/registry/nativeModule.js b/node_modules/@react-native-firebase/app/lib/internal/registry/nativeModule.js
-index 03f001c..23d467d 100644
+index 03f001c..358c795 100644
 --- a/node_modules/@react-native-firebase/app/lib/internal/registry/nativeModule.js
 +++ b/node_modules/@react-native-firebase/app/lib/internal/registry/nativeModule.js
 @@ -65,7 +65,7 @@ function nativeModuleWrapped(namespace, NativeModule, argToPrepend) {
      return NativeModule;
    }
 
 -  const properties = Object.keys(NativeModule);
-+  const properties = Object.keys(Object.getPrototypeOf(NativeModule));
++  const properties = [...Object.keys(Object.getPrototypeOf(NativeModule)), ...Object.keys(NativeModule)];
 
    for (let i = 0, len = properties.length; i < len; i++) {
      const property = properties[i];