Updated on 2026-08-14

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
                     }
 

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")
+                    }
+                },
+            )
         }
     }