diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index 51a162df5c..409a6b6067 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -698,6 +698,16 @@ "networkId": "blast/test" } ] + }, + { + "id": "cyberconnect", + "name": "Cyber", + "symbol": "ETH", + "networks": [ + { + "networkId": "cyber/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 a1613fcb79..f59561c295 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 @@ -72,6 +72,7 @@ fun getActiveIconRes(blockchainId: String): Int { "bittensor" -> R.drawable.img_bittensor_22 "blast", "blast/test" -> R.drawable.img_blast_22 "filecoin" -> R.drawable.img_filecoin_22 + "cyber", "cyber/test" -> R.drawable.img_cyber_22 else -> R.drawable.ic_alert_24 } } @@ -145,6 +146,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int { "bittensor" -> R.drawable.img_bittensor_22 "blast", "blast/test" -> R.drawable.img_blast_22 "filecoin" -> R.drawable.img_filecoin_22 + "cyber", "cyber/test" -> R.drawable.img_cyber_22 else -> R.drawable.ic_alert_24 } } @@ -215,6 +217,7 @@ fun getActiveIconResByCoinId(coinId: String): Int { "bittensor" -> R.drawable.img_bittensor_22 "blast", "blast/test" -> R.drawable.img_blast_22 "filecoin" -> R.drawable.img_filecoin_22 + "cyber", "cyber/test" -> R.drawable.img_cyber_22 else -> R.drawable.ic_alert_24 } } @@ -288,6 +291,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "bittensor" -> R.drawable.ic_bittensor_22 "blast", "blast/test" -> R.drawable.ic_blast_22 "filecoin" -> R.drawable.ic_filecoin_22 + "cyber", "cyber/test" -> R.drawable.ic_cyber_22 else -> R.drawable.ic_alert_24 } } @@ -361,6 +365,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "bittensor" -> R.drawable.ic_bittensor_22 "blast", "blast/test" -> R.drawable.ic_blast_22 "filecoin" -> R.drawable.ic_filecoin_22 + "cyber", "cyber/test" -> R.drawable.ic_cyber_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 new file mode 100644 index 0000000000..b622330ee9 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_cyber_22.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/core/ui/src/main/res/drawable/img_cyber_22.xml b/core/ui/src/main/res/drawable/img_cyber_22.xml new file mode 100644 index 0000000000..e6af2f1807 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_cyber_22.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesUnsupportedCurrenciesIdAdapter.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesUnsupportedCurrenciesIdAdapter.kt index 819dbe2a39..2a3ff567e6 100644 --- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesUnsupportedCurrenciesIdAdapter.kt +++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesUnsupportedCurrenciesIdAdapter.kt @@ -56,6 +56,8 @@ internal class QuotesUnsupportedCurrenciesIdAdapter { "polygon-zkevm-ethereum" to "ethereum", "aurora-ethereum" to "ethereum", "base-ethereum" to "ethereum", + "cyberconnect" to "ethereum", + "blast" to "ethereum", ) } } \ No newline at end of file diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt index 4cc79ed407..0ad1df2428 100644 --- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt +++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/ResponseCryptoCurrenciesFactory.kt @@ -106,6 +106,7 @@ class ResponseCryptoCurrenciesFactory { Blockchain.Telos, Blockchain.Cronos, Blockchain.TON, + Blockchain.Cyber, -> this.fullName else -> responseToken.name } diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt index 30711535be..1f330602ec 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt @@ -58,7 +58,7 @@ internal class SetInitialDataStateTransformer( override fun transform(prevState: StakingUiState): StakingUiState { return prevState.copy( title = TextReference.Res( - R.string.staking_initial_info_title, + R.string.staking_title_stake, wrappedList(cryptoCurrencyStatusProvider().currency.name), ), clickIntents = clickIntents, 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 63f530a1d7..c9be6557a7 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 @@ -121,6 +121,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "filecoin" -> Blockchain.Filecoin "blast" -> Blockchain.Blast "blast/test" -> Blockchain.BlastTestnet + "cyber" -> Blockchain.Cyber + "cyber/test" -> Blockchain.CyberTestnet else -> null } } @@ -243,9 +245,14 @@ fun Blockchain.toNetworkId(): String { Blockchain.Filecoin -> "filecoin" Blockchain.Blast -> "blast" Blockchain.BlastTestnet -> "blast/test" + Blockchain.Cyber -> "cyber" + Blockchain.CyberTestnet -> "cyber/test" } } +/** + * CoinId is id from tangem backend response coin "id" field + */ @Suppress("ComplexMethod", "LongMethod") fun Blockchain.toCoinId(): String { return when (this) { @@ -321,6 +328,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Bittensor -> "bittensor" Blockchain.Filecoin -> "filecoin" Blockchain.Blast, Blockchain.BlastTestnet -> "blast" + Blockchain.Cyber, Blockchain.CyberTestnet -> "cyberconnect" } }