From 2bb443c7d5a28d0d206fc57ad775c2864072e04c Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 12 Oct 2022 19:03:28 +0200 Subject: Port various forgotten fixes from upstream (#1864) * [Glitch] Fix crash when failing to load emoji picker Port bd3420b1398c4c4ab2e2f2850b6dd6eaff0d361b to glitch-soc Signed-off-by: Claire * [Glitch] Remove duplicate frequently used emojis Port 98146281e1beaf994710b13ef70f6224e8588cba to glitch-soc Signed-off-by: Claire Signed-off-by: Claire Co-authored-by: Harmon --- .../features/compose/containers/emoji_picker_dropdown_container.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch/features/compose/containers') diff --git a/app/javascript/flavours/glitch/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/flavours/glitch/features/compose/containers/emoji_picker_dropdown_container.js index ba85edd87..66d51947a 100644 --- a/app/javascript/flavours/glitch/features/compose/containers/emoji_picker_dropdown_container.js +++ b/app/javascript/flavours/glitch/features/compose/containers/emoji_picker_dropdown_container.js @@ -38,7 +38,8 @@ const getFrequentlyUsedEmojis = createSelector([ .toArray(); if (emojis.length < DEFAULTS.length) { - emojis = emojis.concat(DEFAULTS.slice(0, DEFAULTS.length - emojis.length)); + let uniqueDefaults = DEFAULTS.filter(emoji => !emojis.includes(emoji)); + emojis = emojis.concat(uniqueDefaults.slice(0, DEFAULTS.length - emojis.length)); } return emojis; -- cgit