fix(tokens): reflect receiving USD Reserves when selling

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

Author: bmc08gt

apps/flipcash/core/src/main/res/values/strings.xml

@@ -412,4 +412,7 @@
     <string name="subtitle_wasAddedToYourWallet">was added to your Flipcash wallet</string>
     <string name="label_ofToken">of %1s</string>
 
+    <string name="label_sellAmount">Sell Amount</string>
+    <string name="label_percentFee">%1$d Fee</string>
+
 </resources>

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenSellReceiptScreen.kt

@@ -12,13 +12,9 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -30,13 +26,9 @@ import com.flipcash.app.tokens.BuySellSwapTokenViewModel
 import com.flipcash.features.tokens.R
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.TokenWithBalance
-import com.getcode.opencode.model.financial.minus
-import com.getcode.opencode.model.financial.times
 import com.getcode.theme.CodeTheme
 import com.getcode.theme.White05
-import com.getcode.theme.White08
 import com.getcode.theme.bolded
-import com.getcode.theme.inputColors
 import com.getcode.ui.theme.ButtonState
 import com.getcode.ui.theme.CodeButton
 import com.getcode.ui.theme.CodeScaffold
@@ -101,10 +93,11 @@ private fun TokenSellReceiptScreen(
             )
         ) {
             SellReceipt(
-                tokenWithBalance = state.tokenWithBalance!!.copy(
-                    balance = state.amountEntryState.selectedAmount.nativeAmount
-                ),
-                fee = state.sellFee,
+                grossTransferAmount = state.enteredAmount,
+                netTransferAmount = state.netTransferAmount,
+                feeAmount = state.feeAmount,
+                feePercentage = state.sellFee,
+                tokenWithBalance = state.tokenWithBalance!!,
             )
         }
     }
@@ -113,7 +106,10 @@ private fun TokenSellReceiptScreen(
 @Composable
 private fun SellReceipt(
     tokenWithBalance: TokenWithBalance,
-    fee: Double?,
+    grossTransferAmount: Fiat,
+    netTransferAmount: Fiat,
+    feePercentage: Double?,
+    feeAmount: Fiat,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -133,33 +129,20 @@ private fun SellReceipt(
         verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x6),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        val feeAmount by remember(fee, tokenWithBalance.balance) {
-            derivedStateOf {
-                if (fee == null) return@derivedStateOf Fiat.Zero
-                tokenWithBalance.balance * (fee / 100.0)
-            }
-        }
-
-        val netTransferAmount by remember(tokenWithBalance.balance, feeAmount) {
-            derivedStateOf {
-                tokenWithBalance.balance - feeAmount
-            }
-        }
-
         Column(
             modifier = modifier,
             verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x3),
         ) {
             ReceiptLineItem(
                 modifier = Modifier.fillMaxWidth(),
-                label = "Sell amount",
-                amount = tokenWithBalance.balance.formatted(),
+                label = stringResource(R.string.label_sellAmount),
+                amount = grossTransferAmount.formatted(),
             )
 
-            if (fee != null) {
+            if (feePercentage != null) {
                 ReceiptLineItem(
                     modifier = Modifier.fillMaxWidth(),
-                    label = "${fee.roundToInt()}% Fee",
+                    label = stringResource(R.string.label_percentFee, feePercentage.roundToInt()),
                     amount = feeAmount.formatted(
                         extraPrefix = if (feeAmount.decimalValue != 1.0) "~" else null,
                     ),

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenTxProcessingScreen.kt

@@ -182,7 +182,13 @@ private fun TokenTxProcessingScreen(
                             LoadingSuccessState.State.Error -> stringResource(R.string.error_title_buySellFailed)
                             LoadingSuccessState.State.Idle -> ""
                             LoadingSuccessState.State.Loading -> stringResource(R.string.title_processingYourTransaction)
-                            LoadingSuccessState.State.Success -> state.enteredAmount.formatted(suffix = stringResource(R.string.label_ofToken, state.tokenName))
+                            LoadingSuccessState.State.Success -> {
+                                val name = when (state.purpose) {
+                                    is TokenSwapPurpose.BalanceIncrease -> state.tokenName
+                                    else -> stringResource(R.string.title_cashReserves)
+                                }
+                                state.netTransferAmount.formatted(suffix = stringResource(R.string.label_ofToken, name))
+                            }
                         },
                         style = CodeTheme.typography.textLarge,
                         color = CodeTheme.colors.textMain,

apps/flipcash/shared/tokens/src/main/kotlin/BuySellSwapTokenViewModel.kt

@@ -1,5 +1,8 @@
 package com.flipcash.app.tokens
 
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.lifecycle.viewModelScope
 import com.flipcash.app.activityfeed.ActivityFeedCoordinator
 import com.flipcash.app.core.extensions.onResult
@@ -24,6 +27,8 @@ import com.getcode.opencode.model.financial.SendLimit
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.TokenWithBalance
 import com.getcode.opencode.model.financial.TokenWithLocalizedBalance
+import com.getcode.opencode.model.financial.minus
+import com.getcode.opencode.model.financial.times
 import com.getcode.opencode.model.financial.toFiat
 import com.getcode.opencode.model.financial.usdf
 import com.getcode.opencode.model.transactions.SwapState
@@ -93,7 +98,8 @@ class BuySellSwapTokenViewModel @Inject constructor(
             }
 
         val tokenName: String
-            get() = tokenWithBalance?.token?.name.orEmpty()
+            get() = tokenWithBalance?.displayName.orEmpty()
+
         val canTransact: Boolean
             get() = (amountEntryState.amountAnimatedModel.amountData.amount) > 0.00 && buyProgress.isIdle && sellProgress.isIdle && processingProgress.isIdle
 
@@ -123,6 +129,18 @@ class BuySellSwapTokenViewModel @Inject constructor(
                 currencyCode = tokenBalance.currencyCode
             )
 
+        val feeAmount: Fiat
+            get() {
+                val fee = sellFee ?: return Fiat.Zero
+                return enteredAmount * (fee / 100.0)
+            }
+
+        val netTransferAmount: Fiat
+            get() = when (purpose) {
+               is TokenSwapPurpose.BalanceIncrease -> enteredAmount
+               else -> enteredAmount - feeAmount
+            }
+
         val transactionLimit: Fiat
             get() {
                 return when (purpose) {