From db557104a64e89213d1d6267f6d6b3348a69e822 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:34:57 -0400
Subject: [PATCH] Use group name for hidden stories

---
 ts/components/StoriesPane.tsx | 9 +++++----
 ts/state/selectors/stories.ts | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ts/components/StoriesPane.tsx b/ts/components/StoriesPane.tsx
index 18497c660125..10f0eb985fdb 100644
--- a/ts/components/StoriesPane.tsx
+++ b/ts/components/StoriesPane.tsx
@@ -177,17 +177,17 @@ export const StoriesPane = ({
           {renderedStories.map(story => (
             <StoryListItem
               conversationId={story.conversationId}
-              group={story.group}
               getPreferredBadge={getPreferredBadge}
               hasReplies={story.hasReplies}
               hasRepliesFromSelf={story.hasRepliesFromSelf}
+              group={story.group}
               i18n={i18n}
               key={story.storyView.timestamp}
-              onHideStory={toggleHideStories}
               onGoToConversation={conversationId => {
                 showConversation({ conversationId });
                 toggleStoriesView();
               }}
+              onHideStory={toggleHideStories}
               queueStoryDownload={queueStoryDownload}
               story={story.storyView}
               viewUserStories={viewUserStories}
@@ -210,15 +210,16 @@ export const StoriesPane = ({
                 hiddenStories.map(story => (
                   <StoryListItem
                     conversationId={story.conversationId}
-                    key={story.storyView.timestamp}
                     getPreferredBadge={getPreferredBadge}
+                    group={story.group}
                     i18n={i18n}
                     isHidden
-                    onHideStory={toggleHideStories}
+                    key={story.storyView.timestamp}
                     onGoToConversation={conversationId => {
                       showConversation({ conversationId });
                       toggleStoriesView();
                     }}
+                    onHideStory={toggleHideStories}
                     queueStoryDownload={queueStoryDownload}
                     story={story.storyView}
                     viewUserStories={viewUserStories}
diff --git a/ts/state/selectors/stories.ts b/ts/state/selectors/stories.ts
index 4706a211c27c..12d7b6c40e34 100644
--- a/ts/state/selectors/stories.ts
+++ b/ts/state/selectors/stories.ts
@@ -223,7 +223,6 @@ export function getConversationStory(
   story: StoryDataType
 ): ConversationStoryType {
   const sender = pick(conversationSelector(story.sourceUuid || story.source), [
-    'hideStory',
     'id',
   ]);
 
@@ -231,6 +230,7 @@ export function getConversationStory(
     'acceptedMessageRequest',
     'avatarPath',
     'color',
+    'hideStory',
     'id',
     'name',
     'profileName',
@@ -251,7 +251,7 @@ export function getConversationStory(
     group: conversation.id !== sender.id ? conversation : undefined,
     hasReplies: story.hasReplies,
     hasRepliesFromSelf: story.hasRepliesFromSelf,
-    isHidden: Boolean(sender.hideStory),
+    isHidden: Boolean(conversation.hideStory),
     storyView,
   };
 }