fix dismiss on migrate from device

This commit is contained in:
Diogo
2024-08-27 22:08:53 +01:00
parent 7b67e25733
commit 9c15471fbd
2 changed files with 4 additions and 5 deletions
@@ -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)
@@ -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))
}
}