fix: moved default vault selection to RestoreBackupView

joeldavidw · Jun 23, 2024 · 0d09344 · 0d09344
1 parent 4cb3d96
commit 0d09344
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Chronos/App/Onboarding/Restore/RestoreBackupView.swift b/Chronos/App/Onboarding/Restore/RestoreBackupView.swift
@@ -1,4 +1,5 @@
 import Factory
+import SwiftData
 import SwiftUI
 
 struct RestoreBackupView: View {
@@ -8,6 +9,8 @@ struct RestoreBackupView: View {
     @State private var passwordInvalid: Bool = false
     @State private var backupExists: Bool = false
 
+    @Query var vaults: [Vault]
+
     @AppStorage(StateEnum.ICLOUD_BACKUP_ENABLED.rawValue) var isICloudEnabled: Bool = false
 
     @FocusState private var focusedField: FocusedField?
@@ -53,6 +56,12 @@ struct RestoreBackupView: View {
             Spacer()
 
             Button {
+                // Defaults to the first vault if the user is not coming from VaultSelectionView.
+                // Users will only come from VaultSelectionView if there are multiple vaults.
+                if vaults.count == 1 {
+                    stateService.setVaultId(vaultId: vaults.first!.vaultId!)
+                }
+
                 restoreBtnPressed = true
 
                 Task {

diff --git a/Chronos/App/Onboarding/WelcomeView.swift b/Chronos/App/Onboarding/WelcomeView.swift
@@ -56,10 +56,6 @@ struct WelcomeView: View {
                     } else {
                         if hasSynced {
                             Button(action: {
-                                if vaults.count == 1 {
-                                    stateService.setVaultId(vaultId: vaults.first!.vaultId!)
-                                }
-
                                 restorePressed = true
                             }) {
                                 Text("Restore from iCloud")