fix: route pubky keys from send scanner

Author: ben-kaufman

Bitkit/Managers/ScannerManager.swift

@@ -38,6 +38,9 @@ class ScannerManager: ObservableObject {
     }
 
     func handleScan(_ uri: String, context: ScannerContext) async {
+        let uri = uri.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !uri.isEmpty else { return }
+
         Haptics.play(.scanSuccess)
 
         switch context {
@@ -90,7 +93,7 @@ class ScannerManager: ObservableObject {
         }
     }
 
-    private func handlePubkyRouteIfNeeded(_ input: String) -> Bool {
+    private func handlePubkyRouteIfNeeded(_ input: String, hiding sheetId: SheetID? = .scanner, reason: String = "Scanner routed pubky key") -> Bool {
         guard let navigation,
               let route = resolvePastedPubkyRoute(
                   input: input,
@@ -101,7 +104,9 @@ class ScannerManager: ObservableObject {
             return false
         }
 
-        sheets?.hideSheetIfActive(.scanner, reason: "Scanner routed pubky key")
+        if let sheetId {
+            sheets?.hideSheetIfActive(sheetId, reason: reason)
+        }
         navigation.navigate(route)
         return true
     }
@@ -115,6 +120,11 @@ class ScannerManager: ObservableObject {
         Haptics.play(.scanSuccess)
 
         do {
+            if handlePubkyRouteIfNeeded(uri, hiding: .send, reason: "Send scanner routed pubky key") {
+                completion(nil)
+                return
+            }
+
             try await app.handleScannedData(uri)
 
             let route = PaymentNavigationHelper.appropriateSendRoute(
@@ -177,7 +187,7 @@ class ScannerManager: ObservableObject {
             return
         }
 
-        await handleScan(uri, context: context)
+        await handleScan(uri.trimmingCharacters(in: .whitespacesAndNewlines), context: context)
     }
 
     func handleImageSelection(_ item: PhotosPickerItem?, context: ScannerContext, completion: @escaping (SendRoute?) -> Void = { _ in }) async {

Bitkit/Views/Wallets/Send/SendOptionsView.swift

@@ -3,9 +3,13 @@ import SwiftUI
 
 struct SendOptionsView: View {
     @EnvironmentObject var app: AppViewModel
+    @EnvironmentObject var contactsManager: ContactsManager
     @EnvironmentObject var currency: CurrencyViewModel
+    @EnvironmentObject var navigation: NavigationViewModel
+    @EnvironmentObject var pubkyProfile: PubkyProfileManager
     @EnvironmentObject var scanner: ScannerManager
     @EnvironmentObject var settings: SettingsViewModel
+    @EnvironmentObject var sheets: SheetViewModel
     @EnvironmentObject var wallet: WalletViewModel
 
     @Binding var navigationPath: [SendRoute]
@@ -71,8 +75,12 @@ struct SendOptionsView: View {
             wallet.syncState()
             scanner.configure(
                 app: app,
+                contactsManager: contactsManager,
                 currency: currency,
-                settings: settings
+                settings: settings,
+                navigation: navigation,
+                pubkyProfile: pubkyProfile,
+                sheets: sheets
             )
         }
     }
@@ -110,6 +118,13 @@ struct SendOptionsView: View {
                 NavigationStack {
                     SendOptionsView(navigationPath: .constant([]))
                         .environmentObject(AppViewModel())
+                        .environmentObject(ContactsManager())
+                        .environmentObject(CurrencyViewModel())
+                        .environmentObject(NavigationViewModel())
+                        .environmentObject(PubkyProfileManager())
+                        .environmentObject(ScannerManager())
+                        .environmentObject(SettingsViewModel.shared)
+                        .environmentObject(SheetViewModel())
                         .environmentObject(WalletViewModel())
                 }
                 .presentationDetents([.height(UIScreen.screenHeight - 120)])

BitkitTests/ContactsManagerTests.swift

@@ -281,6 +281,19 @@ final class ContactsManagerTests: XCTestCase {
         )
     }
 
+    func testResolvePastedPubkyRouteTrimsClipboardInput() {
+        let contactKey = "pubky3rsduhcxpw74snwyct86m38c63j3pq8x4ycqikxg64roik8yw5xg"
+
+        XCTAssertEqual(
+            resolvePastedPubkyRoute(
+                input: "  \(contactKey)\n",
+                ownPublicKey: nil,
+                contacts: [makeContact(publicKey: contactKey)]
+            ),
+            .contactDetail(publicKey: contactKey)
+        )
+    }
+
     func testResolvePastedPubkyRouteReturnsAddContactForUnknownKey() {
         let contactKey = "pubky3rsduhcxpw74snwyct86m38c63j3pq8x4ycqikxg64roik8yw5xg"