Merge remote-tracking branch 'upstream/main' into fix-61030/AccountSwitcher-emojis-cut-off

Author: ChavdaSachin

.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts

@@ -91,7 +91,7 @@ async function detectReactComponentInFile(filename: string): Promise<boolean | u
     };
     try {
         const {data} = await GithubUtils.octokit.repos.getContent(params);
-        const content = nodeBase64ToUtf8('content' in data ? data?.content ?? '' : '');
+        const content = nodeBase64ToUtf8('content' in data ? (data?.content ?? '') : '');
         return detectReactComponent(content, filename);
     } catch (error) {
         console.error('An unknown error occurred with the GitHub API: ', error, params);

.github/actions/javascript/authorChecklist/index.js

@@ -15419,7 +15419,7 @@ async function detectReactComponentInFile(filename) {
     };
     try {
         const { data } = await GithubUtils_1.default.octokit.repos.getContent(params);
-        const content = nodeBase64ToUtf8('content' in data ? data?.content ?? '' : '');
+        const content = nodeBase64ToUtf8('content' in data ? (data?.content ?? '') : '');
         return detectReactComponent(content, filename);
     }
     catch (error) {

.github/actions/javascript/bumpVersion/index.js

@@ -3682,7 +3682,7 @@ async function updateIOS(version) {
             [PLIST_KEYS.CF_BUNDLE_SHORT_VERSION]: shortVersion,
             [PLIST_KEYS.CF_BUNDLE_VERSION]: cfVersion,
         });
-        // Update plists
+        // Update plist
         await Promise.all([PLIST_PATH, PLIST_PATH_NSE, PLIST_PATH_SHARE, MOBILE_EXPENSIFY_PLIST_PATH, MOBILE_EXPENSIFY_PLIST_PATH_NSE, MOBILE_EXPENSIFY_PLIST_PATH_SS].map(async (file) => {
             console.log(`Updating ${file}`);
             await exec(`${PLIST_BUDDY} -c "Set :${PLIST_KEYS.CF_BUNDLE_SHORT_VERSION} ${shortVersion}" ${file}`);

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

@@ -12321,7 +12321,7 @@ const replacer = (str) => ({
     '\r': '\\r',
     '\f': '\\f',
     '"': '\\"',
-}[str] ?? '');
+})[str] ?? '';
 /**
  * Replace any characters in the string that will break JSON.parse for our Git Log output
  *

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -12358,7 +12358,7 @@ const replacer = (str) => ({
     '\r': '\\r',
     '\f': '\\f',
     '"': '\\"',
-}[str] ?? '');
+})[str] ?? '';
 /**
  * Replace any characters in the string that will break JSON.parse for our Git Log output
  *

.github/actions/javascript/getPreviousVersion/index.js

@@ -3018,7 +3018,7 @@ const replacer = (str) => ({
     '\r': '\\r',
     '\f': '\\f',
     '"': '\\"',
-}[str] ?? '');
+})[str] ?? '';
 /**
  * Replace any characters in the string that will break JSON.parse for our Git Log output
  *

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

@@ -13,27 +13,30 @@ function getTestBuildMessage(): string {
         [inputs[3]]: 'Web',
     };
 
-    const result = inputs.reduce((acc, platform) => {
-        const input = core.getInput(platform, {required: false});
+    const result = inputs.reduce(
+        (acc, platform) => {
+            const input = core.getInput(platform, {required: false});
 
-        if (!input) {
-            acc[platform] = {link: 'N/A', qrCode: 'N/A'};
-            return acc;
-        }
+            if (!input) {
+                acc[platform] = {link: 'N/A', qrCode: 'N/A'};
+                return acc;
+            }
 
-        const isSuccess = input === 'success';
+            const isSuccess = input === 'success';
 
-        const link = isSuccess ? core.getInput(`${platform}_LINK`) : '❌ FAILED ❌';
-        const qrCode = isSuccess
-            ? `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`
-            : `The QR code can't be generated, because the ${names[platform]} build failed`;
+            const link = isSuccess ? core.getInput(`${platform}_LINK`) : '❌ FAILED ❌';
+            const qrCode = isSuccess
+                ? `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`
+                : `The QR code can't be generated, because the ${names[platform]} build failed`;
 
-        acc[platform] = {
-            link,
-            qrCode,
-        };
-        return acc;
-    }, {} as Record<TupleToUnion<typeof inputs>, {link: string; qrCode: string}>);
+            acc[platform] = {
+                link,
+                qrCode,
+            };
+            return acc;
+        },
+        {} 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, Desktop, and Web. Happy testing! :test_tube::test_tube:
 | Android :robot:  | iOS :apple: |

.github/libs/sanitizeStringForJSONParse.ts

@@ -8,7 +8,7 @@ const replacer = (str: string): string =>
         '\r': '\\r',
         '\f': '\\f',
         '"': '\\"',
-    }[str] ?? '');
+    })[str] ?? '';
 
 /**
  * Replace any characters in the string that will break JSON.parse for our Git Log output

.github/scripts/validateActionsAndWorkflows.sh

@@ -41,14 +41,6 @@ done
 
 for ((i=0; i < ${#WORKFLOWS[@]}; i++)); do
   WORKFLOW=${WORKFLOWS[$i]}
-
-    # Skip linting e2e workflow due to bug here: https://github.com/SchemaStore/schemastore/issues/2579
-    if [[ "$WORKFLOW" == './workflows/e2ePerformanceTests.yml'
-          || "$WORKFLOW" == './workflows/testBuild.yml'
-          || "$WORKFLOW" == './workflows/deploy.yml' ]]; then
-      continue
-    fi
-
   ajv -s ./tempSchemas/github-workflow.json -d "$WORKFLOW" --strict=false &
   ASYNC_PROCESSES[${#ACTIONS[@]} + i]=$!
 done

.github/workflows/buildAndroid.yml

@@ -23,10 +23,13 @@ on:
 
     outputs:
       AAB_FILE_NAME:
+        description: Name of the AAB file produced by this workflow.
         value: ${{ jobs.build.outputs.AAB_FILE_NAME }}
       APK_FILE_NAME:
+        description: Name of the APK file produced by this workflow.
         value: ${{ jobs.build.outputs.APK_FILE_NAME }}
       APK_ARTIFACT_NAME:
+        description: Name of the APK artifact.
         value: ${{ jobs.build.outputs.APK_ARTIFACT_NAME }}
 
   workflow_dispatch: