From ac3ea5b5311b4cf0261a6fb24172c3ab4ea9eaeb Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 10 Mar 2025 16:44:51 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../datasource/local/quote/DefaultQuotesStore.kt    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/quote/DefaultQuotesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/quote/DefaultQuotesStore.kt
index 09d14bde66..d4c6a12183 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/quote/DefaultQuotesStore.kt
+++ b/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) {