From b390630f4bbeeb8d941521d0389bd56b26e8bb22 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Wed, 21 Sep 2022 16:28:01 +0100
Subject: [PATCH] ios: fix occasionally broken QR code when creating invitation
 link (#1086)

---
 apps/ios/Shared/Model/SimpleXAPI.swift        |  4 ++--
 .../Shared/Views/NewChat/NewChatButton.swift  | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift
index 7cdc245cc3..ba66393c63 100644
--- a/apps/ios/Shared/Model/SimpleXAPI.swift
+++ b/apps/ios/Shared/Model/SimpleXAPI.swift
@@ -348,8 +348,8 @@ func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -
     throw r
 }
 
-func apiAddContact() -> String? {
-    let r = chatSendCmdSync(.addContact, bgTask: false)
+func apiAddContact() async -> String? {
+    let r = await chatSendCmd(.addContact, bgTask: false)
     if case let .invitation(connReqInvitation) = r { return connReqInvitation }
     connectionErrorAlert(r)
     return nil
diff --git a/apps/ios/Shared/Views/NewChat/NewChatButton.swift b/apps/ios/Shared/Views/NewChat/NewChatButton.swift
index 9c5758111f..bce4bae92e 100644
--- a/apps/ios/Shared/Views/NewChat/NewChatButton.swift
+++ b/apps/ios/Shared/Views/NewChat/NewChatButton.swift
@@ -10,17 +10,23 @@ import SwiftUI
 import SimpleXChat
 
 enum NewChatAction: Identifiable {
-    case createLink
+    case createLink(link: String)
     case pasteLink
     case scanQRCode
     case createGroup
 
-    var id: NewChatAction { get { self } }
+    var id: String {
+        switch self {
+        case let .createLink(link): return "createLink \(link)"
+        case .pasteLink: return "pasteLink"
+        case .scanQRCode: return "scanQRCode"
+        case .createGroup: return "createGroup"
+        }
+    }
 }
 
 struct NewChatButton: View {
     @Binding var showAddChat: Bool
-    @State private var connReq: String = ""
     @State private var actionSheet: NewChatAction?
 
     var body: some View {
@@ -38,7 +44,7 @@ struct NewChatButton: View {
         }
         .sheet(item: $actionSheet) { sheet in
             switch sheet {
-            case .createLink: AddContactView(connReqInvitation: connReq)
+            case let .createLink(link): AddContactView(connReqInvitation: link)
             case .pasteLink: PasteToConnectView()
             case .scanQRCode: ScanToConnectView()
             case .createGroup: AddGroupView()
@@ -47,9 +53,10 @@ struct NewChatButton: View {
     }
 
     func addContactAction() {
-        if let cReq = apiAddContact() {
-            connReq = cReq
-            actionSheet = .createLink
+        Task {
+            if let connReq = await apiAddContact() {
+                actionSheet = .createLink(link: connReq)
+            }
         }
     }
 }