From e3593c69822941bed85e9b49afdcedf53b921f65 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 2 Dec 2024 09:55:53 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../tokens/operations/CurrencyStatusOperations.kt | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 3e4f3a77ae..41d94b2cf2 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
@@ -85,14 +85,8 @@ internal class CurrencyStatusOperations(
         } else {
             null
         }
+        // order is important for correct total balance calculation
         return when {
-            quote is Quote.Empty || ignoreQuote -> CryptoCurrencyStatus.NoQuote(
-                amount = amount,
-                hasCurrentNetworkTransactions = hasCurrentNetworkTransactions,
-                pendingTransactions = currentTransactions,
-                networkAddress = status.address,
-                yieldBalance = currentYieldBalance,
-            )
             currency is CryptoCurrency.Token && currency.isCustom -> CryptoCurrencyStatus.Custom(
                 amount = amount,
                 fiatAmount = calculateFiatAmountOrNull(amount, quote?.fiatRate),
@@ -103,6 +97,13 @@ internal class CurrencyStatusOperations(
                 networkAddress = status.address,
                 yieldBalance = currentYieldBalance,
             )
+            quote is Quote.Empty || ignoreQuote -> CryptoCurrencyStatus.NoQuote(
+                amount = amount,
+                hasCurrentNetworkTransactions = hasCurrentNetworkTransactions,
+                pendingTransactions = currentTransactions,
+                networkAddress = status.address,
+                yieldBalance = currentYieldBalance,
+            )
             quote is Quote.Value -> CryptoCurrencyStatus.Loaded(
                 amount = amount,
                 fiatAmount = calculateFiatAmount(amount, quote.fiatRate),