Merge pull request #45860 from ShridharGoel/patch-15

Fix crash on missing emoji mapping
Expensify · Jul 26, 2024 · 69f2c05 · 69f2c05
2 parents aaa03bd + a0a3f66
commit 69f2c05
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libs/EmojiUtils.ts b/src/libs/EmojiUtils.ts
@@ -42,7 +42,7 @@ Onyx.connect({
                     }
                     const emojiWithSkinTones = Emojis.emojiCodeTableWithSkinTones[emoji.code];
                     if (!emojiWithSkinTones) {
-                        return undefined;
+                        return null;
                     }
                     return {...emojiWithSkinTones, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
                 })
@@ -226,7 +226,7 @@ function getDynamicSpacing(emojiCount: number, suffix: number): EmojiSpacer[] {
 function addSpacesToEmojiCategories(emojis: PickerEmojis): EmojiPickerList {
     let updatedEmojis: EmojiPickerList = [];
     emojis.forEach((emoji, index) => {
-        if ('header' in emoji) {
+        if (emoji && 'header' in emoji) {
             updatedEmojis = updatedEmojis.concat(getDynamicSpacing(updatedEmojis.length, index), [emoji], getDynamicSpacing(1, index));
             return;
         }