Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/extensions/Specific.kt

@@ -68,7 +68,7 @@ fun BigDecimal.toFormattedFiatValue(
 ): String {
     val fiatValue = this.setScale(2, RoundingMode.HALF_UP)
         .let { if (formatWithSpaces) it.formatWithSpaces() else it }
-    return " ${fiatValue}  $fiatCurrencyName"
+    return " $fiatValue $fiatCurrencyName"
 }
 
 fun BigDecimal.stripZeroPlainString(): String = this.stripTrailingZeros().toPlainString()

app/src/main/java/com/tangem/tap/domain/totalBalance/implementation/DefaultTotalFiatBalanceCalculator.kt

@@ -43,7 +43,8 @@ internal class DefaultTotalFiatBalanceCalculator : TotalFiatBalanceCalculator {
 
     private fun Sequence<WalletDataModel>.mapToStatus(): Sequence<TotalFiatBalanceStatus> {
         return this.map { walletData ->
-            when (walletData.status) {
+            if (walletData.fiatRate == null) TotalFiatBalanceStatus.Error
+            else when (walletData.status) {
                 is WalletDataModel.VerifiedOnline,
                 is WalletDataModel.SameCurrencyTransactionInProgress,
                 is WalletDataModel.TransactionInProgress,

app/src/main/java/com/tangem/tap/features/walletSelector/ui/Mapper.kt

@@ -9,6 +9,7 @@ import com.tangem.tap.features.walletSelector.redux.WalletSelectorState
 import com.tangem.tap.features.walletSelector.ui.model.MultiCurrencyUserWalletItem
 import com.tangem.tap.features.walletSelector.ui.model.SingleCurrencyUserWalletItem
 import com.tangem.tap.features.walletSelector.ui.model.UserWalletItem
+import java.math.BigDecimal
 
 internal fun WalletSelectorScreenState.updateWithNewState(
     newState: WalletSelectorState,
@@ -50,10 +51,14 @@ private fun List<UserWalletModel>.toUiModels(
 ): Sequence<UserWalletItem> {
     return this.asSequence().map { userWalletModel ->
         with(userWalletModel) {
-            val balance = UserWalletItem.Balance(
-                amount = fiatBalance.amount.toFormattedFiatValue(appCurrency.symbol),
-                isLoading = fiatBalance is TotalFiatBalance.Loading,
-            )
+            val formatAmount = { amount: BigDecimal ->
+                amount.toFormattedFiatValue(appCurrency.symbol)
+            }
+            val balance = when (fiatBalance) {
+                is TotalFiatBalance.Error -> UserWalletItem.Balance.Error(formatAmount(fiatBalance.amount))
+                is TotalFiatBalance.Loaded -> UserWalletItem.Balance.Loaded(formatAmount(fiatBalance.amount))
+                is TotalFiatBalance.Loading -> UserWalletItem.Balance.Loading
+            }
             when (type) {
                 is UserWalletModel.Type.MultiCurrency -> MultiCurrencyUserWalletItem(
                     id = id,

app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/MockData.kt

@@ -9,9 +9,8 @@ import com.tangem.tap.features.walletSelector.ui.model.UserWalletItem
 internal object MockData {
     private val multiCurrencyUserWallet = MultiCurrencyUserWalletItem(
         id = UserWalletId("wallet_1"),
-        balance = UserWalletItem.Balance(
+        balance = UserWalletItem.Balance.Loaded(
             amount = "6781.05 $",
-            isLoading = false,
         ),
         name = "Wallet",
         imageUrl = "https://app.tangem.com/cards/card_default.png",
@@ -22,9 +21,8 @@ internal object MockData {
 
     private val singleCurrencyUserWallet = SingleCurrencyUserWalletItem(
         id = UserWalletId("wallet_4"),
-        balance = UserWalletItem.Balance(
+        balance = UserWalletItem.Balance.Loaded(
             amount = "6781.05 $",
-            isLoading = false,
         ),
         name = "Wallet",
         imageUrl = "https://app.tangem.com/cards/card_default.png",

app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt

@@ -180,15 +180,24 @@ private fun TokensInfo(
         if (isLocked) {
             LockedPlaceholder()
         } else {
-            if (balance.isLoading) {
-                LoadingTokensInfo(
-                    isMultiCurrencyWallet = tokensCount != null,
-                )
-            } else {
-                LoadedTokensInfo(
-                    balanceAmount = balance.amount,
-                    tokensCount = tokensCount,
-                )
+            when (balance) {
+                is UserWalletItem.Balance.Error -> {
+                    LoadedTokensInfo(
+                        balanceAmount = balance.amount,
+                        tokensCount = tokensCount,
+                        showWarning = true,
+                    )
+                }
+                is UserWalletItem.Balance.Loaded -> {
+                    LoadedTokensInfo(
+                        balanceAmount = balance.amount,
+                        tokensCount = tokensCount,
+                        showWarning = false,
+                    )
+                }
+                is UserWalletItem.Balance.Loading -> {
+                    LoadingTokensInfo(isMultiCurrencyWallet = tokensCount != null)
+                }
             }
         }
     }
@@ -234,17 +243,31 @@ private fun LoadedTokensInfo(
     modifier: Modifier = Modifier,
     balanceAmount: String,
     tokensCount: Int?,
+    showWarning: Boolean,
 ) {
     Column(
         modifier = modifier,
         horizontalAlignment = Alignment.End,
     ) {
-        Text(
-            text = balanceAmount,
-            style = TangemTheme.typography.subtitle1,
-            color = TangemTheme.colors.text.primary1,
-            textAlign = TextAlign.End,
-        )
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing4),
+        ) {
+            Text(
+                text = balanceAmount,
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+                textAlign = TextAlign.End,
+            )
+            if (showWarning) {
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size16),
+                    painter = painterResource(id = R.drawable.ic_alert_24),
+                    tint = TangemTheme.colors.icon.attention,
+                    contentDescription = null,
+                )
+            }
+        }
         if (tokensCount != null) {
             SpacerH2()
             Text(

app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/UserWalletItem.kt

@@ -9,10 +9,13 @@ internal sealed interface UserWalletItem {
     val balance: Balance
     val isLocked: Boolean
 
-    data class Balance(
-        val amount: String,
-        val isLoading: Boolean,
-    )
+    sealed interface Balance {
+        object Loading : Balance
+
+        data class Error(val amount: String) : Balance
+
+        data class Loaded(val amount: String) : Balance
+    }
 }
 
 internal data class MultiCurrencyUserWalletItem(

core/ui/src/main/res/drawable/ic_alert_24.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,15H13V17H11V15ZM11,7H13V13H11V7ZM12,2C6.47,2 2,6.5 2,12C2,14.652 3.054,17.196 4.929,19.071C5.858,20 6.96,20.736 8.173,21.239C9.386,21.741 10.687,22 12,22C14.652,22 17.196,20.946 19.071,19.071C20.946,17.196 22,14.652 22,12C22,10.687 21.741,9.386 21.239,8.173C20.736,6.96 20,5.858 19.071,4.929C18.142,4 17.04,3.264 15.827,2.761C14.614,2.259 13.313,2 12,2ZM12,20C9.878,20 7.843,19.157 6.343,17.657C4.843,16.157 4,14.122 4,12C4,9.878 4.843,7.843 6.343,6.343C7.843,4.843 9.878,4 12,4C14.122,4 16.157,4.843 17.657,6.343C19.157,7.843 20,9.878 20,12C20,14.122 19.157,16.157 17.657,17.657C16.157,19.157 14.122,20 12,20Z" />
+</vector>