ios: dismiss re-opened contact connection view upon connection (#1316)
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user