From 99b6c9a5335bd7f991deea074d672c0644cdbdd4 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 18 Apr 2022 15:36:59 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../features/tokens/ui/compose/CollapsedCurrencyItem.kt  | 2 +-
 .../features/tokens/ui/compose/ExpandedCurrencyItem.kt   | 9 +++------
 .../tap/features/tokens/ui/compose/ListOfCurrencies.kt   | 5 ++++-
 .../tangem/tap/features/tokens/ui/compose/NetworkItem.kt | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CollapsedCurrencyItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CollapsedCurrencyItem.kt
index 21d2de3afd..e4b3810766 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CollapsedCurrencyItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CollapsedCurrencyItem.kt
@@ -59,7 +59,7 @@ fun CollapsedCurrencyItem(
                 .align(Alignment.CenterVertically)
         ) {
             Text(
-                text = currency.name,
+                text = currency.fullName,
                 fontSize = 17.sp,
                 fontWeight = FontWeight.Normal,
                 color = Color(0xFF1C1C1E),
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ExpandedCurrencyItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ExpandedCurrencyItem.kt
index 181bb64187..334e0fb4fb 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ExpandedCurrencyItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ExpandedCurrencyItem.kt
@@ -20,7 +20,6 @@ import androidx.compose.ui.unit.sp
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.tap.domain.tokens.Currency
 import com.tangem.tap.features.tokens.redux.ContractAddress
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
@@ -65,7 +64,7 @@ fun ExpandedCurrencyItem(
                     .align(Alignment.CenterVertically)
             ) {
                 Text(
-                    text = currency.name,
+                    text = currency.fullName,
                     fontSize = 17.sp,
                     fontWeight = FontWeight.Normal,
                     color = Color(0xFF1C1C1E),
@@ -87,9 +86,7 @@ fun ExpandedCurrencyItem(
             )
         }
 
-        val blockchains = currency.contracts?.map { it.blockchain } ?: listOfNotNull(
-            Blockchain.fromNetworkId(currency.id)
-        )
+        val blockchains = currency.contracts.map { it.blockchain }
 
         Row {
             Box(
@@ -134,7 +131,7 @@ fun ExpandedCurrencyItem(
                     .padding(top = 6.dp),
             ) {
                 blockchains.map { blockchain ->
-                    val contract = currency.contracts?.firstOrNull { it.blockchain == blockchain }
+                    val contract = currency.contracts.firstOrNull { it.blockchain == blockchain }
                     val added = if (contract != null && contract.address != currency.symbol) {
                         addedTokens.map { it.token.contractAddress }.contains(contract.address)
                     } else {
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
index d435e6e785..0e7c4e2acf 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt
@@ -66,4 +66,7 @@ fun ListOfCurrencies(
         }
 
     }
-}
\ No newline at end of file
+}
+
+val Currency.fullName: String
+    get() = "${this.name} (${this.symbol})"
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/NetworkItem.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/NetworkItem.kt
index 50618dcb83..bdb5107ae2 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/NetworkItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/NetworkItem.kt
@@ -46,7 +46,7 @@ fun NetworkItem(
             .combinedClickable(
                 enabled = allowToAdd,
                 onLongClick = {
-                    if (contract != null) onNetworkItemClicked(contract.address)
+                    if (!isBlockchain) onNetworkItemClicked(contract!!.address)
                 },
                 onClick = {},
                 indication = null,