From a36c367b81644961a2fcc6bbed3e2c4552b60eb2 Mon Sep 17 00:00:00 2001 From: JRoberts <8711996+jr-simplex@users.noreply.github.com> Date: Tue, 2 Aug 2022 18:07:40 +0400 Subject: [PATCH] mobile: filter out members in statuses left and removed (#869) --- .../chat/simplex/app/views/chat/group/GroupChatInfoView.kt | 4 +++- apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt index 2fec78b4d7..660975f610 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt @@ -37,7 +37,9 @@ fun GroupChatInfoView(chatModel: ChatModel, close: () -> Unit) { GroupChatInfoLayout( chat, groupInfo, - members = chatModel.groupMembers.sortedBy { it.displayName.lowercase() }, + members = chatModel.groupMembers + .filter { it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved } + .sortedBy { it.displayName.lowercase() }, developerTools, addMembers = { withApi { diff --git a/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift b/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift index 5b563aa5c4..e39bd323e4 100644 --- a/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift +++ b/apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift @@ -98,8 +98,10 @@ struct GroupChatInfoView: View { } .task { let ms = await apiListMembers(chat.chatInfo.apiId) + .filter { $0.memberStatus != .memLeft && $0.memberStatus != .memRemoved } + .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() } await MainActor.run { - members = ms.sorted { $0.displayName.lowercased() < $1.displayName.lowercased() } + members = ms } } }