fix: clean up activity contact titles

Author: ben-kaufman

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

@@ -0,0 +1,27 @@
+package to.bitkit.ui.screens.wallets.activity.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.res.stringResource
+import com.synonym.bitkitcore.Activity
+import kotlinx.collections.immutable.ImmutableList
+import to.bitkit.R
+import to.bitkit.ext.contact
+import to.bitkit.ext.isSent
+import to.bitkit.models.PubkyProfile
+import to.bitkit.models.PubkyPublicKeyFormat
+
+@Composable
+fun contactActivityTitle(activity: Activity, contacts: ImmutableList<PubkyProfile>): String? {
+    val contactName = remember(activity, contacts) {
+        val contact = activity.contact() ?: return@remember null
+        contacts.firstOrNull { PubkyPublicKeyFormat.matches(it.publicKey, contact) }?.name
+    } ?: return null
+
+    val titleRes = if (activity.isSent()) {
+        R.string.contacts__activity_sent_to
+    } else {
+        R.string.contacts__activity_received_from
+    }
+    return stringResource(titleRes, contactName)
+}

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

@@ -10,16 +10,21 @@ import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.synonym.bitkitcore.Activity
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import to.bitkit.R
 import to.bitkit.ext.rawId
+import to.bitkit.ui.activityListViewModel
 import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Caption13Up
 import to.bitkit.ui.components.TertiaryButton
@@ -45,6 +50,10 @@ fun ActivityListGrouped(
     contentPadding: PaddingValues = PaddingValues(top = 20.dp),
     titleProvider: @Composable (Activity) -> String? = { null },
 ) {
+    val contacts by activityListViewModel?.contacts?.collectAsStateWithLifecycle() ?: remember {
+        mutableStateOf(persistentListOf())
+    }
+
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = modifier.fillMaxSize()
@@ -100,7 +109,7 @@ fun ActivityListGrouped(
                                     item = item,
                                     onClick = onActivityItemClick,
                                     testTag = "Activity-$index",
-                                    title = titleProvider(item),
+                                    title = titleProvider(item) ?: contactActivityTitle(item, contacts),
                                 )
                                 VerticalSpacer(16.dp)
                             }

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

@@ -5,16 +5,21 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.synonym.bitkitcore.Activity
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import to.bitkit.R
+import to.bitkit.ui.activityListViewModel
 import to.bitkit.ui.components.TertiaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.screens.wallets.activity.utils.previewActivityItems
@@ -27,12 +32,22 @@ fun ActivityListSimple(
     onActivityItemClick: (String) -> Unit,
 ) {
     if (items.isNullOrEmpty()) return
+
+    val contacts by activityListViewModel?.contacts?.collectAsStateWithLifecycle() ?: remember {
+        mutableStateOf(persistentListOf())
+    }
+
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier.fillMaxWidth()
     ) {
         items.forEachIndexed { index, item ->
-            ActivityRow(item, onActivityItemClick, testTag = "ActivityShort-$index")
+            ActivityRow(
+                item = item,
+                onClick = onActivityItemClick,
+                testTag = "ActivityShort-$index",
+                title = contactActivityTitle(item, contacts),
+            )
             if (index < items.lastIndex) {
                 VerticalSpacer(16.dp)
             }

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

@@ -27,10 +27,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
-import kotlinx.collections.immutable.persistentListOf
 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,8 +38,6 @@ 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
@@ -91,22 +87,9 @@ fun ActivityRow(
         is Activity.Onchain -> item.v1.confirmed
     }
     val isTransfer = item.isTransfer()
-
     val activityListViewModel = activityListViewModel
-    val contacts by activityListViewModel?.contacts?.collectAsStateWithLifecycle() ?: remember {
-        mutableStateOf(persistentListOf())
-    }
-    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)
-    }
     var isCpfpChild by remember { mutableStateOf(false) }
-    val resolvedTitle = (title ?: contactTitle).takeIf {
+    val resolvedTitle = title.takeIf {
         shouldUseContactActivityTitle(item, status, isTransfer, isCpfpChild)
     }
 
@@ -190,11 +173,6 @@ 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
-}
-
 private fun shouldUseContactActivityTitle(
     activity: Activity,
     status: PaymentState?,