[codex] Add public Paykit payments to contacts

Bitkit.xcodeproj/project.pbxproj

@@ -904,8 +904,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pubky/paykit-rs";
 			requirement = {
-				kind = revision;
-				revision = cd1253291b1582759d569372d5942b8871527ea1;
+				kind = exactVersion;
+				version = 0.1.0-rc3;
 			};
 		};
 		18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
@@ -936,8 +936,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/synonymdev/bitkit-core";
 			requirement = {
-				kind = revision;
-				revision = 99bd86bb60c1f14e8ce8a6356cd2ab36f222fc69;
+				kind = exactVersion;
+				version = 0.1.58;
 			};
 		};
 		96E20CD22CB6D91A00C24149 /* XCRemoteSwiftPackageReference "CodeScanner" */ = {

Bitkit/Components/Activity/ActivityList.swift

@@ -3,6 +3,7 @@ import SwiftUI
 
 struct ActivityList: View {
     @EnvironmentObject var activity: ActivityListViewModel
+    @EnvironmentObject var contactsManager: ContactsManager
     @EnvironmentObject var feeEstimatesManager: FeeEstimatesManager
     @State private var isHorizontalSwipe = false
 
@@ -28,7 +29,11 @@ struct ActivityList: View {
 
                     case let .activity(item):
                         NavigationLink(value: Route.activityDetail(item)) {
-                            ActivityRow(item: item, feeEstimates: feeEstimatesManager.estimates)
+                            ActivityRow(
+                                item: item,
+                                feeEstimates: feeEstimatesManager.estimates,
+                                contact: item.contact(in: contactsManager.contacts)
+                            )
                         }
                         .accessibilityIdentifier("Activity-\(index)")
                         .disabled(isHorizontalSwipe)

Bitkit/Constants/Env.swift

@@ -272,7 +272,7 @@ enum Env {
         case .bitcoin:
             return "/pub/bitkit.to/:rw,/pub/pubky.app/:r,/pub/paykit/v0/:rw"
         default:
-            return "/pub/staging.bitkit.to/:rw,/pub/staging.pubky.app/:r,/pub/staging.paykit/v0/:rw"
+            return "/pub/staging.bitkit.to/:rw,/pub/staging.pubky.app/:r,/pub/paykit/v0/:rw"
         }
     }
 

Bitkit/Extensions/Activity+Contact.swift

@@ -0,0 +1,18 @@
+import BitkitCore
+
+extension Activity {
+    func contact(in contacts: [PubkyContact]) -> PubkyContact? {
+        guard let contactPublicKey else { return nil }
+        return contacts.first(where: { PubkyPublicKeyFormat.matches($0.publicKey, contactPublicKey) })
+    }
+
+    private var contactPublicKey: String? {
+        switch self {
+        case let .lightning(lightning):
+            return lightning.contact
+
+        case let .onchain(onchain):
+            return onchain.contact
+        }
+    }
+}

Bitkit/MainNavView.swift

@@ -363,6 +363,7 @@ struct MainNavView: View {
                     }
                 case .contactsIntro: ContactsIntroView()
                 case let .contactDetail(publicKey): ContactDetailView(publicKey: publicKey)
+                case let .contactActivity(publicKey): ContactActivityView(publicKey: publicKey)
                 case .contactImportOverview:
                     if let fallbackRoute = fallbackRouteForMissingPendingImport(hasPendingImport: contactsManager.hasPendingImport) {
                         missingPendingImportView(fallbackRoute: fallbackRoute)

Bitkit/Managers/ContactsManager.swift

@@ -49,6 +49,7 @@ enum PubkyPublicKeyFormat {
 
 enum AddContactValidationResult: Equatable {
     case empty
+    case existingContact
     case invalidKey
     case ownKey
     case valid(normalizedKey: String)
@@ -57,6 +58,8 @@ enum AddContactValidationResult: Equatable {
         switch self {
         case .empty, .valid:
             nil
+        case .existingContact:
+            t("contacts__add_error_existing")
         case .invalidKey:
             t("contacts__add_error_invalid_key")
         case .ownKey:
@@ -65,7 +68,11 @@ enum AddContactValidationResult: Equatable {
     }
 }
 
-func resolveAddContactValidation(input: String, ownPublicKey: String?) -> AddContactValidationResult {
+func resolveAddContactValidation(
+    input: String,
+    ownPublicKey: String?,
+    existingContacts: [PubkyContact] = []
+) -> AddContactValidationResult {
     let trimmedInput = input.trimmingCharacters(in: .whitespacesAndNewlines)
 
     guard !trimmedInput.isEmpty else {
@@ -80,26 +87,33 @@ func resolveAddContactValidation(input: String, ownPublicKey: String?) -> AddCon
         return .invalidKey
     }
 
+    if existingContacts.contains(where: { PubkyPublicKeyFormat.matches($0.publicKey, normalizedKey) }) {
+        return .existingContact
+    }
+
     return .valid(normalizedKey: normalizedKey)
 }
 
 enum ContactsManagerError: LocalizedError {
     case invalidPublicKey
     case cannotAddYourself
+    case alreadyExists
 
     var errorDescription: String? {
         switch self {
         case .invalidPublicKey:
             return t("contacts__add_error_invalid_key")
         case .cannotAddYourself:
             return t("contacts__add_error_self")
+        case .alreadyExists:
+            return t("contacts__add_error_existing")
         }
     }
 }
 
 // MARK: - PubkyContact
 
-struct PubkyContact: Identifiable, Hashable, Sendable {
+struct PubkyContact: Identifiable, Hashable {
     let id: String
     let publicKey: String
     let profile: PubkyProfile
@@ -142,6 +156,7 @@ class ContactsManager: ObservableObject {
     @Published var isLoading = false
     @Published var hasLoaded = false
     @Published var loadErrorMessage: String?
+    @Published var shouldOpenAddContactSheet = false
 
     /// Temporarily holds contacts discovered during import (e.g., from pubky.app after Ring auth).
     /// Cleared after import is completed or discarded.
@@ -164,6 +179,7 @@ class ContactsManager: ObservableObject {
         isLoading = false
         hasLoaded = false
         loadErrorMessage = nil
+        shouldOpenAddContactSheet = false
         clearPendingImport()
     }
 
@@ -290,9 +306,8 @@ class ContactsManager: ObservableObject {
             throw ContactsManagerError.cannotAddYourself
         }
 
-        guard !contacts.contains(where: { $0.publicKey == prefixedKey }) else {
-            Logger.debug("Contact \(prefixedKey) already exists, skipping add", context: "ContactsManager")
-            return
+        guard !contacts.contains(where: { PubkyPublicKeyFormat.matches($0.publicKey, prefixedKey) }) else {
+            throw ContactsManagerError.alreadyExists
         }
 
         // Use existing profile if provided (e.g., already fetched during preview),
@@ -697,13 +712,11 @@ class ContactsManager: ObservableObject {
         }
 
         let normalized = message.lowercased()
-        let indicatesMissingResource = normalized.contains("404")
+        return normalized.contains("404")
             || normalized.contains("no such file")
             || normalized.contains("does not exist")
             || normalized.contains("profile not found")
             || normalized.contains("profilenotfound")
             || (normalized.contains("fetch failed") && normalized.contains("not found"))
-
-        return indicatesMissingResource
     }
 }

Bitkit/Managers/ScannerManager.swift

@@ -3,6 +3,7 @@ import SwiftUI
 import Vision
 
 enum ScannerContext {
+    case addContact
     case main
     case send
     case electrum
@@ -40,6 +41,8 @@ class ScannerManager: ObservableObject {
         Haptics.play(.scanSuccess)
 
         switch context {
+        case .addContact:
+            handleAddContactScan(uri)
         case .main:
             await handleMainScan(uri)
         case .send:
@@ -49,6 +52,11 @@ class ScannerManager: ObservableObject {
         }
     }
 
+    private func handleAddContactScan(_ input: String) {
+        navigation?.navigateBack()
+        navigation?.navigate(.addContact(publicKey: input))
+    }
+
     private func handleMainScan(_ uri: String) async {
         guard let app else { return }
 

Bitkit/Resources/Localization/en.lproj/Localizable.strings

@@ -958,6 +958,8 @@
 "slashtags__onboarding_text" = "Get automatic updates from your Bitkit contacts, pay them, and follow their public profiles.";
 "slashtags__onboarding_button" = "Add First Contact";
 "contacts__detail_title" = "Contact";
+"contacts__activity_sent_to" = "Sent to {name}";
+"contacts__activity_received_from" = "Received from {name}";
 "contacts__detail_empty_state" = "Unable to load contact.";
 "contacts__empty_state" = "You don't have any contacts yet.";
 "contacts__intro_add_contact" = "Add Contact";
@@ -973,6 +975,7 @@
 "contacts__add_pubky_placeholder" = "Paste a pubky";
 "contacts__add_scan_qr" = "Scan QR";
 "contacts__add_button" = "Add";
+"contacts__add_error_existing" = "This pubky is already in your contacts.";
 "contacts__add_error_invalid_key" = "Invalid pubky key format. Please check and try again.";
 "contacts__add_error_self" = "You can't add your own pubky as a contact.";
 "contacts__add_retrieving" = "Retrieving\n<accent>contact info</accent>";
@@ -1037,6 +1040,7 @@
 "slashtags__error_deleting_profile" = "Unable To Delete Profile";
 "slashtags__error_pay_title" = "Unable To Pay Contact";
 "slashtags__error_pay_empty_msg" = "The contact you're trying to send to hasn't enabled payments.";
+"slashtags__error_pay_not_opened_msg" = "No compatible payment endpoint is available.";
 "slashtags__auth_depricated_title" = "Deprecated";
 "slashtags__auth_depricated_msg" = "Slashauth is deprecated. Please use Bitkit Beta.";
 "profile__nav_title" = "Profile";

Bitkit/Services/CoreService.swift

@@ -6,6 +6,25 @@ import LDKNode
 // MARK: - Activity Service
 
 class ActivityService {
+    private enum PubkyContactKey {
+        private static let prefix = "pubky"
+        private static let rawKeyLength = 52
+        private static let allowedCharacters = Set("ybndrfg8ejkmcpqxot1uwisza345h769")
+
+        static func normalized(_ input: String) -> String? {
+            let boundedInput = String(input.trimmingCharacters(in: .whitespacesAndNewlines).lowercased().prefix(prefix.count + rawKeyLength))
+            let rawKey = boundedInput.hasPrefix(prefix) ? String(boundedInput.dropFirst(prefix.count)) : boundedInput
+
+            guard rawKey.count == rawKeyLength,
+                  rawKey.allSatisfy({ allowedCharacters.contains($0) })
+            else {
+                return nil
+            }
+
+            return "\(prefix)\(rawKey)"
+        }
+    }
+
     private let coreService: CoreService
 
     private let activitiesChangedSubject = PassthroughSubject<Void, Never>()
@@ -395,6 +414,7 @@ class ActivityService {
         var isTransfer = existingOnchain?.isTransfer ?? false
         var channelId = existingOnchain?.channelId
         let transferTxId = existingOnchain?.transferTxId
+        let contact = existingOnchain?.contact
         let feeRate = existingOnchain?.feeRate ?? 1
         let preservedAddress = existingOnchain?.address ?? "Loading..."
         let doesExist = existingOnchain?.doesExist ?? true
@@ -466,6 +486,7 @@ class ActivityService {
             confirmTimestamp: blockTimestamp,
             channelId: channelId,
             transferTxId: transferTxId,
+            contact: contact,
             createdAt: UInt64(payment.creationTime.timeIntervalSince1970),
             updatedAt: paymentTimestamp,
             seenAt: seenAt
@@ -691,6 +712,7 @@ class ActivityService {
             message: description ?? "",
             timestamp: paymentTimestamp,
             preimage: preimage,
+            contact: existingLightning?.contact,
             createdAt: paymentTimestamp,
             updatedAt: paymentTimestamp,
             seenAt: existingLightning?.seenAt
@@ -960,6 +982,20 @@ class ActivityService {
         }
     }
 
+    func get(contact publicKey: String, sortDirection: SortDirection = .desc) async throws -> [Activity] {
+        let normalizedKey = PubkyContactKey.normalized(publicKey) ?? publicKey
+        let activities = try await get(filter: .all, sortDirection: sortDirection)
+
+        return activities.filter { activity in
+            switch activity {
+            case let .lightning(lightning):
+                return lightning.contact == normalizedKey
+            case let .onchain(onchain):
+                return onchain.contact == normalizedKey
+            }
+        }
+    }
+
     func update(id: String, activity: Activity) async throws {
         try await ServiceQueue.background(.core) {
             try updateActivity(activityId: id, activity: activity)
@@ -982,7 +1018,8 @@ class ActivityService {
         address: String,
         amount: UInt64,
         fee: UInt64,
-        feeRate: UInt32
+        feeRate: UInt32,
+        contact: String? = nil
     ) async {
         do {
             try await ServiceQueue.background(.core) {
@@ -1008,6 +1045,7 @@ class ActivityService {
                     confirmTimestamp: nil,
                     channelId: nil,
                     transferTxId: nil,
+                    contact: contact.map { PubkyContactKey.normalized($0) ?? $0 },
                     createdAt: now,
                     updatedAt: now,
                     seenAt: now
@@ -1022,6 +1060,32 @@ class ActivityService {
         }
     }
 
+    func setContact(_ publicKey: String?, forActivity id: String) async throws {
+        let normalizedContact = publicKey.map { PubkyContactKey.normalized($0) ?? $0 }
+
+        try await ServiceQueue.background(.core) {
+            guard let activity = try getActivityById(activityId: id) else {
+                return
+            }
+
+            switch activity {
+            case var .lightning(lightning):
+                guard lightning.contact != normalizedContact else { return }
+                lightning.contact = normalizedContact
+                lightning.updatedAt = UInt64(Date().timeIntervalSince1970)
+                try updateActivity(activityId: id, activity: .lightning(lightning))
+                self.activitiesChangedSubject.send()
+
+            case var .onchain(onchain):
+                guard onchain.contact != normalizedContact else { return }
+                onchain.contact = normalizedContact
+                onchain.updatedAt = UInt64(Date().timeIntervalSince1970)
+                try updateActivity(activityId: id, activity: .onchain(onchain))
+                self.activitiesChangedSubject.send()
+            }
+        }
+    }
+
     func delete(id: String) async throws -> Bool {
         try await ServiceQueue.background(.core) {
             // Rebuild cache if deleting an onchain activity with boostTxIds
@@ -1217,6 +1281,7 @@ class ActivityService {
                                 message: template.message,
                                 timestamp: timestamp,
                                 preimage: template.status == .succeeded ? "preimage\(activityId)" : nil,
+                                contact: nil,
                                 createdAt: timestamp,
                                 updatedAt: timestamp,
                                 seenAt: nil
@@ -1241,6 +1306,7 @@ class ActivityService {
                                 confirmTimestamp: template.confirmed == true ? timestamp + 3600 : nil,
                                 channelId: nil,
                                 transferTxId: nil,
+                                contact: nil,
                                 createdAt: timestamp,
                                 updatedAt: timestamp,
                                 seenAt: nil