From 1cab75efa90452ec2f1fc505d17dc4ce3543d092 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:22:40 -0600 Subject: [PATCH] composableGroups: Exclude groups where you're not a member Co-authored-by: Scott Nonnenberg --- ts/state/selectors/conversations.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index b2a3f68a9c..915e6e92f7 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -544,7 +544,8 @@ function canComposeConversation(conversation: ConversationType): boolean { !isSignalConversation(conversation) && !conversation.isBlocked && !conversation.removalStage && - (isGroupV2(conversation) || !isConversationUnregistered(conversation)) && + ((isGroupV2(conversation) && !conversation.left) || + !isConversationUnregistered(conversation)) && hasDisplayInfo(conversation) && isTrusted(conversation) ); @@ -559,7 +560,7 @@ export const getAllComposableConversations = createSelector( !conversation.isBlocked && !conversation.removalStage && !conversation.isGroupV1AndDisabled && - (isGroupV2(conversation) || + ((isGroupV2(conversation) && !conversation.left) || !isConversationUnregistered(conversation)) && // All conversation should have a title except in weird cases where // they don't, in that case we don't want to show these for Forwarding. @@ -646,8 +647,7 @@ export const getNonGroupStories = createSelector( conversationIdsWithStories: Set ): Array => { return groups.filter( - group => - !isGroupInStoryMode(group, conversationIdsWithStories) && !group.left + group => !isGroupInStoryMode(group, conversationIdsWithStories) ); } );