From ee3d9ff43b3e37883c5d440996c70be33652a5ac Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 22 Apr 2024 18:24:54 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../CryptoCurrencyToIconStateConverter.kt          | 14 ++++++++++----
 .../state/amount/SendAmountStateConverter.kt       | 10 +++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/tokenicon/converter/CryptoCurrencyToIconStateConverter.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/tokenicon/converter/CryptoCurrencyToIconStateConverter.kt
index 48d6dabf99..fbcc6e3caa 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/tokenicon/converter/CryptoCurrencyToIconStateConverter.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/tokenicon/converter/CryptoCurrencyToIconStateConverter.kt
@@ -20,17 +20,22 @@ class CryptoCurrencyToIconStateConverter : Converter<CryptoCurrencyStatus, Token
         }
     }
 
-    fun convertWithGrayscale(value: CryptoCurrencyStatus): TokenIconState {
+    fun convertCustom(
+        value: CryptoCurrencyStatus,
+        forceGrayscale: Boolean,
+        showCustomTokenBadge: Boolean,
+    ): TokenIconState {
         return when (val currency = value.currency) {
             is CryptoCurrency.Coin -> getIconStateForCoin(
                 coin = currency,
                 isUnreachable = value.value.isError,
-                forceGrayscale = true,
+                forceGrayscale = forceGrayscale,
             )
             is CryptoCurrency.Token -> getIconStateForToken(
                 token = currency,
                 isErrorStatus = value.value.isError,
-                forceGrayscale = true,
+                forceGrayscale = forceGrayscale,
+                showCustomBadge = showCustomTokenBadge,
             )
         }
     }
@@ -58,6 +63,7 @@ class CryptoCurrencyToIconStateConverter : Converter<CryptoCurrencyStatus, Token
     private fun getIconStateForToken(
         token: CryptoCurrency.Token,
         isErrorStatus: Boolean,
+        showCustomBadge: Boolean = true,
         forceGrayscale: Boolean = false,
     ): TokenIconState {
         val grayScale = forceGrayscale || token.network.isTestnet || isErrorStatus
@@ -78,7 +84,7 @@ class CryptoCurrencyToIconStateConverter : Converter<CryptoCurrencyStatus, Token
                 isGrayscale = grayScale,
                 fallbackTint = tint,
                 fallbackBackground = background,
-                showCustomBadge = token.isCustom, // `true` for tokens with custom derivation
+                showCustomBadge = token.isCustom && showCustomBadge, // `true` for tokens with custom derivation
             )
         }
     }
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/amount/SendAmountStateConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/amount/SendAmountStateConverter.kt
index 0bae6dc94a..ba3ab64dcf 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/amount/SendAmountStateConverter.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/amount/SendAmountStateConverter.kt
@@ -46,11 +46,11 @@ internal class SendAmountStateConverter(
             segmentedButtonConfig = persistentListOf(
                 SendAmountSegmentedButtonsConfig(
                     title = stringReference(status.currency.symbol),
-                    iconState = if (noFeeRate) {
-                        iconStateConverter.convertWithGrayscale(status)
-                    } else {
-                        iconStateConverter.convert(status)
-                    },
+                    iconState = iconStateConverter.convertCustom(
+                        value = status,
+                        forceGrayscale = noFeeRate,
+                        showCustomTokenBadge = false,
+                    ),
                     isFiat = false,
                 ),
                 SendAmountSegmentedButtonsConfig(