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 58a7fa8076..707b2a3a5c 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 @@ -41,6 +41,8 @@ fun Blockchain.getGreyedOutIconRes(): Int { Blockchain.Kava, Blockchain.KavaTestnet -> R.drawable.ic_kava_no_color Blockchain.Ravencoin, Blockchain.RavencoinTestnet -> R.drawable.ic_ravencoin_no_color Blockchain.Cosmos, Blockchain.CosmosTestnet -> R.drawable.ic_cosmos_no_color + Blockchain.TerraV1 -> R.drawable.ic_terra_no_color + Blockchain.TerraV2 -> R.drawable.ic_terra2_no_color else -> R.drawable.ic_tangem_logo } } diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/TransactionExtrasReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/TransactionExtrasReducer.kt index c2e52196b5..cb0fbaa3aa 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/TransactionExtrasReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/TransactionExtrasReducer.kt @@ -48,7 +48,10 @@ class TransactionExtrasReducer : SendInternalReducer { Blockchain.Stellar -> TransactionExtrasState(xlmMemo = XlmMemoState()) Blockchain.Binance -> TransactionExtrasState(binanceMemo = BinanceMemoState()) Blockchain.TON, Blockchain.TONTestnet -> TransactionExtrasState(tonMemoState = TonMemoState()) - Blockchain.Cosmos -> TransactionExtrasState(cosmosMemoState = CosmosMemoState()) + Blockchain.Cosmos, + Blockchain.TerraV1, + Blockchain.TerraV2, + -> TransactionExtrasState(cosmosMemoState = CosmosMemoState()) else -> emptyResult } return updateLastState(sendState.copy(transactionExtrasState = result), result) diff --git a/app/src/main/res/drawable/ic_terra2_no_color.xml b/app/src/main/res/drawable/ic_terra2_no_color.xml new file mode 100644 index 0000000000..0a71065d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_terra2_no_color.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_terra_no_color.xml b/app/src/main/res/drawable/ic_terra_no_color.xml new file mode 100644 index 0000000000..0ba5bf40f7 --- /dev/null +++ b/app/src/main/res/drawable/ic_terra_no_color.xml @@ -0,0 +1,18 @@ + + + + + + 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 430fcb853f..eda6fbf9f3 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 @@ -37,6 +37,8 @@ fun getActiveIconRes(blockchainId: String): Int { "KAVA", "KAVA/test" -> R.drawable.img_kava_22 "ravencoin", "ravencoin/test" -> R.drawable.img_ravencoin_22 "cosmos", "cosmos/test" -> R.drawable.img_cosmos_22 + "terra" -> R.drawable.img_terra_22 + "terra-2" -> R.drawable.img_terra2_22 else -> R.drawable.ic_alert_24 } } @@ -79,6 +81,8 @@ fun getActiveIconResByCoinId(coinId: String, networkId: String): Int { "ton" -> R.drawable.img_ton_22 "kava" -> R.drawable.img_kava_22 "ravencoin" -> R.drawable.img_ravencoin_22 + "terra" -> R.drawable.img_terra_22 + "terra-2" -> R.drawable.img_terra2_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/img_terra2_22.xml b/core/ui/src/main/res/drawable/img_terra2_22.xml new file mode 100644 index 0000000000..182851e50e --- /dev/null +++ b/core/ui/src/main/res/drawable/img_terra2_22.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_terra_22.xml b/core/ui/src/main/res/drawable/img_terra_22.xml new file mode 100644 index 0000000000..379004cf76 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_terra_22.xml @@ -0,0 +1,18 @@ + + + + + + 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 92d51a1c57..eedc745042 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 @@ -58,6 +58,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "ravencoin/test" -> Blockchain.RavencoinTestnet "cosmos" -> Blockchain.Cosmos "cosmos/test" -> Blockchain.CosmosTestnet + "terra" -> Blockchain.TerraV1 + "terra-2" -> Blockchain.TerraV2 else -> null } } @@ -120,6 +122,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.RavencoinTestnet -> "ravencoin/test" Blockchain.Cosmos -> "cosmos" Blockchain.CosmosTestnet -> "cosmos/test" + Blockchain.TerraV1 -> "terra" + Blockchain.TerraV2 -> "terra-2" } } @@ -159,6 +163,8 @@ fun Blockchain.toCoinId(): String { Blockchain.Kava, Blockchain.KavaTestnet -> "kava" Blockchain.Ravencoin, Blockchain.RavencoinTestnet -> "ravencoin" Blockchain.Cosmos, Blockchain.CosmosTestnet -> "cosmos" + Blockchain.TerraV1 -> "terra-luna" + Blockchain.TerraV2 -> "terra-luna-2" } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index ef11693d7a..c1f74aa37d 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -73,7 +73,7 @@ reactiveNetwork = "3.0.8" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-221" +tangemBlockchainSdk = "develop-222" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-242" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds