feat: display full decimal places for the currency in transaction details

also make token amount visible as well

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/feed/ActivityFeedMessage.kt

@@ -3,11 +3,17 @@ package com.flipcash.app.core.feed
 import com.flipcash.app.core.pools.PoolResolution
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.financial.LocalFiat
+import com.getcode.opencode.model.financial.Token
 import com.getcode.solana.keys.PublicKey
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 
+data class ActivityFeedMessageWithToken(
+    val message: ActivityFeedMessage,
+    val token: Token?
+)
+
 data class ActivityFeedMessage(
     val id: ID,
     val text: String,

apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/TransactionHistoryScreen.kt

@@ -24,6 +24,7 @@ import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
 import com.flipcash.app.core.feed.ActivityFeedMessage
+import com.flipcash.app.core.feed.ActivityFeedMessageWithToken
 import com.flipcash.app.transactions.internal.components.FeedItem
 import com.flipcash.features.transactions.R
 import com.getcode.theme.CodeTheme
@@ -40,7 +41,7 @@ internal fun TransactionHistoryScreen(viewModel: TransactionHistoryViewModel) {
 @Composable
 private fun TransactionHistoryScreenContent(
     state: TransactionHistoryViewModel.State,
-    transactions: LazyPagingItems<ActivityFeedMessage>,
+    transactions: LazyPagingItems<ActivityFeedMessageWithToken>,
     dispatch: (TransactionHistoryViewModel.Event) -> Unit,
 ) {
     FeedList(
@@ -55,7 +56,7 @@ private fun TransactionHistoryScreenContent(
 private fun FeedList(
     modifier: Modifier = Modifier,
     state: TransactionHistoryViewModel.State,
-    feed: LazyPagingItems<ActivityFeedMessage>,
+    feed: LazyPagingItems<ActivityFeedMessageWithToken>,
     dispatchEvent: (TransactionHistoryViewModel.Event) -> Unit
 ) {
     val listState = rememberLazyListState()
@@ -93,17 +94,16 @@ private fun FeedList(
                 }
             }
         } else {
-            items(feed.itemCount, key = feed.itemKey { item -> item.id }) { index ->
-                val message = feed[index] ?: return@items
+            items(feed.itemCount, key = feed.itemKey { item -> item.message.id }) { index ->
+                val item = feed[index] ?: return@items
                 FeedItem(
                     modifier = Modifier
-                        .fillParentMaxWidth()
-                        .animateItem(),
-                    message = message,
+                        .fillParentMaxWidth(),
+                    item = item,
                     canViewDetails = state.canViewDetails,
-                    isExpanded = state.expandedItem == message.id,
-                    onCancel = { dispatchEvent(TransactionHistoryViewModel.Event.OnCancelRequested(message)) },
-                    onViewDetails = { dispatchEvent(TransactionHistoryViewModel.Event.ViewDetails(message.id)) },
+                    isExpanded = state.expandedItem == item.message.id,
+                    onCancel = { dispatchEvent(TransactionHistoryViewModel.Event.OnCancelRequested(item.message)) },
+                    onViewDetails = { dispatchEvent(TransactionHistoryViewModel.Event.ViewDetails(item.message.id)) },
                 )
 
                 if (index < feed.itemCount - 1) {

apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/TransactionHistoryViewModel.kt

@@ -132,7 +132,6 @@ class TransactionHistoryViewModel @Inject constructor(
 
     val transactions = stateFlow.mapNotNull { it.mint }
         .flatMapLatest { mint -> feedCoordinator.transactions(mint) }
-        .cachedIn(viewModelScope)
 
     companion object {
         val updateStateForEvent: (Event) -> ((State) -> State) = { event ->

apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/components/FeedItem.kt

@@ -19,6 +19,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.flipcash.app.core.feed.ActivityFeedMessage
+import com.flipcash.app.core.feed.ActivityFeedMessageWithToken
 import com.flipcash.app.core.feed.MessageMetadata
 import com.flipcash.app.core.feed.MessageState
 import com.flipcash.app.theme.FlipcashDesignSystem
@@ -27,14 +28,16 @@ import com.getcode.opencode.compose.LocalExchange
 import com.getcode.opencode.model.financial.CurrencyCode
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Rate
+import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.toFiat
+import com.getcode.opencode.model.financial.usdc
 import com.getcode.theme.CodeTheme
 import com.getcode.utils.decodeBase58
 import kotlinx.datetime.Instant
 
 @Composable
 internal fun FeedItem(
-    message: ActivityFeedMessage,
+    item: ActivityFeedMessageWithToken,
     canViewDetails: Boolean,
     isExpanded: Boolean,
     modifier: Modifier = Modifier,
@@ -51,7 +54,7 @@ internal fun FeedItem(
             elevation = elevation,
         ) {
             FeedItemSummary(
-                message = message,
+                message = item.message,
                 canViewDetails = canViewDetails,
                 modifier = Modifier
                     .fillMaxWidth(),
@@ -69,7 +72,7 @@ internal fun FeedItem(
         ) { expanded ->
             if (expanded) {
                 FeedItemDetails(
-                    message = message,
+                    item = item,
                     modifier = Modifier.fillMaxWidth(),
                     onCancel = onCancel
                 )
@@ -102,6 +105,11 @@ private val sampleItem = ActivityFeedMessage(
     metadata = MessageMetadata.GaveCrypto
 )
 
+private val sampleItemWithToken = ActivityFeedMessageWithToken(
+    message = sampleItem,
+    token = Token.usdc,
+)
+
 @Preview
 @Composable
 private fun Preview_CollapsedItem() {
@@ -114,7 +122,7 @@ private fun Preview_CollapsedItem() {
         ) {
             Box(modifier = Modifier.background(CodeTheme.colors.background)) {
                 FeedItem(
-                    message = sampleItem,
+                    item = sampleItemWithToken,
                     isExpanded = false,
                     canViewDetails = true,
                     onCancel = {},
@@ -137,7 +145,7 @@ private fun Preview_ExpandedItem() {
         ) {
             Box(modifier = Modifier.background(CodeTheme.colors.background)) {
                 FeedItem(
-                    message = sampleItem,
+                    item = sampleItemWithToken,
                     isExpanded = true,
                     canViewDetails = true,
                     onViewDetails = {},

apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/components/FeedItemDetails.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
@@ -16,18 +17,22 @@ import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.text.font.FontWeight.Companion.W600
 import androidx.compose.ui.text.style.TextOverflow
 import com.flipcash.app.core.feed.ActivityFeedMessage
+import com.flipcash.app.core.feed.ActivityFeedMessageWithToken
 import com.getcode.opencode.model.financial.Fiat
+import com.getcode.solana.keys.Mint
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.core.unboundedClickable
 import com.getcode.util.format
 import com.getcode.utils.base58
 
 @Composable
 internal fun FeedItemDetails(
-    message: ActivityFeedMessage,
+    item: ActivityFeedMessageWithToken,
     modifier: Modifier = Modifier,
     onCancel: () -> Unit,
 ) {
+    val (message, token) = item
+
     Column(
         modifier = modifier
             .wrapContentHeight()
@@ -62,6 +67,12 @@ internal fun FeedItemDetails(
             )
         }
         message.amount?.let { amount ->
+            val usdcAmount = if (token?.address == Mint.usdc || token == null) {
+                amount.underlyingTokenAmount
+            } else {
+                Fiat.tokenBalance(amount.underlyingTokenAmount.quarks, token = token)
+            }
+
             Row(
                 modifier = Modifier.fillMaxWidth(),
             ) {
@@ -75,9 +86,25 @@ internal fun FeedItemDetails(
                     value = amount.nativeAmount.currencyCode.name,
                     modifier = Modifier.weight(1f)
                 )
+
                 DetailItem(
+                    modifier = Modifier.weight(1f),
                     label = "USDC",
-                    value = amount.underlyingTokenAmount.formatted(formatting = Fiat.Formatting.Length(6)),
+                    value = usdcAmount.formatted(
+                        formatting = Fiat.Formatting.Length(
+                            token?.decimals ?: 6
+                        )
+                    ),
+                )
+            }
+
+            Row(modifier = Modifier.fillMaxWidth()) {
+                Spacer(Modifier.weight(1f))
+                Spacer(Modifier.weight(1f))
+                DetailItem(
+                    modifier = Modifier.weight(1f),
+                    label = "Tokens",
+                    value = usdcAmount.estimatedTokenAmountIn(token),
                 )
             }
         }

apps/flipcash/shared/activityfeed/src/main/kotlin/com/flipcash/app/activityfeed/ActivityFeedCoordinator.kt

@@ -7,6 +7,7 @@ import androidx.paging.PagingData
 import androidx.paging.filter
 import androidx.paging.map
 import com.flipcash.app.core.feed.ActivityFeedMessage
+import com.flipcash.app.core.feed.ActivityFeedMessageWithToken
 import com.flipcash.app.persistence.sources.MessageDataSource
 import com.flipcash.app.persistence.sources.mapper.notifications.MessageEntityToFeedMessageMapper
 import com.flipcash.app.persistence.sources.mediator.FeedRemoteMediator
@@ -15,6 +16,7 @@ import com.flipcash.services.models.ActivityFeedType
 import com.flipcash.services.models.NotificationState
 import com.flipcash.services.models.QueryOptions
 import com.flipcash.services.user.UserManager
+import com.getcode.opencode.controllers.TokenController
 import com.getcode.solana.keys.Mint
 import com.getcode.utils.TraceType
 import com.getcode.utils.trace
@@ -34,6 +36,7 @@ class ActivityFeedCoordinator @Inject constructor(
     private val dataSource: MessageDataSource,
     private val mapper: MessageEntityToFeedMessageMapper,
     private val userManager: UserManager,
+    private val tokenController: TokenController,
 ) {
     private val pagingConfig = PagingConfig(pageSize = 20)
 
@@ -56,9 +59,12 @@ class ActivityFeedCoordinator @Inject constructor(
         .flatMapLatest { _messages }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    fun transactions(mint: Mint): Flow<PagingData<ActivityFeedMessage>> = messages.map { page ->
+    fun transactions(mint: Mint): Flow<PagingData<ActivityFeedMessageWithToken>> = messages.map { page ->
             page.filter { message ->
                 message.amount?.mint == mint
+            }.map { msg ->
+                val token = msg.amount?.mint?.let { tokenController.getTokenMetadata(it) }?.getOrNull()
+                ActivityFeedMessageWithToken(msg, token)
             }
         }