Merge branch 'main' into feat/migrate-issue-new-card-confirm-page-to-use-navigation

Author: jmusial

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

.github/actions/javascript/markPullRequestsAsDeployed/index.js

@@ -12840,6 +12840,7 @@ async function run() {
     const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', { required: true });
     const version = core.getInput('DEPLOY_VERSION', { required: true });
     const androidResult = getDeployTableMessage(core.getInput('ANDROID', { required: true }));
+    const desktopResult = getDeployTableMessage(core.getInput('DESKTOP', { required: true }));
     const iOSResult = getDeployTableMessage(core.getInput('IOS', { required: true }));
     const webResult = getDeployTableMessage(core.getInput('WEB', { required: true }));
     const date = core.getInput('DATE');
@@ -12851,7 +12852,7 @@ async function run() {
             message += `on ${date}`;
         }
         message += `🚀`;
-        message += `\n\nplatform | result\n---|---`;
+        message += `\n\nplatform | result\n---|---\n🖥 desktop 🖥|${desktopResult}`;
         message += `\n🕸 web 🕸|${webResult}`;
         message += `\n🤖 android 🤖|${androidResult}\n🍎 iOS 🍎|${iOSResult}`;
         if (note) {

.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts

@@ -103,6 +103,7 @@ async function run() {
     const version = core.getInput('DEPLOY_VERSION', {required: true});
 
     const androidResult = getDeployTableMessage(core.getInput('ANDROID', {required: true}) as PlatformResult);
+    const desktopResult = getDeployTableMessage(core.getInput('DESKTOP', {required: true}) as PlatformResult);
     const iOSResult = getDeployTableMessage(core.getInput('IOS', {required: true}) as PlatformResult);
     const webResult = getDeployTableMessage(core.getInput('WEB', {required: true}) as PlatformResult);
 
@@ -116,7 +117,7 @@ async function run() {
             message += `on ${date}`;
         }
         message += `🚀`;
-        message += `\n\nplatform | result\n---|---`;
+        message += `\n\nplatform | result\n---|---\n🖥 desktop 🖥|${desktopResult}`;
         message += `\n🕸 web 🕸|${webResult}`;
         message += `\n🤖 android 🤖|${androidResult}\n🍎 iOS 🍎|${iOSResult}`;
 

.github/actions/javascript/postTestBuildComment/action.yml

@@ -16,6 +16,9 @@ inputs:
     ANDROID:
         description: "Android job result ('success', 'failure', 'cancelled', or 'skipped')"
         required: false
+    DESKTOP:
+        description: "Desktop job result ('success', 'failure', 'cancelled', or 'skipped')"
+        required: false
     IOS:
         description: "iOS job result ('success', 'failure', 'cancelled', or 'skipped')"
         required: false
@@ -25,6 +28,9 @@ inputs:
     ANDROID_LINK:
         description: "Link for the Android build"
         required: false
+    DESKTOP_LINK:
+        description: "Link for the desktop build"
+        required: false
     IOS_LINK:
         description: "Link for the iOS build"
         required: false

.github/actions/javascript/postTestBuildComment/index.js

@@ -11585,11 +11585,12 @@ const github_1 = __nccwpck_require__(5438);
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
 function getTestBuildMessage(appPr, mobileExpensifyPr) {
-    const inputs = ['ANDROID', 'IOS', 'WEB'];
+    const inputs = ['ANDROID', 'DESKTOP', 'IOS', 'WEB'];
     const names = {
         [inputs[0]]: 'Android',
-        [inputs[1]]: 'iOS',
-        [inputs[2]]: 'Web',
+        [inputs[1]]: 'Desktop',
+        [inputs[2]]: 'iOS',
+        [inputs[3]]: 'Web',
     };
     const result = inputs.reduce((acc, platform) => {
         const input = core.getInput(platform, { required: false });
@@ -11618,17 +11619,17 @@ function getTestBuildMessage(appPr, mobileExpensifyPr) {
         };
         return acc;
     }, {});
-    const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS${appPr ? ', and Web' : ''}. Happy testing! :test_tube::test_tube:
+    const message = `:test_tube::test_tube: Use the links below to test this adhoc build on Android, iOS${appPr ? ', Desktop, and Web' : ''}. Happy testing! :test_tube::test_tube:
 Built from${appPr ? ` App PR Expensify/App#${appPr}` : ''}${mobileExpensifyPr ? ` Mobile-Expensify PR Expensify/Mobile-Expensify#${mobileExpensifyPr}` : ''}.
 | Android :robot:  | iOS :apple: |
 | ------------- | ------------- |
 | ${result.ANDROID.link}  | ${result.IOS.link}  |
 | ${result.ANDROID.qrCode}  | ${result.IOS.qrCode}  |
 
-| Web :spider_web: |
-| ------------- |
-| ${result.WEB.link}  |
-| ${result.WEB.qrCode}  |
+| Desktop :computer: | Web :spider_web: |
+| ------------- | ------------- |
+| ${result.DESKTOP.link}  | ${result.WEB.link}  |
+| ${result.DESKTOP.qrCode}  | ${result.WEB.qrCode}  |
 
 ---