Improve handling of invalid conversations

signalapp · May 19, 2023 · 36432b3 · 36432b3
1 parent 4404429
commit 36432b3
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 5 deletions.
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
@@ -5459,18 +5459,24 @@ export function reducer(
     const { payload } = action;
     const { conversationId, messageId, switchToAssociatedView } = payload;
 
+    let conversation: ConversationType | undefined;
+
+    if (conversationId) {
+      conversation = getOwn(state.conversationLookup, conversationId);
+      if (!conversation) {
+        log.error(`Unknown conversation selected, id: [${conversationId}]`);
+        return state;
+      }
+    }
+
     const nextState = {
       ...omit(state, 'contactSpoofingReview'),
       selectedConversationId: conversationId,
       targetedMessage: messageId,
       targetedMessageSource: TargetedMessageSource.NavigateToMessage,
     };
 
-    if (switchToAssociatedView && conversationId) {
-      const conversation = getOwn(state.conversationLookup, conversationId);
-      if (!conversation) {
-        return nextState;
-      }
+    if (switchToAssociatedView && conversation) {
       return {
         ...omit(nextState, 'composer', 'selectedMessageIds'),
         showArchived: Boolean(conversation.isArchived),

diff --git a/ts/test-electron/state/ducks/conversations_test.ts b/ts/test-electron/state/ducks/conversations_test.ts
@@ -372,9 +372,32 @@ describe('both/state/ducks/conversations', () => {
     }
 
     describe('showConversation', () => {
+      it('does not select a conversation if it does not exist', () => {
+        const state = {
+          ...getEmptyState(),
+        };
+        const dispatch = sinon.spy();
+        showConversation({ conversationId: 'abc123' })(
+          dispatch,
+          getEmptyRootState,
+          null
+        );
+        const action = dispatch.getCall(0).args[0];
+        const nextState = reducer(state, action);
+
+        assert.isUndefined(nextState.selectedConversationId);
+        assert.isUndefined(nextState.targetedMessage);
+      });
+
       it('selects a conversation id', () => {
+        const conversation = getDefaultConversation({
+          id: 'abc123',
+        });
         const state = {
           ...getEmptyState(),
+          conversationLookup: {
+            [conversation.id]: conversation,
+          },
         };
         const dispatch = sinon.spy();
         showConversation({ conversationId: 'abc123' })(
@@ -390,9 +413,16 @@ describe('both/state/ducks/conversations', () => {
       });
 
       it('selects a conversation and a message', () => {
+        const conversation = getDefaultConversation({
+          id: 'abc123',
+        });
         const state = {
           ...getEmptyState(),
+          conversationLookup: {
+            [conversation.id]: conversation,
+          },
         };
+
         const dispatch = sinon.spy();
         showConversation({
           conversationId: 'abc123',