fix: show contact names in activity rows

Author: ben-kaufman

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/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/Views/Contacts/ContactActivityView.swift

@@ -114,7 +114,7 @@ struct ContactActivityView: View {
     }
 
     private func resolveContactName() {
-        contactName = contactsManager.contacts.first(where: { $0.publicKey == publicKey })?.profile.name ?? ""
+        contactName = contactsManager.contacts.first(where: { PubkyPublicKeyFormat.matches($0.publicKey, publicKey) })?.displayName ?? ""
     }
 
     private func activityTitle(_ activity: Activity) -> String {

Bitkit/Views/Wallets/Activity/ActivityLatest.swift

@@ -4,6 +4,7 @@ import SwiftUI
 struct ActivityLatest: View {
     @EnvironmentObject private var activity: ActivityListViewModel
     @EnvironmentObject private var app: AppViewModel
+    @EnvironmentObject private var contactsManager: ContactsManager
     @EnvironmentObject private var feeEstimatesManager: FeeEstimatesManager
     @EnvironmentObject private var navigation: NavigationViewModel
     @EnvironmentObject private var settings: SettingsViewModel
@@ -60,7 +61,11 @@ struct ActivityLatest: View {
                 LazyVStack(alignment: .leading, spacing: 16) {
                     ForEach(Array(zip(rows.indices, rows)), id: \.1) { index, item in
                         NavigationLink(value: Route.activityDetail(item)) {
-                            ActivityRow(item: item, feeEstimates: feeEstimatesManager.estimates)
+                            ActivityRow(
+                                item: item,
+                                feeEstimates: feeEstimatesManager.estimates,
+                                contact: item.contact(in: contactsManager.contacts)
+                            )
                         }
                         .accessibilityIdentifier("ActivityShort-\(index)")
                     }

Bitkit/Views/Wallets/Activity/ActivityRow.swift

@@ -4,21 +4,60 @@ import SwiftUI
 struct ActivityRow: View {
     let item: Activity
     let feeEstimates: FeeRates?
+    let contact: PubkyContact?
     let titleOverride: String?
 
-    init(item: Activity, feeEstimates: FeeRates?, titleOverride: String? = nil) {
+    init(item: Activity, feeEstimates: FeeRates?, contact: PubkyContact? = nil, titleOverride: String? = nil) {
         self.item = item
         self.feeEstimates = feeEstimates
+        self.contact = contact
         self.titleOverride = titleOverride
     }
 
+    private var rowTitleOverride: String? {
+        if let titleOverride {
+            return titleOverride
+        }
+
+        return contactTitle
+    }
+
+    private var contactTitle: String? {
+        guard let contact else { return nil }
+
+        let txType: PaymentType
+        switch item {
+        case let .lightning(lightning):
+            guard lightning.status == .succeeded else {
+                return nil
+            }
+            txType = lightning.txType
+
+        case let .onchain(onchain):
+            guard onchain.doesExist,
+                  !onchain.isTransfer,
+                  !(onchain.isBoosted && !onchain.confirmed)
+            else {
+                return nil
+            }
+            txType = onchain.txType
+        }
+
+        switch txType {
+        case .sent:
+            return t("contacts__activity_sent_to", variables: ["name": contact.displayName])
+        case .received:
+            return t("contacts__activity_received_from", variables: ["name": contact.displayName])
+        }
+    }
+
     var body: some View {
         Group {
             switch item {
             case let .lightning(activity):
-                ActivityRowLightning(item: activity, titleOverride: titleOverride)
+                ActivityRowLightning(item: activity, titleOverride: rowTitleOverride)
             case let .onchain(activity):
-                ActivityRowOnchain(item: activity, feeEstimates: feeEstimates, titleOverride: titleOverride)
+                ActivityRowOnchain(item: activity, feeEstimates: feeEstimates, titleOverride: rowTitleOverride)
             }
         }
         .padding(16)

BitkitTests/ContactsManagerTests.swift

@@ -1,4 +1,5 @@
 @testable import Bitkit
+import BitkitCore
 import XCTest
 
 @MainActor
@@ -24,6 +25,61 @@ final class ContactsManagerTests: XCTestCase {
         XCTAssertFalse(PubkyPublicKeyFormat.matches(prefixedKey, "pubkyinvalid"))
     }
 
+    func testActivityContactResolvesLightningContactKey() {
+        let rawKey = "3rsduhcxpw74snwyct86m38c63j3pq8x4ycqikxg64roik8yw5xg"
+        let contact = makeContact(publicKey: "pubky\(rawKey)")
+        let activity = Activity.lightning(
+            LightningActivity(
+                id: "test-lightning-contact",
+                txType: .sent,
+                status: .succeeded,
+                value: 1000,
+                fee: 10,
+                invoice: "lnbc...",
+                message: "",
+                timestamp: 0,
+                preimage: nil,
+                contact: rawKey,
+                createdAt: nil,
+                updatedAt: nil,
+                seenAt: nil
+            )
+        )
+
+        XCTAssertEqual(activity.contact(in: [contact])?.publicKey, contact.publicKey)
+    }
+
+    func testActivityContactResolvesBoostingOnchainContactKey() {
+        let rawKey = "3rsduhcxpw74snwyct86m38c63j3pq8x4ycqikxg64roik8yw5xg"
+        let contact = makeContact(publicKey: "pubky\(rawKey)")
+        let activity = Activity.onchain(
+            OnchainActivity(
+                id: "test-onchain-boosting-contact",
+                txType: .sent,
+                txId: "txid",
+                value: 1000,
+                fee: 10,
+                feeRate: 1,
+                address: "bcrt1...",
+                confirmed: false,
+                timestamp: 0,
+                isBoosted: true,
+                boostTxIds: [],
+                isTransfer: false,
+                doesExist: true,
+                confirmTimestamp: nil,
+                channelId: nil,
+                transferTxId: nil,
+                contact: contact.publicKey,
+                createdAt: nil,
+                updatedAt: nil,
+                seenAt: nil
+            )
+        )
+
+        XCTAssertEqual(activity.contact(in: [contact])?.publicKey, contact.publicKey)
+    }
+
     func testResolveAddContactValidationReturnsEmptyForBlankInput() {
         XCTAssertEqual(resolveAddContactValidation(input: "   ", ownPublicKey: nil), .empty)
     }