From e045a08252f2b76bdfaa1af2b9ef224f004d81cd Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 9 Aug 2024 15:10:19 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/tap/common/extensions/Blockchain.kt | 7 ++++--- .../routers/DefaultCustomTokenRouter.kt | 2 +- .../viewmodels/AddCustomTokenViewModel.kt | 6 +++--- .../presentation/router/DefaultTokensListRouter.kt | 2 +- .../presentation/viewmodels/TokensListViewModel.kt | 14 +++++++------- .../tap/domain/card/CryptoCurrenciesMocks.kt | 2 +- .../data/tokens/paging/CoinsResponseConverter.kt | 2 +- .../tangem/data/tokens/utils/NetworkOperations.kt | 2 +- .../feature/swap/domain/SwapInteractorImpl.kt | 2 +- gradle/dependencies.toml | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt index a0cf53059d..08c1b72a81 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt @@ -3,15 +3,16 @@ package com.tangem.tap.common.extensions import com.tangem.blockchain.common.Blockchain import com.tangem.common.extensions.remove -fun Blockchain.getNetworkName(): String { +fun Blockchain.getNetworkStandardName(): String { return when (this) { Blockchain.Ethereum, Blockchain.EthereumTestnet -> "ERC20" Blockchain.BSC, Blockchain.BSCTestnet -> "BEP20" Blockchain.Binance, Blockchain.BinanceTestnet -> "BEP2" Blockchain.Tron, Blockchain.TronTestnet -> "TRC20" + Blockchain.TON -> "TON" else -> "" } } -val Blockchain.fullNameWithoutTestnet - get() = this.fullName.remove(" Testnet") \ No newline at end of file +val Blockchain.networkNameWithoutTestnet + get() = this.getNetworkName().remove(" Testnet") \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/DefaultCustomTokenRouter.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/DefaultCustomTokenRouter.kt index 858d49c31c..348c3492ce 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/DefaultCustomTokenRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/DefaultCustomTokenRouter.kt @@ -25,7 +25,7 @@ internal class DefaultCustomTokenRouter : CustomTokenRouter { val alert = AppDialog.SimpleOkDialogRes( headerId = R.string.common_warning, messageId = R.string.alert_manage_tokens_unsupported_curve_message, - args = listOf(blockchain.fullName), + args = listOf(blockchain.getNetworkName()), ) store.dispatchDialogShow(alert) } diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt index df99426334..0fadd8ea5b 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt @@ -190,7 +190,7 @@ internal class AddCustomTokenViewModel @Inject constructor( ) DerivationPathSelectorType.BLOCKCHAIN -> SelectorItem.TitleWithSubtitle( title = TextReference.Str(derivationPath), - subtitle = TextReference.Str(blockchain.fullName), + subtitle = TextReference.Str(blockchain.getNetworkName()), blockchain = blockchain, ) } @@ -204,7 +204,7 @@ internal class AddCustomTokenViewModel @Inject constructor( ) } else { SelectorItem.Title( - title = TextReference.Str(blockchain.fullName), + title = TextReference.Str(blockchain.getNetworkName()), blockchain = blockchain, ) } @@ -501,7 +501,7 @@ internal class AddCustomTokenViewModel @Inject constructor( return buildSet { if (!isSupportedToken && !isContractAddressFieldEmpty) { - add(AddCustomTokenWarning.UnsupportedToken(networkSelectorValue.fullName)) + add(AddCustomTokenWarning.UnsupportedToken(networkSelectorValue.getNetworkName())) } if (isCustomTokenAlreadyAdded()) { add(AddCustomTokenWarning.TokenAlreadyAdded) diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt index 987034d99b..d9142d235c 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt @@ -51,7 +51,7 @@ internal class DefaultTokensListRouter : TokensListRouter { val alert = AppDialog.SimpleOkDialogRes( headerId = R.string.common_warning, messageId = R.string.alert_manage_tokens_unsupported_curve_message, - args = listOf(blockchain.fullName), + args = listOf(blockchain.getNetworkName()), ) store.dispatchDialogShow(alert) } diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt index 6e471d192d..736278526e 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt @@ -24,8 +24,8 @@ import com.tangem.domain.tokens.AddCryptoCurrenciesUseCase import com.tangem.domain.tokens.GetCryptoCurrenciesUseCase import com.tangem.domain.tokens.TokenWithBlockchain import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase -import com.tangem.tap.common.extensions.fullNameWithoutTestnet -import com.tangem.tap.common.extensions.getNetworkName +import com.tangem.tap.common.extensions.networkNameWithoutTestnet +import com.tangem.tap.common.extensions.getNetworkStandardName import com.tangem.tap.features.customtoken.impl.presentation.models.SupportBlockchainType import com.tangem.tap.features.tokens.impl.domain.TokensListInteractor import com.tangem.tap.features.tokens.impl.domain.models.Token @@ -185,7 +185,7 @@ internal class TokensListViewModel @Inject constructor( private fun createManageNetworkContent(network: Network): NetworkItemState.ManageContent { return NetworkItemState.ManageContent( - name = network.blockchain.fullNameWithoutTestnet.uppercase(), + name = network.blockchain.networkNameWithoutTestnet.uppercase(), protocolName = getNetworkProtocolName(network), iconResId = mutableIntStateOf(value = getNetworkIconResId(network.address, network.blockchain)), isMainNetwork = isMainNetwork(network), @@ -214,7 +214,7 @@ internal class TokensListViewModel @Inject constructor( private fun createReadNetworkContent(network: Network): NetworkItemState.ReadContent { return NetworkItemState.ReadContent( - name = network.blockchain.fullNameWithoutTestnet.uppercase(), + name = network.blockchain.networkNameWithoutTestnet.uppercase(), protocolName = getNetworkProtocolName(network), iconResId = mutableIntStateOf(value = getNetworkIconResId(network.address, network.blockchain)), isMainNetwork = isMainNetwork(network), @@ -227,7 +227,7 @@ internal class TokensListViewModel @Inject constructor( return if (network.address == null) { MAIN_NETWORK_LABEL } else { - network.blockchain.getNetworkName().uppercase() + network.blockchain.getNetworkStandardName().uppercase() } } @@ -361,7 +361,7 @@ internal class TokensListViewModel @Inject constructor( router.openUnableHideMainTokenAlert( tokenName = blockchain.name, tokenSymbol = blockchain.currency, - networkName = blockchain.fullName, + networkName = blockchain.getNetworkName(), ) } else if (isAddedOnMainScreen) { router.openRemoveWalletAlert( @@ -431,7 +431,7 @@ internal class TokensListViewModel @Inject constructor( } else { when (isUnsupportedToken(token.blockchain)) { SupportTokensState.NetworkTokensUnsupported -> { - router.openNetworkTokensNotSupportAlert(token.blockchain.fullName) + router.openNetworkTokensNotSupportAlert(token.blockchain.getNetworkName()) } SupportTokensState.SupportedToken -> { analyticsSender.sendWhenTokenAdded(token.token) diff --git a/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt b/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt index aadeccf980..6cb075061a 100644 --- a/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt +++ b/app/src/test/kotlin/com/tangem/tap/domain/card/CryptoCurrenciesMocks.kt @@ -58,7 +58,7 @@ internal class CryptoCurrenciesMocks(private val scanResponse: ScanResponse) { network = Network( id = Network.ID(value = blockchain.id), backendId = "NEVER-MIND", - name = blockchain.fullName, + name = blockchain.getNetworkName(), currencySymbol = "NEVER-MIND", derivationPath = Network.DerivationPath.Custom( value = derivationBlockchain.derivationPath( diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/paging/CoinsResponseConverter.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/paging/CoinsResponseConverter.kt index 17e39d7f0d..a1a8018cab 100644 --- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/paging/CoinsResponseConverter.kt +++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/paging/CoinsResponseConverter.kt @@ -32,7 +32,7 @@ internal object CoinsResponseConverter : Converter> { Token.Network( networkId = network.networkId, standardType = getNetworkStandardType(blockchain).name, - name = blockchain.fullName, + name = blockchain.getNetworkName(), address = network.contractAddress, iconUrl = getIconUrl(network.networkId, value.imageHost), decimalCount = network.decimalCount?.toInt(), diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt index 251a2b420f..c7986bd414 100644 --- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt +++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/NetworkOperations.kt @@ -24,7 +24,7 @@ internal fun getNetwork( return Network( id = Network.ID(blockchain.id), backendId = blockchain.toNetworkId(), - name = blockchain.fullName, + name = blockchain.getNetworkName(), isTestnet = blockchain.isTestnet(), derivationPath = getNetworkDerivationPath(blockchain, extraDerivationPath, derivationStyleProvider), currencySymbol = blockchain.currency, diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt index 3f3656b18c..ac6b130966 100644 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt +++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt @@ -1889,7 +1889,7 @@ internal class SwapInteractorImpl @Inject constructor( } else { SwapFeeState.NotEnough( feeCurrency = fromTokenStatus.currency, - currencyName = fromTokenStatus.currency.network.name, + currencyName = fromTokenStatus.currency.name, currencySymbol = fromTokenStatus.currency.symbol, ) } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index d2eee2cff6..13ed958b5f 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.13-731" +tangemBlockchainSdk = "release-app_5.13-732" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.13-376" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^