Stories improvements

ts/components/StoryViewer.tsx

@@ -208,7 +208,7 @@ export const StoryViewer = ({
     return () => {
       unmountRef.current = true;
     };
-  });
+  }, []);
 
   const [styles, spring] = useSpring(
     () => ({

ts/state/ducks/stories.ts

@@ -906,6 +906,12 @@ export function reducer(
     return {
       ...state,
       isShowingStoriesView: !state.isShowingStoriesView,
+      selectedStoryData: state.isShowingStoriesView
+        ? undefined
+        : state.selectedStoryData,
+      storyViewMode: state.isShowingStoriesView
+        ? undefined
+        : state.storyViewMode,
     };
   }
 

ts/state/selectors/stories.ts

@@ -342,11 +342,14 @@ export const getStories = createSelector(
   }
 );
 
-export const getUnreadStoriesCount = createSelector(
+export const getUnreadStorySenderCount = createSelector(
   getStoriesState,
   ({ stories }): number => {
-    return stories.filter(story => story.readStatus === ReadStatus.Unread)
-      .length;
+    return new Set(
+      stories
+        .filter(story => story.readStatus === ReadStatus.Unread)
+        .map(story => story.conversationId)
+    ).size;
   }
 );
 

ts/state/smart/MainHeader.tsx

@@ -17,7 +17,7 @@ import {
 } from '../selectors/user';
 import { getMe } from '../selectors/conversations';
 import { getStoriesEnabled } from '../selectors/items';
-import { getUnreadStoriesCount } from '../selectors/stories';
+import { getUnreadStorySenderCount } from '../selectors/stories';
 
 const mapStateToProps = (state: StateType) => {
   const me = getMe(state);
@@ -32,7 +32,7 @@ const mapStateToProps = (state: StateType) => {
     badge: getPreferredBadgeSelector(state)(me.badges),
     theme: getTheme(state),
     i18n: getIntl(state),
-    unreadStoriesCount: getUnreadStoriesCount(state),
+    unreadStoriesCount: getUnreadStorySenderCount(state),
   };
 };