diff --git a/app/src/main/java/com/tangem/tap/common/ui/AddressInfoBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/common/ui/AddressInfoBottomSheetDialog.kt index 18882c44dd..df54352380 100644 --- a/app/src/main/java/com/tangem/tap/common/ui/AddressInfoBottomSheetDialog.kt +++ b/app/src/main/java/com/tangem/tap/common/ui/AddressInfoBottomSheetDialog.kt @@ -67,7 +67,7 @@ internal class AddressInfoBottomSheetDialog( val blockchain = stateDialog.currency.blockchain tvReceiveMessage.text = tvReceiveMessage.getString( id = R.string.address_qr_code_message_format, - blockchain.fullName, + blockchain.getCoinName(), blockchain.currency, blockchain.fullName, ) 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 2f2e54876b..dceee7e356 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 @@ -48,7 +48,7 @@ internal class CryptoCurrenciesMocks(private val scanResponse: ScanResponse) { val network = Network( id = Network.ID(blockchain.id), backendId = blockchain.toNetworkId(), - name = blockchain.getNetworkName(), + name = blockchain.fullName, isTestnet = blockchain.isTestnet(), derivationPath = getNetworkDerivationPath( blockchain, @@ -76,7 +76,7 @@ internal class CryptoCurrenciesMocks(private val scanResponse: ScanResponse) { network = Network( id = Network.ID(value = blockchain.id), backendId = "NEVER-MIND", - name = blockchain.getNetworkName(), + name = blockchain.fullName, currencySymbol = "NEVER-MIND", derivationPath = Network.DerivationPath.Custom( value = derivationBlockchain.derivationPath( diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt index fb8608e78b..7b9c905f0d 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/CryptoCurrencyFactory.kt @@ -89,7 +89,7 @@ class CryptoCurrencyFactory( return CryptoCurrency.Coin( id = getCoinId(network, blockchain.toCoinId()), network = network, - name = blockchain.fullName, + name = blockchain.getCoinName(), symbol = blockchain.currency, iconUrl = getCoinIconUrl(blockchain), decimals = blockchain.decimals(), diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt index 594efd38f4..b27a7f17ef 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/NetworkOperations.kt @@ -30,7 +30,7 @@ fun getNetwork( return Network( id = Network.ID(blockchain.id), backendId = blockchain.toNetworkId(), - name = blockchain.getNetworkName(), + name = blockchain.fullName, isTestnet = blockchain.isTestnet(), derivationPath = getNetworkDerivationPath( blockchain = blockchain, @@ -59,7 +59,7 @@ fun getNetwork( return Network( id = networkId, backendId = blockchain.toNetworkId(), - name = blockchain.getNetworkName(), + name = blockchain.fullName, isTestnet = blockchain.isTestnet(), derivationPath = derivationPath, currencySymbol = blockchain.currency, diff --git a/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt index 7cda282ecb..24e9f844e5 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/currency/ResponseCryptoCurrenciesFactory.kt @@ -2,7 +2,6 @@ package com.tangem.data.common.currency import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.Token -import com.tangem.blockchainsdk.compatibility.l2BlockchainsList import com.tangem.blockchainsdk.utils.ExcludedBlockchains import com.tangem.blockchainsdk.utils.fromNetworkId import com.tangem.blockchainsdk.utils.toCoinId @@ -78,7 +77,7 @@ class ResponseCryptoCurrenciesFactory( return CryptoCurrency.Coin( id = getCoinId(network, blockchain.toCoinId()), network = network, - name = blockchain.getNameForCoin(responseToken), + name = blockchain.getCoinName(), symbol = blockchain.getSymbolForCoin(responseToken), decimals = responseToken.decimals, iconUrl = getCoinIconUrl(blockchain), @@ -86,21 +85,6 @@ class ResponseCryptoCurrenciesFactory( ) } - private fun Blockchain.getNameForCoin(responseToken: UserTokensResponse.Token): String { - return when (this) { - // workaround: for Blockchains full name different than backend name, - // get name and symbol from enum Blockchain until backend renamed - // [REDACTED_JIRA] - Blockchain.Dischain, - Blockchain.Telos, - Blockchain.Cronos, - Blockchain.TON, - in l2BlockchainsList, - -> this.fullName - else -> responseToken.name - } - } - private fun Blockchain.getSymbolForCoin(responseToken: UserTokensResponse.Token): String { return when (this) { // workaround: Dischain was renamed but backend still returns the old name, diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt index 6e2f02f44c..84780326f4 100644 --- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt +++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/DefaultManageTokensRepository.kt @@ -295,7 +295,7 @@ internal class DefaultManageTokensRepository( ) return if (!canHandleBlockchain) { - CurrencyUnsupportedState.UnsupportedNetwork(networkName = blockchain.getNetworkName()) + CurrencyUnsupportedState.UnsupportedNetwork(networkName = blockchain.fullName) } else { null } @@ -314,10 +314,10 @@ internal class DefaultManageTokensRepository( return when { // refactor this later by moving all this logic in card config blockchain == Blockchain.Solana && !supportedTokens.contains(Blockchain.Solana) -> { - CurrencyUnsupportedState.Token.NetworkTokensUnsupported(networkName = blockchain.getNetworkName()) + CurrencyUnsupportedState.Token.NetworkTokensUnsupported(networkName = blockchain.fullName) } !userWallet.scanResponse.card.canHandleToken(supportedTokens, blockchain, cardTypesResolver) -> { - CurrencyUnsupportedState.Token.UnsupportedCurve(networkName = blockchain.getNetworkName()) + CurrencyUnsupportedState.Token.UnsupportedCurve(networkName = blockchain.fullName) } else -> null } 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 611ccafe2b..c2b2108053 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.getNetworkName(), + name = blockchain.fullName, address = network.contractAddress, iconUrl = getIconUrl(network.networkId, value.imageHost), decimalCount = network.decimalCount?.toInt(), diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 370216254c..2a7ce1423f 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -89,7 +89,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.20-929" +tangemBlockchainSdk = "release-app_5.20-930" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.20-427" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/compatibility/L2Networks.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/compatibility/L2Networks.kt index 963d14bf12..6c395cd076 100644 --- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/compatibility/L2Networks.kt +++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/compatibility/L2Networks.kt @@ -7,17 +7,7 @@ import com.tangem.datasource.api.markets.models.response.TokenMarketInfoResponse import com.tangem.datasource.api.tangemTech.models.CoinsResponse import com.tangem.datasource.api.tangemTech.models.UserTokensResponse -val l2BlockchainsList = listOf( - Blockchain.Optimism, - Blockchain.Arbitrum, - Blockchain.ZkSyncEra, - Blockchain.Manta, - Blockchain.PolygonZkEVM, - Blockchain.Aurora, - Blockchain.Base, - Blockchain.Blast, - Blockchain.Cyber, -) +val l2BlockchainsList = Blockchain.entries.filter { it.isL2EthereumNetwork() } val l2BlockchainsCoinIds = l2BlockchainsList.map { it.toCoinId() } diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt index ab076272bd..85abd3906e 100644 --- a/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt +++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt @@ -143,7 +143,7 @@ object BlockchainUtils { } private fun getNetworkNameWithoutTestnet(blockchain: Blockchain): String { - return blockchain.getNetworkName().replace(oldValue = " Testnet", newValue = "") + return blockchain.fullName.replace(oldValue = " Testnet", newValue = "") } fun isTokenBetaFunctionality(blockchainId: String): Boolean {