diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt b/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt index 4d7fcfa4b1..bab6215a17 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt @@ -307,9 +307,9 @@ class ChatModel(val controller: ChatController) { } fun upsertGroupMember(groupInfo: GroupInfo, member: GroupMember): Boolean { + // user member was updated if (groupInfo.membership.groupMemberId == member.groupMemberId) { - // Current user was updated (like his role, for example) - updateChatInfo(ChatInfo.Group(groupInfo)) + updateGroup(groupInfo) return false } // update current chat diff --git a/apps/ios/Shared/Model/ChatModel.swift b/apps/ios/Shared/Model/ChatModel.swift index 5f11cd1e4a..894a79a03b 100644 --- a/apps/ios/Shared/Model/ChatModel.swift +++ b/apps/ios/Shared/Model/ChatModel.swift @@ -386,6 +386,11 @@ final class ChatModel: ObservableObject { } func upsertGroupMember(_ groupInfo: GroupInfo, _ member: GroupMember) -> Bool { + // user member was updated + if groupInfo.membership.groupMemberId == member.groupMemberId { + updateGroup(groupInfo) + return false + } // update current chat if chatId == groupInfo.id { if let i = groupMembers.firstIndex(where: { $0.id == member.id }) { @@ -393,10 +398,6 @@ final class ChatModel: ObservableObject { self.groupMembers[i] = member } return false - } else if (groupInfo.membership.groupMemberId == member.groupMemberId) { - // Current user was updated (like his role, for example) - updateGroup(groupInfo) - return true } else { withAnimation { groupMembers.append(member) } return true diff --git a/apps/ios/Shared/Views/NewChat/AddContactView.swift b/apps/ios/Shared/Views/NewChat/AddContactView.swift index 18c2e56bac..fb3011de51 100644 --- a/apps/ios/Shared/Views/NewChat/AddContactView.swift +++ b/apps/ios/Shared/Views/NewChat/AddContactView.swift @@ -56,6 +56,7 @@ struct AddContactView: View { .padding() .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top) } + .onAppear { chatModel.connReqInv = connReqInvitation } } }