From dbbbdd2d33e99a38aa0dbba0358d13c4dba35a51 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 14 Aug 2025 16:27:38 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../DefaultFeeSelectorBlockComponent.kt       |  5 +++-
 .../feeselector/ui/FeeSelectorBlockContent.kt | 24 ++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorBlockComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorBlockComponent.kt
index 7bfbe898e3..5cb0f113e0 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorBlockComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorBlockComponent.kt
@@ -18,6 +18,7 @@ import com.tangem.features.send.v2.api.entity.FeeSelectorUM
 import com.tangem.features.send.v2.api.params.FeeSelectorParams
 import com.tangem.features.send.v2.feeselector.model.FeeSelectorModel
 import com.tangem.features.send.v2.feeselector.ui.FeeSelectorBlockContent
+import com.tangem.utils.extensions.isSingleItem
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -73,11 +74,13 @@ internal class DefaultFeeSelectorBlockComponent @AssistedInject constructor(
         val state by model.uiState.collectAsStateWithLifecycle()
         val bottomSheet by bottomSheetSlot.subscribeAsState()
 
+        val isScreenSource = params.feeDisplaySource == FeeSelectorParams.FeeDisplaySource.Screen
+        val isNotSingleFee = (state as? FeeSelectorUM.Content)?.feeItems?.isSingleItem() == false
         FeeSelectorBlockContent(
             state = state,
             onReadMoreClick = model::onReadMoreClicked,
             modifier = modifier
-                .conditional(params.feeDisplaySource == FeeSelectorParams.FeeDisplaySource.Screen) {
+                .conditional(isScreenSource && isNotSingleFee) {
                     Modifier.clickable {
                         model.showFeeSelector()
                     }
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt
index b0f08978aa..2f403f5b0c 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt
@@ -39,6 +39,7 @@ import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.transaction.error.GetFeeError
 import com.tangem.features.send.v2.api.entity.*
 import com.tangem.features.send.v2.impl.R
+import com.tangem.utils.extensions.isSingleItem
 import kotlinx.collections.immutable.persistentListOf
 import java.math.BigDecimal
 
@@ -118,12 +119,11 @@ private fun FeeSelectorStaticPart(onReadMoreClick: () -> Unit, modifier: Modifie
             text = annotatedString,
             modifier = Modifier
                 .padding(start = TangemTheme.dimens.spacing6)
-                .size(TangemTheme.dimens.size16),
+                .size(TangemTheme.dimens.size16)
+                .clip(CircleShape),
             content = { contentModifier ->
                 Icon(
-                    modifier = contentModifier
-                        .size(TangemTheme.dimens.size16)
-                        .clip(CircleShape),
+                    modifier = contentModifier.size(TangemTheme.dimens.size16),
                     painter = painterResource(id = R.drawable.ic_token_info_24),
                     contentDescription = null,
                     tint = TangemTheme.colors.icon.informative,
@@ -176,12 +176,14 @@ private fun FeeContent(state: FeeSelectorUM.Content, modifier: Modifier = Modifi
             textAlign = TextAlign.End,
             modifier = Modifier.padding(start = TangemTheme.dimens.spacing4),
         )
-        Icon(
-            modifier = Modifier.size(width = 18.dp, height = 24.dp),
-            painter = painterResource(id = R.drawable.ic_select_18_24),
-            contentDescription = null,
-            tint = TangemTheme.colors.icon.informative,
-        )
+        if (!state.feeItems.isSingleItem()) {
+            Icon(
+                modifier = Modifier.size(width = 18.dp, height = 24.dp),
+                painter = painterResource(id = R.drawable.ic_select_18_24),
+                contentDescription = null,
+                tint = TangemTheme.colors.icon.informative,
+            )
+        }
     }
 }
 
@@ -220,7 +222,7 @@ private class FeeSelectorUMProvider : PreviewParameterProvider<FeeSelectorUM> {
         ),
         FeeSelectorUM.Content(
             isPrimaryButtonEnabled = false,
-            feeItems = persistentListOf(maxFeeItem),
+            feeItems = persistentListOf(lowFeeItem, maxFeeItem),
             selectedFeeItem = maxFeeItem,
             feeExtraInfo = FeeExtraInfo(
                 isFeeApproximate = false,