diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt index 5488669d34..b1ce83c287 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoBlockchainMapping.kt @@ -147,5 +147,6 @@ internal val Blockchain.mercuryoNetwork: String? Blockchain.Xodex -> null Blockchain.Canxium -> null Blockchain.Clore -> null + Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet -> null } } \ No newline at end of file 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 4a16217522..bb7bfb5047 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 @@ -148,4 +148,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency? Clore -> null VanarChain -> null VanarChainTestnet -> null + OdysseyChain, OdysseyChainTestnet -> null } \ No newline at end of file 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 d3d5ab0171..44921bbd2c 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 @@ -85,6 +85,7 @@ fun getActiveIconRes(blockchainId: String): Int { "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22 "clore-ai" -> R.drawable.img_clore_22 "fact0rn" -> R.drawable.img_fact0rn_22 + "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 else -> R.drawable.ic_alert_24 } } @@ -168,6 +169,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "chiliz", "chiliz/test" -> R.drawable.img_chiliz_22 "clore-ai" -> R.drawable.img_clore_22 "fact0rn" -> R.drawable.img_fact0rn_22 + "odyssey", "odyssey/test" -> R.drawable.img_odyssey_chain_22 else -> R.drawable.ic_alert_24 } } @@ -254,6 +256,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "chiliz", "chiliz/test" -> R.drawable.ic_chiliz_22 "clore-ai" -> R.drawable.ic_clore_22 "fact0rn" -> R.drawable.ic_fact0rn_22 + "odyssey", "odyssey/test" -> R.drawable.ic_odyssey_chain_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_cyber_22.xml b/core/ui/src/main/res/drawable/ic_cyber_22.xml index b622330ee9..bf79d52477 100644 --- a/core/ui/src/main/res/drawable/ic_cyber_22.xml +++ b/core/ui/src/main/res/drawable/ic_cyber_22.xml @@ -3,15 +3,15 @@ android:height="22dp" android:viewportWidth="22" android:viewportHeight="22"> - - - - - - - + + diff --git a/core/ui/src/main/res/drawable/ic_odyssey_chain_22.xml b/core/ui/src/main/res/drawable/ic_odyssey_chain_22.xml new file mode 100644 index 0000000000..a7c93ad394 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_odyssey_chain_22.xml @@ -0,0 +1,16 @@ + + + + diff --git a/core/ui/src/main/res/drawable/img_odyssey_chain_22.xml b/core/ui/src/main/res/drawable/img_odyssey_chain_22.xml new file mode 100644 index 0000000000..b4f62cdb25 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_odyssey_chain_22.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + 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 9ca9d26d6a..4c31c8f08d 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 @@ -292,6 +292,7 @@ private fun Blockchain.getSupportedTransactionExtras(): Network.TransactionExtra Blockchain.ChilizTestnet, Blockchain.VanarChain, Blockchain.VanarChainTestnet, + Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet, -> Network.TransactionExtrasType.NONE // endregion } diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt index 1cf81e5c50..bfc8208097 100644 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt +++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt @@ -978,6 +978,7 @@ internal class SwapInteractorImpl @AssistedInject constructor( Clore, VanarChain, VanarChainTestnet, + OdysseyChain, OdysseyChainTestnet, -> Fee.Common(feeAmount) // endregion } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 7021eea020..bbae985165 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-898" +tangemBlockchainSdk = "develop-900" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-420" #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 e40d856618..a111bdadbe 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 @@ -148,6 +148,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "xodex" -> Blockchain.Xodex "canxium" -> Blockchain.Canxium "clore-ai" -> Blockchain.Clore + "dione" -> Blockchain.OdysseyChain + "dione/test" -> Blockchain.OdysseyChainTestnet else -> null } } @@ -293,6 +295,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.Xodex -> "xodex" Blockchain.Canxium -> "canxium" Blockchain.Clore -> "clore-ai" + Blockchain.OdysseyChain -> "dione" + Blockchain.OdysseyChainTestnet -> "dione/test" } } @@ -388,6 +392,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Xodex -> "xodex" Blockchain.Canxium -> "canxium" Blockchain.Clore -> "clore-ai" + Blockchain.OdysseyChain, Blockchain.OdysseyChainTestnet -> "dione" } }