Merge branch 'main' into fix/78107-selection-isnt-cleared-after-split

Author: bernhardoj

.github/ISSUE_TEMPLATE/Performance.md

@@ -32,7 +32,6 @@ Select the officially supported platforms where the issue was reproduced:
 - [ ] iOS: mWeb Chrome
 - [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
-- [ ] MacOS: Desktop
 
 <details>
   <summary>Platforms Tested:</summary>
@@ -45,7 +44,6 @@ On which of our officially supported platforms was this issue tested:
 - [ ] iOS: mWeb Chrome
 - [ ] Windows: Chrome
 - [ ] MacOS: Chrome / Safari
-- [ ] MacOS: Desktop
 
 </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/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}`;
 

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

@@ -16,9 +16,6 @@ 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
@@ -28,9 +25,6 @@ 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,12 +11585,11 @@ 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', 'DESKTOP', 'IOS', 'WEB'];
+    const inputs = ['ANDROID', 'IOS', 'WEB'];
     const names = {
         [inputs[0]]: 'Android',
-        [inputs[1]]: 'Desktop',
-        [inputs[2]]: 'iOS',
-        [inputs[3]]: 'Web',
+        [inputs[1]]: 'iOS',
+        [inputs[2]]: 'Web',
     };
     const result = inputs.reduce((acc, platform) => {
         const input = core.getInput(platform, { required: false });
@@ -11619,17 +11618,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 ? ', Desktop, 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 ? ', 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}  |
 
-| Desktop :computer: | Web :spider_web: |
-| ------------- | ------------- |
-| ${result.DESKTOP.link}  | ${result.WEB.link}  |
-| ${result.DESKTOP.qrCode}  | ${result.WEB.qrCode}  |
+| Web :spider_web: |
+| ------------- |
+| ${result.WEB.link}  |
+| ${result.WEB.qrCode}  |
 
 ---
 

.github/actions/javascript/postTestBuildComment/postTestBuildComment.ts

@@ -5,12 +5,11 @@ import CONST from '@github/libs/CONST';
 import GithubUtils from '@github/libs/GithubUtils';
 
 function getTestBuildMessage(appPr?: number, mobileExpensifyPr?: number): string {
-    const inputs = ['ANDROID', 'DESKTOP', 'IOS', 'WEB'] as const;
+    const inputs = ['ANDROID', 'IOS', 'WEB'] as const;
     const names = {
         [inputs[0]]: 'Android',
-        [inputs[1]]: 'Desktop',
-        [inputs[2]]: 'iOS',
-        [inputs[3]]: 'Web',
+        [inputs[1]]: 'iOS',
+        [inputs[2]]: 'Web',
     };
 
     const result = inputs.reduce(
@@ -47,17 +46,17 @@ function getTestBuildMessage(appPr?: number, mobileExpensifyPr?: number): string
         {} as Record<TupleToUnion<typeof inputs>, {link: string; qrCode: string}>,
     );
 
-    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:
+    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:
 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}  |
 
-| Desktop :computer: | Web :spider_web: |
-| ------------- | ------------- |
-| ${result.DESKTOP.link}  | ${result.WEB.link}  |
-| ${result.DESKTOP.qrCode}  | ${result.WEB.qrCode}  |
+| Web :spider_web: |
+| ------------- |
+| ${result.WEB.link}  |
+| ${result.WEB.qrCode}  |
 
 ---
 

.github/workflows/checkE2ETestCode.yml

@@ -19,8 +19,6 @@ jobs:
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
-        with:
-          IS_DESKTOP_BUILD: 'true'
 
       - name: Verify e2e tests compile correctly
         run: npm run e2e-test-runner-build

.github/workflows/checkSVGCompression.yml

@@ -26,8 +26,6 @@ jobs:
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
-        with:
-          IS_DESKTOP_BUILD: true
 
       - name: Compress SVG check
         uses: ./.github/actions/javascript/checkSVGCompression