Merge pull request #531 from synonymdev/codex-paykit-public-endpoints-pr527

Author: ovitrif

Bitkit.xcodeproj/project.pbxproj

@@ -87,6 +87,7 @@
 				Extensions/PaymentDetails.swift,
 				Models/BlocktankNotificationType.swift,
 				Models/LnPeer.swift,
+				Models/PubkyPublicKeyFormat.swift,
 				Models/Toast.swift,
 				Models/Transfer.swift,
 				Models/TransferType.swift,
@@ -117,6 +118,7 @@
 				Extensions/PaymentDetails.swift,
 				Models/BlocktankNotificationType.swift,
 				Models/LnPeer.swift,
+				Models/PubkyPublicKeyFormat.swift,
 				Models/Toast.swift,
 				Services/CoreService.swift,
 				Services/GeoService.swift,
@@ -904,8 +906,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pubky/paykit-rs";
 			requirement = {
-				kind = revision;
-				revision = cd1253291b1582759d569372d5942b8871527ea1;
+				kind = exactVersion;
+				version = 0.1.0-rc5;
 			};
 		};
 		18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
@@ -936,8 +938,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.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -560,6 +560,7 @@ struct AppScene: View {
                 Task {
                     await clearDeliveredNotifications()
                     await LightningService.shared.reconnectPeers()
+                    await wallet.refreshPublicPaykitEndpointsOnForeground()
                 }
             }
         }

Bitkit/AppScene.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/Components/Activity/ActivityList.swift

@@ -0,0 +1,42 @@
+import SwiftUI
+
+struct ContactAvatarLetter: View {
+    let source: String
+    let size: CGFloat
+    var backgroundColor: Color = .white.opacity(0.1)
+    var strokeColor: Color?
+    var strokeWidth: CGFloat = 0
+
+    private var letter: String {
+        String(source.prefix(1)).uppercased()
+    }
+
+    var body: some View {
+        Circle()
+            .fill(backgroundColor)
+            .frame(width: size, height: size)
+            .overlay {
+                avatarText
+            }
+            .overlay {
+                if let strokeColor, strokeWidth > 0 {
+                    Circle()
+                        .stroke(strokeColor, lineWidth: strokeWidth)
+                }
+            }
+            .accessibilityHidden(true)
+    }
+
+    @ViewBuilder
+    private var avatarText: some View {
+        if size >= 72 {
+            HeadlineText(letter)
+        } else if size >= 56 {
+            TitleText(letter)
+        } else if size >= 44 {
+            BodyMSBText(letter)
+        } else {
+            CaptionBText(letter, textColor: .textPrimary)
+        }
+    }
+}

Bitkit/Components/ContactAvatarLetter.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/Constants/Env.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/Extensions/Activity+Contact.swift

@@ -385,6 +385,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)