From 92523aa0dab87ec1348f7976db2ad3f6c0794845 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 18 Dec 2025 14:53:01 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../tangem/common/ui/notifications/NotificationsFactory.kt | 7 +++++++
 .../notifications/model/YieldSupplyNotificationsModel.kt   | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
index 997da53ad1..668943b4c7 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
@@ -108,6 +108,13 @@ object NotificationsFactory {
         }
     }
 
+    // Must be called last – shown only when no other notifications exist
+    fun MutableList<NotificationUM>.addHighFeeNotificationIfNoOther(shouldShowHighFeeNotification: Boolean) {
+        if (shouldShowHighFeeNotification && this.isEmpty()) {
+            add(NotificationUM.Info.YieldSupplyHighNetworkFee)
+        }
+    }
+
     fun MutableList<NotificationUM>.addReserveAmountErrorNotification(
         reserveAmount: BigDecimal?,
         sendingAmount: BigDecimal,
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/model/YieldSupplyNotificationsModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/model/YieldSupplyNotificationsModel.kt
index fc8a944729..9dc753015c 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/model/YieldSupplyNotificationsModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/model/YieldSupplyNotificationsModel.kt
@@ -5,6 +5,7 @@ import com.tangem.common.routing.AppRouter
 import com.tangem.common.ui.notifications.NotificationUM
 import com.tangem.common.ui.notifications.NotificationsFactory.addExceedsBalanceNotification
 import com.tangem.common.ui.notifications.NotificationsFactory.addFeeUnreachableNotification
+import com.tangem.common.ui.notifications.NotificationsFactory.addHighFeeNotificationIfNoOther
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
@@ -75,9 +76,9 @@ internal class YieldSupplyNotificationsModel @Inject constructor(
                         onReload = params.callback::onFeeReload,
                     )
 
-                    if (data.shouldShowHighFeeNotification) {
-                        add(NotificationUM.Info.YieldSupplyHighNetworkFee)
-                    }
+                    addHighFeeNotificationIfNoOther(
+                        shouldShowHighFeeNotification = data.shouldShowHighFeeNotification,
+                    )
                 }
 
                 sendAnalytics(notifications, cryptoCurrencyStatus.currency)