From 73bb96665e66dbc558069c7c2699775d61677f3a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Wed, 15 Jan 2025 14:51:36 +1100
Subject: [PATCH] fix: only trigger remove of members that are not in the group

---
 ts/components/dialog/UpdateGroupMembersDialog.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx
index c5b25dcdb..50cbca888 100644
--- a/ts/components/dialog/UpdateGroupMembersDialog.tsx
+++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx
@@ -175,11 +175,15 @@ export const UpdateGroupMembersDialog = (props: Props) => {
 
   const onClickOK = async () => {
     if (PubKey.is03Pubkey(conversationId)) {
+      const toRemoveAndCurrentMembers = membersToRemove.filter(m =>
+        existingMembers.includes(m as PubkeyType)
+      );
+
       const groupv2Action = groupInfoActions.currentDeviceGroupMembersChange({
         groupPk: conversationId,
         addMembersWithHistory: [],
         addMembersWithoutHistory: [],
-        removeMembers: membersToRemove as Array<PubkeyType>,
+        removeMembers: toRemoveAndCurrentMembers as Array<PubkeyType>,
         alsoRemoveMessages,
       });
       dispatch(groupv2Action as any);