feat: connect hardware flow

Bitkit.xcodeproj/project.pbxproj

@@ -1201,7 +1201,7 @@
 			repositoryURL = "https://github.com/synonymdev/bitkit-core";
 			requirement = {
 				kind = exactVersion;
-				version = 0.3.6;
+				version = 0.3.9;
 			};
 		};
 		96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {

Bitkit/Assets.xcassets/Illustrations/coin-stack-3.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "coin-stack-3.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Bitkit/Assets.xcassets/Illustrations/hw-searching-arrows.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "hw-searching-arrows.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Bitkit/Assets.xcassets/Illustrations/hw-searching-ring-inner.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "hw-searching-ring-inner.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Bitkit/Assets.xcassets/Illustrations/hw-searching-ring.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "hw-searching-ring.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Bitkit/Assets.xcassets/Illustrations/trezor.imageset/Contents.json → Bitkit/Assets.xcassets/Illustrations/trezor-cropped.imageset/Contents.json

@@ -1,12 +1,12 @@
 {
   "images" : [
     {
-      "filename" : "trezor.png",
+      "filename" : "trezor-cropped.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "trezor@2x.png",
+      "filename" : "trezor-cropped@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

Bitkit/Components/Trezor/HwDeviceIllustrations.swift

@@ -24,7 +24,7 @@ struct HwDeviceIllustrations: View {
             let staggerY = width * Layout.proportionalStagger
 
             ZStack {
-                Image("trezor")
+                Image("trezor-cropped")
                     .resizable()
                     .scaledToFit()
                     .frame(width: width * Layout.trezorProportionalWidth, height: imageHeight)

Bitkit/Components/Widgets/Suggestions.swift

@@ -358,7 +358,7 @@ struct Suggestions: View {
         case .support:
             route = .support
         case .hardware:
-            sheets.showSheet(.hardwareIntro)
+            sheets.showSheet(.hardwareConnect)
         case .transferToSpending:
             route = app.hasSeenTransferIntro ? .fundingOptions : .transferIntro
         }

Bitkit/MainNavView.swift

@@ -189,12 +189,12 @@ struct MainNavView: View {
             config in WidgetsSheet(config: config)
         }
         .sheet(
-            item: $sheets.hardwareIntroSheetItem,
+            item: $sheets.hardwareConnectSheetItem,
             onDismiss: {
                 sheets.hideSheet()
             }
         ) {
-            config in HardwareIntroSheet(config: config)
+            config in HardwareConnectSheet(config: config)
         }
         .sheet(
             item: $sheets.hardwarePairingSheetItem,
@@ -216,6 +216,7 @@ struct MainNavView: View {
             // A hardware device asked for its one-time pairing code (e.g. during reconnect);
             // surface the app-wide Pair Device sheet. Hidden again once submitted/cancelled.
             if needsCode {
+                guard !sheets.hardwareConnectHandlesPairing else { return }
                 sheets.showSheet(.hardwarePairing)
             } else {
                 sheets.hideSheetIfActive(.hardwarePairing, reason: "Pairing code resolved")

Bitkit/Managers/TrezorManager.swift

@@ -52,6 +52,8 @@ final class TrezorManager {
 
     var showPairingCode: Bool = false
 
+    private(set) var pairingCodeRequestID: Int = 0
+
     var showConfirmOnDevice: Bool = false
 
     var confirmMessage: String = ""
@@ -115,6 +117,7 @@ final class TrezorManager {
             .receive(on: DispatchQueue.main)
             .sink { [weak self] in
                 self?.showPairingCode = true
+                self?.pairingCodeRequestID &+= 1
             }
             .store(in: &cancellables)
 
@@ -170,6 +173,7 @@ final class TrezorManager {
         showPinEntry = false
         showPassphraseEntry = false
         showConfirmOnDevice = false
+        showPairingCode = false
         showWalletModeChooser = false
         uiHandler.setWalletMode(.standard)
         walletMode = .standard
@@ -263,6 +267,7 @@ final class TrezorManager {
     func connect(device: TrezorDeviceInfo) async {
         error = nil
         suppressNextAutoReconnect = false
+        showPairingCode = false
 
         // Explicit user-initiated connect always opens the standard wallet — a
         // passphrase/on-device selection left over from a previously connected device
@@ -274,6 +279,13 @@ final class TrezorManager {
 
         do {
             let features = try await trezorService.connect(deviceId: device.path, selection: uiHandler.currentSelection())
+
+            if Task.isCancelled {
+                try? await trezorService.disconnect()
+                trezorLog("Connect cancelled before pairing; disconnected \(device.path)")
+                return
+            }
+
             connectedDevice = device
             deviceFeatures = features
             showConfirmOnDevice = false
@@ -710,6 +722,12 @@ final class TrezorManager {
         if message.contains("Pairing required") {
             return "Bluetooth pairing required. Please put your Trezor in pairing mode."
         }
+        if message.contains("Code verification failed") || message.contains("verification failed") {
+            return t("hardware__pairing_code_invalid")
+        }
+        if message.contains("DeviceBusy") || message.contains("Device is busy") || message.contains("DeviceLocked") {
+            return t("hardware__device_busy")
+        }
         if message.contains("Pairing failed") || message.contains("Invalid credentials") {
             return "Pairing failed. Please try putting your Trezor back in pairing mode."
         }

Bitkit/Resources/Localization/en.lproj/Localizable.strings

@@ -36,6 +36,31 @@
 "hardware__intro_title" = "Hardware Wallet";
 "hardware__intro_header" = "Add your <accent>hardware wallet</accent>";
 "hardware__intro_text" = "Connect your hardware device to watch or manage your long-term funds.";
+"hardware__connect_title" = "Connect Device";
+"hardware__connect_header" = "Searching for <accent>devices</accent>";
+"hardware__connect_text" = "Please connect your hardware wallet now via Bluetooth.";
+"hardware__connect_error" = "Could not connect to your Trezor. Check that it is unlocked and try again.";
+"hardware__search_error" = "Could not search for hardware wallets. Check your connection and try again.";
+"hardware__pairing_code_invalid" = "Incorrect pairing code. Put your Trezor back in pairing mode and try again.";
+"hardware__device_busy" = "Your Trezor is busy. Unlock it on the device, then try again.";
+"hardware__device_model_trezor" = "Trezor";
+"hardware__bluetooth_open_settings" = "Open Settings";
+"hardware__bluetooth_off_title" = "Bluetooth is Off";
+"hardware__bluetooth_off_text" = "Please enable Bluetooth in Settings to connect to your Trezor.";
+"hardware__bluetooth_unauthorized_title" = "Bluetooth Unauthorized";
+"hardware__bluetooth_unauthorized_text" = "Bitkit needs Bluetooth permission to connect to your Trezor. Please enable it in Settings.";
+"hardware__bluetooth_unsupported_title" = "Bluetooth Unsupported";
+"hardware__bluetooth_unsupported_text" = "This device does not support Bluetooth Low Energy.";
+"hardware__bluetooth_unavailable_title" = "Bluetooth Unavailable";
+"hardware__bluetooth_unavailable_text" = "Bluetooth is not available. Please check your device settings.";
+"hardware__found_title" = "Found Device";
+"hardware__found_header" = "Found\n<accent>Trezor</accent>";
+"hardware__found_text" = "Would you like to securely pair this {model} with Bitkit?";
+"hardware__paired_title" = "Device Connected";
+"hardware__paired_header" = "Paired\n<accent>Trezor</accent>";
+"hardware__paired_text" = "Bitkit found funds on your device and added these to your balance.";
+"hardware__paired_label" = "Label Funds";
+"hardware__paired_finish" = "Finish";
 "hardware__pairing_title" = "Pair Device";
 "hardware__pairing_text" = "Enter the 6-digit code shown on your hardware device.";
 "hardware__remove_button" = "Remove {name}";

Bitkit/Services/Trezor/TrezorTransport.swift

@@ -1,5 +1,5 @@
 import BitkitCore
 import Combine
 import CoreBluetooth
 import Foundation
 
@@ -8,15 +8,15 @@
 final class TrezorTransport: TrezorTransportCallback {
     static let shared = TrezorTransport()
 
     private let bleManager = TrezorBLEManager.shared
     private let bridgeTransport = TrezorBridgeTransport.shared
 
     // MARK: - Pairing Code Handling
 
     /// Subject to notify UI when pairing code is needed
     let needsPairingCodePublisher = PassthroughSubject<Void, Never>()
 
     private var submittedPairingCode: String = ""
     private let pairingCodeLock = NSLock()
 
     /// Timeout for pairing code entry (2 minutes)
@@ -198,6 +198,10 @@
         submittedPairingCode = ""
         pairingCodeLock.unlock()
 
+        // Drain any leftover signal from a prior (cancelled/submitted) pairing so this request
+        // doesn't return an empty code instantly and abort the handshake mid-pairing.
+        while pairingCodeSemaphore.wait(timeout: DispatchTime.now()) == .success {}
+
         // Notify UI to show pairing code dialog
         DispatchQueue.main.async {
             self.needsPairingCodePublisher.send()

Bitkit/ViewModels/SheetViewModel.swift

@@ -24,7 +24,7 @@ enum SheetID: String, CaseIterable {
     case tagFilter
     case dateRangeSelector
     case widgets
-    case hardwareIntro
+    case hardwareConnect
     case hardwarePairing
     case renameHardwareWallet
 }
@@ -36,6 +36,7 @@ struct SheetConfiguration {
 
 class SheetViewModel: ObservableObject {
     @Published var activeSheetConfiguration: SheetConfiguration? = nil
+    @Published var hardwareConnectHandlesPairing = false
 
     func showSheet(_ id: SheetID, data: Any? = nil) {
         if isAnySheetOpen {
@@ -304,10 +305,10 @@ class SheetViewModel: ObservableObject {
         }
     }
 
-    var hardwareIntroSheetItem: HardwareIntroSheetItem? {
+    var hardwareConnectSheetItem: HardwareConnectSheetItem? {
         get {
-            guard let config = activeSheetConfiguration, config.id == .hardwareIntro else { return nil }
-            return HardwareIntroSheetItem()
+            guard let config = activeSheetConfiguration, config.id == .hardwareConnect else { return nil }
+            return HardwareConnectSheetItem()
         }
         set {
             if newValue == nil {