From 75e6da7cee27d9d0ad03b00f73aa00f717e56d06 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 24 Jul 2025 02:05:07 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../domain/models/currency/CryptoCurrency.kt | 1 + .../entity/SwapChooseTokenNetworkUM.kt | 1 + .../SwapChooseContentStateTransformer.kt | 9 ++++++++- .../ui/SwapChooseTokenNetworkContent.kt | 17 ++++++++++++++--- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrency.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrency.kt index fae3cf240b..e3ed9d10db 100644 --- a/domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrency.kt +++ b/domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrency.kt @@ -216,6 +216,7 @@ sealed class CryptoCurrency { private const val DERIVATION_PATH_DELIMITER = '\u2192' // → private const val ID_PARTS_COUNT = 3 + const val MAIN_NETWORK_TYPE_NAME = "MAIN" /** * Creates an [ID] from a string [value]. diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/entity/SwapChooseTokenNetworkUM.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/entity/SwapChooseTokenNetworkUM.kt index 202ba8410f..44cd023b3a 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/entity/SwapChooseTokenNetworkUM.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/entity/SwapChooseTokenNetworkUM.kt @@ -36,5 +36,6 @@ internal data class SwapChooseNetworkUM( val subtitle: TextReference, @DrawableRes val iconResId: Int, val hasFixedRate: Boolean, + val isMainNetwork: Boolean, val onNetworkClick: () -> Unit, ) \ No newline at end of file diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/transformers/SwapChooseContentStateTransformer.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/transformers/SwapChooseContentStateTransformer.kt index f876199b86..ff4f6ce201 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/transformers/SwapChooseContentStateTransformer.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/transformers/SwapChooseContentStateTransformer.kt @@ -4,6 +4,7 @@ import com.tangem.core.ui.extensions.iconResId import com.tangem.core.ui.extensions.stringReference import com.tangem.domain.express.models.ExpressRateType import com.tangem.domain.models.currency.CryptoCurrency +import com.tangem.domain.models.currency.CryptoCurrency.ID.Companion.MAIN_NETWORK_TYPE_NAME import com.tangem.domain.swap.models.SwapCurrencies import com.tangem.features.swap.v2.impl.choosetoken.fromSupported.entity.SwapChooseNetworkUM import com.tangem.features.swap.v2.impl.choosetoken.fromSupported.entity.SwapChooseTokenNetworkContentUM @@ -21,10 +22,16 @@ internal class SwapChooseContentStateTransformer( override fun transform(prevState: SwapChooseTokenNetworkUM): SwapChooseTokenNetworkUM { val swapNetworks = pairs.fromGroup.available.map { val network = it.currencyStatus.currency.network + val isMain = it.currencyStatus.currency is CryptoCurrency.Coin SwapChooseNetworkUM( title = stringReference(network.name), - subtitle = stringReference(network.standardType.name), + subtitle = if (isMain) { + stringReference(MAIN_NETWORK_TYPE_NAME) + } else { + stringReference(network.standardType.name) + }, iconResId = network.iconResId, + isMainNetwork = isMain, hasFixedRate = it.providers.any { it.rateTypes.any { it == ExpressRateType.Fixed } }, onNetworkClick = { onNetworkClick(it.currencyStatus.currency) }, ) diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/ui/SwapChooseTokenNetworkContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/ui/SwapChooseTokenNetworkContent.kt index aa9e2fc590..03d5b2f8c9 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/ui/SwapChooseTokenNetworkContent.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/ui/SwapChooseTokenNetworkContent.kt @@ -98,7 +98,7 @@ private fun SwapChooseTokenNetworkContentList(swapNetworks: ImmutableList Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier .fillMaxWidth() .clickable( @@ -117,14 +117,19 @@ private fun SwapChooseTokenNetworkContentList(swapNetworks: ImmutableList