Updated on 2026-08-14

features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/ContactMatcher.kt

@@ -1,6 +1,9 @@
 package com.tangem.features.addressbook.common
 
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.common.ui.account.AccountIconUM
+import com.tangem.domain.addressbook.model.AddressEntry
 import com.tangem.domain.addressbook.model.Contact
 import com.tangem.domain.models.account.CryptoPortfolioIcon
 import com.tangem.features.addressbook.MatchedContact
@@ -27,7 +30,7 @@ internal object ContactMatcher {
                     MatchedContact.ContactAddress(
                         address = entry.address,
                         memo = entry.memo,
-                        networkName = entry.networkName,
+                        networkName = entry.displayNetworkName(),
                     )
                 }.toImmutableList(),
             )
@@ -40,4 +43,8 @@ internal object ContactMatcher {
         color = CryptoPortfolioIcon.Color.entries.firstOrNull { it.name == iconColor }
             ?: CryptoPortfolioIcon.Color.Azure,
     )
+
+    /** Display network name is derived from [AddressEntry.networkId] — it is not stored in the encrypted payload. */
+    private fun AddressEntry.displayNetworkName(): String =
+        Blockchain.fromNetworkId(networkId.value)?.fullName ?: networkId.value
 }

features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/model/ContactAddressEntriesConverter.kt

@@ -37,7 +37,6 @@ internal class ContactAddressEntriesConverter {
             id = AddressEntryId(UUID.randomUUID().toString()),
             address = address,
             networkId = Network.RawID(rawId),
-            networkName = blockchain?.fullName ?: rawId,
             memo = memo?.takeIf { hasExtrasSupport },
             signature = "",
         )

features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/DefaultAddressBookListComponent.kt

@@ -63,7 +63,7 @@ internal class DefaultAddressBookListComponent(
             is AddressBookListUM.Content -> AddressBookListScreen(
                 state = addressBookListUM,
                 onBackClick = router::pop,
-                modifier = modifier.background(TangemTheme.colors3.bg.primary),
+                modifier = Modifier.background(TangemTheme.colors3.bg.primary),
             )
         }
         selector.child?.instance?.BottomSheet()

features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/AddressBookListScreen.kt

@@ -43,7 +43,7 @@ internal fun AddressBookListScreen(
 ) {
     val density = LocalDensity.current
     val bottomBarHeight = with(density) { WindowInsets.systemBars.getBottom(this).toDp() }
-    Column(modifier = modifier) {
+    Column(modifier = modifier.fillMaxSize()) {
         TangemTopBar(
             modifier = Modifier.statusBarsPadding(),
             title = resourceReference(R.string.address_book_title),

features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/common/ContactMatcherTest.kt

@@ -90,7 +90,6 @@ internal class ContactMatcherTest {
         networkId = Network.RawID(networkId),
         memo = memo,
         signature = "sig",
-        networkName = "Ethereum",
     )
 
     private companion object {

features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModelTest.kt

@@ -808,7 +808,6 @@ internal class EditContactModelTest {
                         id = AddressEntryId("e-1"),
                         address = "0xAAA",
                         networkId = Network.RawID("ethereum"),
-                        networkName = "Ethereum",
                         memo = null,
                         signature = "sig",
                     ),
@@ -816,7 +815,6 @@ internal class EditContactModelTest {
                         id = AddressEntryId("e-2"),
                         address = "0xBBB",
                         networkId = Network.RawID("bsc"),
-                        networkName = "BSC",
                         memo = null,
                         signature = "sig",
                     ),
@@ -1016,7 +1014,6 @@ internal class EditContactModelTest {
                 id = AddressEntryId("e-1"),
                 address = address,
                 networkId = Network.RawID("ethereum"),
-                networkName = "Ethereum",
                 memo = null,
                 signature = "sig",
             ),

features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/list/model/AddressBookListModelTest.kt

@@ -186,7 +186,6 @@ internal class AddressBookListModelTest {
                     id = AddressEntryId("e-$id"),
                     address = "0xABC",
                     networkId = Network.RawID("ethereum"),
-                    networkName = "Ethereum",
                     memo = null,
                     signature = "sig",
                 ),

features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/list/state/transformers/UpdateAddressBookListContentTransformerTest.kt

@@ -172,7 +172,6 @@ internal class UpdateAddressBookListContentTransformerTest {
                     networkId = Network.RawID("ethereum"),
                     memo = null,
                     signature = "sig",
-                    networkName = "Ethereum",
                 ),
             ),
         ),