feat: home-screen hardware wallet (watch-only)

Bitkit.xcodeproj/project.pbxproj

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

Bitkit/AppScene.swift

@@ -31,7 +31,9 @@ struct AppScene: View {
     @StateObject private var pubkyProfile = PubkyProfileManager()
     @StateObject private var contactsManager = ContactsManager()
     @State private var keyboardManager = KeyboardManager()
-    @State private var trezorViewModel = TrezorViewModel()
+    @State private var trezorManager: TrezorManager
+    @State private var trezorViewModel: TrezorViewModel
+    @State private var hwWalletManager: HwWalletManager
     @State private var calculatorInputManager = CalculatorInputManager()
 
     @State private var hideSplash = false
@@ -82,6 +84,12 @@ struct AppScene: View {
 
         _transferTracking = StateObject(wrappedValue: TransferTrackingManager(service: transferService))
 
+        let trezorManager = TrezorManager()
+        let trezorViewModel = TrezorViewModel(connection: trezorManager)
+        _trezorManager = State(initialValue: trezorManager)
+        _trezorViewModel = State(initialValue: trezorViewModel)
+        _hwWalletManager = State(initialValue: HwWalletManager())
+
         CoreService.shared.activity.setPrivatePaykitContactResolvers(
             invoice: { paymentHash in
                 await PrivatePaykitService.shared.contactPublicKey(forPrivateInvoicePaymentHash: paymentHash)
@@ -106,6 +114,13 @@ struct AppScene: View {
             .onChange(of: wallet.nodeLifecycleState) { _, newValue in handleNodeLifecycleChange(newValue) }
             .onChange(of: scenePhase, initial: true) { _, newValue in handleScenePhaseChange(newValue) }
             .onChange(of: network.isConnected) { _, isConnected in handleNetworkChange(isConnected) }
+            // Bridge Trezor device state into the watch-only manager without coupling the two:
+            // TrezorManager bumps devicesRevision on any device/connection change.
+            .onChange(of: trezorManager.devicesRevision) { _, _ in pushHardwareDevices() }
+            .onChange(of: isPinVerified) { _, verified in
+                if verified { Task { await trezorManager.autoReconnect() } }
+            }
+            .onReceive(settings.settingsPublisher) { _ in hwWalletManager.reconcileForSettingsChange() }
             .onChange(of: migrations.isShowingMigrationLoading) { _, isLoading in
                 if !isLoading {
                     SettingsViewModel.shared.updatePinEnabledState()
@@ -148,7 +163,9 @@ struct AppScene: View {
             .environmentObject(pubkyProfile)
             .environmentObject(contactsManager)
             .environment(keyboardManager)
+            .environment(trezorManager)
             .environment(trezorViewModel)
+            .environment(hwWalletManager)
             .environment(calculatorInputManager)
             .onChange(of: pubkyProfile.authState, initial: true) { _, authState in
                 if authState == .authenticated, let pk = pubkyProfile.publicKey {
@@ -470,6 +487,12 @@ struct AppScene: View {
             await checkAndPerformRNMigration()
             try wallet.setWalletExistsState()
 
+            // Load any paired hardware devices from storage and feed the watch-only manager so its
+            // watchers start at launch (no-op until a device is paired). loadKnownDevices() also
+            // bumps devicesRevision, but push explicitly so the initial state is delivered.
+            trezorManager.loadKnownDevices()
+            pushHardwareDevices()
+
             // Setup TimedSheetManager with all timed sheets
             TimedSheetManager.shared.setup(
                 sheetViewModel: sheets,
@@ -601,6 +624,10 @@ struct AppScene: View {
         }
 
         if newPhase == .active {
+            // Reconnect a known hardware device so its connection indicator turns green again;
+            if isPinVerified || !settings.pinEnabled {
+                Task { await trezorManager.autoReconnect() }
+            }
             if wallet.walletExists == true {
                 Task {
                     await clearDeliveredNotifications()
@@ -634,6 +661,15 @@ struct AppScene: View {
         center.removeDeliveredNotifications(withIdentifiers: deliveredNotifications.map(\.request.identifier))
     }
 
+    /// Feed the current Trezor device snapshot into the watch-only manager. This is the only link
+    /// between the two managers, kept in the composition root so neither type references the other.
+    private func pushHardwareDevices() {
+        hwWalletManager.updateDevices(
+            knownDevices: trezorManager.knownDevices,
+            connectedDeviceId: trezorManager.connectedDevice?.id
+        )
+    }
+
     private func handleNetworkChange(_ isConnected: Bool) {
         Logger.info("Network changed: \(isConnected ? "connected" : "disconnected")", context: "AppScene")
 

Bitkit/Assets.xcassets/Illustrations/ledger.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ledger.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ledger@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Bitkit/Assets.xcassets/Illustrations/trezor.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "trezor.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "trezor@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Bitkit/Assets.xcassets/icons/bluetooth-connected.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "bluetooth-connected.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Bitkit/Assets.xcassets/icons/btc-circle-blue.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "btc-circle-blue.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Bitkit/Components/HardwareWalletsGrid.swift

@@ -0,0 +1,105 @@
+import SwiftUI
+
+/// Two-column grid of paired hardware wallets shown on Home, under the Savings/Spending tiles.
+/// Mirrors bitkit-android's `HwDevices` (rows chunked in pairs, divided like the on-chain tiles).
+struct HardwareWalletsGrid: View {
+    let wallets: [HwWallet]
+    let onTap: (HwWallet) -> Void
+
+    private var rows: [[HwWallet]] {
+        chunked(wallets, into: 2)
+    }
+
+    private func chunked(_ wallets: [HwWallet], into size: Int) -> [[HwWallet]] {
+        stride(from: 0, to: wallets.count, by: size).map { start in
+            let end = min(start + size, wallets.count)
+            return Array(wallets[start ..< end])
+        }
+    }
+
+    var body: some View {
+        VStack(spacing: 16) {
+            ForEach(Array(rows.enumerated()), id: \.offset) { _, row in
+                HStack(spacing: 16) {
+                    HardwareWalletCell(wallet: row[0], onTap: onTap)
+
+                    CustomDivider(color: .gray4, type: .vertical)
+
+                    if row.count > 1 {
+                        HardwareWalletCell(wallet: row[1], onTap: onTap)
+                    } else {
+                        Color.clear.frame(maxWidth: .infinity)
+                    }
+                }
+                .frame(height: 50)
+            }
+        }
+    }
+}
+
+private struct HardwareWalletCell: View {
+    let wallet: HwWallet
+    let onTap: (HwWallet) -> Void
+
+    var body: some View {
+        Button {
+            onTap(wallet)
+        } label: {
+            VStack(alignment: .leading) {
+                CaptionMText(wallet.name)
+                    .lineLimit(1)
+                    .padding(.bottom, 4)
+
+                HStack(spacing: 4) {
+                    Image("btc-circle-blue")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 24, height: 24)
+                        .padding(.trailing, 4)
+
+                    MoneyText(
+                        sats: Int(clamping: wallet.balanceSats),
+                        size: .subtitle,
+                        enableHide: true,
+                        symbolColor: .textPrimary
+                    )
+
+                    HwWalletConnectionIcon(isConnected: wallet.isConnected)
+                        .frame(width: 16, height: 16)
+                }
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+        .buttonStyle(.plain)
+        .accessibilityIdentifier("ActivityHardware")
+    }
+}
+
+#Preview {
+    func wallet(_ id: String, _ name: String, connected: Bool, sats: UInt64) -> HwWallet {
+        HwWallet(id: id, walletId: "trezor:\(id)", name: name, model: name, isConnected: connected, balanceSats: sats)
+    }
+
+    return VStack(spacing: 32) {
+        // Single device
+        HardwareWalletsGrid(
+            wallets: [wallet("1", "Trezor Safe 5", connected: true, sats: 1_234_567)],
+            onTap: { _ in }
+        )
+
+        CustomDivider()
+
+        // Two devices (full 2-column row), one connected, one not
+        HardwareWalletsGrid(
+            wallets: [
+                wallet("1", "Trezor Safe 5", connected: true, sats: 1_234_567),
+                wallet("2", "Trezor Model T", connected: false, sats: 89000),
+            ],
+            onTap: { _ in }
+        )
+    }
+    .padding()
+    .environmentObject(CurrencyViewModel())
+    .environmentObject(SettingsViewModel.shared)
+    .preferredColorScheme(.dark)
+}

Bitkit/Components/Trezor/HwDeviceIllustrations.swift

@@ -0,0 +1,51 @@
+import SwiftUI
+
+/// Staggered hardware-device hero used by the hardware intro sheet: a Trezor on the left and a
+/// blurred Ledger bleeding off the right. Ports bitkit-android's `HwDeviceIllustrations`.
+struct HwDeviceIllustrations: View {
+    /// All measurements are expressed as fractions of the Figma design frame's width, so the hero
+    /// scales proportionally to whatever width it's given. Each device is rendered at its natural
+    /// (non-square) aspect ratio; the Trezor's left bleed is baked into the exported asset, while
+    /// the Ledger is offset to bleed off the right edge.
+    private enum Layout {
+        static let referenceWidth: CGFloat = 375
+
+        static let proportionalHeight: CGFloat = 256 / referenceWidth
+        static let trezorProportionalWidth: CGFloat = 172 / referenceWidth
+        static let ledgerProportionalWidth: CGFloat = 203 / referenceWidth
+        static let ledgerProportionalX: CGFloat = 172 / referenceWidth
+        static let proportionalStagger: CGFloat = 11.6 / referenceWidth
+    }
+
+    var body: some View {
+        GeometryReader { geo in
+            let width = geo.size.width
+            let imageHeight = width * Layout.proportionalHeight
+            let staggerY = width * Layout.proportionalStagger
+
+            ZStack {
+                Image("trezor")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: width * Layout.trezorProportionalWidth, height: imageHeight)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading)
+                    .offset(y: staggerY)
+
+                Image("ledger")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: width * Layout.ledgerProportionalWidth, height: imageHeight)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading)
+                    .offset(x: width * Layout.ledgerProportionalX, y: -staggerY)
+            }
+        }
+        .accessibilityHidden(true)
+    }
+}
+
+#Preview {
+    HwDeviceIllustrations()
+        .frame(height: 300)
+        .background(Color.black)
+        .preferredColorScheme(.dark)
+}

Bitkit/Components/Trezor/HwWalletConnectionIcon.swift

@@ -0,0 +1,30 @@
+import SwiftUI
+
+/// Bluetooth connection indicator for a paired hardware wallet. iOS supports Bluetooth only,
+/// so there is a single transport glyph — tinted green when connected, gray when disconnected.
+/// Mirrors bitkit-android's `HwWalletConnectionIcon` (BLE branch).
+struct HwWalletConnectionIcon: View {
+    let isConnected: Bool
+
+    var body: some View {
+        Image("bluetooth-connected")
+            .renderingMode(.template)
+            .resizable()
+            .scaledToFit()
+            .foregroundColor(isConnected ? .greenAccent : .gray1)
+            .accessibilityLabel(
+                isConnected
+                    ? t("hardware__connection_badge_connected_bluetooth")
+                    : t("hardware__connection_badge_disconnected_bluetooth")
+            )
+    }
+}
+
+#Preview {
+    HStack(spacing: 24) {
+        HwWalletConnectionIcon(isConnected: true).frame(width: 16, height: 16)
+        HwWalletConnectionIcon(isConnected: false).frame(width: 16, height: 16)
+    }
+    .padding()
+    .preferredColorScheme(.dark)
+}