Merge branch 'main' of https://github.com/Expensify/App into fix-v3/72636

Author: lorretheboy

.github/ISSUE_TEMPLATE/Accessibility.md

@@ -43,7 +43,8 @@ Which of our officially supported platforms is this issue occurring on? Please o
 - [ ] iOS: mWeb Chrome
 - [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
-- [ ] MacOS: Desktop
+
+## Screenshots/Videos
 
 **Version Number:**
 **Reproducible in staging?:**

.github/PULL_REQUEST_TEMPLATE.md

@@ -85,7 +85,6 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] iOS: Native
     - [ ] iOS: mWeb Safari
     - [ ] MacOS: Chrome / Safari
-    - [ ] MacOS: Desktop
 - [ ] I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
 - [ ] I verified there are no new alerts related to the `canBeMissing` param for `useOnyx`
 - [ ] I followed proper code patterns (see [Reviewing the code](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
@@ -157,11 +156,4 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
 
 <!-- add screenshots or videos here -->
 
-</details>
-
-<details>
-<summary>MacOS: Desktop</summary>
-
-<!-- add screenshots or videos here -->
-
-</details>
+</details>

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

@@ -6,10 +6,6 @@ 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:
@@ -27,9 +23,7 @@ runs:
       with:
         node-version-file: '.nvmrc'
         cache: npm
-        cache-dependency-path: |
-          normalized-package-lock.json
-          desktop/package-lock.json
+        cache-dependency-path: normalized-package-lock.json
 
     - id: cache-node-modules
       # v4
@@ -46,14 +40,6 @@ 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
@@ -65,12 +51,4 @@ runs:
       with:
         timeout_minutes: 30
         max_attempts: 3
-        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
+        command: npm ci

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

@@ -164,6 +164,7 @@ 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) => {
                 const isResolved = deployBlockers.findIndex((openBlocker) => openBlocker.number === deployBlocker.number) < 0;
                 deployBlockers.push({
@@ -173,6 +174,7 @@ async function run(): Promise<IssuesCreateResponse | void> {
             });
 
             // 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) => {
                 const isAlreadyIncluded = PRListMobileExpensify.findIndex((pr) => pr.number === existingPR.number) >= 0;
                 if (!isAlreadyIncluded) {

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

@@ -11674,6 +11674,7 @@ 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) => {
                 const isResolved = deployBlockers.findIndex((openBlocker) => openBlocker.number === deployBlocker.number) < 0;
                 deployBlockers.push({
@@ -11682,6 +11683,7 @@ async function run() {
                 });
             });
             // 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) => {
                 const isAlreadyIncluded = PRListMobileExpensify.findIndex((pr) => pr.number === existingPR.number) >= 0;
                 if (!isAlreadyIncluded) {

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

@@ -26,6 +26,7 @@ const run = () => {
     let timestamp: number;
 
     // Iterate over each entry
+    // eslint-disable-next-line unicorn/no-array-for-each
     regressionEntries.forEach((entry) => {
         // Skip empty lines
         if (entry.trim() === '') {

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

@@ -2747,6 +2747,7 @@ const run = () => {
     let graphiteString = '';
     let timestamp;
     // Iterate over each entry
+    // eslint-disable-next-line unicorn/no-array-for-each
     regressionEntries.forEach((entry) => {
         // Skip empty lines
         if (entry.trim() === '') {

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

@@ -20,9 +20,6 @@ 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,7 +12840,6 @@ 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');
@@ -12852,7 +12851,7 @@ async function run() {
             message += `on ${date}`;
         }
         message += `🚀`;
-        message += `\n\nplatform | result\n---|---\n🖥 desktop 🖥|${desktopResult}`;
+        message += `\n\nplatform | result\n---|---`;
         message += `\n🕸 web 🕸|${webResult}`;
         message += `\n🤖 android 🤖|${androidResult}\n🍎 iOS 🍎|${iOSResult}`;
         if (note) {

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

@@ -103,7 +103,6 @@ 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);
 
@@ -117,7 +116,7 @@ async function run() {
             message += `on ${date}`;
         }
         message += `🚀`;
-        message += `\n\nplatform | result\n---|---\n🖥 desktop 🖥|${desktopResult}`;
+        message += `\n\nplatform | result\n---|---`;
         message += `\n🕸 web 🕸|${webResult}`;
         message += `\n🤖 android 🤖|${androidResult}\n🍎 iOS 🍎|${iOSResult}`;