Merge branch 'main' into fix/41523-chat-header-show-with-delay

.eslintignore

@@ -1,5 +1,11 @@
-**/node_modules/*
-**/dist/*
-android/**/build/*
-.github/actions/**/index.js"
+!.storybook
+!.github
+.github/actions/**/index.js
+*.config.js
+**/.eslintrc.js
+**/node_modules/**
+**/dist/**
+android/**/build/**
 docs/vendor/**
+docs/assets/**
+web/gtm.js

.github/.eslintrc.js

@@ -1,6 +1,10 @@
-// For all these Node.js scripts, we do not want to disable `console` statements
 module.exports = {
     rules: {
+        // For all these Node.js scripts, we do not want to disable `console` statements
         'no-console': 'off',
+
+        '@lwc/lwc/no-async-await': 'off',
+        'no-await-in-loop': 'off',
+        'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
     },
 };

.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts

@@ -8,19 +8,10 @@ import {promiseDoWhile} from '@github/libs/promiseWhile';
 type CurrentStagingDeploys = Awaited<ReturnType<typeof GitHubUtils.octokit.actions.listWorkflowRuns>>['data']['workflow_runs'];
 
 function run() {
-    console.info('[awaitStagingDeploys] POLL RATE', CONST.POLL_RATE);
-    console.info('[awaitStagingDeploys] run()');
-    console.info('[awaitStagingDeploys] getStringInput', getStringInput);
-    console.info('[awaitStagingDeploys] GitHubUtils', GitHubUtils);
-    console.info('[awaitStagingDeploys] promiseDoWhile', promiseDoWhile);
-
     const tag = getStringInput('TAG', {required: false});
-    console.info('[awaitStagingDeploys] run() tag', tag);
 
     let currentStagingDeploys: CurrentStagingDeploys = [];
 
-    console.info('[awaitStagingDeploys] run()  _.throttle', lodashThrottle);
-
     const throttleFunc = () =>
         Promise.all([
             // These are active deploys
@@ -42,24 +33,20 @@ function run() {
                 }),
         ])
             .then((responses) => {
-                console.info('[awaitStagingDeploys] listWorkflowRuns responses', responses);
                 const workflowRuns = responses[0].data.workflow_runs;
                 if (!tag && typeof responses[1] === 'object') {
                     workflowRuns.push(...responses[1].data.workflow_runs);
                 }
-                console.info('[awaitStagingDeploys] workflowRuns', workflowRuns);
                 return workflowRuns;
             })
             .then((workflowRuns) => (currentStagingDeploys = workflowRuns.filter((workflowRun) => workflowRun.status !== 'completed')))
             .then(() => {
-                console.info('[awaitStagingDeploys] currentStagingDeploys', currentStagingDeploys);
                 console.log(
                     !currentStagingDeploys.length
                         ? 'No current staging deploys found'
                         : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
                 );
             });
-    console.info('[awaitStagingDeploys] run() throttleFunc', throttleFunc);
 
     return promiseDoWhile(
         () => !!currentStagingDeploys.length,

.github/actions/javascript/awaitStagingDeploys/index.js

@@ -12131,15 +12131,8 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
 const promiseWhile_1 = __nccwpck_require__(9438);
 function run() {
-    console.info('[awaitStagingDeploys] POLL RATE', CONST_1.default.POLL_RATE);
-    console.info('[awaitStagingDeploys] run()');
-    console.info('[awaitStagingDeploys] getStringInput', ActionUtils_1.getStringInput);
-    console.info('[awaitStagingDeploys] GitHubUtils', GithubUtils_1.default);
-    console.info('[awaitStagingDeploys] promiseDoWhile', promiseWhile_1.promiseDoWhile);
     const tag = (0, ActionUtils_1.getStringInput)('TAG', { required: false });
-    console.info('[awaitStagingDeploys] run() tag', tag);
     let currentStagingDeploys = [];
-    console.info('[awaitStagingDeploys] run()  _.throttle', throttle_1.default);
     const throttleFunc = () => Promise.all([
         // These are active deploys
         GithubUtils_1.default.octokit.actions.listWorkflowRuns({
@@ -12159,22 +12152,18 @@ function run() {
             }),
     ])
         .then((responses) => {
-        console.info('[awaitStagingDeploys] listWorkflowRuns responses', responses);
         const workflowRuns = responses[0].data.workflow_runs;
         if (!tag && typeof responses[1] === 'object') {
             workflowRuns.push(...responses[1].data.workflow_runs);
         }
-        console.info('[awaitStagingDeploys] workflowRuns', workflowRuns);
         return workflowRuns;
     })
         .then((workflowRuns) => (currentStagingDeploys = workflowRuns.filter((workflowRun) => workflowRun.status !== 'completed')))
         .then(() => {
-        console.info('[awaitStagingDeploys] currentStagingDeploys', currentStagingDeploys);
         console.log(!currentStagingDeploys.length
             ? 'No current staging deploys found'
             : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`);
     });
-    console.info('[awaitStagingDeploys] run() throttleFunc', throttleFunc);
     return (0, promiseWhile_1.promiseDoWhile)(() => !!currentStagingDeploys.length, (0, throttle_1.default)(throttleFunc, 
     // Poll every 60 seconds instead of every 10 seconds
     CONST_1.default.POLL_RATE * 6));
@@ -12730,15 +12719,13 @@ exports.promiseDoWhile = exports.promiseWhile = void 0;
  * Simulates a while loop where the condition is determined by the result of a Promise.
  */
 function promiseWhile(condition, action) {
-    console.info('[promiseWhile] promiseWhile()');
     return new Promise((resolve, reject) => {
         const loop = function () {
             if (!condition()) {
                 resolve();
             }
             else {
                 const actionResult = action?.();
-                console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
                 if (!actionResult) {
                     resolve();
                     return;
@@ -12759,11 +12746,8 @@ exports.promiseWhile = promiseWhile;
  * Simulates a do-while loop where the condition is determined by the result of a Promise.
  */
 function promiseDoWhile(condition, action) {
-    console.info('[promiseWhile] promiseDoWhile()');
     return new Promise((resolve, reject) => {
-        console.info('[promiseWhile] promiseDoWhile() condition', condition);
         const actionResult = action?.();
-        console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
         if (!actionResult) {
             resolve();
             return;

.github/libs/promiseWhile.ts

@@ -4,15 +4,12 @@ import type {DebouncedFunc} from 'lodash';
  * Simulates a while loop where the condition is determined by the result of a Promise.
  */
 function promiseWhile(condition: () => boolean, action: (() => Promise<void>) | DebouncedFunc<() => Promise<void>> | undefined): Promise<void> {
-    console.info('[promiseWhile] promiseWhile()');
-
     return new Promise((resolve, reject) => {
         const loop = function () {
             if (!condition()) {
                 resolve();
             } else {
                 const actionResult = action?.();
-                console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
 
                 if (!actionResult) {
                     resolve();
@@ -35,12 +32,9 @@ function promiseWhile(condition: () => boolean, action: (() => Promise<void>) |
  * Simulates a do-while loop where the condition is determined by the result of a Promise.
  */
 function promiseDoWhile(condition: () => boolean, action: (() => Promise<void>) | DebouncedFunc<() => Promise<void>> | undefined): Promise<void> {
-    console.info('[promiseWhile] promiseDoWhile()');
-
     return new Promise((resolve, reject) => {
-        console.info('[promiseWhile] promiseDoWhile() condition', condition);
         const actionResult = action?.();
-        console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
+
         if (!actionResult) {
             resolve();
             return;

.github/libs/sanitizeStringForJSONParse.ts

@@ -16,7 +16,7 @@ const replacer = (str: string): string =>
  * Solution partly taken from SO user Gabriel Rodríguez Flores 🙇
  * https://stackoverflow.com/questions/52789718/how-to-remove-special-characters-before-json-parse-while-file-reading
  */
-const sanitizeStringForJSONParse = (inputString: string): string => {
+const sanitizeStringForJSONParse = (inputString: string | number | boolean | null | undefined): string => {
     if (typeof inputString !== 'string') {
         throw new TypeError('Input must me of type String');
     }

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
           key: ${{ runner.os }}-jest
 
       - name: Jest tests
-        run: npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
+        run: NODE_OPTIONS="$NODE_OPTIONS --experimental-vm-modules" npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
 
   storybookTests:
     if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}

.nvmrc

@@ -1 +1 @@
-20.10.0
+20.13.0

.storybook/preview.tsx

@@ -16,7 +16,7 @@ import './fonts.css';
 Onyx.init({
     keys: ONYXKEYS,
     initialKeyStates: {
-        [ONYXKEYS.NETWORK]: {isOffline: false},
+        [ONYXKEYS.NETWORK]: {isOffline: false, isBackendReachable: true},
     },
 });
 

__mocks__/@react-navigation/native/index.ts

@@ -3,9 +3,7 @@ import {useIsFocused as realUseIsFocused, useTheme as realUseTheme} from '@react
 // We only want these mocked for storybook, not jest
 const useIsFocused: typeof realUseIsFocused = process.env.NODE_ENV === 'test' ? realUseIsFocused : () => true;
 
-// @ts-expect-error as we're mocking this function
-const useTheme: typeof realUseTheme = process.env.NODE_ENV === 'test' ? realUseTheme : () => ({});
+const useTheme = process.env.NODE_ENV === 'test' ? realUseTheme : () => ({});
 
 export * from '@react-navigation/core';
-export * from '@react-navigation/native';
 export {useIsFocused, useTheme};

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047200
-        versionName "1.4.72-0"
+        versionCode 1001047404
+        versionName "1.4.74-4"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

assets/emojis/index.ts

@@ -1,7 +1,5 @@
 import type {Locale} from '@src/types/onyx';
 import emojis from './common';
-import enEmojis from './en';
-import esEmojis from './es';
 import type {Emoji, EmojisList} from './types';
 
 type EmojiTable = Record<string, Emoji>;
@@ -30,10 +28,22 @@ const emojiCodeTableWithSkinTones = emojis.reduce<EmojiTable>((prev, cur) => {
 }, {});
 
 const localeEmojis: LocaleEmojis = {
-    en: enEmojis,
-    es: esEmojis,
+    en: undefined,
+    es: undefined,
+};
+
+const importEmojiLocale = (locale: Locale) => {
+    const normalizedLocale = locale.toLowerCase().split('-')[0] as Locale;
+    if (!localeEmojis[normalizedLocale]) {
+        const emojiImportPromise = normalizedLocale === 'en' ? import('./en') : import('./es');
+        return emojiImportPromise.then((esEmojiModule) => {
+            // it is needed because in jest test the modules are imported in double nested default object
+            localeEmojis[normalizedLocale] = esEmojiModule.default.default ? (esEmojiModule.default.default as unknown as EmojisList) : esEmojiModule.default;
+        });
+    }
+    return Promise.resolve();
 };
 
 export default emojis;
-export {emojiNameTable, emojiCodeTableWithSkinTones, localeEmojis};
+export {emojiNameTable, emojiCodeTableWithSkinTones, localeEmojis, importEmojiLocale};
 export {skinTones, categoryFrequentlyUsed} from './common';