Merge branch 'main' into fix/update-options-when-creating-task

.github/actionlint.yaml

@@ -2,6 +2,6 @@
 self-hosted-runner:
   labels:
     - ubuntu-latest-xl
-    - macos-12-xl
+    - macos-13-large
     - macos-13-xlarge
     - ubuntu-latest-reassure-tests

.github/actions/javascript/awaitStagingDeploys/index.js

@@ -12754,9 +12754,13 @@ function promiseDoWhile(condition, action) {
         console.info('[promiseWhile] promiseDoWhile() condition', condition);
         const actionResult = action?.();
         console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
+        if (!actionResult) {
+            resolve();
+            return;
+        }
         actionResult
-            ?.then(() => promiseWhile(condition, action))
-            .then(() => resolve())
+            .then(() => promiseWhile(condition, action))
+            .then(resolve)
             .catch(reject);
     });
 }

.github/libs/promiseWhile.ts

@@ -30,9 +30,14 @@ function promiseDoWhile(condition: () => boolean, action: (() => Promise<void>)
         console.info('[promiseWhile] promiseDoWhile() condition', condition);
         const actionResult = action?.();
         console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
+        if (!actionResult) {
+            resolve();
+            return;
+        }
+
         actionResult
-            ?.then(() => promiseWhile(condition, action))
-            .then(() => resolve())
+            .then(() => promiseWhile(condition, action))
+            .then(resolve)
             .catch(reject);
     });
 }

.github/workflows/platformDeploy.yml

@@ -134,7 +134,7 @@ jobs:
     name: Build and deploy Desktop
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on: macos-12-xl
+    runs-on: macos-13-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/testBuild.yml

@@ -228,7 +228,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-    runs-on: macos-12-xl
+    runs-on: macos-13-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001046100
-        versionName "1.4.61-0"
+        versionCode 1001046105
+        versionName "1.4.61-5"
     }
 
     flavorDimensions "default"

android/app/proguard-rules.pro

@@ -9,6 +9,7 @@
 
 # Add any project specific keep options here:
 -keep class com.expensify.chat.BuildConfig { *; }
+-keep class com.facebook.** { *; }
 -keep, allowoptimization, allowobfuscation class expo.modules.** { *; }
 
 # Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).

android/gradle.properties

@@ -32,12 +32,13 @@ AsyncStorage_useNextStorage=true
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
 reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.

android/settings.gradle

@@ -16,6 +16,14 @@ project(':react-native-dev-menu').projectDir = new File(rootProject.projectDir,
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
+includeBuild('../node_modules/react-native') {
+    dependencySubstitution {
+        substitute(module("com.facebook.react:react-android")).using(project(":packages:react-native:ReactAndroid"))
+        substitute(module("com.facebook.react:react-native")).using(project(":packages:react-native:ReactAndroid"))
+        substitute(module("com.facebook.react:hermes-android")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
+        substitute(module("com.facebook.react:hermes-engine")).using(project(":packages:react-native:ReactAndroid:hermes-engine"))
+    }
+}
 
 apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
 useExpoModules()

docs/_layouts/default.html

@@ -84,6 +84,7 @@ <h1 class="title">
         </div>
 
         <!-- Concierge button at the bottom of the page -->
+        {% include CONST.html %}
         <div class="get-help">
             <h2 class="title with-margin">Didn't find what you were looking for?</h2>
             <p class="description">Concierge is here to answer all your questions.</p>

docs/redirects.csv

@@ -98,3 +98,7 @@ https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-c
 https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Direct-Bank-Connections
 https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Reconciliation,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Reconciliation
 https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting
+https://help.expensify.com/articles/expensify-classic/reports/Expense-Rules,https://help.expensify.com/articles/expensify-classic/expenses/Expense-Rules
+https://help.expensify.com/articles/expensify-classic/reports/Currency,https://help.expensify.com/articles/expensify-classic/workspaces/Currency
+https://help.expensify.com/articles/expensify-classic/reports/The-Expenses-Page,https://help.expensify.com/articles/expensify-classic/expenses/The-Expenses-Page
+https://help.expensify.com/articles/expensify-classic/reports/Attendee-Tracking,https://help.expensify.com/articles/expensify-classic/expenses/Track-group-expenses