Merge branch 'main' into fix/map-preview-resize

Author: Nabi Ebrahimi

.env.example

@@ -14,6 +14,7 @@ USE_REDUX_DEVTOOLS=false
 CAPTURE_METRICS=false
 ONYX_METRICS=false
 USE_THIRD_PARTY_SCRIPTS=false
+IS_EXPENSIFY_EMPLOYEE=false
 
 EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
 EXPENSIFY_ACCOUNT_ID_ACCOUNTS_PAYABLE=-1
@@ -42,3 +43,4 @@ GITHUB_TOKEN=YOUR_TOKEN
 OPENAI_API_KEY=YOUR_TOKEN
 
 SENTRY_AUTH_TOKEN=SENTRY_AUTH_TOKEN
+SENTRY_ALLOW_FAILURE=true

.github/ISSUE_TEMPLATE/Standard.md

@@ -10,7 +10,7 @@ ___
 **Version Number:**
 **Reproducible in staging?:**
 **Reproducible in production?:**
-**If this was caught during regression testing, add the test name, ID and link from TestRail:**
+**If this was caught during regression testing, add the test name, ID and link from BrowserStack:**
 **Email or phone of affected tester (no customers):**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
 **Expensify/Expensify Issue URL:**

.github/actions/composite/getJavaVersion/action.yml

@@ -0,0 +1,15 @@
+name: Get Java version
+description: Reads the Java version from .java-version file
+
+outputs:
+  version:
+    description: The Java version from .java-version file
+    value: ${{ steps.getVersion.outputs.VERSION }}
+
+runs:
+  using: composite
+  steps:
+    - name: Get Java version
+      id: getVersion
+      shell: bash
+      run: echo "VERSION=$(cat .java-version | tr -d '\n')" >> "$GITHUB_OUTPUT"

.github/actions/composite/setupNode/action.yml

@@ -6,6 +6,10 @@ inputs:
     description: "Indicates if node is set up for hybrid app"
     required: false
     default: 'false'
+  IS_DESKTOP_BUILD:
+    description: "Indicates if node is set up for desktop app"
+    required: false
+    default: 'false'
 
 outputs:
   cache-hit:
@@ -23,7 +27,9 @@ runs:
       with:
         node-version-file: '.nvmrc'
         cache: npm
-        cache-dependency-path: normalized-package-lock.json
+        cache-dependency-path: |
+          normalized-package-lock.json
+          desktop/package-lock.json
 
     - id: cache-node-modules
       # v4
@@ -40,6 +46,14 @@ runs:
         path: Mobile-Expensify/node_modules
         key: ${{ runner.os }}-node-modules-${{ hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**') }}
 
+    - id: cache-desktop-node-modules
+      if: inputs.IS_DESKTOP_BUILD == 'true'
+      # v4
+      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
+      with:
+        path: desktop/node_modules
+        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
+
     - name: Remove ND node_modules if needed for hybrid app build
       if: inputs.IS_HYBRID_BUILD == 'true' && steps.cache-node-modules.outputs.cache-hit == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true'
       shell: bash
@@ -51,4 +65,12 @@ runs:
       with:
         timeout_minutes: 30
         max_attempts: 3
-        command: npm ci
+        command: npm ci
+
+    - name: Install node packages for desktop submodule
+      if: inputs.IS_DESKTOP_BUILD == 'true' && steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
+      uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
+      with:
+        timeout_minutes: 30
+        max_attempts: 3
+        command: cd desktop && npm ci

.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts

@@ -164,23 +164,21 @@ async function run(): Promise<IssuesCreateResponse | void> {
             });
 
             // Then make sure we include any demoted or closed blockers as well, and just check them off automatically
-            // eslint-disable-next-line unicorn/no-array-for-each
-            currentChecklistData?.deployBlockers.forEach((deployBlocker) => {
+            for (const deployBlocker of currentChecklistData?.deployBlockers ?? []) {
                 const isResolved = deployBlockers.findIndex((openBlocker) => openBlocker.number === deployBlocker.number) < 0;
                 deployBlockers.push({
                     ...deployBlocker,
                     isResolved,
                 });
-            });
+            }
 
             // Include any existing Mobile-Expensify PRs from the current checklist that aren't in the new merged list
-            // eslint-disable-next-line unicorn/no-array-for-each
-            currentChecklistData?.PRListMobileExpensify.forEach((existingPR) => {
+            for (const existingPR of currentChecklistData?.PRListMobileExpensify ?? []) {
                 const isAlreadyIncluded = PRListMobileExpensify.findIndex((pr) => pr.number === existingPR.number) >= 0;
                 if (!isAlreadyIncluded) {
                     PRListMobileExpensify.push(existingPR);
                 }
-            });
+            }
 
             const didVersionChange = newVersion !== currentChecklistData?.version;
             const stagingDeployCashBodyAndAssignees = await GithubUtils.generateStagingDeployCashBodyAndAssignees(

.github/actions/javascript/createOrUpdateStagingDeploy/index.js

@@ -11674,22 +11674,20 @@ async function run() {
                 };
             });
             // Then make sure we include any demoted or closed blockers as well, and just check them off automatically
-            // eslint-disable-next-line unicorn/no-array-for-each
-            currentChecklistData?.deployBlockers.forEach((deployBlocker) => {
+            for (const deployBlocker of currentChecklistData?.deployBlockers ?? []) {
                 const isResolved = deployBlockers.findIndex((openBlocker) => openBlocker.number === deployBlocker.number) < 0;
                 deployBlockers.push({
                     ...deployBlocker,
                     isResolved,
                 });
-            });
+            }
             // Include any existing Mobile-Expensify PRs from the current checklist that aren't in the new merged list
-            // eslint-disable-next-line unicorn/no-array-for-each
-            currentChecklistData?.PRListMobileExpensify.forEach((existingPR) => {
+            for (const existingPR of currentChecklistData?.PRListMobileExpensify ?? []) {
                 const isAlreadyIncluded = PRListMobileExpensify.findIndex((pr) => pr.number === existingPR.number) >= 0;
                 if (!isAlreadyIncluded) {
                     PRListMobileExpensify.push(existingPR);
                 }
-            });
+            }
             const didVersionChange = newVersion !== currentChecklistData?.version;
             const stagingDeployCashBodyAndAssignees = await GithubUtils_1.default.generateStagingDeployCashBodyAndAssignees(newVersion, PRList.map((pr) => pr.url), PRListMobileExpensify.map((pr) => pr.url), PRList.filter((pr) => pr.isVerified).map((pr) => pr.url), PRListMobileExpensify.filter((pr) => pr.isVerified).map((pr) => pr.url), deployBlockers.map((blocker) => blocker.url), deployBlockers.filter((blocker) => blocker.isResolved).map((blocker) => blocker.url), currentChecklistData?.internalQAPRList.filter((pr) => pr.isResolved).map((pr) => pr.url), didVersionChange ? false : currentChecklistData.isFirebaseChecked, didVersionChange ? false : currentChecklistData.isGHStatusChecked);
             if (stagingDeployCashBodyAndAssignees) {

.github/actions/javascript/getGraphiteString/getGraphiteString.ts

@@ -23,14 +23,13 @@ const run = () => {
 
     // Initialize string to store Graphite metrics
     let graphiteString = '';
-    let timestamp: number;
+    let timestamp: number | null = null;
 
     // Iterate over each entry
-    // eslint-disable-next-line unicorn/no-array-for-each
-    regressionEntries.forEach((entry) => {
+    for (const entry of regressionEntries) {
         // Skip empty lines
         if (entry.trim() === '') {
-            return;
+            continue;
         }
 
         try {
@@ -56,7 +55,7 @@ const run = () => {
             console.error(error.message);
             core.setFailed(error);
         }
-    });
+    }
 
     // Set generated graphite string to the github variable
     core.setOutput('GRAPHITE_STRING', graphiteString);

.github/actions/javascript/getGraphiteString/index.js

@@ -2745,13 +2745,12 @@ const run = () => {
     const regressionEntries = regressionFile.split('\n');
     // Initialize string to store Graphite metrics
     let graphiteString = '';
-    let timestamp;
+    let timestamp = null;
     // Iterate over each entry
-    // eslint-disable-next-line unicorn/no-array-for-each
-    regressionEntries.forEach((entry) => {
+    for (const entry of regressionEntries) {
         // Skip empty lines
         if (entry.trim() === '') {
-            return;
+            continue;
         }
         try {
             const current = JSON.parse(entry);
@@ -2773,7 +2772,7 @@ const run = () => {
             console.error(error.message);
             core.setFailed(error);
         }
-    });
+    }
     // Set generated graphite string to the github variable
     core.setOutput('GRAPHITE_STRING', graphiteString);
 };

.github/actions/javascript/getPullRequestIncrementalChanges/index.js

@@ -12746,6 +12746,24 @@ class Git {
             hasChanges: files.length > 0,
         };
     }
+    /**
+     * Check if a file from a Git diff is added.
+     *
+     * @param file - The file to check
+     * @returns true if the file is added, false otherwise
+     */
+    static isAddedDiffFile(file) {
+        const hasAddedLines = file.addedLines.size > 0;
+        const hasModifiedLines = file.modifiedLines.size > 0;
+        const hasRemovedLines = file.removedLines.size > 0;
+        if (!hasAddedLines || hasModifiedLines || hasRemovedLines) {
+            return false;
+        }
+        if (file.hunks.length === 1 && file.hunks.at(0)?.oldStart === 0 && file.hunks.at(0)?.oldCount === 0) {
+            return true;
+        }
+        return false;
+    }
     /**
      * Calculate the line number for a diff line based on the hunk and line type.
      */

.github/actions/javascript/markPullRequestsAsDeployed/action.yml

@@ -20,6 +20,9 @@ inputs:
     ANDROID:
         description: "Android job result ('success', 'failure', 'cancelled', or 'skipped')"
         required: true
+    DESKTOP:
+        description: "Desktop job result ('success', 'failure', 'cancelled', or 'skipped')"
+        required: true
     IOS:
         description: "iOS job result ('success', 'failure', 'cancelled', or 'skipped')"
         required: true