From feb5e569f346696878f17f318aacfcaad0682249 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Wed, 1 Jun 2022 14:32:40 -0700
Subject: [PATCH] Ensure that untrusted conversations are always rendered in
 dialog

---
 ts/state/ducks/conversations.ts     |  3 +++
 ts/state/selectors/conversations.ts | 15 +++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index de318dbfb..76b58fe2e 100644
--- 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
index cc9f7c178..86c5e6fb2 100644
--- 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);
   }
 );