diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 7ae8d89566..0a2434d93d 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 7ae8d8956605c444a46a5b15cfa0a11cb595ca9f +Subproject commit 0a2434d93d67bec1804e3e827b3795a62f961d90 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 cd697735cb..e487628df9 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 @@ -100,6 +100,8 @@ internal class ConfigManagerImpl @Inject constructor() : ConfigManager { chiaFireAcademyApiKey = configValues.chiaFireAcademyApiKey, chiaTangemApiKey = configValues.chiaTangemApiKey, polygonScanApiKey = configValues.polygonScanApiKey, + bittensorDwellirApiKey = configValues.bittensorDwellirApiKey, + bittensorOnfinalityApiKey = configValues.bittensorOnfinalityKey, ), amplitudeApiKey = configValues.amplitudeApiKey, sprinklr = configValues.sprinklr, 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 a3f41169e6..e408679340 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 @@ -43,6 +43,8 @@ class ConfigValueModel( val express: ExpressModel?, val polygonScanApiKey: String?, val stakeKitApiKey: String?, + @Json(name = "bittensorDwellirKey") val bittensorDwellirApiKey: String?, + @Json(name = "bittensorOnfinalityKey") val bittensorOnfinalityKey: String?, ) @JsonClass(generateAdapter = true) 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 3c849d7c63..5b56a60eb8 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 @@ -69,6 +69,7 @@ fun getActiveIconRes(blockchainId: String): Int { "base" -> R.drawable.img_base_22 "joystream" -> R.drawable.img_joystream_22 "koinos", "koinos/test" -> R.drawable.img_koinos_22 + "bittensor" -> R.drawable.img_bittensor_22 else -> R.drawable.ic_alert_24 } } @@ -139,6 +140,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int { "base" -> R.drawable.img_base_22 "joystream" -> R.drawable.img_joystream_22 "koinos", "koinos/test" -> R.drawable.img_koinos_22 + "bittensor" -> R.drawable.img_bittensor_22 else -> R.drawable.ic_alert_24 } } @@ -205,6 +207,8 @@ fun getActiveIconResByCoinId(coinId: String): Int { "radiant" -> R.drawable.img_radiant_22 "base" -> R.drawable.img_base_22 "joystream" -> R.drawable.img_joystream_22 + "koinos", "koinos/test" -> R.drawable.img_koinos_22 + "bittensor" -> R.drawable.img_bittensor_22 else -> R.drawable.ic_alert_24 } } @@ -275,6 +279,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int { "base", "base/test" -> R.drawable.ic_base_22 "joystream" -> R.drawable.ic_joystream_22 "koinos", "koinos/test" -> R.drawable.ic_koinos_22 + "bittensor" -> R.drawable.ic_bittensor_22 else -> R.drawable.ic_alert_24 } } @@ -345,6 +350,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int { "base", "base/test" -> R.drawable.ic_base_22 "joystream" -> R.drawable.ic_joystream_22 "koinos", "koinos/test" -> R.drawable.ic_koinos_22 + "bittensor" -> R.drawable.ic_bittensor_22 else -> R.drawable.ic_alert_24 } } \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_bittensor_22.xml b/core/ui/src/main/res/drawable/ic_bittensor_22.xml new file mode 100644 index 0000000000..f625ce0f50 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_bittensor_22.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/img_bittensor_22.xml b/core/ui/src/main/res/drawable/img_bittensor_22.xml new file mode 100644 index 0000000000..4c7f09c9e7 --- /dev/null +++ b/core/ui/src/main/res/drawable/img_bittensor_22.xml @@ -0,0 +1,12 @@ + + + + diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 53962859e2..e283e62211 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -87,7 +87,7 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-651" +tangemBlockchainSdk = "develop-652" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-356" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainProviderTypesConverter.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainProviderTypesConverter.kt index 2a2e2a42f9..54ff6683f2 100644 --- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainProviderTypesConverter.kt +++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainProviderTypesConverter.kt @@ -55,6 +55,8 @@ internal object BlockchainProviderTypesConverter : "solana" -> ProviderType.Solana.Official "ton" -> ProviderType.Ton.TonCentral "tron" -> ProviderType.Tron.TronGrid + "dwellirBittensor" -> ProviderType.Bittensor.Dwellir + "onfinalityBittensor" -> ProviderType.Bittensor.Onfinality else -> { Timber.e("$blockchain private provider ($name) is not supported") null diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainSDKConfigConverter.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainSDKConfigConverter.kt index 7fd86c9aa1..c46918c7f2 100644 --- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainSDKConfigConverter.kt +++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/converters/BlockchainSDKConfigConverter.kt @@ -38,6 +38,8 @@ internal object BlockchainSDKConfigConverter : Converter Blockchain.Koinos "koinos/test" -> Blockchain.KoinosTestnet "joystream" -> Blockchain.Joystream + "bittensor" -> Blockchain.Bittensor else -> null } } @@ -235,6 +236,7 @@ fun Blockchain.toNetworkId(): String { Blockchain.Koinos -> "koinos" Blockchain.KoinosTestnet -> "koinos/test" Blockchain.Joystream -> "joystream" + Blockchain.Bittensor -> "bittensor" } } @@ -310,6 +312,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Base, Blockchain.BaseTestnet -> "base-ethereum" Blockchain.Koinos, Blockchain.KoinosTestnet -> "koinos" Blockchain.Joystream -> "joystream" + Blockchain.Bittensor -> "bittensor" } }