From 4a31dcd319b587d8cfe2e20a6d2b2d90c702e342 Mon Sep 17 00:00:00 2001
From: Diogo Cunha <diogofncunha@gmail.com>
Date: Mon, 12 Aug 2024 01:02:22 +0100
Subject: [PATCH] ios: navigation to delete chat working for group members

---
 apps/ios/Shared/Model/SimpleXAPI.swift                  | 8 +-------
 apps/ios/Shared/Views/Chat/ChatView.swift               | 7 ++++++-
 apps/ios/Shared/Views/Contacts/ContactListNavLink.swift | 3 ---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift
index 5ebdc74788..ea1900c7ca 100644
--- a/apps/ios/Shared/Model/SimpleXAPI.swift
+++ b/apps/ios/Shared/Model/SimpleXAPI.swift
@@ -340,13 +340,7 @@ func loadChat(chat: Chat, search: String = "") {
         m.chatItemStatuses = [:]
         im.reversedChatItems = []
         let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
-        if case let .direct(contact) = chat.chatInfo, !cInfo.chatDeleted, chat.chatInfo.chatDeleted {
-            var updatedContact = contact
-            updatedContact.chatDeleted = false
-            m.updateContact(updatedContact)
-        } else {
-            m.updateChatInfo(chat.chatInfo)
-        }
+        m.updateChatInfo(chat.chatInfo)
         im.reversedChatItems = chat.chatItems.reversed()
     } catch let error {
         logger.error("loadChat error: \(responseError(error))")
diff --git a/apps/ios/Shared/Views/Chat/ChatView.swift b/apps/ios/Shared/Views/Chat/ChatView.swift
index 11b6f9aba3..14880fa501 100644
--- a/apps/ios/Shared/Views/Chat/ChatView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatView.swift
@@ -306,7 +306,12 @@ struct ChatView: View {
                     let (stats, _) = try await apiContactInfo(chat.chatInfo.apiId)
                     await MainActor.run {
                         if let s = stats {
-                            chatModel.updateContactConnectionStats(contact, s)
+                            var updatedContact = contact
+                            if contact.chatDeleted {
+                                updatedContact.chatDeleted = false
+                            }
+                            
+                            chatModel.updateContactConnectionStats(updatedContact, s)
                         }
                     }
                 } catch let error {
diff --git a/apps/ios/Shared/Views/Contacts/ContactListNavLink.swift b/apps/ios/Shared/Views/Contacts/ContactListNavLink.swift
index 4079e1474a..1656710f55 100644
--- a/apps/ios/Shared/Views/Contacts/ContactListNavLink.swift
+++ b/apps/ios/Shared/Views/Contacts/ContactListNavLink.swift
@@ -82,9 +82,6 @@ struct ContactListNavLink: View {
         Button {
             Task {
                 await MainActor.run {
-                    var updatedContact = contact
-                    updatedContact.chatDeleted = false
-                    ChatModel.shared.updateContact(updatedContact)
                     dismissAllSheets(animated: true) {
                         ChatModel.shared.chatId = contact.id
                     }