fix: keep contact payment boundaries in view layer

Author: ben-kaufman

Bitkit/Services/PublicPaykitService.swift

@@ -20,7 +20,7 @@ enum PublicPaykitError: LocalizedError {
 }
 
 enum PublicPaykitPaymentLaunchResult {
-    case opened
+    case opened(paymentRequest: String)
     case noEndpoint
     case notOpened
 
@@ -176,13 +176,8 @@ enum PublicPaykitService {
         return payableEndpoints
     }
 
-    @MainActor
     static func beginPayment(
-        to publicKey: String,
-        app: AppViewModel,
-        currency: CurrencyViewModel,
-        settings: SettingsViewModel,
-        sheets: SheetViewModel
+        to publicKey: String
     ) async throws -> PublicPaykitPaymentLaunchResult {
         let endpoints = try await fetchPublicEndpoints(publicKey: publicKey)
         let payableEndpoints = await payableEndpoints(from: endpoints)
@@ -191,16 +186,7 @@ enum PublicPaykitService {
             return endpoints.isEmpty ? .noEndpoint : .notOpened
         }
 
-        try await app.handleScannedData(paymentRequest(from: payableEndpoints))
-
-        guard let route = contactPaymentRoute(app: app, currency: currency, settings: settings) else {
-            return .notOpened
-        }
-
-        app.contactPaymentContext = ContactPaymentContext(publicKey: publicKey)
-        sheets.showSheet(.send, data: SendConfig(view: route))
-
-        return .opened
+        return .opened(paymentRequest: paymentRequest(from: payableEndpoints))
     }
 
     static func paymentRequest(from endpoints: [Endpoint]) -> String {
@@ -213,37 +199,6 @@ enum PublicPaykitService {
         return "bitcoin:\(onchainEndpoint.paymentRequest)?lightning=\(bolt11Endpoint.paymentRequest)"
     }
 
-    @MainActor
-    private static func contactPaymentRoute(
-        app: AppViewModel,
-        currency: CurrencyViewModel,
-        settings: SettingsViewModel
-    ) -> SendRoute? {
-        guard let route = PaymentNavigationHelper.appropriateSendRoute(app: app, currency: currency, settings: settings) else {
-            return nil
-        }
-
-        switch route {
-        case .quickpay:
-            if app.lnurlPayData != nil {
-                return .lnurlPayAmount
-            }
-
-            if app.scannedLightningInvoice != nil || app.scannedOnchainInvoice != nil {
-                return .amount
-            }
-
-            return route
-        case .confirm:
-            if app.scannedLightningInvoice != nil || app.scannedOnchainInvoice != nil {
-                return .amount
-            }
-            return route
-        default:
-            return route
-        }
-    }
-
     static func onchainMethodId(for address: String) -> MethodId {
         let normalizedAddress = address.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
 

Bitkit/ViewModels/ActivityListViewModel.swift

@@ -47,6 +47,10 @@ class ActivityListViewModel: ObservableObject {
 
     @Published private(set) var availableTags: [String] = []
 
+    var activitiesChangedPublisher: AnyPublisher<Void, Never> {
+        coreService.activity.activitiesChangedPublisher
+    }
+
     private func updateAvailableTags() async {
         do {
             availableTags = try await coreService.activity.allPossibleTags()
@@ -268,6 +272,10 @@ class ActivityListViewModel: ObservableObject {
         return activity
     }
 
+    func contactActivities(publicKey: String) async throws -> [Activity] {
+        try await coreService.activity.get(contact: publicKey, sortDirection: .desc)
+    }
+
     func setContact(_ contactPublicKey: String, forPaymentId paymentId: String, syncLdkPayments: Bool = true) async throws {
         if syncLdkPayments {
             try? await syncLdkNodePayments()

Bitkit/Views/Contacts/AddContactView.swift

@@ -273,17 +273,18 @@ struct AddContactView: View {
         }
 
         do {
-            let result = try await PublicPaykitService.beginPayment(
-                to: normalizedPublicKey,
-                app: app,
-                currency: currency,
-                settings: settings,
-                sheets: sheets
-            )
+            let result = try await PublicPaykitService.beginPayment(to: normalizedPublicKey)
 
             switch result {
-            case .opened:
-                break
+            case let .opened(paymentRequest):
+                guard await openContactPayment(paymentRequest: paymentRequest, publicKey: normalizedPublicKey) else {
+                    app.toast(
+                        type: .warning,
+                        title: t("slashtags__error_pay_title"),
+                        description: t("slashtags__error_pay_not_opened_msg")
+                    )
+                    return
+                }
             case .noEndpoint:
                 app.toast(
                     type: .warning,
@@ -306,6 +307,51 @@ struct AddContactView: View {
             )
         }
     }
+
+    @MainActor
+    private func openContactPayment(paymentRequest: String, publicKey: String) async -> Bool {
+        do {
+            try await app.handleScannedData(paymentRequest)
+        } catch {
+            Logger.warn("Failed to decode contact payment request: \(error)", context: "AddContactView")
+            return false
+        }
+
+        guard let route = contactPaymentRoute() else {
+            return false
+        }
+
+        app.contactPaymentContext = ContactPaymentContext(publicKey: publicKey)
+        sheets.showSheet(.send, data: SendConfig(view: route))
+        return true
+    }
+
+    @MainActor
+    private func contactPaymentRoute() -> SendRoute? {
+        guard let route = PaymentNavigationHelper.appropriateSendRoute(app: app, currency: currency, settings: settings) else {
+            return nil
+        }
+
+        switch route {
+        case .quickpay:
+            if app.lnurlPayData != nil {
+                return .lnurlPayAmount
+            }
+
+            if app.scannedLightningInvoice != nil || app.scannedOnchainInvoice != nil {
+                return .amount
+            }
+
+            return route
+        case .confirm:
+            if app.scannedLightningInvoice != nil || app.scannedOnchainInvoice != nil {
+                return .amount
+            }
+            return route
+        default:
+            return route
+        }
+    }
 }
 
 #Preview {

Bitkit/Views/Contacts/ContactActivityView.swift

@@ -40,7 +40,7 @@ struct ContactActivityView: View {
             resolveContactName()
             await loadActivities()
         }
-        .onReceive(CoreService.shared.activity.activitiesChangedPublisher) { _ in
+        .onReceive(activityList.activitiesChangedPublisher) { _ in
             Task {
                 await loadActivities()
             }
@@ -138,7 +138,7 @@ struct ContactActivityView: View {
         defer { isLoading = false }
 
         do {
-            activities = try await CoreService.shared.activity.get(contact: publicKey, sortDirection: .desc)
+            activities = try await activityList.contactActivities(publicKey: publicKey)
             hasError = false
         } catch {
             Logger.error(error, context: "ContactActivityView")

Bitkit/Views/Contacts/ContactDetailView.swift

@@ -279,17 +279,18 @@ struct ContactDetailView: View {
 
     private func payContact() async {
         do {
-            let result = try await PublicPaykitService.beginPayment(
-                to: publicKey,
-                app: app,
-                currency: currency,
-                settings: settings,
-                sheets: sheets
-            )
+            let result = try await PublicPaykitService.beginPayment(to: publicKey)
 
             switch result {
-            case .opened:
-                break
+            case let .opened(paymentRequest):
+                guard await openContactPayment(paymentRequest: paymentRequest) else {
+                    app.toast(
+                        type: .warning,
+                        title: t("slashtags__error_pay_title"),
+                        description: t("slashtags__error_pay_not_opened_msg")
+                    )
+                    return
+                }
             case .noEndpoint:
                 app.toast(
                     type: .warning,
@@ -312,6 +313,51 @@ struct ContactDetailView: View {
             )
         }
     }
+
+    @MainActor
+    private func openContactPayment(paymentRequest: String) async -> Bool {
+        do {
+            try await app.handleScannedData(paymentRequest)
+        } catch {
+            Logger.warn("Failed to decode contact payment request: \(error)", context: "ContactDetailView")
+            return false
+        }
+
+        guard let route = contactPaymentRoute() else {
+            return false
+        }
+
+        app.contactPaymentContext = ContactPaymentContext(publicKey: publicKey)
+        sheets.showSheet(.send, data: SendConfig(view: route))
+        return true
+    }
+
+    @MainActor
+    private func contactPaymentRoute() -> SendRoute? {
+        guard let route = PaymentNavigationHelper.appropriateSendRoute(app: app, currency: currency, settings: settings) else {
+            return nil
+        }
+
+        switch route {
+        case .quickpay:
+            if app.lnurlPayData != nil {
+                return .lnurlPayAmount
+            }
+
+            if app.scannedLightningInvoice != nil || app.scannedOnchainInvoice != nil {
+                return .amount
+            }
+
+            return route
+        case .confirm:
+            if app.scannedLightningInvoice != nil || app.scannedOnchainInvoice != nil {
+                return .amount
+            }
+            return route
+        default:
+            return route
+        }
+    }
 }
 
 #Preview {

BitkitTests/PublicPaykitServiceTests.swift

@@ -155,7 +155,7 @@ final class PublicPaykitServiceTests: XCTestCase {
     }
 
     func testPaymentLaunchResultFailureMessageKeys() {
-        XCTAssertNil(PublicPaykitPaymentLaunchResult.opened.contactPaymentFailureMessageKey)
+        XCTAssertNil(PublicPaykitPaymentLaunchResult.opened(paymentRequest: "bitcoin:bcrt1ptest").contactPaymentFailureMessageKey)
         XCTAssertEqual(PublicPaykitPaymentLaunchResult.noEndpoint.contactPaymentFailureMessageKey, "slashtags__error_pay_empty_msg")
         XCTAssertEqual(PublicPaykitPaymentLaunchResult.notOpened.contactPaymentFailureMessageKey, "slashtags__error_pay_not_opened_msg")
     }