Updated on 2026-08-14

core/datasource/src/main/java/com/tangem/datasource/local/quote/DefaultQuotesStore.kt

@@ -46,9 +46,16 @@ internal class DefaultQuotesStore(
     }
 
     override suspend fun getSync(currenciesIds: Set<CryptoCurrency.RawID>): Set<Quote> {
-        return runtimeStore.getSyncOrDefault(default = emptySet())
-            .filter { it.rawCurrencyId in currenciesIds }
-            .toSet()
+        val runtimeQuotes = runtimeStore.getSyncOrNull()
+        val cachedQuotes = getCachedQuotes(currenciesIds = currenciesIds)
+
+        if (runtimeQuotes.isNullOrEmpty() && cachedQuotes.isEmpty()) return emptySet()
+
+        return mergeQuotes(
+            currenciesIds = currenciesIds,
+            cachedQuotes = cachedQuotes,
+            runtimeQuotes = runtimeQuotes.orEmpty(),
+        )
     }
 
     override suspend fun store(response: QuotesResponse) {

data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/CustomTokensMerger.kt

@@ -83,7 +83,9 @@ internal class CustomTokensMerger(
         return token.copy(
             id = foundToken.id,
             name = foundToken.name,
-            symbol = foundToken.symbol,
+            symbol = foundToken.symbol.ifEmpty {
+                token.symbol
+            },
         )
     }