Ensure that untrusted conversations are always rendered in dialog

signalapp · Jun 1, 2022 · feb5e56 · feb5e56
1 parent 08360d1
commit feb5e56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
@@ -1293,6 +1293,9 @@ function verifyConversationsStoppingSend(): ThunkAction<
     conversationIdsStoppingSend.forEach(async conversationId => {
       const conversation = window.ConversationController.get(conversationId);
       if (!conversation) {
+        log.warn(
+          `verifyConversationsStoppingSend: Cannot verify missing conversation for conversationId ${conversationId}`
+        );
         return;
       }
 

diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
@@ -1027,20 +1027,15 @@ export const getConversationIdsStoppingSend = createSelector(
 );
 
 export const getConversationsStoppingSend = createSelector(
-  getConversationByIdSelector,
+  getConversationSelector,
   getConversationIdsStoppingSend,
   (
-    conversationSelector: (id: string) => undefined | ConversationType,
+    conversationSelector: GetConversationByIdType,
     conversationIds: ReadonlyArray<string>
   ): Array<ConversationType> => {
-    const conversations = conversationIds
-      .map(conversationId => conversationSelector(conversationId))
-      .filter(isNotNil);
-    if (conversationIds.length !== conversations.length) {
-      log.warn(
-        `getConversationsStoppingSend: Started with ${conversationIds.length} items, ended up with ${conversations.length}.`
-      );
-    }
+    const conversations = conversationIds.map(conversationId =>
+      conversationSelector(conversationId)
+    );
     return sortByTitle(conversations);
   }
 );