From f9d1e222afc589f981b982b2cae6c329ca766dd2 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 24 Dec 2025 15:14:53 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../data/yield/supply/DefaultYieldSupplyRepository.kt  | 10 +++++-----
 .../features/markets/tokenlist/impl/ui/MarketsList.kt  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyRepository.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyRepository.kt
index a40499ba87..d7faa6176a 100644
--- a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyRepository.kt
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyRepository.kt
@@ -27,6 +27,7 @@ import com.tangem.domain.yield.supply.models.YieldMarketToken
 import com.tangem.domain.yield.supply.models.YieldSupplyEnterStatus
 import com.tangem.domain.yield.supply.models.YieldSupplyMarketChartData
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.coroutines.runSuspendCatching
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
@@ -155,7 +156,7 @@ internal class DefaultYieldSupplyRepository(
     override suspend fun getTokenPendingStatus(
         userWalletId: UserWalletId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
-    ): YieldSupplyEnterStatus? = try {
+    ): YieldSupplyEnterStatus? = runSuspendCatching {
         val cryptoCurrency = cryptoCurrencyStatus.currency
         val walletManager = walletManagersFacade.getOrCreateWalletManager(
             userWalletId = userWalletId,
@@ -174,10 +175,9 @@ internal class DefaultYieldSupplyRepository(
             hasRecentYieldExitTxs -> YieldSupplyEnterStatus.Exit
             else -> null
         }
-    } catch (e: Exception) {
-        Timber.e(e, "Failed to get pending yield supply status")
-        null
-    }
+    }.onFailure { exception ->
+        Timber.w(exception, "Failed to get pending yield supply status")
+    }.getOrNull()
 
     override fun getShouldShowYieldPromoBanner(): Flow<Boolean> {
         return appPreferencesStore.get(PreferencesKeys.YIELD_SUPPLY_SHOULD_SHOW_MAIN_PROMO_KEY, true)
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/MarketsList.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/MarketsList.kt
index 29c313fd89..0a7e31ebfc 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/MarketsList.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/MarketsList.kt
@@ -176,14 +176,14 @@ private fun ColumnScope.Content(state: MarketsListUM, modifier: Modifier = Modif
                 )
             }
 
+            val marketsNotificationUM = state.marketsNotificationUM
             AnimatedVisibility(
                 state.list !is ListUM.LoadingError &&
                     state.isInSearchMode.not() && state.selectedSortBy != SortByTypeUM.YieldSupply,
             ) {
-                val wrappedNotification = remember(this) { state.marketsNotificationUM }
                 val showMore = stringResourceSafe(R.string.common_show_more)
 
-                when (wrappedNotification) {
+                when (marketsNotificationUM) {
                     is MarketsNotificationUM.YieldSupplyPromo -> {
                         val description = stringResourceSafe(
                             R.string.markets_yield_supply_banner_description,
@@ -199,7 +199,7 @@ private fun ColumnScope.Content(state: MarketsListUM, modifier: Modifier = Modif
                         }
 
                         YieldSupplyInMarketsPromoNotification(
-                            config = wrappedNotification.config.copy(
+                            config = marketsNotificationUM.config.copy(
                                 subtitle = clickableDescription,
                             ),
                             modifier = Modifier.padding(bottom = TangemTheme.dimens.spacing12),