From cf071c5ac659898f19865411bfb3e9c874bc2da8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 5 Jan 2020 21:23:34 +0000 Subject: [PATCH 1/2] Deduplicate recent emoji Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/emojipicker/EmojiPicker.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js index 4d49b25100..0325dfd807 100644 --- a/src/components/views/emojipicker/EmojiPicker.js +++ b/src/components/views/emojipicker/EmojiPicker.js @@ -47,10 +47,10 @@ class EmojiPicker extends React.Component { viewportHeight: 280, }; - // Convert recent emoji characters to emoji data, removing unknowns. - this.recentlyUsed = recent.get() + // Convert recent emoji characters to emoji data, removing unknowns and duplicates + this.recentlyUsed = Array.from(new Set(recent.get() .map(unicode => getEmojiFromUnicode(unicode)) - .filter(data => !!data); + .filter(data => !!data))); this.memoizedDataByCategory = { recent: this.recentlyUsed, ...DATA_BY_CATEGORY, From ba2f4aa973db060afd62807b837e9ee266b245ab Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sun, 5 Jan 2020 21:26:32 +0000 Subject: [PATCH 2/2] tidy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/emojipicker/EmojiPicker.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js index 0325dfd807..a9cf2a4732 100644 --- a/src/components/views/emojipicker/EmojiPicker.js +++ b/src/components/views/emojipicker/EmojiPicker.js @@ -48,9 +48,7 @@ class EmojiPicker extends React.Component { }; // Convert recent emoji characters to emoji data, removing unknowns and duplicates - this.recentlyUsed = Array.from(new Set(recent.get() - .map(unicode => getEmojiFromUnicode(unicode)) - .filter(data => !!data))); + this.recentlyUsed = Array.from(new Set(recent.get().map(getEmojiFromUnicode).filter(Boolean))); this.memoizedDataByCategory = { recent: this.recentlyUsed, ...DATA_BY_CATEGORY,