fix: show contact activity titles

Author: ben-kaufman

app/src/main/java/to/bitkit/ext/Activities.kt

@@ -52,6 +52,11 @@ fun Activity.isSent() = when (this) {
     is Activity.Onchain -> v1.txType == PaymentType.SENT
 }
 
+fun Activity.contact(): String? = when (this) {
+    is Activity.Lightning -> v1.contact
+    is Activity.Onchain -> v1.contact
+}
+
 fun Activity.matchesPaymentId(paymentHashOrTxId: String): Boolean = when (this) {
     is Activity.Lightning -> paymentHashOrTxId == v1.id
     is Activity.Onchain -> paymentHashOrTxId == v1.txId

app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

@@ -35,6 +35,7 @@ import to.bitkit.data.dto.PendingBoostActivity
 import to.bitkit.di.BgDispatcher
 import to.bitkit.di.IoDispatcher
 import to.bitkit.ext.amountOnClose
+import to.bitkit.ext.contact
 import to.bitkit.ext.matchesPaymentId
 import to.bitkit.ext.nowMillis
 import to.bitkit.ext.nowTimestamp
@@ -404,11 +405,6 @@ class ActivityRepo @Inject constructor(
         coreService.activity.getActivity(forPaymentId)
             ?: getOnchainActivityByTxId(forPaymentId)?.let { Activity.Onchain(it) }
 
-    private fun Activity.contact(): String? = when (this) {
-        is Activity.Lightning -> v1.contact
-        is Activity.Onchain -> v1.contact
-    }
-
     private fun Activity.withContact(normalizedKey: String, updatedAt: ULong): Activity = when (this) {
         is Activity.Lightning -> Activity.Lightning(v1.copy(contact = normalizedKey, updatedAt = updatedAt))
         is Activity.Onchain -> Activity.Onchain(v1.copy(contact = normalizedKey, updatedAt = updatedAt))

app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityRow.kt

@@ -31,6 +31,7 @@ import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
 import to.bitkit.R
 import to.bitkit.ext.DatePattern
+import to.bitkit.ext.contact
 import to.bitkit.ext.formatted
 import to.bitkit.ext.isSent
 import to.bitkit.ext.isTransfer
@@ -40,6 +41,8 @@ import to.bitkit.ext.totalValue
 import to.bitkit.ext.txType
 import to.bitkit.models.FeeRate.Companion.getFeeShortDescription
 import to.bitkit.models.PrimaryDisplay
+import to.bitkit.models.PubkyProfile
+import to.bitkit.models.PubkyPublicKeyFormat
 import to.bitkit.models.formatToModernDisplay
 import to.bitkit.repositories.CurrencyState
 import to.bitkit.ui.LocalCurrencies
@@ -90,6 +93,19 @@ fun ActivityRow(
     val isTransfer = item.isTransfer()
 
     val activityListViewModel = activityListViewModel
+    val contacts by activityListViewModel?.contacts?.collectAsStateWithLifecycle() ?: remember {
+        mutableStateOf(emptyList())
+    }
+    val contactName = remember(item, contacts) { contactName(item, contacts) }
+    val contactTitle = contactName?.let {
+        val titleRes = if (item.isSent()) {
+            R.string.contacts__activity_sent_to
+        } else {
+            R.string.contacts__activity_received_from
+        }
+        stringResource(titleRes, it)
+    }
+    val resolvedTitle = title ?: contactTitle
     var isCpfpChild by remember { mutableStateOf(false) }
 
     LaunchedEffect(item) {
@@ -121,7 +137,7 @@ fun ActivityRow(
                 status = status,
                 isTransfer = isTransfer,
                 isCpfpChild = isCpfpChild,
-                title = title,
+                title = resolvedTitle,
             )
             val context = LocalContext.current
             val subtitleText = when (item) {
@@ -172,6 +188,11 @@ fun ActivityRow(
     }
 }
 
+private fun contactName(activity: Activity, contacts: List<PubkyProfile>): String? {
+    val contact = activity.contact() ?: return null
+    return contacts.firstOrNull { PubkyPublicKeyFormat.matches(it.publicKey, contact) }?.name
+}
+
 @Suppress("CyclomaticComplexMethod")
 @Composable
 private fun TransactionStatusText(

app/src/main/java/to/bitkit/viewmodels/ActivityListViewModel.kt

@@ -28,6 +28,7 @@ import kotlinx.coroutines.launch
 import to.bitkit.di.BgDispatcher
 import to.bitkit.ext.isTransfer
 import to.bitkit.repositories.ActivityRepo
+import to.bitkit.repositories.PubkyRepo
 import to.bitkit.ui.screens.wallets.activity.components.ActivityTab
 import to.bitkit.utils.Logger
 import javax.inject.Inject
@@ -37,6 +38,7 @@ import javax.inject.Inject
 class ActivityListViewModel @Inject constructor(
     @BgDispatcher private val bgDispatcher: CoroutineDispatcher,
     private val activityRepo: ActivityRepo,
+    pubkyRepo: PubkyRepo,
 ) : ViewModel() {
     private val _filteredActivities = MutableStateFlow<ImmutableList<Activity>?>(null)
     val filteredActivities = _filteredActivities.asStateFlow()
@@ -50,6 +52,8 @@ class ActivityListViewModel @Inject constructor(
     private val _latestActivities = MutableStateFlow<ImmutableList<Activity>?>(null)
     val latestActivities = _latestActivities.asStateFlow()
 
+    val contacts = pubkyRepo.contacts
+
     val availableTags: StateFlow<ImmutableList<String>> =
         activityRepo.state.map { it.tags }.stateInScope(persistentListOf())