Merge master into release branch

Author: ovitrif

Bitkit.xcodeproj/project.pbxproj

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

Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -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/AppScene.swift

@@ -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/ledger.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/Illustrations/ledger.imageset/ledger.png

@@ -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"
+  }
+}