diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json
index 6be450bd32..ada88c6bc7 100644
--- a/app/src/main/assets/testnet_tokens.json
+++ b/app/src/main/assets/testnet_tokens.json
@@ -569,6 +569,16 @@
}
]
},
+ {
+ "id": "shibarium",
+ "name": "Shibarium",
+ "symbol": "BONE",
+ "networks": [
+ {
+ "networkId": "shibarium/test"
+ }
+ ]
+ },
{
"id": "aptos",
"name": "Aptos",
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt
index ea2c77ed2a..d5328878eb 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/BriefNetworksList.kt
@@ -83,7 +83,9 @@ internal fun BriefNetworkItem(model: NetworkItemState, modifier: Modifier = Modi
Icon(
painter = painterResource(id = model.iconResId.value),
contentDescription = null,
- modifier = Modifier.size(size = TangemTheme.dimens.size20),
+ modifier = Modifier
+ .size(size = TangemTheme.dimens.size20)
+ .clip(CircleShape),
tint = if (isAdded) Color.Unspecified else TangemTheme.colors.text.tertiary,
)
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenListPreviewData.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenListPreviewData.kt
index f5481080e5..fafeb5d244 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenListPreviewData.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokenListPreviewData.kt
@@ -80,6 +80,13 @@ object TokenListPreviewData {
iconResId = mutableStateOf(R.drawable.ic_bsc_16),
isMainNetwork = false,
),
+ // check icon clipping
+ NetworkItemState.ReadContent(
+ name = "SHIBARIUM",
+ protocolName = "BEP20",
+ iconResId = mutableStateOf(R.drawable.ic_shibarium_22),
+ isMainNetwork = false,
+ ),
)
}
}
\ 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 e3170a4467..33e08b6314 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
@@ -49,6 +49,7 @@ fun getActiveIconRes(blockchainId: String): Int {
"xdc", "xdc/test" -> R.drawable.img_xdc_22
"vechain", "vechain/test" -> R.drawable.img_vechain_22
"aptos", "aptos/test" -> R.drawable.img_aptos_22
+ "shibarium", "shibarium/test" -> R.drawable.img_shibarium_22
else -> R.drawable.ic_alert_24
}
}
@@ -99,6 +100,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int {
"xdc-network", "xdc-network/test" -> R.drawable.img_xdc_22
"vechain", "vechain/test" -> R.drawable.img_vechain_22
"aptos", "aptos/test" -> R.drawable.img_aptos_22
+ "shibarium", "shibarium/test" -> R.drawable.img_shibarium_22
else -> R.drawable.ic_alert_24
}
}
@@ -146,6 +148,7 @@ fun getActiveIconResByCoinId(coinId: String): Int {
"xdce-crowd-sale" -> R.drawable.img_xdc_22
"vechain" -> R.drawable.img_vechain_22
"aptos" -> R.drawable.img_aptos_22
+ "shibarium" -> R.drawable.img_shibarium_22
else -> R.drawable.ic_alert_24
}
}
@@ -196,6 +199,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int {
"xdc", "xdc/test" -> R.drawable.ic_xdc_22
"vechain", "vechain/test" -> R.drawable.ic_vechain_22
"aptos", "aptos/test" -> R.drawable.ic_aptos_22
+ "shibarium", "shibarium/test" -> R.drawable.ic_shibarium_22
else -> R.drawable.ic_alert_24
}
}
@@ -246,6 +250,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int {
"xdc-network", "xdc-network/test" -> R.drawable.ic_xdc_22
"vechain", "vechain/test" -> R.drawable.ic_vechain_22
"aptos", "aptos/test" -> R.drawable.ic_aptos_22
+ "shibarium", "shibarium/test" -> R.drawable.ic_shibarium_22
else -> R.drawable.ic_alert_24
}
}
\ No newline at end of file
diff --git a/core/ui/src/main/res/drawable/ic_shibarium_22.xml b/core/ui/src/main/res/drawable/ic_shibarium_22.xml
new file mode 100644
index 0000000000..359f911c8f
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_shibarium_22.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/ui/src/main/res/drawable/img_shibarium_22.xml b/core/ui/src/main/res/drawable/img_shibarium_22.xml
new file mode 100644
index 0000000000..683c3555ca
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_shibarium_22.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 9d0357e1f1..f25e9a4f57 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
@@ -80,6 +80,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
"vechain/test" -> Blockchain.VeChainTestnet
"aptos" -> Blockchain.Aptos
"aptos/test" -> Blockchain.AptosTestnet
+ "shibarium" -> Blockchain.Shibarium
+ "shibarium/test" -> Blockchain.ShibariumTestnet
else -> null
}
}
@@ -161,6 +163,9 @@ fun Blockchain.toNetworkId(): String {
Blockchain.VeChainTestnet -> "vechain/test"
Blockchain.Aptos -> "aptos"
Blockchain.AptosTestnet -> "aptos/test"
+ Blockchain.Shibarium -> "shibarium"
+ Blockchain.ShibariumTestnet -> "shibarium/test"
+ Blockchain.Playa3ull -> "" // FIXME
}
}
@@ -213,6 +218,9 @@ fun Blockchain.toCoinId(): String {
Blockchain.Aptos -> "aptos"
Blockchain.AptosTestnet -> "aptos/test"
Blockchain.Unknown -> "unknown"
+ Blockchain.Shibarium -> "bone-shibaswap"
+ Blockchain.ShibariumTestnet -> "bone-shibaswap/test"
+ Blockchain.Playa3ull -> "" // FIXME
}
}
@@ -241,4 +249,5 @@ private val excludedBlockchains = listOf(
Blockchain.Unknown,
Blockchain.Ducatus,
Blockchain.Aptos,
+ Blockchain.Playa3ull,
)
\ No newline at end of file
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 266de7e848..297f61b088 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -85,7 +85,7 @@ web3j = "4.10.1"
# endregion Other libraries
# region Tangem
-tangemBlockchainSdk = "develop-475"
+tangemBlockchainSdk = "develop-482"
#tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
tangemCardSdk = "develop-324"
#tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^