Preventing navigation to the next screen if peer connection fails (from FundManualSetupView to FundManualAmountView)

Author: piotr-iohk

Bitkit/ViewModels/WalletViewModel.swift

@@ -469,6 +469,36 @@ class WalletViewModel: ObservableObject {
         syncState()
     }
 
+    /// Attempts to connect to a peer if not already connected.
+    /// - Parameters:
+    ///   - peer: Peer to connect.
+    ///   - app: AppViewModel used to surface errors.
+    /// - Returns: True if connected (already or after connecting), false otherwise.
+    func ensurePeerConnection(_ peer: LnPeer, app: AppViewModel) async -> Bool {
+        let alreadyConnected = await MainActor.run {
+            peers?.contains(where: { $0.nodeId == peer.nodeId }) ?? false
+        }
+
+        if alreadyConnected {
+            return true
+        }
+
+        do {
+            try await connectPeer(peer)
+            return true
+        } catch {
+            Logger.error("Failed to connect to peer \(peer.nodeId): \(error)", context: "WalletViewModel")
+            await MainActor.run {
+                app.toast(
+                    type: .error,
+                    title: t("lightning__error_add_title"),
+                    description: t("lightning__error_add")
+                )
+            }
+            return false
+        }
+    }
+
     /// Sync all state (node status, channels, peers, balances)
     /// Use this for initial load or after sync operations
     func syncState() {

Bitkit/Views/Transfer/FundManualAmountView.swift

@@ -92,18 +92,7 @@ struct FundManualAmountView: View {
         guard !didAttemptPeerConnection else { return }
         didAttemptPeerConnection = true
 
-        do {
-            try await wallet.connectPeer(lnPeer)
-        } catch {
-            Logger.error("Failed to connect to peer \(lnPeer.nodeId): \(error)", context: "FundManualAmountView")
-            await MainActor.run {
-                app.toast(
-                    type: .error,
-                    title: t("lightning__error_add_title"),
-                    description: t("lightning__error_add")
-                )
-            }
-        }
+        _ = await wallet.ensurePeerConnection(lnPeer, app: app)
     }
 }
 

Bitkit/Views/Transfer/FundManualSetupView.swift

@@ -14,6 +14,9 @@ struct FundManualSetupView: View {
     @State private var showAlert: Bool = false
     @State private var alertMessage: String = ""
     @State private var alertTitle: String = ""
+    @State private var isConnectingPeer = false
+    @State private var showAmountEntry = false
+    @State private var connectedPeer: LnPeer?
 
     init(initialNodeUri: String? = nil) {
         self.initialNodeUri = initialNodeUri
@@ -120,9 +123,11 @@ struct FundManualSetupView: View {
                     CustomButton(
                         title: t("common__continue"),
                         variant: .primary,
-                        isDisabled: nodeId.isEmpty || host.isEmpty || port.isEmpty,
-                        destination: FundManualAmountView(lnPeer: LnPeer(nodeId: nodeId, host: host, port: UInt16(port) ?? 0))
-                    )
+                        isDisabled: !isFormValid || isConnectingPeer,
+                        isLoading: isConnectingPeer
+                    ) {
+                        await handleContinueTapped()
+                    }
                     .accessibilityIdentifier("ExternalContinue")
                 }
             }
@@ -142,6 +147,45 @@ struct FundManualSetupView: View {
                 parseNodeUri(initialNodeUri)
             }
         }
+
+        NavigationLink(
+            destination: amountDestination,
+            isActive: $showAmountEntry
+        ) {
+            EmptyView()
+        }
+        .hidden()
+    }
+
+    private var isFormValid: Bool {
+        !nodeId.isEmpty && !host.isEmpty && !port.isEmpty
+    }
+
+    @ViewBuilder
+    private var amountDestination: some View {
+        if let connectedPeer {
+            FundManualAmountView(lnPeer: connectedPeer)
+        } else {
+            EmptyView()
+        }
+    }
+
+    private func handleContinueTapped() async {
+        guard isFormValid, !isConnectingPeer else { return }
+
+        let peer = LnPeer(nodeId: nodeId, host: host, port: UInt16(port) ?? 0)
+
+        isConnectingPeer = true
+        defer { isConnectingPeer = false }
+
+        let connected = await wallet.ensurePeerConnection(peer, app: app)
+        if connected {
+            connectedPeer = peer
+            showAmountEntry = true
+        } else {
+            connectedPeer = nil
+            showAmountEntry = false
+        }
     }
 }