diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json index 816e3b83c4..1cfcedb097 100644 --- a/app/src/main/assets/testnet_tokens.json +++ b/app/src/main/assets/testnet_tokens.json @@ -539,7 +539,7 @@ }, { "id": "xdce-crowd-sale", - "name": "XinFin", + "name": "XDC", "symbol": "XDC", "networks": [ { diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt b/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt index 6b25bae61d..364e4941d6 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt @@ -129,6 +129,7 @@ internal class ConfigManagerImpl @Inject constructor() : ConfigManager { tron = GetBlockAccessToken(rest = accessTokens.tron?.rest), cosmos = GetBlockAccessToken(rest = accessTokens.cosmos?.rest), near = GetBlockAccessToken(jsonRpc = accessTokens.near?.jsonRPC), + aptos = GetBlockAccessToken(rest = accessTokens.aptos?.rest), dogecoin = GetBlockAccessToken( jsonRpc = accessTokens.dogecoin?.jsonRPC, blockBookRest = accessTokens.dogecoin?.blockBookRest, diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt b/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt index ea21e05104..bc4f50bc30 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt @@ -62,6 +62,7 @@ data class GetBlockAccessTokens( @Json(name = "tron") val tron: GetBlockToken?, @Json(name = "cosmos-hub") val cosmos: GetBlockToken?, @Json(name = "near") val near: GetBlockToken?, + @Json(name = "aptos") val aptos: GetBlockToken?, @Json(name = "dogecoin") val dogecoin: GetBlockToken?, @Json(name = "litecoin") val litecoin: GetBlockToken?, @Json(name = "dash") val dash: GetBlockToken?, 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 e70af67f56..e25d693b6d 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 @@ -46,7 +46,7 @@ fun getActiveIconRes(blockchainId: String): Int { "chia", "chia/test" -> R.drawable.img_chia_22 "NEAR", "NEAR/test" -> R.drawable.img_near_22 "decimal", "decimal/test" -> R.drawable.img_decimal_22 - "xinfin", "xinfin/test" -> R.drawable.img_xdc_22 + "xdc", "xdc/test" -> R.drawable.img_xdc_22 else -> R.drawable.ic_alert_24 } } @@ -187,7 +187,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "chia", "chia/test" -> R.drawable.ic_chia_22 "NEAR", "NEAR/test" -> R.drawable.ic_near_22 "decimal", "decimal/test" -> R.drawable.ic_decimal_22 - "xdc-network", "xdc-network/test" -> R.drawable.ic_xinfin_22 + "xdc", "xdc/test" -> R.drawable.ic_xdc_22 else -> R.drawable.ic_alert_24 } } @@ -235,7 +235,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "chia", "chia/test" -> R.drawable.ic_chia_22 "near-protocol", "near-protocol/test" -> R.drawable.ic_near_22 "decimal", "decimal/test" -> R.drawable.ic_decimal_22 - "xdc-network", "xdc-network/test" -> R.drawable.ic_xinfin_22 + "xdc-network", "xdc-network/test" -> R.drawable.ic_xdc_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_xinfin_22.xml b/core/ui/src/main/res/drawable/ic_xdc_22.xml similarity index 100% rename from core/ui/src/main/res/drawable/ic_xinfin_22.xml rename to core/ui/src/main/res/drawable/ic_xdc_22.xml diff --git a/core/ui/src/main/res/drawable/img_xdc_22.xml b/core/ui/src/main/res/drawable/img_xdc_22.xml index a7720f1fad..7ca3ec0aa2 100644 --- a/core/ui/src/main/res/drawable/img_xdc_22.xml +++ b/core/ui/src/main/res/drawable/img_xdc_22.xml @@ -1,5 +1,16 @@ - - - + + + + + + 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 9fdc8f2327..4a08355267 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 @@ -74,8 +74,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "near-protocol/test" -> Blockchain.NearTestnet "decimal" -> Blockchain.Decimal "decimal/test" -> Blockchain.DecimalTestnet - "xdc-network" -> Blockchain.XinFin - "xdc-network/test" -> Blockchain.XinFinTestnet + "xdc-network" -> Blockchain.XDC + "xdc-network/test" -> Blockchain.XDCTestnet "TODO" -> Blockchain.Vechain // TODO [REDACTED_TASK_KEY] "TODO/test" -> Blockchain.VechainTestnet // TODO [REDACTED_TASK_KEY] "aptos" -> Blockchain.Aptos @@ -155,8 +155,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.NearTestnet -> "near-protocol/test" Blockchain.Decimal -> "decimal" Blockchain.DecimalTestnet -> "decimal/test" - Blockchain.XinFin -> "xdc-network" - Blockchain.XinFinTestnet -> "xdc-network/test" + Blockchain.XDC -> "xdc-network" + Blockchain.XDCTestnet -> "xdc-network/test" Blockchain.Vechain -> "TODO" // TODO [REDACTED_TASK_KEY] Blockchain.VechainTestnet -> "TODO/test" // TODO [REDACTED_TASK_KEY] Blockchain.Aptos -> "aptos" @@ -208,7 +208,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Near -> "near" Blockchain.NearTestnet -> "near/test" Blockchain.Decimal, Blockchain.DecimalTestnet -> "decimal" - Blockchain.XinFin, Blockchain.XinFinTestnet -> "xdce-crowd-sale" + Blockchain.XDC, Blockchain.XDCTestnet -> "xdce-crowd-sale" Blockchain.Vechain -> "TODO" // TODO [REDACTED_TASK_KEY] Blockchain.VechainTestnet -> "TODO/test" // TODO [REDACTED_TASK_KEY] Blockchain.Aptos -> "aptos" 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 6ba6616a00..a70e9f4958 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 @@ -1302,6 +1302,7 @@ internal class SwapInteractorImpl @Inject constructor( is Fee.Common -> 0 is Fee.Ethereum -> this.gasLimit.toInt() is Fee.Vechain -> TODO() // TODO [REDACTED_TASK_KEY] + is Fee.Aptos -> TODO() } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index f769f6732d..fb1268f9f8 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -85,7 +85,7 @@ spr-client = "3.6.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-450" +tangemBlockchainSdk = "develop-453" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-318" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^