From 85f706d48f425c2ca62f772d5fddb0d5b4fb0773 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Wed, 19 Oct 2022 13:36:54 -0400
Subject: [PATCH] Render @mentions for group story replies

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

diff --git a/ts/components/StoryViewsNRepliesModal.tsx b/ts/components/StoryViewsNRepliesModal.tsx
index f0cb60e03564..59e9d17ecd32 100644
--- a/ts/components/StoryViewsNRepliesModal.tsx
+++ b/ts/components/StoryViewsNRepliesModal.tsx
@@ -353,6 +353,7 @@ export const StoryViewsNRepliesModal = ({
               <Message
                 {...MESSAGE_DEFAULT_PROPS}
                 author={reply.author}
+                bodyRanges={reply.bodyRanges}
                 contactNameColor={reply.contactNameColor}
                 containerElementRef={containerElementRef}
                 conversationColor="ultramarine"
diff --git a/ts/state/selectors/stories.ts b/ts/state/selectors/stories.ts
index 02700630f8e8..6299045a15a3 100644
--- a/ts/state/selectors/stories.ts
+++ b/ts/state/selectors/stories.ts
@@ -299,7 +299,13 @@ export const getStoryReplies = createSelector(
 
       return {
         author: getAvatarData(conversation),
-        ...pick(reply, ['body', 'deletedForEveryone', 'id', 'timestamp']),
+        ...pick(reply, [
+          'body',
+          'bodyRanges',
+          'deletedForEveryone',
+          'id',
+          'timestamp',
+        ]),
         contactNameColor: contactNameColorSelector(
           reply.conversationId,
           conversation.id
diff --git a/ts/types/Stories.ts b/ts/types/Stories.ts
index 48b1d6ba934f..d5850af94ebf 100644
--- a/ts/types/Stories.ts
+++ b/ts/types/Stories.ts
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import type { AttachmentType } from './Attachment';
+import type { BodyRangesType, LocalizerType } from './Util';
 import type { ContactNameColorType } from './Colors';
 import type { ConversationType } from '../state/ducks/conversations';
-import type { LocalizerType } from './Util';
 import type { ReadStatus } from '../messages/MessageReadStatus';
 import type { SendStatus } from '../messages/MessageSendState';
 import type { StoryDistributionListDataType } from '../state/ducks/storyDistributionLists';
@@ -27,6 +27,7 @@ export type ReplyType = {
     | 'title'
   >;
   body?: string;
+  bodyRanges?: BodyRangesType;
   contactNameColor?: ContactNameColorType;
   conversationId: string;
   deletedForEveryone?: boolean;