Revert "Update branch"

This reverts commit d9ff6fa.

.eslintrc.js

@@ -38,7 +38,6 @@ module.exports = {
         {
             files: ['*.js', '*.jsx', '*.ts', '*.tsx'],
             rules: {
-                'rulesdir/no-multiple-onyx-in-file': 'off',
                 'rulesdir/onyx-props-must-have-default': 'off',
                 'react-native-a11y/has-accessibility-hint': ['off'],
                 'react-native-a11y/has-valid-accessibility-descriptors': [
@@ -164,7 +163,6 @@ module.exports = {
                     },
                 ],
                 curly: 'error',
-                'you-dont-need-lodash-underscore/throttle': 'off',
             },
         },
         {

.github/actions/composite/buildAndroidAPK/action.yml

@@ -13,7 +13,7 @@ runs:
 
     - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
       with:
-        ruby-version: "2.7"
+        ruby-version: '2.7'
         bundler-cache: true
 
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
@@ -26,4 +26,4 @@ runs:
       uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
       with:
         name: ${{ inputs.ARTIFACT_NAME }}
-        path: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk
+        path: android/app/build/outputs/apk/e2eRelease/app-e2eRelease.apk

.github/actions/javascript/getPullRequestDetails/action.yml

@@ -13,14 +13,8 @@ inputs:
 outputs:
   MERGE_COMMIT_SHA:
     description: 'The merge_commit_sha of the given pull request'
-  HEAD_COMMIT_SHA:
-    description: 'The head_commit_sha of the given pull request'
   MERGE_ACTOR:
     description: 'The actor who merged the pull request'
-  IS_MERGED:
-    description: 'True if the pull request is merged'
-  FORKED_REPO_URL:
-    description: 'Output forked repo URL if PR includes changes from a fork'
 runs:
   using: 'node16'
   main: './index.js'

.github/workflows/e2ePerformanceTests.yml

@@ -84,7 +84,12 @@ jobs:
       - name: Unmerged PR - Fetch head ref of unmerged PR
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
         run: |
-          git fetch origin ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
+          if [[ ${{ steps.getPullRequestDetails.outputs.FORKED_REPO_URL }} != '' ]]; then
+            git remote add pr_remote ${{ steps.getPullRequestDetails.outputs.FORKED_REPO_URL }}
+            git fetch pr_remote ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
+          else
+            git fetch origin ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
+          fi
 
       - name: Unmerged PR - Set dummy git credentials before merging
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
@@ -96,7 +101,7 @@ jobs:
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
         id: getMergeCommitShaIfUnmergedPR
         run: |
-          git merge --allow-unrelated-histories --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
+          git merge --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
           git checkout ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -135,19 +140,18 @@ jobs:
           name: baseline-apk-${{ needs.buildBaseline.outputs.VERSION }}
           path: zip
 
-      # The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it
+      # The downloaded artifact will be a file named "app-e2eRelease.apk" so we have to rename it
       - name: Rename baseline APK
-        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
+        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
 
       - name: Download delta APK
         uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
-        id: downloadDeltaAPK
         with:
           name: delta-apk-${{ needs.buildDelta.outputs.DELTA_REF }}
           path: zip
 
       - name: Rename delta APK
-        run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
+        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
 
       - name: Copy e2e code into zip folder
         run: cp -r tests/e2e zip
@@ -192,6 +196,7 @@ jobs:
         run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/debug.log"
 
       - name: Check if test failed, if so post the results and add the DeployBlocker label
+        if: ${{ github.event_name == 'workflow_call' }}
         run: |
           if grep -q '🔴' ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md; then
             gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash

.storybook/preview.js

@@ -6,7 +6,7 @@ import './fonts.css';
 import ComposeProviders from '../src/components/ComposeProviders';
 import HTMLEngineProvider from '../src/components/HTMLEngineProvider';
 import OnyxProvider from '../src/components/OnyxProvider';
-import {LocaleContextProvider} from '../src/components/LocaleContextProvider';
+import {LocaleContextProvider} from '../src/components/withLocalize';
 import {KeyboardStateProvider} from '../src/components/withKeyboardState';
 import {EnvironmentProvider} from '../src/components/withEnvironment';
 import {WindowDimensionsProvider} from '../src/components/withWindowDimensions';

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

@@ -68,17 +68,9 @@
                         "/": "/workspace/*",
                         "comment": "Workspace Details"
                     },
-                    {
-                        "/": "/get-assistance/*",
-                        "comment": "Get Assistance Pages"
-                    },
                     {
                         "/": "/teachersunite/*",
                         "comment": "Teachers Unite!"
-                    },
-                    {
-                        "/": "/search/*",
-                        "comment": "Search"
                     }
                 ]
             }

README.md

@@ -51,7 +51,6 @@ For an M1 Mac, read this [SO](https://stackoverflow.com/questions/64901180/how-t
     * If you get the error `Could not find 'bundler'`, install the bundler gem first: `gem install bundler` and try again.
     * If you are using MacOS and get the error `Gem::FilePermissionError` when trying to install the bundler gem, you're likely using system Ruby, which requires administrator permission to modify. To get around this, install another version of Ruby with a version manager like [rbenv](https://github.com/rbenv/rbenv#installation).
 * Before installing iOS dependencies, you need to obtain a token from Mapbox to download their SDKs. Please run `npm run configure-mapbox` and follow the instructions.
-    * For help with MapBox token, you can see [this Slack thread](https://expensify.slack.com/archives/C01GTK53T8Q/p1692740856745279?thread_ts=1692322511.804599&cid=C01GTK53T8Q)
 * To install the iOS dependencies, run: `npm install && npm run pod-install`
 * If you are an Expensify employee and want to point the emulator to your local VM, follow [this](https://stackoverflow.com/c/expensify/questions/7699)
 * To run a on a **Development Simulator**: `npm run ios`

android/app/build.gradle

@@ -58,7 +58,7 @@ project.ext.envConfigFiles = [
     adhocRelease: ".env.adhoc",
     developmentRelease: ".env",
     developmentDebug: ".env",
-    e2eRelease: "tests/e2e/.env.e2e"
+    e2eRelease: ".env.production"
 ]
 
 /**
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001037705
-        versionName "1.3.77-5"
+        versionCode 1001037402
+        versionName "1.3.74-2"
     }
 
     flavorDimensions "default"
@@ -136,20 +136,10 @@ android {
             signingConfig signingConfigs.debug
         }
         release {
+            signingConfig signingConfigs.release
             productFlavors.production.signingConfig signingConfigs.release
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-
-            signingConfig null
-            // buildTypes take precedence over productFlavors when it comes to the signing configuration,
-            // thus we need to manually set the signing config, so that the e2e uses the debug config again.
-            // In other words, the signingConfig setting above will be ignored when we build the flavor in release mode. 
-            productFlavors.all { flavor ->
-                // All release builds should be signed with the release config ...
-                flavor.signingConfig signingConfigs.release
-            }
-            // ... except for the e2e flavor, which we maybe want to build locally:
-            productFlavors.e2e.signingConfig signingConfigs.debug
         }
     }
 

android/app/src/debug/AndroidManifest.xml

@@ -4,7 +4,6 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS"/>
     <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning">
         <meta-data
             android:name="firebase_performance_logcat_enabled"

android/app/src/main/AndroidManifest.xml

@@ -7,7 +7,6 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS"/>
 
     <!-- android:hardwareAccelerated is essential for Android performance: https://developer.android.com/topic/performance/hardware-accel -->
     <application
@@ -68,7 +67,6 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/split"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/new"/>
-                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/search"/>
 
                 <!-- Staging URLs -->
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
@@ -85,7 +83,6 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/split"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/new"/>
-                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/search"/>
             </intent-filter>
         </activity>