From 52e7b5e58c489741e37c35778b4d21712362ad43 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 4 Feb 2026 16:57:30 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../staking/single/DefaultSingleStakingBalanceProducer.kt   | 6 +++---
 .../single/DefaultSingleStakingBalanceProducerTest.kt       | 2 +-
 .../features/account/fetcher/DefaultPortfolioFetcher.kt     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/staking/src/main/java/com/tangem/data/staking/single/DefaultSingleStakingBalanceProducer.kt b/data/staking/src/main/java/com/tangem/data/staking/single/DefaultSingleStakingBalanceProducer.kt
index 691773948a..bf66f62a4a 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/single/DefaultSingleStakingBalanceProducer.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/single/DefaultSingleStakingBalanceProducer.kt
@@ -15,7 +15,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
 /**
@@ -44,7 +44,7 @@ internal class DefaultSingleStakingBalanceProducer @AssistedInject constructor(
         return multiStakingBalanceSupplier(
             params = MultiStakingBalanceProducer.Params(userWalletId = params.userWalletId),
         )
-            .mapNotNull { balances ->
+            .map { balances ->
                 val currentStakingId = params.stakingId
 
                 val currentBalances = balances.filter { it.stakingId == currentStakingId }
@@ -53,7 +53,7 @@ internal class DefaultSingleStakingBalanceProducer @AssistedInject constructor(
                     currentStakingId = currentStakingId,
                     currentBalances = currentBalances,
                     analyticsExceptionHandler = analyticsExceptionHandler,
-                )
+                ) ?: StakingBalance.Error(stakingId = currentStakingId)
             }
             .flowOn(dispatchers.default)
     }
diff --git a/data/staking/src/test/kotlin/com/tangem/data/staking/single/DefaultSingleStakingBalanceProducerTest.kt b/data/staking/src/test/kotlin/com/tangem/data/staking/single/DefaultSingleStakingBalanceProducerTest.kt
index 774e23100c..f431e630e4 100644
--- a/data/staking/src/test/kotlin/com/tangem/data/staking/single/DefaultSingleStakingBalanceProducerTest.kt
+++ b/data/staking/src/test/kotlin/com/tangem/data/staking/single/DefaultSingleStakingBalanceProducerTest.kt
@@ -200,7 +200,7 @@ internal class DefaultSingleStakingBalanceProducerTest {
         val actual = getEmittedValues(flow = producerFlow)
 
         // Assert
-        Truth.assertThat(actual).isEmpty()
+        Truth.assertThat(actual).containsExactly(StakingBalance.Error(stakingId = tonId))
 
         verify(exactly = 1) { multiNetworkStatusSupplier(multiParams) }
     }
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt b/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt
index f8bf368a40..9fb0924c4a 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt
@@ -78,6 +78,7 @@ internal class DefaultPortfolioFetcher @AssistedInject constructor(
     }
 
     private fun balancesForWallets(wallets: List<UserWallet>): Flow<Map<UserWalletId, PortfolioBalance>> {
+        if (wallets.isEmpty()) return flowOf(emptyMap())
         val balanceFlows = wallets.map { walletAccountsBalancesFlow(it) }
         return combine(balanceFlows) { pairs -> pairs.toMap() }
     }