From 98fa3b5ce5b437fd35120c62b43b782ca488a72c Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 23 Dec 2025 17:06:07 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../markets/tokenlist/impl/model/MarketsListModel.kt   |  4 ++--
 .../features/markets/tokenlist/impl/ui/MarketsList.kt  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/MarketsListModel.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/MarketsListModel.kt
index e214f30658..27fd01e1d5 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/MarketsListModel.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/MarketsListModel.kt
@@ -116,7 +116,7 @@ internal class MarketsListModel @Inject constructor(
                         flow4 = shouldShowYieldModeMarketPromoUseCase(
                             appCurrency = currentAppCurrency.value,
                             interval = marketsListUMStateManager.selectedInterval.toBatchRequestInterval(),
-                        ),
+                        ).conflate(),
                         flow5 = getUserCountryUseCase.invoke(),
                     ) { uiItems, isInInitialLoadingErrorState, isSearchNotFoundState, isYieldModePromo, userCountry ->
                         MarketsItemsData(
@@ -134,7 +134,7 @@ internal class MarketsListModel @Inject constructor(
                         flow3 = shouldShowYieldModeMarketPromoUseCase(
                             appCurrency = currentAppCurrency.value,
                             interval = marketsListUMStateManager.selectedInterval.toBatchRequestInterval(),
-                        ),
+                        ).conflate(),
                         flow4 = getUserCountryUseCase.invoke(),
                     ) { uiItems, isInInitialLoadingErrorState, shouldShowYieldModePromo, userCountry ->
                         MarketsItemsData(
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 0930d3c1e4..29c313fd89 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 marketsNotification = state.marketsNotificationUM
             AnimatedVisibility(
-                state.isInSearchMode.not() &&
-                    state.selectedSortBy != SortByTypeUM.YieldSupply,
+                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 (marketsNotification) {
+                when (wrappedNotification) {
                     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 = marketsNotification.config.copy(
+                            config = wrappedNotification.config.copy(
                                 subtitle = clickableDescription,
                             ),
                             modifier = Modifier.padding(bottom = TangemTheme.dimens.spacing12),