diff --git a/app/src/main/assets/testnet_tokens.json b/app/src/main/assets/testnet_tokens.json
index 5c6a10ceb7..dd90c8b04c 100644
--- a/app/src/main/assets/testnet_tokens.json
+++ b/app/src/main/assets/testnet_tokens.json
@@ -525,7 +525,7 @@
"networks":
[
{
- "networkId": "near/test"
+ "networkId": "near-protocol/test"
}
]
}
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
index 88a8e16ed6..f1daaf34f6 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
@@ -47,6 +47,7 @@ fun Blockchain.getGreyedOutIconRes(): Int {
Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> R.drawable.ic_azero_no_color
Blockchain.OctaSpace, Blockchain.OctaSpaceTestnet -> R.drawable.ic_octaspace_no_color
Blockchain.Chia, Blockchain.ChiaTestnet -> R.drawable.ic_chia_no_color
+ Blockchain.Near, Blockchain.NearTestnet -> R.drawable.ic_near_no_color
else -> R.drawable.ic_tangem_logo
}
}
diff --git a/app/src/main/res/drawable/ic_near_no_color.xml b/app/src/main/res/drawable/ic_near_no_color.xml
new file mode 100644
index 0000000000..573a4ef9be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_near_no_color.xml
@@ -0,0 +1,9 @@
+
+
+
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 9481be4e27..cb9a24b04a 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
@@ -28,6 +28,7 @@ fun getActiveIconRes(blockchainId: String): Int {
"GNO" -> R.drawable.img_gnosis_22
"ETH-Pow", "ETH-Pow/test" -> R.drawable.img_eth_pow_22
"ETH-Fair" -> R.drawable.img_eth_fair_22
+ "NEAR", "NEAR/test" -> R.drawable.img_near_22
"Polkadot", "Polkadot/test" -> R.drawable.img_polkadot_22
"Kusama" -> R.drawable.img_kusama_22
"OPTIMISM", "OPTIMISM/test" -> R.drawable.img_optimism_22
@@ -91,6 +92,7 @@ fun getActiveIconResByCoinId(coinId: String, networkId: String): Int {
"telos" -> R.drawable.img_telos_22
"octaspace" -> R.drawable.img_octaspace_22
"chia" -> R.drawable.img_chia_22
+ "near" -> R.drawable.img_near_22
else -> R.drawable.ic_alert_24
}
}
\ No newline at end of file
diff --git a/core/ui/src/main/res/drawable/img_near_22.xml b/core/ui/src/main/res/drawable/img_near_22.xml
new file mode 100644
index 0000000000..6688dfd747
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_near_22.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
index be82d11c84..273fb46be7 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/TokensOperations.kt
@@ -55,7 +55,7 @@ internal fun getTokenIconUrl(blockchain: Blockchain, token: SdkToken): String? {
internal fun getCoinIconUrl(blockchain: Blockchain): String? {
val coinId = when (blockchain) {
Blockchain.Unknown -> null
- Blockchain.TerraV1, Blockchain.TerraV2 -> blockchain.toCoinId()
+ Blockchain.TerraV1, Blockchain.TerraV2, Blockchain.Near -> blockchain.toCoinId()
else -> blockchain.toNetworkId()
}
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 8c4877ad37..09df8a3d40 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
@@ -70,8 +70,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
"octaspace/test" -> Blockchain.OctaSpaceTestnet
"chia" -> Blockchain.Chia
"chia/test" -> Blockchain.ChiaTestnet
- "near" -> Blockchain.Near
- "near/test" -> Blockchain.NearTestnet
+ "near-protocol" -> Blockchain.Near
+ "near-protocol/test" -> Blockchain.NearTestnet
else -> null
}
}
@@ -143,8 +143,8 @@ fun Blockchain.toNetworkId(): String {
Blockchain.OctaSpaceTestnet -> "octaspace/test"
Blockchain.Chia -> "chia"
Blockchain.ChiaTestnet -> "chia/test"
- Blockchain.Near -> "near"
- Blockchain.NearTestnet -> "near/test"
+ Blockchain.Near -> "near-protocol"
+ Blockchain.NearTestnet -> "near-protocol/test"
}
}
@@ -203,6 +203,7 @@ fun Blockchain.amountToCreateAccount(token: Token? = null): BigDecimal? {
return when (this) {
Blockchain.Stellar -> if (token?.symbol == NODL) BigDecimal(NODL_AMOUNT_TO_CREATE_ACCOUNT) else BigDecimal.ONE
Blockchain.XRP -> BigDecimal.TEN
+ Blockchain.Near, Blockchain.NearTestnet -> 0.00182.toBigDecimal()
else -> null
}
}