From 9c15471fbd698872e3b97b7a11f909ccfe8c82a8 Mon Sep 17 00:00:00 2001
From: Diogo <diogofncunha@gmail.com>
Date: Tue, 27 Aug 2024 22:08:53 +0100
Subject: [PATCH] fix dismiss on migrate from device

---
 apps/ios/Shared/Views/ChatList/UserPicker.swift         | 2 +-
 apps/ios/Shared/Views/Migration/MigrateFromDevice.swift | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/ios/Shared/Views/ChatList/UserPicker.swift b/apps/ios/Shared/Views/ChatList/UserPicker.swift
index 4871310ba9..d5e1790967 100644
--- a/apps/ios/Shared/Views/ChatList/UserPicker.swift
+++ b/apps/ios/Shared/Views/ChatList/UserPicker.swift
@@ -182,7 +182,7 @@ struct UserPicker: View {
                             .navigationBarTitleDisplayMode(.large)
                             .modifier(ThemedBackground(grouped: true))
                     case .migrateDevice:
-                        MigrateFromDevice(showSettings: $showSettings, showProgressOnSettings: $showProgress)
+                        MigrateFromDevice(showProgressOnSettings: $showProgress)
                             .navigationTitle("Migrate device")
                             .modifier(ThemedBackground(grouped: true))
                             .navigationBarTitleDisplayMode(.large)
diff --git a/apps/ios/Shared/Views/Migration/MigrateFromDevice.swift b/apps/ios/Shared/Views/Migration/MigrateFromDevice.swift
index 584e6bf693..8ce26141c2 100644
--- a/apps/ios/Shared/Views/Migration/MigrateFromDevice.swift
+++ b/apps/ios/Shared/Views/Migration/MigrateFromDevice.swift
@@ -57,7 +57,6 @@ struct MigrateFromDevice: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var showSettings: Bool
     @Binding var showProgressOnSettings: Bool
     @State private var migrationState: MigrationFromState = .chatStopInProgress
     @State private var useKeychain = storeDBPassphraseGroupDefault.get()
@@ -587,7 +586,7 @@ struct MigrateFromDevice: View {
                     } catch let error {
                         fatalError("Error starting chat \(responseError(error))")
                     }
-                    showSettings = false
+                    dismiss()
                 }
             } catch let error {
                 alert = .error(title: "Error deleting database", error: responseError(error))
@@ -611,7 +610,7 @@ struct MigrateFromDevice: View {
         // Hide settings anyway if chatDbStatus is not ok, probably passphrase needs to be entered
         if dismiss || m.chatDbStatus != .ok {
             await MainActor.run {
-                showSettings = false
+                self.dismiss()
             }
         }
     }
@@ -764,6 +763,6 @@ private class MigrationChatReceiver {
 
 struct MigrateFromDevice_Previews: PreviewProvider {
     static var previews: some View {
-        MigrateFromDevice(showSettings: Binding.constant(true), showProgressOnSettings: Binding.constant(false))
+        MigrateFromDevice(showProgressOnSettings: Binding.constant(false))
     }
 }