Merge branch 'main' into issue-64902

Author: nyomanjyotisa

.github/workflows/createNewVersion.yml

@@ -126,11 +126,11 @@ jobs:
             echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
             git fetch origin main
             if ! git rebase origin/main; then
-              echo "::error:: Rebase failed while retrying Mobile-Expensify push"
+              echo "::error:: Rebase failed while retrying E/App push"
               exit 1
             fi
             if ! git push origin main; then
-              echo "::error:: Mobile-Expensify change failed to push after rebase"
+              echo "::error:: E/App change failed to push after rebase"
               exit 1
             fi
           fi

.github/workflows/deployNewHelp.yml

@@ -58,7 +58,7 @@ jobs:
         # v4
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
         with:
-          node-version: '20.19.1'
+          node-version-file: '.nvmrc'
 
       # Wil install the _help/package.js
       - name: Install Node.js Dependencies

.nvmrc

@@ -1 +1 @@
-20.19.1
+20.19.3

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018000
-        versionName "9.1.80-0"
+        versionCode 1009018106
+        versionName "9.1.81-6"
         // 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

@@ -455,6 +455,8 @@
         "positionMillis",
         "Postharvest",
         "Postproduction",
+        "Powerform",
+        "POWERFORM",
         "Précédent",
         "precheck",
         "Precheck",

cspell.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.6.4",
+    "electron-updater": "^6.6.5",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },

desktop/package-lock.json

@@ -141,6 +141,9 @@ The submitter can only delete expenses, and the report must be in the Open state
 
 # FAQ
 
+## Can I add multiple attachments to a single expense?
+No, it's only possible to add one attachment per expense. 
+
 ## Who can edit an expense?
 - **Expense owner**: Can edit expenses if the report is Open.
 - **Approvers and Workspace Admins**: Can edit submitted expenses before final approval.

desktop/package.json

@@ -66,7 +66,7 @@ Earn **1%–2% cash back**
 - 2% if monthly spend reaches **$250,000+**  
 - Cash back is applied to your bill first, then to your bank account
 
-👉 Use the [savings calculator](https://use.expensify.com/resource-center/tools/savings-calculator) to estimate your monthly savings.
+👉 Use the [savings calculator](https://use.expensify.com/savings-calculator) to estimate your monthly savings.
 
 ## 📅 Annual Subscription Only