From fef9e5b58e8c7bc04e063f9609738feba4f450f0 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Tue, 23 Aug 2022 14:02:51 -0400
Subject: [PATCH] @mention support for story replies

---
 ts/components/StoryViewer.tsx             | 2 ++
 ts/components/StoryViewsNRepliesModal.tsx | 4 ++++
 ts/state/selectors/stories.ts             | 1 +
 ts/types/Stories.ts                       | 1 +
 4 files changed, 8 insertions(+)

diff --git a/ts/components/StoryViewer.tsx b/ts/components/StoryViewer.tsx
index 1eef5af83..b27324638 100644
--- a/ts/components/StoryViewer.tsx
+++ b/ts/components/StoryViewer.tsx
@@ -54,6 +54,7 @@ export type PropsType = {
     | 'name'
     | 'profileName'
     | 'sharedGroupNames'
+    | 'sortedGroupMembers'
     | 'title'
   >;
   hasActiveCall?: boolean;
@@ -774,6 +775,7 @@ export const StoryViewer = ({
             renderEmojiPicker={renderEmojiPicker}
             replies={replies}
             skinTone={skinTone}
+            sortedGroupMembers={group?.sortedGroupMembers}
             storyPreviewAttachment={attachment}
             views={views}
           />
diff --git a/ts/components/StoryViewsNRepliesModal.tsx b/ts/components/StoryViewsNRepliesModal.tsx
index 66294c308..4bf7a2157 100644
--- a/ts/components/StoryViewsNRepliesModal.tsx
+++ b/ts/components/StoryViewsNRepliesModal.tsx
@@ -6,6 +6,7 @@ import classNames from 'classnames';
 import { usePopper } from 'react-popper';
 import type { AttachmentType } from '../types/Attachment';
 import type { BodyRangeType, LocalizerType } from '../types/Util';
+import type { ConversationType } from '../state/ducks/conversations';
 import type { EmojiPickDataType } from './emoji/EmojiPicker';
 import type { InputApi } from './CompositionInput';
 import type { PreferredBadgeSelectorType } from '../state/selectors/badges';
@@ -104,6 +105,7 @@ export type PropsType = {
   renderEmojiPicker: (props: RenderEmojiPickerProps) => JSX.Element;
   replies: Array<ReplyType>;
   skinTone?: number;
+  sortedGroupMembers?: Array<ConversationType>;
   storyPreviewAttachment?: AttachmentType;
   views: Array<StorySendStateType>;
 };
@@ -126,6 +128,7 @@ export const StoryViewsNRepliesModal = ({
   renderEmojiPicker,
   replies,
   skinTone,
+  sortedGroupMembers,
   storyPreviewAttachment,
   views,
 }: PropsType): JSX.Element | null => {
@@ -210,6 +213,7 @@ export const StoryViewsNRepliesModal = ({
                   ? i18n('StoryViewer__reply-group')
                   : i18n('StoryViewer__reply')
               }
+              sortedGroupMembers={sortedGroupMembers}
               theme={ThemeType.dark}
             >
               <EmojiButton
diff --git a/ts/state/selectors/stories.ts b/ts/state/selectors/stories.ts
index a8b28a874..484aa0a05 100644
--- a/ts/state/selectors/stories.ts
+++ b/ts/state/selectors/stories.ts
@@ -180,6 +180,7 @@ export function getConversationStory(
     'name',
     'profileName',
     'sharedGroupNames',
+    'sortedGroupMembers',
     'title',
   ]);
 
diff --git a/ts/types/Stories.ts b/ts/types/Stories.ts
index d642454bf..0690d2122 100644
--- a/ts/types/Stories.ts
+++ b/ts/types/Stories.ts
@@ -50,6 +50,7 @@ export type ConversationStoryType = {
     | 'name'
     | 'profileName'
     | 'sharedGroupNames'
+    | 'sortedGroupMembers'
     | 'title'
   >;
   isHidden?: boolean;