diff --git a/apps/ios/Shared/ContentView.swift b/apps/ios/Shared/ContentView.swift index d791153197..94421060ec 100644 --- a/apps/ios/Shared/ContentView.swift +++ b/apps/ios/Shared/ContentView.swift @@ -19,6 +19,7 @@ struct ContentView: View { do { try apiStartChat() try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path) + chatModel.userAddress = try apiGetUserAddress() chatModel.userSMPServers = try getUserSMPServers() chatModel.chats = try apiGetChats() } catch { diff --git a/apps/ios/Shared/Model/SimpleXAPI.swift b/apps/ios/Shared/Model/SimpleXAPI.swift index 185644b4d3..62722fc54e 100644 --- a/apps/ios/Shared/Model/SimpleXAPI.swift +++ b/apps/ios/Shared/Model/SimpleXAPI.swift @@ -520,8 +520,8 @@ func apiDeleteUserAddress() async throws { throw r } -func apiGetUserAddress() async throws -> String? { - let r = await chatSendCmd(.showMyAddress) +func apiGetUserAddress() throws -> String? { + let r = chatSendCmdSync(.showMyAddress) switch r { case let .userContactLink(connReq): return connReq diff --git a/apps/ios/Shared/Views/UserSettings/SettingsButton.swift b/apps/ios/Shared/Views/UserSettings/SettingsButton.swift index 4d9818278d..7292fd4373 100644 --- a/apps/ios/Shared/Views/UserSettings/SettingsButton.swift +++ b/apps/ios/Shared/Views/UserSettings/SettingsButton.swift @@ -18,18 +18,6 @@ struct SettingsButton: View { } .sheet(isPresented: $showSettings, content: { SettingsView(showSettings: $showSettings) - .onAppear { - Task { - do { - let userAddress = try await apiGetUserAddress() - DispatchQueue.main.async { - chatModel.userAddress = userAddress - } - } catch { - logger.error("SettingsButton apiGetUserAddress error: \(error.localizedDescription)") - } - } - } }) } }