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): Set { - 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) {