From 0e0982147c2d41f8ae84438fe6f9b07b7fe66a85 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Fri, 10 Sep 2021 13:43:17 -0500
Subject: [PATCH] Show recent emoji in the customize reaction emoji picker

---
 ts/components/CustomizingPreferredReactionsModal.stories.tsx | 1 +
 ts/components/CustomizingPreferredReactionsModal.tsx         | 3 +++
 ts/state/smart/CustomizingPreferredReactionsModal.tsx        | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/ts/components/CustomizingPreferredReactionsModal.stories.tsx b/ts/components/CustomizingPreferredReactionsModal.stories.tsx
index 5fa3aa11b..a82663e20 100644
--- a/ts/components/CustomizingPreferredReactionsModal.stories.tsx
+++ b/ts/components/CustomizingPreferredReactionsModal.stories.tsx
@@ -29,6 +29,7 @@ const defaultProps: ComponentProps<
   isSaving: false,
   onSetSkinTone: action('onSetSkinTone'),
   originalPreferredReactions: ['❤️', '👍', '👎', '😂', '😮', '😢'],
+  recentEmojis: ['cake'],
   replaceSelectedDraftEmoji: action('replaceSelectedDraftEmoji'),
   resetDraftEmoji: action('resetDraftEmoji'),
   savePreferredReactions: action('savePreferredReactions'),
diff --git a/ts/components/CustomizingPreferredReactionsModal.tsx b/ts/components/CustomizingPreferredReactionsModal.tsx
index 0d04bd018..4319acd4e 100644
--- a/ts/components/CustomizingPreferredReactionsModal.tsx
+++ b/ts/components/CustomizingPreferredReactionsModal.tsx
@@ -23,6 +23,7 @@ type PropsType = {
   i18n: LocalizerType;
   isSaving: boolean;
   originalPreferredReactions: Array<string>;
+  recentEmojis: Array<string>;
   selectedDraftEmojiIndex: undefined | number;
   skinTone: number;
 
@@ -44,6 +45,7 @@ export function CustomizingPreferredReactionsModal({
   isSaving,
   onSetSkinTone,
   originalPreferredReactions,
+  recentEmojis,
   replaceSelectedDraftEmoji,
   resetDraftEmoji,
   savePreferredReactions,
@@ -162,6 +164,7 @@ export function CustomizingPreferredReactionsModal({
               );
               replaceSelectedDraftEmoji(emoji);
             }}
+            recentEmojis={recentEmojis}
             skinTone={skinTone}
             onSetSkinTone={onSetSkinTone}
             onClose={() => {
diff --git a/ts/state/smart/CustomizingPreferredReactionsModal.tsx b/ts/state/smart/CustomizingPreferredReactionsModal.tsx
index 961227a6f..2c5c16851 100644
--- a/ts/state/smart/CustomizingPreferredReactionsModal.tsx
+++ b/ts/state/smart/CustomizingPreferredReactionsModal.tsx
@@ -10,6 +10,7 @@ import { useActions as usePreferredReactionsActions } from '../ducks/preferredRe
 import { useActions as useItemsActions } from '../ducks/items';
 import { getIntl } from '../selectors/user';
 import { getEmojiSkinTone } from '../selectors/items';
+import { useRecentEmojis } from '../selectors/emojis';
 import { getCustomizeModalState } from '../selectors/preferredReactions';
 
 import { CustomizingPreferredReactionsModal } from '../../components/CustomizingPreferredReactionsModal';
@@ -30,6 +31,8 @@ export function SmartCustomizingPreferredReactionsModal(): JSX.Element {
     );
   }
 
+  const recentEmojis = useRecentEmojis();
+
   const skinTone = useSelector<StateType, number>(state =>
     getEmojiSkinTone(state)
   );
@@ -38,6 +41,7 @@ export function SmartCustomizingPreferredReactionsModal(): JSX.Element {
     <CustomizingPreferredReactionsModal
       i18n={i18n}
       onSetSkinTone={onSetSkinTone}
+      recentEmojis={recentEmojis}
       skinTone={skinTone}
       {...preferredReactionsActions}
       {...customizeModalState}