From f1a23ce0472b427596e83da14bda306f97c527be Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 22 Oct 2024 13:01:54 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../data/staking/DefaultStakingRepository.kt      |  2 ++
 .../intents/WalletWarningsClickIntents.kt         | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
index bbf7601d27..2ee25c9a24 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
@@ -409,6 +409,8 @@ internal class DefaultStakingRepository(
                         Timber.i("No yield balances available for $userWalletId")
                         stakingBalanceStore.store(userWalletId, emptySet())
 
+                        cacheRegistry.invalidate(getYieldBalancesKey(userWalletId))
+
                         return@invokeOnExpire
                     }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletWarningsClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletWarningsClickIntents.kt
index fb53cabe3d..2db549db07 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletWarningsClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletWarningsClickIntents.kt
@@ -131,13 +131,14 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
             derivePublicKeysUseCase(
                 userWalletId = userWallet.walletId,
                 currencies = missedAddressCurrencies,
-            ).onLeft {
-                Timber.e(it, "Failed to derive public keys")
-                return@launch
-            }
-
-            // Refresh must be set to true to ensure that yield balances are updated
-            fetchTokenListUseCase(userWallet.walletId, mode = RefreshMode.SKIP_CURRENCIES)
+            ).fold(
+                ifLeft = { Timber.e(it, "Failed to derive public keys") },
+                ifRight = {
+                    fetchTokenListUseCase(userWallet.walletId, mode = RefreshMode.SKIP_CURRENCIES).onLeft {
+                        Timber.e("Unable to refresh token list: $it")
+                    }
+                },
+            )
         }
     }