revert Swift-side filtering + bump ldk-node to v0.7.0-rc.33 which includes the migration-aware write protection

Author: jvsena42

Bitkit.xcodeproj/project.pbxproj

@@ -928,7 +928,7 @@
 			repositoryURL = "https://github.com/synonymdev/ldk-node";
 			requirement = {
 				kind = revision;
-				revision = c5698d00066e0e50f33696afc562d71023da2373;
+				revision = 1531af727811f03ec0542aec3befb5a26198b192;
 			};
 		};
 		96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */ = {

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

@@ -0,0 +1,25 @@
+import UIKit
+
+/// Shared state for swipe-back gesture. Views can set this via the `.allowSwipeBack(_:)` modifier
+/// to disable the gesture on screens that don't show a back button (e.g. SheetHeader without back).
+enum SwipeBackState {
+    /// When false, the interactive pop gesture is disabled. Set by views that hide the back button.
+    static var allowSwipeBack: Bool = true
+}
+
+/// Re-enables the interactive swipe-back gesture when the navigation bar is hidden
+/// (e.g. when using a custom NavigationBar with `.navigationBarHidden(true)`).
+/// Without this, the system disables the gesture when the bar is hidden.
+/// Use `.allowSwipeBack(false)` on views that don't show a back button to disable the gesture there.
+extension UINavigationController: @retroactive UIGestureRecognizerDelegate {
+    override open func viewDidLoad() {
+        super.viewDidLoad()
+        interactivePopGestureRecognizer?.delegate = self
+    }
+
+    public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        // Only allow swipe-back when not at root — avoids iOS 17+ freeze when re-pushing after swiping to root
+        guard viewControllers.count > 1 else { return false }
+        return SwipeBackState.allowSwipeBack
+    }
+}

Bitkit/Extensions/UINavigationController+SwipeBack.swift

@@ -0,0 +1,21 @@
+import SwiftUI
+
+extension View {
+    /// Controls whether the interactive swipe-back gesture is enabled on this screen.
+    /// Use `.allowSwipeBack(false)` on screens that use a custom header without a back button
+    /// (e.g. `SheetHeader` with default `showBackButton: false`) so users can't swipe to dismiss.
+    /// Default is `true`; only apply this modifier when you want to disable the gesture.
+    func allowSwipeBack(_ allowed: Bool) -> some View {
+        modifier(AllowSwipeBackModifier(allowed: allowed))
+    }
+}
+
+private struct AllowSwipeBackModifier: ViewModifier {
+    let allowed: Bool
+
+    func body(content: Content) -> some View {
+        content
+            .onAppear { SwipeBackState.allowSwipeBack = allowed }
+            .onDisappear { SwipeBackState.allowSwipeBack = true }
+    }
+}

Bitkit/Extensions/View+AllowSwipeBack.swift

@@ -311,9 +311,6 @@ enum RNKeychainKey {
 struct PendingChannelMigration: Codable {
     let channelManager: Data
     let channelMonitors: [Data]
-    /// Parallel array of channel monitor IDs in "{txid}_{output_index}" format.
-    /// Used to filter out monitors that already exist locally before applying migration.
-    let channelMonitorIds: [String]
 }
 
 /// Peer entry from backup peers.json: [{"pubKey":"...","address":"...","port":9735}, ...]
@@ -682,7 +679,6 @@ extension MigrationsService {
 
         let managerData = try Data(contentsOf: managerPath)
         var monitors: [Data] = []
-        var monitorIds: [String] = []
 
         let channelsPath = accountPath.appendingPathComponent("channels")
         let monitorsPath = accountPath.appendingPathComponent("monitors")
@@ -693,14 +689,12 @@ extension MigrationsService {
             for file in monitorFiles where file.hasSuffix(".bin") {
                 let monitorData = try Data(contentsOf: monitorDir.appendingPathComponent(file))
                 monitors.append(monitorData)
-                monitorIds.append(file.replacingOccurrences(of: ".bin", with: ""))
             }
         }
 
         pendingChannelMigration = PendingChannelMigration(
             channelManager: managerData,
-            channelMonitors: monitors,
-            channelMonitorIds: monitorIds
+            channelMonitors: monitors
         )
         Logger.info("Prepared \(monitors.count) channel monitors for migration", context: "Migration")
     }
@@ -2138,12 +2132,7 @@ extension MigrationsService {
                 )
             }
 
-            let successfulResults = monitorResults.compactMap { id, data -> (String, Data)? in
-                guard let data else { return nil }
-                return (id, data)
-            }
-            let monitorIds = successfulResults.map(\.0)
-            let monitors = successfulResults.map(\.1)
+            let monitors = monitorResults.compactMap(\.1)
 
             if monitors.count < expectedCount {
                 Logger.warn(
@@ -2155,8 +2144,7 @@ extension MigrationsService {
             if !monitors.isEmpty {
                 pendingChannelMigration = PendingChannelMigration(
                     channelManager: managerData,
-                    channelMonitors: monitors,
-                    channelMonitorIds: monitorIds
+                    channelMonitors: monitors
                 )
                 Logger.info("Prepared \(monitors.count)/\(expectedCount) channel monitors for migration", context: "Migration")
             }

Bitkit/Services/MigrationsService.swift

@@ -282,8 +282,7 @@ class WalletViewModel: ObservableObject {
                     "Found \(migration.channelMonitors.count) monitors on RN backup for pre-startup recovery",
                     context: "WalletViewModel"
                 )
-                let filtered = filterMigrationMonitors(migration, walletIndex: walletIndex)
-                return (filtered, allRetrieved)
+                return (migration, allRetrieved)
             } else {
                 Logger.info("No channel monitors found on RN backup", context: "WalletViewModel")
                 return (nil, allRetrieved)
@@ -294,56 +293,6 @@ class WalletViewModel: ObservableObject {
         }
     }
 
-    /// Filters out migration monitors for channels that already have local monitors.
-    /// Prevents old RN monitors from overwriting newer local ones during orphaned channel recovery.
-    private func filterMigrationMonitors(_ migration: PendingChannelMigration, walletIndex: Int) -> PendingChannelMigration? {
-        let monitorsDir = Env.ldkStorage(walletIndex: walletIndex)
-            .appendingPathComponent("channel_monitors")
-            .appendingPathComponent("0")
-
-        guard FileManager.default.fileExists(atPath: monitorsDir.path) else {
-            Logger.debug("No local monitors directory, keeping all migration monitors", context: "WalletViewModel")
-            return migration
-        }
-
-        let localFiles = (try? FileManager.default.contentsOfDirectory(atPath: monitorsDir.path)) ?? []
-        guard !localFiles.isEmpty else {
-            Logger.debug("No local monitor files, keeping all migration monitors", context: "WalletViewModel")
-            return migration
-        }
-
-        let localMonitorIds = Set(localFiles)
-        var filteredMonitors: [Data] = []
-        var filteredIds: [String] = []
-
-        for (index, monitorId) in migration.channelMonitorIds.enumerated() {
-            if localMonitorIds.contains(monitorId) {
-                Logger.info("Skipping migration monitor \(monitorId) — already exists locally", context: "WalletViewModel")
-            } else {
-                filteredMonitors.append(migration.channelMonitors[index])
-                filteredIds.append(monitorId)
-            }
-        }
-
-        if filteredMonitors.isEmpty {
-            Logger.info(
-                "All \(migration.channelMonitors.count) migration monitors already exist locally, skipping migration",
-                context: "WalletViewModel"
-            )
-            return nil
-        }
-
-        Logger.info(
-            "Filtered migration monitors: \(filteredMonitors.count) kept, \(migration.channelMonitors.count - filteredMonitors.count) skipped (already local)",
-            context: "WalletViewModel"
-        )
-        return PendingChannelMigration(
-            channelManager: migration.channelManager,
-            channelMonitors: filteredMonitors,
-            channelMonitorIds: filteredIds
-        )
-    }
-
     private func fetchTrustedPeersFromBlocktank() async -> [LnPeer]? {
         switch Self.peerSimulation {
         case .apiFailure:

Bitkit/ViewModels/WalletViewModel.swift

@@ -99,6 +99,7 @@ struct BackupMnemonicView: View {
             .padding(.horizontal, 16)
         }
         .navigationBarHidden(true)
+        .allowSwipeBack(false)
         .padding(.horizontal, 16)
         .sheetBackground()
         .frame(maxWidth: .infinity, maxHeight: .infinity)

Bitkit/Views/Backup/BackupMnemonic.swift

@@ -7,7 +7,7 @@ struct BackupPassphrase: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
-            SheetHeader(title: t("security__pass_your"))
+            SheetHeader(title: t("security__pass_your"), showBackButton: true)
 
             VStack(spacing: 0) {
                 BodyMText(t("security__pass_text"))

Bitkit/Views/Backup/BackupPassphrase.swift

@@ -30,6 +30,7 @@ struct GiftFailed: View {
             }
         }
         .navigationBarHidden(true)
+        .allowSwipeBack(false)
         .padding(.horizontal, 16)
         .sheetBackground()
         .accessibilityIdentifier("GiftError")

Bitkit/Views/Gift/GiftError.swift

@@ -30,6 +30,7 @@ struct GiftUsed: View {
             }
         }
         .navigationBarHidden(true)
+        .allowSwipeBack(false)
         .padding(.horizontal, 16)
         .sheetBackground()
         .accessibilityIdentifier("GiftUsed")