diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt index 14757eae60..3a83c00641 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt @@ -159,4 +159,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? KaspaTestnet -> null Pepecoin, PepecoinTestnet -> null Hyperliquid, HyperliquidTestnet -> null + Quai, QuaiTestnet -> null } \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/small/TangemIconButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/small/TangemIconButton.kt index 9cb8a2f121..665299d7aa 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/small/TangemIconButton.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/small/TangemIconButton.kt @@ -52,11 +52,9 @@ fun TangemIconButton( modifier = modifier .size(24.dp) .clip(shape) + .clickable(onClick = onClick) .background(background) - .padding(innerPadding) - .clickable( - onClick = onClick, - ), + .padding(innerPadding), ) } 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 87c7602ba9..e106f177ab 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 @@ -95,6 +95,7 @@ fun getActiveIconRes(blockchainId: String): Int { "vanar-chain", "vanar-chain/test" -> R.drawable.img_vanar_22 "pepecoin", "pepecoin/test" -> R.drawable.img_pepecoin_22 "hyperliquid", "hyperliquid/test" -> R.drawable.img_hyperliquid_22 + "quai", "quai/test" -> R.drawable.img_quai_22 else -> R.drawable.ic_alert_24 } } @@ -188,6 +189,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "vanar-chain", "vanar-chain/test" -> R.drawable.img_vanar_22 "pepecoin-network", "pepecoin-network/test" -> R.drawable.img_pepecoin_22 "hyperliquid", "hyperliquid/test" -> R.drawable.img_hyperliquid_22 + "quai", "quai/test" -> R.drawable.img_quai_22 else -> R.drawable.ic_alert_24 } } @@ -284,6 +286,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "vanar-chain", "vanar-chain/test" -> R.drawable.ic_vanar_22 "pepecoin", "pepecoin/test" -> R.drawable.ic_pepecoin_22 "hyperliquid", "hyperliquid/test" -> R.drawable.ic_hyperliquid_22 + "quai", "quai/test" -> R.drawable.ic_quai_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_quai_22.xml b/core/ui/src/main/res/drawable/ic_quai_22.xml new file mode 100644 index 0000000000..6e21cfe61c --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_quai_22.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_quai_22.xml b/core/ui/src/main/res/drawable/img_quai_22.xml new file mode 100644 index 0000000000..59e964b66b --- /dev/null +++ b/core/ui/src/main/res/drawable/img_quai_22.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt index 9a57b58ea2..c7aff7add9 100644 --- a/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt +++ b/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt @@ -325,6 +325,7 @@ class NetworkFactory @Inject constructor( Blockchain.ZkLinkNova, Blockchain.ZkLinkNovaTestnet, Blockchain.Pepecoin, Blockchain.PepecoinTestnet, Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet, + Blockchain.Quai, Blockchain.QuaiTestnet, -> Network.TransactionExtrasType.NONE // endregion } diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt b/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt index 486ba69104..fe654114a6 100644 --- a/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt +++ b/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt @@ -159,5 +159,6 @@ public val Blockchain.mercuryoNetwork: String? Blockchain.KaspaTestnet -> null Blockchain.Pepecoin, Blockchain.PepecoinTestnet -> null Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet -> null + Blockchain.Quai, Blockchain.QuaiTestnet -> null } } \ No newline at end of file diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt index 58c029cccb..88464e81e4 100644 --- a/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt +++ b/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt @@ -209,6 +209,8 @@ data object Wallet2CardConfig : CardConfig { Blockchain.PepecoinTestnet -> EllipticCurve.Secp256k1 Blockchain.Hyperliquid -> EllipticCurve.Secp256k1 Blockchain.HyperliquidTestnet -> EllipticCurve.Secp256k1 + Blockchain.Quai -> EllipticCurve.Secp256k1 + Blockchain.QuaiTestnet -> EllipticCurve.Secp256k1 } } } \ No newline at end of file diff --git a/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt b/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt index 927e7f0aa1..8f9f3f26ff 100644 --- a/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt +++ b/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt @@ -166,6 +166,8 @@ class Wallet2CardConfigTest { Blockchain.PepecoinTestnet to EllipticCurve.Secp256k1, Blockchain.Hyperliquid to EllipticCurve.Secp256k1, Blockchain.HyperliquidTestnet to EllipticCurve.Secp256k1, + Blockchain.Quai to EllipticCurve.Secp256k1, + Blockchain.QuaiTestnet to EllipticCurve.Secp256k1, ) @Test diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml index 5af837553d..dcf538a07f 100644 --- a/gradle/tangem_dependencies.toml +++ b/gradle/tangem_dependencies.toml @@ -5,7 +5,7 @@ # https://github.com/tangem/tangem-sdk-android/ # https://github.com/tangem/vico -tangemBlockchainSdk = "develop-1248" +tangemBlockchainSdk = "develop-1252" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-564" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt index 0449da0454..182a09f0c4 100644 --- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt +++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt @@ -167,6 +167,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "pepecoin/test" -> Blockchain.PepecoinTestnet "hyperevm" -> Blockchain.Hyperliquid "hyperevm/test" -> Blockchain.HyperliquidTestnet + "quai-network" -> Blockchain.Quai + "quai-network/test" -> Blockchain.QuaiTestnet else -> null } } @@ -331,6 +333,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.PepecoinTestnet -> "pepecoin/test" Blockchain.Hyperliquid -> "hyperevm" Blockchain.HyperliquidTestnet -> "hyperevm/test" + Blockchain.Quai -> "quai-network" + Blockchain.QuaiTestnet -> "quai-network/test" } } @@ -435,6 +439,7 @@ fun Blockchain.toCoinId(): String { Blockchain.ZkLinkNova, Blockchain.ZkLinkNovaTestnet -> "zklink-ethereum" Blockchain.Pepecoin, Blockchain.PepecoinTestnet -> "pepecoin-network" Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet -> "hyperliquid" + Blockchain.Quai, Blockchain.QuaiTestnet -> "quai" } }