From 37d866e31d317ce490a367d7ba263fe6fa42e956 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Mon, 16 Aug 2021 14:21:26 +0300
Subject: [PATCH] Emoji Picker: Fix missing all emojis (#1378)

---
 src/components/middle/composer/EmojiCategory.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/middle/composer/EmojiCategory.tsx b/src/components/middle/composer/EmojiCategory.tsx
index 2468d580e..ad91b46f7 100644
--- a/src/components/middle/composer/EmojiCategory.tsx
+++ b/src/components/middle/composer/EmojiCategory.tsx
@@ -58,6 +58,10 @@ const EmojiCategory: FC<OwnProps> = ({
       >
         {shouldRender && category.emojis.map((name) => {
           const emoji = allEmojis[name];
+          // Recent emojis may contain emoticons that are no longer in the list
+          if (!emoji) {
+            return undefined;
+          }
           // Some emojis have multiple skins and are represented as an Object with emojis for all skins.
           // For now, we select only the first emoji with 'neutral' skin.
           const displayedEmoji = 'id' in emoji ? emoji : emoji[1];