Merge branch 'main' into removeDebugLogs

.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

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 1001047303
+        versionName "1.4.73-3"
         // 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';