From 21912f4c7f6b4cc327078416491e125eba2fcb49 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 20 Sep 2024 12:23:04 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../domain/tokens/operations/CurrencyStatusOperations.kt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
index c8990cebf4..abdf3f94fd 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
@@ -61,7 +61,7 @@ internal class CurrencyStatusOperations(
             (yieldBalance as? YieldBalance.Data)?.address == status.address.defaultAddress.value
         val currentYieldBalance = yieldBalance.takeIf { isCurrentAddressStaking }
         return when {
-            ignoreQuote || quote == null -> CryptoCurrencyStatus.NoQuote(
+            ignoreQuote -> CryptoCurrencyStatus.NoQuote(
                 amount = amount,
                 hasCurrentNetworkTransactions = hasCurrentNetworkTransactions,
                 pendingTransactions = currentTransactions,
@@ -70,14 +70,15 @@ internal class CurrencyStatusOperations(
             )
             currency is CryptoCurrency.Token && currency.isCustom -> CryptoCurrencyStatus.Custom(
                 amount = amount,
-                fiatAmount = calculateFiatAmountOrNull(amount, quote.fiatRate),
-                fiatRate = quote.fiatRate,
-                priceChange = quote.priceChange,
+                fiatAmount = calculateFiatAmountOrNull(amount, quote?.fiatRate),
+                fiatRate = quote?.fiatRate,
+                priceChange = quote?.priceChange,
                 hasCurrentNetworkTransactions = hasCurrentNetworkTransactions,
                 pendingTransactions = currentTransactions,
                 networkAddress = status.address,
                 yieldBalance = currentYieldBalance,
             )
+            quote == null -> CryptoCurrencyStatus.Loading
             else -> CryptoCurrencyStatus.Loaded(
                 amount = amount,
                 fiatAmount = calculateFiatAmount(amount, quote.fiatRate),