From 3a95fbcfb50cfae7a2ce166f85d3898fe560fc14 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 6 May 2024 12:49:48 +0100
Subject: [PATCH] Updated on 2026-08-14

---
 .../core/ui/extensions/BlockchainIcons.kt       |  5 +++++
 .../src/main/res/drawable/ic_joystream_22.xml   | 14 ++++++++++++++
 .../src/main/res/drawable/img_joystream_22.xml  | 17 +++++++++++++++++
 gradle/dependencies.toml                        |  2 +-
 .../tangem/blockchainsdk/utils/Blockchain.kt    |  3 +++
 5 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 core/ui/src/main/res/drawable/ic_joystream_22.xml
 create mode 100644 core/ui/src/main/res/drawable/img_joystream_22.xml

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 1a95df0142..e6e331c589 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
@@ -67,6 +67,7 @@ fun getActiveIconRes(blockchainId: String): Int {
         "taraxa", "taraxa/test" -> R.drawable.img_taraxa_22
         "radiant" -> R.drawable.img_radiant_22
         "base" -> R.drawable.img_base_22
+        "joystream" -> R.drawable.img_joystream_22
         else -> R.drawable.ic_alert_24
     }
 }
@@ -135,6 +136,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int {
         "taraxa", "taraxa/test" -> R.drawable.img_taraxa_22
         "radiant" -> R.drawable.img_radiant_22
         "base" -> R.drawable.img_base_22
+        "joystream" -> R.drawable.img_joystream_22
         else -> R.drawable.ic_alert_24
     }
 }
@@ -200,6 +202,7 @@ fun getActiveIconResByCoinId(coinId: String): Int {
         "taraxa" -> R.drawable.img_taraxa_22
         "radiant" -> R.drawable.img_radiant_22
         "base" -> R.drawable.img_base_22
+        "joystream" -> R.drawable.img_joystream_22
         else -> R.drawable.ic_alert_24
     }
 }
@@ -268,6 +271,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int {
         "taraxa", "taraxa/test" -> R.drawable.ic_taraxa_22
         "radiant" -> R.drawable.ic_radiant_22
         "base", "base/test" -> R.drawable.ic_base_22
+        "joystream" -> R.drawable.ic_joystream_22
         else -> R.drawable.ic_alert_24
     }
 }
@@ -336,6 +340,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int {
         "taraxa", "taraxa/test" -> R.drawable.ic_taraxa_22
         "radiant" -> R.drawable.ic_radiant_22
         "base", "base/test" -> R.drawable.ic_base_22
+        "joystream" -> R.drawable.ic_joystream_22
         else -> R.drawable.ic_alert_24
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/res/drawable/ic_joystream_22.xml b/core/ui/src/main/res/drawable/ic_joystream_22.xml
new file mode 100644
index 0000000000..91f187f81c
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_joystream_22.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <group>
+    <clip-path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"/>
+    <path
+        android:pathData="M11.895,12.263V3.989H10.616V12.263C10.615,13.444 10.143,14.576 9.303,15.411C8.464,16.246 7.326,16.715 6.139,16.716H5.881L5.5,17.989H6.139C7.664,17.985 9.126,17.381 10.205,16.308C11.283,15.235 11.891,13.781 11.895,12.263ZM12.919,3.989H14.198V9.967C14.199,11.366 13.684,12.717 12.749,13.762C12.862,13.268 12.919,12.764 12.919,12.257V3.989ZM8.818,14.426C8.5,14.817 8.1,15.134 7.645,15.353C7.191,15.573 6.693,15.69 6.188,15.697L6.572,14.426H8.818ZM9.593,12.263V12.135H7.259L6.877,13.407H9.396C9.527,13.039 9.594,12.653 9.593,12.263ZM15.221,3.989H16.5V7.681C16.501,9.08 15.985,10.431 15.051,11.477C15.164,10.983 15.221,10.478 15.221,9.971V3.989Z"
+        android:fillColor="#000000"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_joystream_22.xml b/core/ui/src/main/res/drawable/img_joystream_22.xml
new file mode 100644
index 0000000000..2168e5839e
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_joystream_22.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <group>
+    <clip-path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"/>
+    <path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
+        android:fillColor="#4038FF"/>
+    <path
+        android:pathData="M11.895,12.263V3.989H10.616V12.263C10.615,13.444 10.143,14.576 9.303,15.411C8.464,16.246 7.326,16.715 6.139,16.716H5.881L5.5,17.989H6.139C7.664,17.985 9.126,17.381 10.205,16.308C11.283,15.235 11.891,13.781 11.895,12.263ZM12.919,3.989H14.198V9.967C14.199,11.366 13.684,12.717 12.749,13.762C12.862,13.268 12.919,12.764 12.919,12.257V3.989ZM8.818,14.426C8.5,14.817 8.1,15.134 7.645,15.353C7.191,15.573 6.693,15.69 6.188,15.697L6.572,14.426H8.818ZM9.593,12.263V12.135H7.259L6.877,13.407H9.396C9.527,13.039 9.594,12.653 9.593,12.263ZM15.221,3.989H16.5V7.681C16.501,9.08 15.985,10.431 15.051,11.477C15.164,10.983 15.221,10.478 15.221,9.971V3.989Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 99fc8ec14e..6e2f105776 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -86,7 +86,7 @@ room = "2.6.1"
 # endregion Other libraries
 
 # region Tangem
-tangemBlockchainSdk = "develop-620"
+tangemBlockchainSdk = "develop-621"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
 tangemCardSdk = "develop-351"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^
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 1ae43f5950..e8ac19e194 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
@@ -116,6 +116,7 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
         "base/test" -> Blockchain.BaseTestnet
         "koinos" -> Blockchain.Koinos
         "koinos/test" -> Blockchain.KoinosTestnet
+        "joystream" -> Blockchain.Joystream
         else -> null
     }
 }
@@ -233,6 +234,7 @@ fun Blockchain.toNetworkId(): String {
         Blockchain.BaseTestnet -> "base/test"
         Blockchain.Koinos -> "koinos"
         Blockchain.KoinosTestnet -> "koinos/test"
+        Blockchain.Joystream -> "joystream"
     }
 }
 
@@ -307,6 +309,7 @@ fun Blockchain.toCoinId(): String {
         Blockchain.Taraxa, Blockchain.TaraxaTestnet -> "taraxa"
         Blockchain.Base, Blockchain.BaseTestnet -> "base-ethereum"
         Blockchain.Koinos, Blockchain.KoinosTestnet -> "koinos"
+        Blockchain.Joystream -> "joystream"
     }
 }