From 5f66c29dbdbde40fe2f36782fea24eb77576f978 Mon Sep 17 00:00:00 2001
From: Diogo <diogofncunha@gmail.com>
Date: Thu, 5 Dec 2024 16:15:24 +0000
Subject: [PATCH] ios: fix open from notification and connected directly chat
 item chat loading (#5326)

* ios: fix opening from notification and connected directly chat item chat loading

* better fix
---
 apps/ios/Shared/Model/NtfManager.swift                      | 6 +++++-
 apps/ios/Shared/SimpleXApp.swift                            | 3 ++-
 .../Views/Chat/ChatItem/CIMemberCreatedContactView.swift    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/ios/Shared/Model/NtfManager.swift b/apps/ios/Shared/Model/NtfManager.swift
index b2fa6a0200..6c33031eeb 100644
--- a/apps/ios/Shared/Model/NtfManager.swift
+++ b/apps/ios/Shared/Model/NtfManager.swift
@@ -26,6 +26,7 @@ enum NtfCallAction {
 class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
     static let shared = NtfManager()
 
+    public var navigatingToChat = false
     private var granted = false
     private var prevNtfTime: Dictionary<ChatId, Date> = [:]
 
@@ -74,7 +75,10 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
             }
         } else {
             if let chatId = content.targetContentIdentifier {
-                ItemsModel.shared.loadOpenChat(chatId)
+                self.navigatingToChat = true
+                ItemsModel.shared.loadOpenChat(chatId) {
+                    self.navigatingToChat = false
+                }
             }
         }
     }
diff --git a/apps/ios/Shared/SimpleXApp.swift b/apps/ios/Shared/SimpleXApp.swift
index 0dd54782b4..10120db185 100644
--- a/apps/ios/Shared/SimpleXApp.swift
+++ b/apps/ios/Shared/SimpleXApp.swift
@@ -143,7 +143,8 @@ struct SimpleXApp: App {
             let chats = try await apiGetChatsAsync()
             await MainActor.run { chatModel.updateChats(chats) }
             if let id = chatModel.chatId,
-               let chat = chatModel.getChat(id) {
+               let chat = chatModel.getChat(id),
+               !NtfManager.shared.navigatingToChat {
                 Task { await loadChat(chat: chat, clearItems: false) }
             }
             if let ncr = chatModel.ntfContactRequest {
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift
index e9cd838234..d24c737907 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CIMemberCreatedContactView.swift
@@ -23,7 +23,7 @@ struct CIMemberCreatedContactView: View {
                         .onTapGesture {
                             dismissAllSheets(animated: true)
                             DispatchQueue.main.async {
-                                m.chatId = "@\(contactId)"
+                                ItemsModel.shared.loadOpenChat("@\(contactId)")
                             }
                         }
                 } else {