From e79380b37cb5064c51b80bf1b5bcfe22207a1344 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Mon, 24 Oct 2022 13:45:51 -0400
Subject: [PATCH] Gracefully close the story viewer when we cannot find story

---
 ts/state/smart/StoryViewer.tsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ts/state/smart/StoryViewer.tsx b/ts/state/smart/StoryViewer.tsx
index edb738cafc..eed62664e3 100644
--- a/ts/state/smart/StoryViewer.tsx
+++ b/ts/state/smart/StoryViewer.tsx
@@ -59,16 +59,6 @@ export function SmartStoryViewer(): JSX.Element | null {
 
   const getStoryById = useSelector(getStoryByIdSelector);
 
-  const storyInfo = getStoryById(
-    conversationSelector,
-    selectedStoryData.messageId
-  );
-  strictAssert(
-    storyInfo,
-    'StoryViewer: selected story does not exist in stories'
-  );
-  const { conversationStory, distributionList, storyView } = storyInfo;
-
   const recentEmojis = useRecentEmojis();
   const skinTone = useSelector<StateType, number>(getEmojiSkinTone);
   const replyState = useSelector(getStoryReplies);
@@ -81,6 +71,17 @@ export function SmartStoryViewer(): JSX.Element | null {
     getHasReadReceiptSetting
   );
 
+  const storyInfo = getStoryById(
+    conversationSelector,
+    selectedStoryData.messageId
+  );
+
+  if (!storyInfo) {
+    return null;
+  }
+
+  const { conversationStory, distributionList, storyView } = storyInfo;
+
   return (
     <StoryViewer
       currentIndex={selectedStoryData.currentIndex}