fix: address switch refresh

Author: reez

BDKSwiftExampleWallet/App/BDKSwiftExampleWalletApp.swift

@@ -8,19 +8,31 @@
 import BitcoinDevKit
 import SwiftUI
 
+extension Notification.Name {
+    static let walletCreated = Notification.Name("walletCreated")
+}
+
 @main
 struct BDKSwiftExampleWalletApp: App {
     @AppStorage("isOnboarding") var isOnboarding: Bool = true
     @State private var navigationPath = NavigationPath()
+    @State private var refreshTrigger = UUID()
+    
+    private var walletExists: Bool {
+        // Force re-evaluation by reading refreshTrigger and isOnboarding
+        let _ = refreshTrigger
+        let _ = isOnboarding
+        return (try? KeyClient.live.getBackupInfo()) != nil
+    }
 
     var body: some Scene {
         WindowGroup {
             NavigationStack(path: $navigationPath) {
-                let value = try? KeyClient.live.getBackupInfo()
-                if isOnboarding && (value == nil) {
-                    OnboardingView(viewModel: .init(bdkClient: .live))
-                } else if !isOnboarding && (value == nil) {
+                if !walletExists {
                     OnboardingView(viewModel: .init(bdkClient: .live))
+                        .onReceive(NotificationCenter.default.publisher(for: .walletCreated)) { _ in
+                            refreshTrigger = UUID()
+                        }
                 } else {
                     HomeView(viewModel: .init(bdkClient: .live), navigationPath: $navigationPath)
                 }

BDKSwiftExampleWallet/Resources/Localizable.xcstrings

@@ -535,6 +535,9 @@
           }
         }
       }
+    },
+    "Creating..." : {
+
     },
     "Danger Zone" : {
       "localizations" : {

BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift

@@ -408,7 +408,6 @@ private class BDKService {
                 self.wallet = wallet
             } catch is LoadWithPersistError {
                 // Database is corrupted or incompatible, delete and recreate
-                print("Wallet database is corrupted, recreating...")
                 try Persister.deleteConnection()
 
                 let persister = try Persister.createConnection()
@@ -583,7 +582,13 @@ extension BDKService {
     }
 
     func updateAddressType(_ newAddressType: AddressType) {
+        let currentType = getCurrentAddressType()
         try? keyClient.saveAddressType(newAddressType.description)
+        
+        // If address type changed, we need a full scan to find transactions with new derivation paths
+        if currentType != newAddressType {
+            needsFullScan = true
+        }
     }
 
     func updateClientType(_ newType: BlockchainClientType) {

BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift

@@ -9,14 +9,34 @@ import BitcoinDevKit
 import Foundation
 import SwiftUI
 
+struct TimeoutError: Error {}
+
+func withTimeout<T>(seconds: TimeInterval, operation: @escaping () throws -> T) async throws -> T {
+    try await withThrowingTaskGroup(of: T.self) { group in
+        group.addTask {
+            return try operation()
+        }
+        
+        group.addTask {
+            try await Task.sleep(nanoseconds: UInt64(seconds * 1_000_000_000))
+            throw TimeoutError()
+        }
+        
+        let result = try await group.next()!
+        group.cancelAll()
+        return result
+    }
+}
+
 // Can't make @Observable yet
 // https://developer.apple.com/forums/thread/731187
 // Feature or Bug?
 class OnboardingViewModel: ObservableObject {
     let bdkClient: BDKClient
 
-    @AppStorage("isOnboarding") var isOnboarding: Bool?
+    @AppStorage("isOnboarding") var isOnboarding: Bool = true
     @Published var createWithPersistError: CreateWithPersistError?
+    @Published var isCreatingWallet = false
     var isDescriptor: Bool {
         words.hasPrefix("tr(") || words.hasPrefix("wpkh(") || words.hasPrefix("wsh(")
             || words.hasPrefix("sh(")
@@ -90,24 +110,53 @@ class OnboardingViewModel: ObservableObject {
     }
 
     func createWallet() {
-        do {
-            if isDescriptor {
-                try bdkClient.createWalletFromDescriptor(words)
-            } else if isXPub {
-                try bdkClient.createWalletFromXPub(words)
-            } else {
-                try bdkClient.createWalletFromSeed(words)
-            }
+        // Check if wallet already exists
+        if let existingBackup = try? bdkClient.getBackupInfo() {
             DispatchQueue.main.async {
                 self.isOnboarding = false
             }
-        } catch let error as CreateWithPersistError {
-            DispatchQueue.main.async {
-                self.createWithPersistError = error
-            }
-        } catch {
-            DispatchQueue.main.async {
-                self.onboardingViewError = .generic(message: error.localizedDescription)
+            return
+        }
+        
+        guard !isCreatingWallet else {
+            return
+        }
+        
+        DispatchQueue.main.async {
+            self.isCreatingWallet = true
+        }
+        
+        Task {
+            do {
+                try await withTimeout(seconds: 30) {
+                    if self.isDescriptor {
+                        try self.bdkClient.createWalletFromDescriptor(self.words)
+                    } else if self.isXPub {
+                        try self.bdkClient.createWalletFromXPub(self.words)
+                    } else {
+                        try self.bdkClient.createWalletFromSeed(self.words)
+                    }
+                }
+                DispatchQueue.main.async {
+                    self.isCreatingWallet = false
+                    self.isOnboarding = false
+                    NotificationCenter.default.post(name: .walletCreated, object: nil)
+                }
+            } catch let error as CreateWithPersistError {
+                DispatchQueue.main.async {
+                    self.isCreatingWallet = false
+                    self.createWithPersistError = error
+                }
+            } catch is TimeoutError {
+                DispatchQueue.main.async {
+                    self.isCreatingWallet = false
+                    self.onboardingViewError = .generic(message: "Wallet creation timed out. Please try again.")
+                }
+            } catch {
+                DispatchQueue.main.async {
+                    self.isCreatingWallet = false
+                    self.onboardingViewError = .generic(message: error.localizedDescription)
+                }
             }
         }
     }

BDKSwiftExampleWallet/View/OnboardingView.swift

@@ -10,7 +10,7 @@ import BitcoinUI
 import SwiftUI
 
 struct OnboardingView: View {
-    @AppStorage("isOnboarding") var isOnboarding: Bool?
+    @AppStorage("isOnboarding") var isOnboarding: Bool = true
     @ObservedObject var viewModel: OnboardingViewModel
     @State private var showingOnboardingViewErrorAlert = false
     @State private var showingImportView = false
@@ -176,9 +176,19 @@ struct OnboardingView: View {
 
                 Spacer()
 
-                Button("Create Wallet") {
+                Button(action: {
                     viewModel.createWallet()
+                }) {
+                    HStack {
+                        if viewModel.isCreatingWallet {
+                            ProgressView()
+                                .scaleEffect(0.8)
+                                .foregroundColor(Color(uiColor: .systemBackground))
+                        }
+                        Text(viewModel.isCreatingWallet ? "Creating..." : "Create Wallet")
+                    }
                 }
+                .disabled(viewModel.isCreatingWallet)
                 .buttonStyle(
                     BitcoinFilled(
                         tintColor: .primary,