Merge pull request #673 from code-payments/style/withdrawal-receipt-string-resources

chore(withdrawal): always show token "amount in" on receipt regardless of token type

Author: bmc08gt

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

@@ -628,4 +628,8 @@
     <string name="description_withdrawUsdfAsUsdc">Your USDF will be converted 1:1 to Solana USDC on withdrawal</string>
     <string name="displayName_solanaUsdc">Solana USDC</string>
     <string name="displayName_usdc">USDC</string>
+    <string name="label_withdrawalAmount">Withdrawal amount</string>
+    <string name="label_lessFee">Less fee</string>
+    <string name="label_netAmount">Net amount</string>
+    <string name="label_amountInToken">Amount in %1$s</string>
 </resources>

apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/components/TransactionReceipt.kt

@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.derivedStateOf
@@ -126,14 +126,14 @@ private fun LineItems(
     ) {
         ReceiptLineItem(
             modifier = Modifier.fillMaxWidth(),
-            label = AnnotatedString("Withdrawal amount"),
+            label = AnnotatedString(stringResource(R.string.label_withdrawalAmount)),
             amount = tokenWithBalance.balance.formatted()
         )
 
         if (fee != null) {
             ReceiptLineItem(
                 modifier = Modifier.fillMaxWidth(),
-                label = AnnotatedString("Less fee"),
+                label = AnnotatedString(stringResource(R.string.label_lessFee)),
                 amount = fee.formatted(extraPrefix = "-"),
             )
 
@@ -143,20 +143,20 @@ private fun LineItems(
 
             ReceiptLineItem(
                 modifier = Modifier.fillMaxWidth(),
-                label = AnnotatedString("Net amount"),
+                label = AnnotatedString(stringResource(R.string.label_netAmount)),
                 amount = netAmount
             )
         }
 
-        if (tokenWithBalance.token.address != Mint.usdf) {
-            val exchange = LocalExchange.current
-            ReceiptLineItem(
-                modifier = Modifier.fillMaxWidth(),
-                label = AnnotatedString("Amount in ${tokenWithBalance.displayName}"),
-                amount = transferAmount.convertingToUsdIfNeeded(exchange.entryRate)
-                    .estimatedTokenAmountIn(tokenWithBalance.token, fractionDigits = 2),
-            )
-        }
+        val exchange = LocalExchange.current
+        ReceiptLineItem(
+            modifier = Modifier.fillMaxWidth(),
+            label = AnnotatedString(
+                stringResource(R.string.label_amountInToken, tokenWithBalance.displayName)
+            ),
+            amount = transferAmount.convertingToUsdIfNeeded(exchange.entryRate)
+                .estimatedTokenAmountIn(tokenWithBalance.token, fractionDigits = 2),
+        )
     }
 }
 

apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/confirmation/WithdrawalConfirmationScreen.kt

@@ -74,6 +74,7 @@ private fun WithdrawalConfirmationScreenContent(
                 tokenWithBalance = TokenWithBalance(
                     state.token!!.token,
                     balance = state.amountEntryState.selectedAmount.localFiat.nativeAmount,
+                    displayName = state.token.displayName
                 ),
                 destination = state.destinationState.textFieldState.text.toString(),
                 fee = state.feeInEntryCurrency,