Merge branch 'Expensify:main' into fixintegervalidation

.eslintignore

@@ -12,4 +12,5 @@ docs/assets/**
 web/gtm.js
 **/.expo/**
 src/libs/SearchParser/searchParser.js
+src/libs/SearchParser/autocompleteParser.js
 help/_scripts/**

.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/cla.yml

@@ -8,35 +8,5 @@ on:
 
 jobs:
   CLA:
-    runs-on: ubuntu-latest
-    # This job only runs for pull request comments or pull request target events (not issue comments)
-    # It does not run for pull requests created by OSBotify
-    if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify' && github.event.pull_request.user.login != 'imgbot[bot]') }}
-    steps:
-        - name: CLA comment check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: sign
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*I have read the CLA Document and I hereby sign the CLA\s*'
-        - name: CLA comment re-check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: recheck
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*recheck\s*'
-        - name: CLA Assistant
-          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' || github.event_name == 'pull_request_target' }}
-          # Version: 2.1.2-beta
-          uses: cla-assistant/github-action@948230deb0d44dd38957592f08c6bd934d96d0cf
-          env:
-              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_BOTIFY_TOKEN }}
-          with:
-              path-to-signatures: '${{ github.repository }}/cla.json'
-              path-to-document: 'https://github.com/${{ github.repository }}/blob/main/contributingGuides/CLA.md'
-              branch: 'main'
-              remote-organization-name: 'Expensify'
-              remote-repository-name: 'CLA'
-              lock-pullrequest-aftermerge: false
-              allowlist: OSBotify,snyk-bot
+    uses: Expensify/GitHub-Actions/.github/workflows/cla.yml@main
+    secrets: inherit

.github/workflows/deployNewHelp.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '20.15.1'
+          node-version: '20.18.0'
 
       # Wil install the _help/package.js
       - name: Install Node.js Dependencies

.github/workflows/e2ePerformanceTests.yml

@@ -24,33 +24,21 @@ jobs:
     runs-on: ubuntu-latest
     name: Find the baseline and delta refs, and check for an existing build artifact for that commit
     outputs:
-      BASELINE_ARTIFACT_FOUND: ${{ steps.checkForExistingArtifact.outputs.ARTIFACT_FOUND }}
-      BASELINE_ARTIFACT_WORKFLOW_ID: ${{ steps.checkForExistingArtifact.outputs.ARTIFACT_WORKFLOW_ID }}
-      BASELINE_VERSION: ${{ steps.getMostRecentRelease.outputs.VERSION }}
+      BASELINE_REF: ${{ steps.getBaselineRef.outputs.BASELINE_REF }}
       DELTA_REF: ${{ steps.getDeltaRef.outputs.DELTA_REF }}
       IS_PR_MERGED: ${{ steps.getPullRequestDetails.outputs.IS_MERGED }}
     steps:
       - uses: actions/checkout@v4
         with:
-          # The OS_BOTIFY_COMMIT_TOKEN is a personal access token tied to osbotify (we need a PAT to access the artifact API)
-          token: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
-
-      - name: Get most recent release version
-        id: getMostRecentRelease
-        run: echo "VERSION=$(gh release list --limit 1 | awk '{ print $1 }')" >> "$GITHUB_OUTPUT"
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Check if there's an existing artifact for this baseline
-        id: checkForExistingArtifact
-        uses: ./.github/actions/javascript/getArtifactInfo
-        with:
-          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
-          ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}android-artifact-apk
+          fetch-depth: 0  # Fetches the entire history
 
-      - name: Skip build if there's already an existing artifact for the baseline
-        if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.ARTIFACT_FOUND) }}
-        run: echo 'APK for baseline ${{ steps.getMostRecentRelease.outputs.VERSION }} already exists, reusing existing build'
+      - 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"
+          echo "$previous_merge"
+          echo "BASELINE_REF=$previous_merge" >> "$GITHUB_OUTPUT"
 
       - name: Get pull request details
         id: getPullRequestDetails
@@ -84,15 +72,14 @@ jobs:
           fi
 
   buildBaseline:
-    name: Build apk from latest release as a baseline
+    name: Build apk from baseline
     uses: ./.github/workflows/buildAndroid.yml
     needs: prep
-    if: ${{ !fromJSON(needs.prep.outputs.BASELINE_ARTIFACT_FOUND) }}
     secrets: inherit
     with:
       type: e2e
-      ref: ${{ needs.prep.outputs.BASELINE_VERSION }}
-      artifact-prefix: baseline-${{ needs.prep.outputs.BASELINE_VERSION }}
+      ref: ${{ needs.prep.outputs.BASELINE_REF }}
+      artifact-prefix: baseline-${{ needs.prep.outputs.BASELINE_REF }}
 
   buildDelta:
     name: Build apk from delta ref
@@ -127,9 +114,6 @@ jobs:
         with:
           name: ${{ needs.buildBaseline.outputs.APK_ARTIFACT_NAME }}
           path: zip
-          # Set github-token only if the baseline was built in this workflow run:
-          github-token: ${{ needs.prep.outputs.BASELINE_ARTIFACT_WORKFLOW_ID && github.token }}
-          run-id: ${{ needs.prep.outputs.BASELINE_ARTIFACT_WORKFLOW_ID }}
 
       # The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it
       - name: Rename baseline APK

.nvmrc

@@ -1 +1 @@
-20.15.1
+20.18.0

.prettierignore

@@ -18,8 +18,7 @@ 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
+src/libs/SearchParser/autocompleteParser.js

.well-known/apple-app-site-association

@@ -2,7 +2,7 @@
     "applinks": {
         "details": [
             {
-                "appIDs": ["368M544MTT.com.chat.expensify.chat"],
+                "appIDs": ["368M544MTT.com.chat.expensify.chat", "452835FXHF.com.expensify.expensifylite"],
                 "components": [
                     {
                        "/": "/r/*",
@@ -105,6 +105,6 @@
         ]
     },
     "webcredentials": {
-        "apps": ["368M544MTT.com.chat.expensify.chat"]
+        "apps": ["368M544MTT.com.chat.expensify.chat", "452835FXHF.com.expensify.expensifylite"]
     }
 }

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 1009005001
-        versionName "9.0.50-1"
+        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

@@ -11,9 +11,11 @@ import com.expensify.chat.bootsplash.BootSplashPackage
 import com.expensify.chat.shortcutManagerModule.ShortcutManagerPackage
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.modules.i18nmanager.I18nUtil
 import com.facebook.soloader.SoLoader
@@ -44,6 +46,9 @@ class MainApplication : MultiDexApplication(), ReactApplication {
             get() = BuildConfig.IS_HERMES_ENABLED
     })
 
+    override val reactHost: ReactHost
+        get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
     override fun onCreate() {
         super.onCreate()
         ReactFontManager.getInstance().addCustomFont(this, "Expensify New Kansas", R.font.expensify_new_kansas)
@@ -59,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(bridgelessEnabled = false)
+            load()
         }
         if (BuildConfig.DEBUG) {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)