Updated on 2026-08-14

app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt

@@ -18,7 +18,6 @@ import com.tangem.domain.staking.repositories.StakingRepository
 import com.tangem.domain.staking.single.SingleYieldBalanceFetcher
 import com.tangem.domain.staking.single.SingleYieldBalanceSupplier
 import com.tangem.domain.tokens.*
-import com.tangem.domain.tokens.operations.BaseCurrenciesStatusesOperations
 import com.tangem.domain.tokens.operations.BaseCurrencyStatusOperations
 import com.tangem.domain.tokens.operations.CachedCurrenciesStatusesOperations
 import com.tangem.domain.tokens.repository.CurrenciesRepository
@@ -97,11 +96,11 @@ internal object TokensDomainModule {
     @Singleton
     fun provideGetTokenListUseCase(
         currenciesRepository: CurrenciesRepository,
-        baseCurrenciesStatusesOperations: BaseCurrenciesStatusesOperations,
+        currenciesStatusesOperations: BaseCurrencyStatusOperations,
     ): GetTokenListUseCase {
         return GetTokenListUseCase(
             currenciesRepository = currenciesRepository,
-            currenciesStatusesOperations = baseCurrenciesStatusesOperations,
+            currenciesStatusesOperations = currenciesStatusesOperations,
         )
     }
 
@@ -369,9 +368,9 @@ internal object TokensDomainModule {
     @Provides
     @Singleton
     fun provideGetWalletTotalBalanceUseCase(
-        baseCurrenciesStatusesOperations: BaseCurrenciesStatusesOperations,
+        currenciesStatusesOperations: BaseCurrencyStatusOperations,
     ): GetWalletTotalBalanceUseCase {
-        return GetWalletTotalBalanceUseCase(baseCurrenciesStatusesOperations)
+        return GetWalletTotalBalanceUseCase(currenciesStatusesOperations)
     }
 
     @Provides
@@ -399,42 +398,6 @@ internal object TokensDomainModule {
         return GetCurrencyCheckUseCase(currencyChecksRepository, dispatchers)
     }
 
-    @Provides
-    @Singleton
-    fun provideBaseCurrenciesStatusesOperations(
-        tokensFeatureToggles: TokensFeatureToggles,
-        currenciesRepository: CurrenciesRepository,
-        quotesRepository: QuotesRepository,
-        singleNetworkStatusSupplier: SingleNetworkStatusSupplier,
-        multiNetworkStatusSupplier: MultiNetworkStatusSupplier,
-        multiNetworkStatusFetcher: MultiNetworkStatusFetcher,
-        singleNetworkStatusFetcher: SingleNetworkStatusFetcher,
-        multiQuoteStatusFetcher: MultiQuoteStatusFetcher,
-        singleQuoteStatusSupplier: SingleQuoteStatusSupplier,
-        singleYieldBalanceSupplier: SingleYieldBalanceSupplier,
-        multiYieldBalanceSupplier: MultiYieldBalanceSupplier,
-        multiYieldBalanceFetcher: MultiYieldBalanceFetcher,
-        multiWalletCryptoCurrenciesSupplier: MultiWalletCryptoCurrenciesSupplier,
-        stakingIdFactory: StakingIdFactory,
-    ): BaseCurrenciesStatusesOperations {
-        return CachedCurrenciesStatusesOperations(
-            currenciesRepository = currenciesRepository,
-            quotesRepository = quotesRepository,
-            singleNetworkStatusSupplier = singleNetworkStatusSupplier,
-            multiNetworkStatusSupplier = multiNetworkStatusSupplier,
-            multiNetworkStatusFetcher = multiNetworkStatusFetcher,
-            singleNetworkStatusFetcher = singleNetworkStatusFetcher,
-            multiQuoteStatusFetcher = multiQuoteStatusFetcher,
-            singleQuoteStatusSupplier = singleQuoteStatusSupplier,
-            singleYieldBalanceSupplier = singleYieldBalanceSupplier,
-            multiYieldBalanceSupplier = multiYieldBalanceSupplier,
-            multiYieldBalanceFetcher = multiYieldBalanceFetcher,
-            tokensFeatureToggles = tokensFeatureToggles,
-            multiWalletCryptoCurrenciesSupplier = multiWalletCryptoCurrenciesSupplier,
-            stakingIdFactory = stakingIdFactory,
-        )
-    }
-
     @Provides
     @Singleton
     fun provideBaseCurrencyStatusOperations(

domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetTokenListUseCase.kt

@@ -9,7 +9,7 @@ import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.error.mapper.mapToTokenListError
-import com.tangem.domain.tokens.operations.BaseCurrenciesStatusesOperations
+import com.tangem.domain.tokens.operations.BaseCurrencyStatusOperations
 import com.tangem.domain.tokens.operations.TokenListOperations
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.transformLatest
 
 class GetTokenListUseCase(
     private val currenciesRepository: CurrenciesRepository,
-    private val currenciesStatusesOperations: BaseCurrenciesStatusesOperations,
+    private val currenciesStatusesOperations: BaseCurrencyStatusOperations,
 ) {
 
     @OptIn(ExperimentalCoroutinesApi::class)

domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetWalletTotalBalanceUseCase.kt

@@ -12,7 +12,7 @@ import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.tokens.error.TokenListError
-import com.tangem.domain.tokens.operations.BaseCurrenciesStatusesOperations
+import com.tangem.domain.tokens.operations.BaseCurrencyStatusOperations
 import com.tangem.domain.tokens.operations.TokenListFiatBalanceOperations
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
@@ -20,7 +20,7 @@ import timber.log.Timber
 import java.util.concurrent.ConcurrentHashMap
 
 class GetWalletTotalBalanceUseCase(
-    private val currenciesStatusesOperations: BaseCurrenciesStatusesOperations,
+    private val currenciesStatusesOperations: BaseCurrencyStatusOperations,
 ) {
 
     private val walletBalanceCache = ConcurrentHashMap<UserWalletId, TotalFiatBalance.Loaded>()

domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/BaseCurrencyStatusOperations.kt

@@ -3,6 +3,7 @@ package com.tangem.domain.tokens.operations
 import arrow.core.*
 import arrow.core.raise.*
 import com.tangem.blockchainsdk.utils.toBlockchain
+import com.tangem.domain.core.lce.LceFlow
 import com.tangem.domain.core.utils.EitherFlow
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
@@ -28,6 +29,7 @@ import com.tangem.domain.staking.single.SingleYieldBalanceSupplier
 import com.tangem.domain.tokens.MultiWalletCryptoCurrenciesProducer
 import com.tangem.domain.tokens.MultiWalletCryptoCurrenciesSupplier
 import com.tangem.domain.tokens.TokensFeatureToggles
+import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.operations.CurrenciesStatusesOperations.Error
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.utils.CurrencyStatusProxyCreator
@@ -56,6 +58,8 @@ abstract class BaseCurrencyStatusOperations(
 
     protected val currencyStatusProxyCreator = CurrencyStatusProxyCreator()
 
+    abstract fun getCurrenciesStatuses(userWalletId: UserWalletId): LceFlow<TokenListError, List<CryptoCurrencyStatus>>
+
     protected abstract fun getQuotes(id: CryptoCurrency.RawID): Flow<Either<Error, Set<QuoteStatus>>>
 
     protected abstract suspend fun fetchComponents(

domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CachedCurrenciesStatusesOperations.kt

@@ -60,19 +60,18 @@ class CachedCurrenciesStatusesOperations(
     multiWalletCryptoCurrenciesSupplier: MultiWalletCryptoCurrenciesSupplier,
     private val stakingIdFactory: StakingIdFactory,
     private val tokensFeatureToggles: TokensFeatureToggles,
-) : BaseCurrenciesStatusesOperations,
-    BaseCurrencyStatusOperations(
-        currenciesRepository = currenciesRepository,
-        quotesRepository = quotesRepository,
-        multiNetworkStatusSupplier = multiNetworkStatusSupplier,
-        singleNetworkStatusSupplier = singleNetworkStatusSupplier,
-        singleQuoteStatusSupplier = singleQuoteStatusSupplier,
-        singleYieldBalanceSupplier = singleYieldBalanceSupplier,
-        multiYieldBalanceSupplier = multiYieldBalanceSupplier,
-        multiWalletCryptoCurrenciesSupplier = multiWalletCryptoCurrenciesSupplier,
-        stakingIdFactory = stakingIdFactory,
-        tokensFeatureToggles = tokensFeatureToggles,
-    ) {
+) : BaseCurrencyStatusOperations(
+    currenciesRepository = currenciesRepository,
+    quotesRepository = quotesRepository,
+    multiNetworkStatusSupplier = multiNetworkStatusSupplier,
+    singleNetworkStatusSupplier = singleNetworkStatusSupplier,
+    singleQuoteStatusSupplier = singleQuoteStatusSupplier,
+    singleYieldBalanceSupplier = singleYieldBalanceSupplier,
+    multiYieldBalanceSupplier = multiYieldBalanceSupplier,
+    multiWalletCryptoCurrenciesSupplier = multiWalletCryptoCurrenciesSupplier,
+    stakingIdFactory = stakingIdFactory,
+    tokensFeatureToggles = tokensFeatureToggles,
+) {
 
     override fun getCurrenciesStatuses(
         userWalletId: UserWalletId,
@@ -83,6 +82,7 @@ class CachedCurrenciesStatusesOperations(
         )
     }
 
+    @Suppress("LongMethod")
     @OptIn(ExperimentalCoroutinesApi::class)
     private fun transformToCurrenciesStatuses(
         userWalletId: UserWalletId,
@@ -163,10 +163,23 @@ class CachedCurrenciesStatusesOperations(
                     .invokeOnCompletion { setFetchFinished(userWalletId) }
             }
 
+            val networksStatusesUpdates = getNetworkStatusesUpdates(userWalletId, networks)
+
             combine(
                 flow = getQuotes(currenciesIds),
-                flow2 = getNetworkStatusesUpdates(userWalletId, networks),
-                flow3 = getYieldsBalancesUpdates(userWalletId, currencies),
+                flow2 = networksStatusesUpdates,
+                flow3 = networksStatusesUpdates.flatMapLatest {
+                    val currenciesAddresses = it.getOrElse(default = { emptySet() })
+                        .mapNotNull {
+                            val currency = currencies.firstOrNull { currency -> currency.network == it.network }
+                                ?: return@mapNotNull null
+
+                            currency.id to extractAddress(it)
+                        }
+                        .toMap()
+
+                    getYieldsBalancesUpdates(userWalletId, currenciesAddresses)
+                },
                 flow4 = fetchingState.map {
                     val state = it[userWalletId] ?: return@map false
 
@@ -379,24 +392,24 @@ class CachedCurrenciesStatusesOperations(
     // temporary code because token list is built using networks list
     private fun getYieldsBalancesUpdates(
         userWalletId: UserWalletId,
-        cryptoCurrencies: List<CryptoCurrency>,
+        cryptoCurrencies: Map<CryptoCurrency.ID, String?>,
     ): EitherFlow<TokenListError, List<YieldBalance>> {
         return channelFlow {
             val state = MutableStateFlow(emptyList<YieldBalance>())
 
             val stakingIds = cryptoCurrencies.mapNotNullTo(hashSetOf()) {
-                stakingIdFactory.create(userWalletId = userWalletId, currencyId = it.id, network = it.network)
+                stakingIdFactory.create(currencyId = it.key, defaultAddress = it.value)
                     .getOrNull()
             }
 
-            stakingIds.onEach {
+            stakingIds.onEach { stakingId ->
                 launch {
                     singleYieldBalanceSupplier(
-                        params = SingleYieldBalanceProducer.Params(userWalletId = userWalletId, stakingId = it),
+                        params = SingleYieldBalanceProducer.Params(userWalletId = userWalletId, stakingId = stakingId),
                     )
                         .onEach { balance ->
                             state.update { loadedBalances ->
-                                loadedBalances.addOrReplace(balance) { balance.stakingId == it }
+                                loadedBalances.addOrReplace(balance) { balance.stakingId == it.stakingId }
                             }
                         }
                         .launchIn(scope = this)