From e679b6ae7e2a841ee72685601d63dc5e4349e2be Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Sat, 5 Mar 2022 18:06:15 +0100 Subject: [PATCH] Management / Add Member: Fix exception --- src/modules/actions/api/chats.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/actions/api/chats.ts b/src/modules/actions/api/chats.ts index 170e58ea2..392dd28a0 100644 --- a/src/modules/actions/api/chats.ts +++ b/src/modules/actions/api/chats.ts @@ -953,12 +953,16 @@ addReducer('loadMoreMembers', (global) => { global = getGlobal(); global = addUsers(global, buildCollectionByKey(users, 'id')); + + const newMemberIds = new Set(members.map(m => m.userId)); + const preservedMembers = chat.fullInfo?.members?.filter((m) => !newMemberIds.has(m.userId)) || []; + global = updateChat(global, chat.id, { fullInfo: { ...chat.fullInfo, members: [ - ...((chat.fullInfo || {}).members || []), - ...(members || []), + ...preservedMembers, + ...members, ], }, });