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 8e50c099b3..88a8e16ed6 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 @@ -16,7 +16,7 @@ fun Blockchain.getGreyedOutIconRes(): Int { Blockchain.Ethereum, Blockchain.EthereumTestnet -> R.drawable.ic_eth_no_color Blockchain.EthereumClassic, Blockchain.EthereumClassicTestnet -> R.drawable.ic_eth_no_color Blockchain.RSK -> R.drawable.ic_rsk_no_color - Blockchain.Cardano, Blockchain.CardanoShelley -> R.drawable.ic_cardano_no_color + Blockchain.Cardano -> R.drawable.ic_cardano_no_color Blockchain.Tezos -> R.drawable.ic_tezos_no_color Blockchain.XRP -> R.drawable.ic_xrp_no_color Blockchain.Stellar -> R.drawable.ic_stellar_no_color 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 406963b699..4aee8f0645 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 @@ -208,8 +208,7 @@ internal class AddCustomTokenViewModel @Inject constructor( val defaultNetwork = createNetworkSelectorItem(blockchain = Blockchain.Unknown) return listOf(defaultNetwork) + Blockchain.values() .filter { blockchain -> - reduxStateHolder.scanResponse?.card?.supportedBlockchains()?.contains(blockchain) == true && - blockchain != Blockchain.Cardano + reduxStateHolder.scanResponse?.card?.supportedBlockchains()?.contains(blockchain) == true } .sortedBy(Blockchain::fullName) .map(::createNetworkSelectorItem) @@ -273,7 +272,7 @@ internal class AddCustomTokenViewModel @Inject constructor( ), ) + Blockchain.values() .filter { blockchain -> - blockchain.isSupportedInApp() && !blockchain.isTestnet() && blockchain != Blockchain.Cardano + blockchain.isSupportedInApp() && !blockchain.isTestnet() } .sortedBy(Blockchain::fullName) .map(::createDerivationPathSelectorAdditionalItem) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt index c61cb57c3f..9531a726e3 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt @@ -12,7 +12,7 @@ object MultipleAddressUiHelper { Blockchain.BitcoinTestnet, Blockchain.Litecoin, Blockchain.BitcoinCash, - Blockchain.CardanoShelley, + Blockchain.Cardano, ) fun typeToId(type: AddressType, blockchain: Blockchain): Int { diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt index f7725ec89a..39d09fb0dc 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt @@ -119,7 +119,7 @@ internal class MercuryoService(private val environment: MercuryoEnvironment) : E return when (currencyName) { "BNB" -> Blockchain.BSC "ETH" -> Blockchain.Ethereum - "ADA" -> Blockchain.CardanoShelley + "ADA" -> Blockchain.Cardano else -> Blockchain.values().find { it.currency.lowercase() == currencyName.lowercase() } } } diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt b/domain/legacy/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt index 757ce2bb3e..c3053f87b6 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt @@ -103,6 +103,9 @@ internal class TangemCardTypesResolver( "BINANCE/test" -> { Blockchain.BSCTestnet } + "CARDANO" -> { + Blockchain.Cardano + } else -> { Blockchain.fromId(blockchainName) } diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt b/domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt index 8ff17001e9..bd892377ae 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt @@ -44,7 +44,7 @@ object TapWorkarounds { private val tangemNoteBatches = mapOf( "AB01" to Blockchain.Bitcoin, "AB02" to Blockchain.Ethereum, - "AB03" to Blockchain.CardanoShelley, + "AB03" to Blockchain.Cardano, "AB04" to Blockchain.Dogecoin, "AB05" to Blockchain.BSC, "AB06" to Blockchain.XRP, diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index 2665166cf8..590f740d1a 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -32,7 +32,7 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "bitcoin/test" -> Blockchain.BitcoinTestnet "bitcoin-cash" -> Blockchain.BitcoinCash "bitcoin-cash/test" -> Blockchain.BitcoinCashTestnet - "cardano" -> Blockchain.CardanoShelley + "cardano" -> Blockchain.Cardano "dogecoin" -> Blockchain.Dogecoin "ducatus" -> Blockchain.Ducatus "litecoin" -> Blockchain.Litecoin @@ -94,7 +94,6 @@ fun Blockchain.toNetworkId(): String { Blockchain.BitcoinCash -> "bitcoin-cash" Blockchain.BitcoinCashTestnet -> "bitcoin-cash/test" Blockchain.Cardano -> "cardano" - Blockchain.CardanoShelley -> "cardano" Blockchain.Dogecoin -> "dogecoin" Blockchain.Ducatus -> "ducatus" Blockchain.Ethereum -> "ethereum" @@ -157,7 +156,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Ethereum, Blockchain.EthereumTestnet -> "ethereum" Blockchain.EthereumClassic, Blockchain.EthereumClassicTestnet -> "ethereum-classic" Blockchain.Stellar, Blockchain.StellarTestnet -> "stellar" - Blockchain.Cardano, Blockchain.CardanoShelley -> "cardano" + Blockchain.Cardano -> "cardano" Blockchain.Polygon, Blockchain.PolygonTestnet -> "matic-network" Blockchain.Arbitrum, Blockchain.ArbitrumTestnet -> "ethereum" Blockchain.Avalanche, Blockchain.AvalancheTestnet -> "avalanche-2" diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 8a2db82671..8bab2c5ac9 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -80,7 +80,7 @@ okHttp-prettyLogging = "3.1.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-312" +tangemBlockchainSdk = "develop-313" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-288" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds