diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index b09a1ffa91..14327b84be 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -608,6 +608,36 @@ "networkId": "hedera-hashgraph/test" } ] + }, + { + "id": "aurora-near", + "name": "Aurora Testnet", + "symbol": "ETH", + "networks": [ + { + "networkId": "aurora/test" + } + ] + }, + { + "id": "areon-network", + "name": "Areon Network Testnet", + "symbol": "TAREA", + "networks": [ + { + "networkId": "areon-network/test" + } + ] + }, + { + "id": "pulsechain", + "name": "PulseChain Testnet v4", + "symbol": "tPLS", + "networks": [ + { + "networkId": "pulsechain/test" + } + ] } ] } diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt index 95951380ca..f49147879e 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt @@ -54,6 +54,9 @@ fun getActiveIconRes(blockchainId: String): Int { "hedera", "hedera/test" -> R.drawable.img_hedera_22 "playa3ull" -> R.drawable.img_playa3ull_22 "DUC" -> R.drawable.img_ducatus_22 + "aurora", "aurora/test" -> R.drawable.img_aurora_22 + "areon", "areon/test" -> R.drawable.img_areon_22 + "pls", "pls/test" -> R.drawable.img_pls_22 else -> R.drawable.ic_alert_24 } } @@ -109,6 +112,9 @@ fun getActiveIconResByNetworkId(networkId: String): Int { "hedera-hashgraph", "hedera/test" -> R.drawable.img_hedera_22 "playa3ull-games" -> R.drawable.img_playa3ull_22 "ducatus" -> R.drawable.img_ducatus_22 + "aurora", "aurora/test" -> R.drawable.img_aurora_22 + "areon", "areon/test" -> R.drawable.img_areon_22 + "pls", "pls/test" -> R.drawable.img_pls_22 else -> R.drawable.ic_alert_24 } } @@ -161,6 +167,9 @@ fun getActiveIconResByCoinId(coinId: String): Int { "hedera-hashgraph" -> R.drawable.img_hedera_22 "playa3ull-games-2" -> R.drawable.img_playa3ull_22 "ducatus" -> R.drawable.img_ducatus_22 + "aurora-near" -> R.drawable.img_aurora_22 + "areon" -> R.drawable.img_areon_22 + "pls" -> R.drawable.img_pls_22 else -> R.drawable.ic_alert_24 } } @@ -216,6 +225,9 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "hedera", "hedera/test" -> R.drawable.ic_hedera_22 "playa3ull" -> R.drawable.ic_playa3ull_22 "DUC" -> R.drawable.ic_ducatus_22 + "aurora", "aurora/test" -> R.drawable.ic_aurora_22 + "areon", "areon/test" -> R.drawable.ic_areon_22 + "pls", "pls/test" -> R.drawable.ic_pls_22 else -> R.drawable.ic_alert_24 } } @@ -271,6 +283,9 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "hedera-hashgraph", "hedera/test" -> R.drawable.ic_hedera_22 "playa3ull-games" -> R.drawable.ic_playa3ull_22 "ducatus" -> R.drawable.ic_ducatus_22 + "aurora", "aurora/test" -> R.drawable.ic_aurora_22 + "areon", "areon/test" -> R.drawable.ic_areon_22 + "pls", "pls/test" -> R.drawable.ic_pls_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_areon_22.xml b/core/ui/src/main/res/drawable/ic_areon_22.xml new file mode 100644 index 0000000000..5c4661ff99 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_areon_22.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/core/ui/src/main/res/drawable/ic_aurora_22.xml b/core/ui/src/main/res/drawable/ic_aurora_22.xml new file mode 100644 index 0000000000..65d64fc01e --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_aurora_22.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_bitcoin_16.xml b/core/ui/src/main/res/drawable/ic_bitcoin_16.xml index b18c3c9cce..9f9cccbc58 100644 --- a/core/ui/src/main/res/drawable/ic_bitcoin_16.xml +++ b/core/ui/src/main/res/drawable/ic_bitcoin_16.xml @@ -1,5 +1,7 @@ - + diff --git a/core/ui/src/main/res/drawable/ic_pls_22.xml b/core/ui/src/main/res/drawable/ic_pls_22.xml new file mode 100644 index 0000000000..2c285561f2 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_pls_22.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/img_areon_22.xml b/core/ui/src/main/res/drawable/img_areon_22.xml new file mode 100644 index 0000000000..23c71490ed --- /dev/null +++ b/core/ui/src/main/res/drawable/img_areon_22.xml @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_aurora_22.xml b/core/ui/src/main/res/drawable/img_aurora_22.xml new file mode 100644 index 0000000000..c1b0be7ce0 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_aurora_22.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_pls_22.xml b/core/ui/src/main/res/drawable/img_pls_22.xml new file mode 100644 index 0000000000..5560c5314a --- /dev/null +++ b/core/ui/src/main/res/drawable/img_pls_22.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + 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 aca3f01cc2..03841cc507 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 @@ -87,6 +87,12 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "algorand/test" -> Blockchain.AlgorandTestnet "hedera-hashgraph" -> Blockchain.Hedera "hedera-hashgraph/test" -> Blockchain.HederaTestnet + "aurora" -> Blockchain.Aurora + "aurora/test" -> Blockchain.AuroraTestnet + "areon-network" -> Blockchain.Areon + "areon-network/test" -> Blockchain.AreonTestnet + "pulsechain" -> Blockchain.PulseChain + "pulsechain/test" -> Blockchain.PulseChainTestnet else -> null } } @@ -175,6 +181,12 @@ fun Blockchain.toNetworkId(): String { Blockchain.AlgorandTestnet -> "algorand/test" Blockchain.Hedera -> "hedera-hashgraph" Blockchain.HederaTestnet -> "hedera-hashgraph/test" + Blockchain.Aurora -> "aurora" + Blockchain.AuroraTestnet -> "aurora/test" + Blockchain.Areon -> "areon-network" + Blockchain.AreonTestnet -> "areon-network/test" + Blockchain.PulseChain -> "pulsechain" + Blockchain.PulseChainTestnet -> "pulsechain/test" } } @@ -234,6 +246,9 @@ fun Blockchain.toCoinId(): String { Blockchain.Unknown -> "unknown" Blockchain.Hedera -> "hedera-hashgraph" Blockchain.HederaTestnet -> "hedera-hashgraph/test" + Blockchain.Aurora, Blockchain.AuroraTestnet -> "aurora-near" + Blockchain.Areon, Blockchain.AreonTestnet -> "areon-network" + Blockchain.PulseChain, Blockchain.PulseChainTestnet -> "pulsechain" } } @@ -252,7 +267,7 @@ fun Blockchain.amountToCreateAccount(token: Token? = null): BigDecimal? { } fun Blockchain.minimalAmount(): BigDecimal { - return 1.toBigDecimal().movePointLeft(decimals()) + return BigDecimal.ONE.movePointLeft(decimals()) } private const val NODL = "NODL" diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 4c493dcd5b..411c7b3b54 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -85,7 +85,7 @@ web3j = "4.10.1" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-505" +tangemBlockchainSdk = "develop-508" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-324" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^