From 4b62c933bf817c831767b42e15741e8d3afe98db Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 11 Nov 2025 13:42:29 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../AccountPortfolioItemUMConverter.kt        |  3 +-
 .../common/ui/userwallet/UserWalletItem.kt    | 32 ++++++++++---------
 .../converter/UserWalletItemUMConverter.kt    |  2 +-
 .../ui/userwallet/state/UserWalletItemUM.kt   |  5 +--
 .../core/ui/components/text/TooltipText.kt    |  2 +-
 .../repository/DefaultCurrenciesRepository.kt |  1 -
 .../selector/entity/PortfolioSelectorUM.kt    |  2 +-
 .../selector/ui/PortfolioSelectorContent.kt   |  5 ++-
 .../preview/PreviewUserWalletListComponent.kt |  7 ++--
 .../PreviewAddToPortfolioBSContentProvider.kt |  3 +-
 .../preview/PreviewWalletSettingsComponent.kt |  2 +-
 .../entity/WalletSettingsItemUM.kt            |  2 +-
 .../model/WalletSettingsModel.kt              |  2 +-
 .../walletsettings/ui/WalletSettingsScreen.kt |  4 ++-
 .../components/WcSelectWalletComponent.kt     | 16 +++++-----
 .../connections/utils/WcUserWalletsFetcher.kt |  4 +--
 .../features/welcome/impl/ui/Welcome.kt       |  5 ++-
 17 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/common/ui/src/main/java/com/tangem/common/ui/account/AccountPortfolioItemUMConverter.kt b/common/ui/src/main/java/com/tangem/common/ui/account/AccountPortfolioItemUMConverter.kt
index ef26a51eef..d45ef488d1 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/account/AccountPortfolioItemUMConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/account/AccountPortfolioItemUMConverter.kt
@@ -10,7 +10,6 @@ import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.account.Account
-import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.utils.converter.Converter
 
 class AccountPortfolioItemUMConverter(
@@ -25,7 +24,7 @@ class AccountPortfolioItemUMConverter(
     override fun convert(value: Account): UserWalletItemUM {
         return with(value) {
             UserWalletItemUM(
-                id = UserWalletId(accountId.value),
+                id = accountId.value,
                 name = accountName.toUM().value,
                 information = getInfo(account = this),
                 balance = getBalanceInfo(),
diff --git a/common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt b/common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt
index 5f431fee2f..4b35beb47b 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt
@@ -37,10 +37,12 @@ import com.tangem.core.ui.components.account.AccountIconSize
 import com.tangem.core.ui.components.block.BlockCard
 import com.tangem.core.ui.components.block.TangemBlockCardColors
 import com.tangem.core.ui.components.text.applyBladeBrush
-import com.tangem.core.ui.extensions.*
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.utils.StringsSigns.DASH_SIGN
 import com.tangem.utils.StringsSigns.DOT
 import com.tangem.utils.StringsSigns.THREE_STARS
@@ -322,7 +324,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
     override val values: Sequence<UserWalletItemUM>
         get() = sequenceOf(
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_0".encodeToByteArray()),
+                id = "user_wallet_0",
                 name = stringReference("Mobile Wallet"),
                 information = getInformation(cardCount = 1),
                 balance = UserWalletItemUM.Balance.Locked,
@@ -331,7 +333,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_1".encodeToByteArray()),
+                id = "user_wallet_1",
                 name = stringReference("My Wallet"),
                 information = getInformation(cardCount = 1),
                 balance = UserWalletItemUM.Balance.Locked,
@@ -339,7 +341,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_2".encodeToByteArray()),
+                id = "user_wallet_2",
                 name = stringReference("Old wallet"),
                 information = getInformation(cardCount = 2),
                 balance = UserWalletItemUM.Balance.Hidden,
@@ -348,7 +350,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 endIcon = UserWalletItemUM.EndIcon.Arrow,
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = getInformation(cardCount = 3),
                 balance = UserWalletItemUM.Balance.Failed,
@@ -357,7 +359,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = getInformation(cardCount = 3),
                 balance = UserWalletItemUM.Balance.Loading,
@@ -366,7 +368,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = UserWalletItemUM.Information.Loading,
                 balance = UserWalletItemUM.Balance.Loading,
@@ -375,7 +377,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = getInformation(cardCount = 3),
                 balance = UserWalletItemUM.Balance.Loaded(
@@ -387,7 +389,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = getInformation(cardCount = 3),
                 balance = UserWalletItemUM.Balance.Loaded(
@@ -399,7 +401,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = UserWalletItemUM.Information.Loading,
                 balance = UserWalletItemUM.Balance.Loaded(
@@ -410,7 +412,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = UserWalletItemUM.Information.Failed,
                 balance = UserWalletItemUM.Balance.Loaded(
@@ -421,7 +423,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = UserWalletItemUM.Information.Failed,
                 balance = UserWalletItemUM.Balance.Loaded(
@@ -433,7 +435,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                id = "user_wallet_3",
                 name = stringReference("Multi Card"),
                 information = getInformation(cardCount = 3),
                 balance = UserWalletItemUM.Balance.NotShowing,
@@ -442,7 +444,7 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 onClick = {},
             ),
             UserWalletItemUM(
-                id = UserWalletId("user_wallet_4".encodeToByteArray()),
+                id = "user_wallet_4",
                 name = stringReference("Main account"),
                 information = getInformation(cardCount = 3),
                 balance = UserWalletItemUM.Balance.NotShowing,
diff --git a/common/ui/src/main/java/com/tangem/common/ui/userwallet/converter/UserWalletItemUMConverter.kt b/common/ui/src/main/java/com/tangem/common/ui/userwallet/converter/UserWalletItemUMConverter.kt
index 7add1ddcef..bc1e70f2a5 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/userwallet/converter/UserWalletItemUMConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/userwallet/converter/UserWalletItemUMConverter.kt
@@ -41,7 +41,7 @@ class UserWalletItemUMConverter(
     override fun convert(value: UserWallet): UserWalletItemUM {
         return with(value) {
             UserWalletItemUM(
-                id = walletId,
+                id = walletId.stringValue,
                 name = stringReference(name),
                 information = getInfo(userWallet = this),
                 balance = getBalanceInfo(userWallet = this),
diff --git a/common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt b/common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt
index 98c0988741..3c59142510 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt
@@ -3,12 +3,11 @@ package com.tangem.common.ui.userwallet.state
 import com.tangem.common.ui.account.CryptoPortfolioIconUM
 import com.tangem.core.ui.components.artwork.ArtworkUM
 import com.tangem.core.ui.extensions.TextReference
-import com.tangem.domain.models.wallet.UserWalletId
 import javax.annotation.concurrent.Immutable
 
 @Immutable
 data class UserWalletItemUM(
-    val id: UserWalletId,
+    val id: String,
     val name: TextReference,
     val information: Information,
     val balance: Balance,
@@ -25,6 +24,7 @@ data class UserWalletItemUM(
         Warning,
     }
 
+    @Immutable
     sealed class Balance {
 
         data object Hidden : Balance()
@@ -43,6 +43,7 @@ data class UserWalletItemUM(
         ) : Balance()
     }
 
+    @Immutable
     sealed class Information {
 
         data object Failed : Information()
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/text/TooltipText.kt b/core/ui/src/main/java/com/tangem/core/ui/components/text/TooltipText.kt
index 801d47263b..42bf28e249 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/text/TooltipText.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/text/TooltipText.kt
@@ -82,7 +82,7 @@ private fun Preview_TooltipText() {
         ) {
             TooltipText(
                 text = stringReference("Text"),
-                onInfoClick = { /* [REDACTED_TODO_COMMENT]*/ },
+                onInfoClick = { },
             )
         }
     }
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
index 6e48f04871..ad46acd627 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
@@ -602,7 +602,6 @@ internal class DefaultCurrenciesRepository(
         return demoConfig.isDemoCardId(userWallet.cardId) && response == null
     }
 
-    // TODO [REDACTED_JIRA]
     private suspend fun fetchExpressAssetsByNetworkIds(userWallet: UserWallet, userTokens: UserTokensResponse) {
         val tokens = userTokens.tokens.mapTo(hashSetOf()) { token ->
             ExpressAsset.ID(
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt
index ab0f8ec525..83d3979381 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt
@@ -23,6 +23,6 @@ sealed interface PortfolioSelectorItemUM {
         val item: UserWalletItemUM,
         val isSelected: Boolean,
     ) : PortfolioSelectorItemUM {
-        override val id: String = item.id.stringValue
+        override val id: String = item.id
     }
 }
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt
index 396694b443..0fc52dd44d 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt
@@ -32,7 +32,6 @@ import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.features.account.impl.R
 import com.tangem.features.account.selector.entity.PortfolioSelectorItemUM
 import com.tangem.features.account.selector.entity.PortfolioSelectorUM
@@ -132,7 +131,7 @@ internal object PortfolioSelectorPreviewData {
 
     private val accountItem: UserWalletItemUM
         get() = UserWalletItemUM(
-            id = UserWalletId(UUID.randomUUID().toString().encodeToByteArray()),
+            id = UUID.randomUUID().toString(),
             name = accountName,
             information = UserWalletItemUM.Information.Loaded(stringReference("12 tokens")),
             balance = UserWalletItemUM.Balance.Loaded("$726.04", false),
@@ -149,7 +148,7 @@ internal object PortfolioSelectorPreviewData {
 
     private val walletItem: UserWalletItemUM
         get() = UserWalletItemUM(
-            id = UserWalletId(UUID.randomUUID().toString().encodeToByteArray()),
+            id = UUID.randomUUID().toString(),
             name = walletName,
             information = UserWalletItemUM.Information.Loaded(stringReference("12 tokens")),
             balance = UserWalletItemUM.Balance.Loaded("$726.04", false),
diff --git a/features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewUserWalletListComponent.kt b/features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewUserWalletListComponent.kt
index 3e15f2bc56..86ecb2a42f 100644
--- a/features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewUserWalletListComponent.kt
+++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewUserWalletListComponent.kt
@@ -10,7 +10,6 @@ import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.features.details.component.UserWalletListComponent
 import com.tangem.features.details.entity.UserWalletListUM
 import com.tangem.features.details.impl.R
@@ -25,7 +24,7 @@ internal class PreviewUserWalletListComponent : UserWalletListComponent {
         UserWalletListUM(
             userWallets = persistentListOf(
                 UserWalletItemUM(
-                    id = UserWalletId("user_wallet_1".encodeToByteArray()),
+                    id = "user_wallet_1",
                     name = stringReference("My Wallet"),
                     information = getInformation(cardCount = 1),
                     balance = UserWalletItemUM.Balance.Loading,
@@ -33,7 +32,7 @@ internal class PreviewUserWalletListComponent : UserWalletListComponent {
                     onClick = {},
                 ),
                 UserWalletItemUM(
-                    id = UserWalletId("user_wallet_2".encodeToByteArray()),
+                    id = "user_wallet_2",
                     name = stringReference("Old wallet"),
                     information = getInformation(cardCount = 2),
                     balance = UserWalletItemUM.Balance.Loading,
@@ -41,7 +40,7 @@ internal class PreviewUserWalletListComponent : UserWalletListComponent {
                     onClick = {},
                 ),
                 UserWalletItemUM(
-                    id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                    id = "user_wallet_3",
                     name = stringReference("Multi Card"),
                     information = getInformation(cardCount = 3),
                     balance = UserWalletItemUM.Balance.Loading,
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/preview/PreviewAddToPortfolioBSContentProvider.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/preview/PreviewAddToPortfolioBSContentProvider.kt
index 3cc93f8bbc..16b7cf769f 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/preview/PreviewAddToPortfolioBSContentProvider.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/preview/PreviewAddToPortfolioBSContentProvider.kt
@@ -6,7 +6,6 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.components.rows.model.BlockchainRowUM
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.features.markets.impl.R
 import com.tangem.features.markets.portfolio.impl.ui.state.AddToPortfolioBSContentUM
 import com.tangem.features.markets.portfolio.impl.ui.state.SelectNetworkUM
@@ -24,7 +23,7 @@ internal class PreviewAddToPortfolioBSContentProvider : PreviewParameterProvider
     )
 
     val userWallet = UserWalletItemUM(
-        id = UserWalletId("1"),
+        id = "1",
         name = stringReference("Wallet 1"),
         information = UserWalletItemUM.Information.Loaded(TextReference.Str("3 cards")),
         balance = UserWalletItemUM.Balance.Loading,
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewWalletSettingsComponent.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewWalletSettingsComponent.kt
index 67df3940fa..6b788a5b3e 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewWalletSettingsComponent.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewWalletSettingsComponent.kt
@@ -29,7 +29,7 @@ internal class PreviewWalletSettingsComponent : WalletSettingsComponent {
 
     private val accountItem: UserWalletItemUM
         get() = UserWalletItemUM(
-            id = UserWalletId(UUID.randomUUID().toString().encodeToByteArray()),
+            id = UUID.randomUUID().toString(),
             name = accountName,
             information = UserWalletItemUM.Information.Loaded(stringReference("12 tokens")),
             balance = UserWalletItemUM.Balance.Loaded("$726.04", false),
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/WalletSettingsItemUM.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/WalletSettingsItemUM.kt
index c6d8ddb1a3..dd53d06711 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/WalletSettingsItemUM.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/WalletSettingsItemUM.kt
@@ -67,7 +67,7 @@ internal sealed class WalletSettingsAccountsUM : WalletSettingsItemUM() {
     data class Account(
         val state: UserWalletItemUM,
     ) : WalletSettingsAccountsUM() {
-        override val id: String get() = state.id.stringValue
+        override val id: String = state.id
     }
 
     data class Footer(
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
index 390895141b..082180535d 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
@@ -448,7 +448,7 @@ internal class WalletSettingsModel @Inject constructor(
             val id = (it as? WalletSettingsAccountsUM.Account)?.state?.id
                 ?: return@mapNotNull null
 
-            AccountId.forCryptoPortfolio(userWalletId = params.userWalletId, value = id.stringValue).getOrNull()
+            AccountId.forCryptoPortfolio(userWalletId = params.userWalletId, value = id).getOrNull()
         }
 
         accountListSortingSaver.save(accountIds = accountIds)
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt
index b3a5218d38..ebb484971d 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt
@@ -114,6 +114,7 @@ private fun Content(state: WalletSettingsUM, modifier: Modifier = Modifier) {
         items(
             items = state.items,
             key = WalletSettingsItemUM::id,
+            contentType = { it::class.java },
         ) { item ->
             val offsetModifier = when (item) {
                 is WalletSettingsAccountsUM.Account,
@@ -335,6 +336,7 @@ private fun LazyItemScope.AccountItem(
     ReorderableItem(
         state = reorderableListState,
         key = model.id,
+        modifier = modifier,
     ) { isDragging ->
         val elevation by animateDpAsState(if (isDragging) 9.dp else 0.dp)
         val scale by animateFloatAsState(if (isDragging) 1.04f else 1f)
@@ -343,7 +345,7 @@ private fun LazyItemScope.AccountItem(
         Surface(
             shape = RoundedCornerShape(shapeRadius),
             shadowElevation = elevation,
-            modifier = modifier.scale(scale),
+            modifier = Modifier.scale(scale),
         ) {
             UserWalletItem(
                 state = model.state,
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcSelectWalletComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcSelectWalletComponent.kt
index 92ff58d06f..93e8566ec0 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcSelectWalletComponent.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcSelectWalletComponent.kt
@@ -119,7 +119,7 @@ private fun WcSelectWalletContent(
                 val baseModifier = Modifier
                     .clip(RoundedCornerShape(14.dp))
                     .clickable(onClick = state.onClick)
-                val itemModifier = if (state.id == selectedWalletId) {
+                val itemModifier = if (state.id == selectedWalletId.stringValue) {
                     baseModifier.border(
                         width = 1.dp,
                         color = TangemTheme.colors.text.accent,
@@ -148,7 +148,7 @@ private fun WcSelectWalletContent(
 private fun WcSelectWalletContent_Preview() {
     val wallets = persistentListOf(
         UserWalletItemUM(
-            id = UserWalletId("user_wallet_1".encodeToByteArray()),
+            id = "user_wallet_1",
             name = stringReference("Tangem 2.0"),
             information = getInformation(42),
             balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@@ -156,7 +156,7 @@ private fun WcSelectWalletContent_Preview() {
             onClick = {},
         ),
         UserWalletItemUM(
-            id = UserWalletId("user_wallet_2".encodeToByteArray()),
+            id = "user_wallet_2",
             name = stringReference("Tangem White"),
             information = getInformation(24),
             balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@@ -164,7 +164,7 @@ private fun WcSelectWalletContent_Preview() {
             onClick = {},
         ),
         UserWalletItemUM(
-            id = UserWalletId("user_wallet_3".encodeToByteArray()),
+            id = "user_wallet_3",
             name = stringReference("Bitcoin"),
             information = getInformation(1),
             balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@@ -172,7 +172,7 @@ private fun WcSelectWalletContent_Preview() {
             onClick = {},
         ),
         UserWalletItemUM(
-            id = UserWalletId("user_wallet_4".encodeToByteArray()),
+            id = "user_wallet_4",
             name = stringReference("Tangem 1.0"),
             information = getInformation(21),
             balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@@ -180,7 +180,7 @@ private fun WcSelectWalletContent_Preview() {
             onClick = {},
         ),
         UserWalletItemUM(
-            id = UserWalletId("user_wallet_4".encodeToByteArray()),
+            id = "user_wallet_4",
             name = stringReference("Tangem 1.0"),
             information = UserWalletItemUM.Information.Loading,
             balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@@ -188,7 +188,7 @@ private fun WcSelectWalletContent_Preview() {
             onClick = {},
         ),
         UserWalletItemUM(
-            id = UserWalletId("user_wallet_4".encodeToByteArray()),
+            id = "user_wallet_4",
             name = stringReference("Tangem 1.0"),
             information = UserWalletItemUM.Information.Failed,
             balance = UserWalletItemUM.Balance.Loaded("1 496,34 $", isFlickering = false),
@@ -199,7 +199,7 @@ private fun WcSelectWalletContent_Preview() {
     TangemThemePreview {
         WcSelectWalletModalBS(
             wallets = wallets,
-            selectedWalletId = wallets.first().id,
+            selectedWalletId = UserWalletId(wallets.first().id.encodeToByteArray()),
             onBack = {},
             onDismiss = {},
         )
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcUserWalletsFetcher.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcUserWalletsFetcher.kt
index dc19a55e4e..584b345971 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcUserWalletsFetcher.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcUserWalletsFetcher.kt
@@ -6,8 +6,8 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.domain.tokens.GetTokenListUseCase
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.tokens.GetTokenListUseCase
 import com.tangem.features.wallet.utils.UserWalletsFetcher
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -41,7 +41,7 @@ internal class WcUserWalletsFetcher(
         }
 
     private fun getTokenListFlow(walletItem: UserWalletItemUM): Flow<UserWalletItemUM> {
-        return getTokenListUseCase.launch(walletItem.id).map { lce ->
+        return getTokenListUseCase.launch(UserWalletId(walletItem.id)).map { lce ->
             val information = lce.fold(
                 ifLoading = { UserWalletItemUM.Information.Loading },
                 ifError = { UserWalletItemUM.Information.Failed },
diff --git a/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/ui/Welcome.kt b/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/ui/Welcome.kt
index 04b1e81910..a6e8deed67 100644
--- a/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/ui/Welcome.kt
+++ b/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/ui/Welcome.kt
@@ -14,7 +14,6 @@ import com.tangem.common.ui.userwallet.state.UserWalletItemUM
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.features.welcome.impl.ui.state.WelcomeUM
 import kotlinx.collections.immutable.persistentListOf
 
@@ -48,7 +47,7 @@ private fun Preview() {
         val state = WelcomeUM.SelectWallet(
             wallets = persistentListOf(
                 UserWalletItemUM(
-                    id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                    id = "user_wallet_3",
                     name = stringReference("Multi Card"),
                     information = UserWalletItemUM.Information.Loading,
                     balance = UserWalletItemUM.Balance.Loaded(
@@ -59,7 +58,7 @@ private fun Preview() {
                     onClick = {},
                 ),
                 UserWalletItemUM(
-                    id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                    id = "user_wallet_3",
                     name = stringReference("Multi Card"),
                     information = UserWalletItemUM.Information.Failed,
                     imageState = UserWalletItemUM.ImageState.MobileWallet,