From 7257feb12d226582ee557b83bcf7f818bc95ee3a Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 22 Feb 2023 13:38:56 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt | 4 +++-
 .../java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
index 2307af3c90..e759fd412c 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
@@ -284,7 +284,9 @@ internal class SwapInteractorImpl @Inject constructor(
             TokenWithBalance(
                 token = it,
                 tokenBalanceData = TokenBalanceData(
-                    amount = balance?.let { amount -> amountFormatter.formatSwapAmountToUI(amount, "") },
+                    amount = balance?.let { amount ->
+                        amountFormatter.formatSwapAmountToUI(amount, it.symbol)
+                    },
                     amountEquivalent = balance?.value?.toFiatString(
                         rates[it.id]?.toBigDecimal() ?: BigDecimal.ZERO,
                         appCurrency.symbol,
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
index c5f9ded2ff..382986835c 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
@@ -181,13 +181,13 @@ private fun TokenItem(token: TokenToSelect, network: Network, onTokenClick: () -
                 modifier = Modifier.padding(start = TangemTheme.dimens.spacing8),
             ) {
                 Text(
-                    text = token.addedTokenBalanceData.amount ?: "",
+                    text = token.addedTokenBalanceData.amountEquivalent.orEmpty(),
                     style = TangemTheme.typography.subtitle1,
                     color = TangemTheme.colors.text.primary1,
                 )
                 SpacerW2()
                 Text(
-                    text = token.addedTokenBalanceData.amountEquivalent ?: "",
+                    text = token.addedTokenBalanceData.amount.orEmpty(),
                     style = TangemTheme.typography.caption,
                     color = TangemTheme.colors.text.tertiary,
                 )