ios: dismiss re-opened contact connection view upon connection (#1316)

This commit is contained in:
JRoberts
2022-11-07 21:05:59 +04:00
committed by GitHub
parent 655041c657
commit f3e59aa3c3
3 changed files with 8 additions and 6 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -56,6 +56,7 @@ struct AddContactView: View {
.padding()
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
}
.onAppear { chatModel.connReqInv = connReqInvitation }
}
}