Updated on 2026-08-14

common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt

@@ -1,14 +1,13 @@
 package com.tangem.common.routing
 
 import android.os.Bundle
-import com.tangem.common.routing.AppRoute.ManageTokens.Source
 import com.tangem.common.routing.bundle.RouteBundleParams
 import com.tangem.common.routing.bundle.bundle
 import com.tangem.common.routing.entity.InitScreenLaunchMode
 import com.tangem.common.routing.entity.SerializableIntent
 import com.tangem.core.decompose.navigation.Route
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.feedback.models.CardInfo
+import com.tangem.domain.feedback.models.WalletMetaInfo
 import com.tangem.domain.markets.TokenMarketParams
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.currency.CryptoCurrency
@@ -83,8 +82,8 @@ sealed class AppRoute(val path: String) : Route {
 
     @Serializable
     data class Usedesk(
-        val cardInfo: CardInfo,
-    ) : AppRoute(path = "/usedesk/${cardInfo.cardId}")
+        val walletMetaInfo: WalletMetaInfo,
+    ) : AppRoute(path = "/usedesk/${walletMetaInfo.userWalletId}")
 
     @Serializable
     data class CardSettings(
@@ -239,6 +238,7 @@ sealed class AppRoute(val path: String) : Route {
         val source: OnrampSource,
         val userWalletId: UserWalletId,
         val currency: CryptoCurrency,
+        val launchSepa: Boolean = false,
     ) : AppRoute(path = "/onramp/${userWalletId.stringValue}/${currency.symbol}"), RouteBundleParams {
         override fun getBundle(): Bundle = bundle(serializer())
     }
@@ -311,6 +311,11 @@ sealed class AppRoute(val path: String) : Route {
     @Serializable
     object CreateMobileWallet : AppRoute(path = "/create_mobile_wallet")
 
+    @Serializable
+    data class UpgradeWallet(
+        val userWalletId: UserWalletId,
+    ) : AppRoute(path = "/upgrade_wallet/${userWalletId.stringValue}")
+
     @Serializable
     object AddExistingWallet : AppRoute(path = "/add_existing_wallet")
 

common/ui/src/main/java/com/tangem/common/ui/account/AccountRow.kt

@@ -9,6 +9,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import com.tangem.common.ui.R
 import com.tangem.core.ui.extensions.TextReference
@@ -73,6 +74,8 @@ private fun Title(title: TextReference) {
         text = title.resolveReference(),
         style = TangemTheme.typography.subtitle2,
         color = TangemTheme.colors.text.primary1,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
     )
 }
 
@@ -82,6 +85,8 @@ private fun Subtitle(subtitle: TextReference) {
         color = TangemTheme.colors.text.tertiary,
         style = TangemTheme.typography.caption2,
         text = subtitle.resolveReference(),
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
     )
 }
 

common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt

@@ -139,33 +139,59 @@ private fun NameAndInfo(
                     )
                 }
             }
-            Text(
-                text = " $DOT ",
-                style = TangemTheme.typography.caption2,
-                color = TangemTheme.colors.text.tertiary,
-                maxLines = 1,
-            )
 
-            AnimatedContent(
-                targetState = balance,
-                label = "Balance content",
-            ) { balance ->
-                val (balanceValue, isFlickering) = getBalanceValueAndFlickerState(balance)
+            BalanceContent(balance)
+        }
+    }
+}
 
-                if (balanceValue == null) {
-                    TextShimmer(
-                        style = TangemTheme.typography.caption2,
-                        text = "aaaaa",
-                    )
-                } else {
+@Composable
+private fun BalanceContent(balance: UserWalletItemUM.Balance, modifier: Modifier = Modifier) {
+    AnimatedContent(
+        modifier = modifier,
+        targetState = balance,
+        label = "Balance content",
+    ) { balance ->
+        when (balance) {
+            UserWalletItemUM.Balance.Locked -> {
+                Icon(
+                    modifier = Modifier
+                        .padding(start = 4.dp, bottom = 2.dp, top = 2.dp)
+                        .size(12.dp),
+                    imageVector = ImageVector.vectorResource(R.drawable.ic_lock_24),
+                    tint = TangemTheme.colors.icon.informative,
+                    contentDescription = null,
+                )
+            }
+            UserWalletItemUM.Balance.NotShowing -> {
+                /** No balance and no dot */
+            }
+            else -> {
+                Row {
                     Text(
-                        text = balanceValue,
-                        style = TangemTheme.typography.caption2.applyBladeBrush(
-                            isEnabled = isFlickering,
-                            textColor = TangemTheme.colors.text.tertiary,
-                        ),
+                        text = " $DOT ",
+                        style = TangemTheme.typography.caption2,
+                        color = TangemTheme.colors.text.tertiary,
                         maxLines = 1,
                     )
+
+                    val (balanceValue, isFlickering) = getBalanceValueAndFlickerState(balance)
+
+                    if (balanceValue == null) {
+                        TextShimmer(
+                            style = TangemTheme.typography.caption2,
+                            text = "aaaaa",
+                        )
+                    } else {
+                        Text(
+                            text = balanceValue,
+                            style = TangemTheme.typography.caption2.applyBladeBrush(
+                                isEnabled = isFlickering,
+                                textColor = TangemTheme.colors.text.tertiary,
+                            ),
+                            maxLines = 1,
+                        )
+                    }
                 }
             }
         }
@@ -246,9 +272,8 @@ fun getBalanceValueAndFlickerState(balance: UserWalletItemUM.Balance): Pair<Stri
     return when (balance) {
         is UserWalletItemUM.Balance.Failed -> DASH_SIGN to false
         is UserWalletItemUM.Balance.Hidden -> THREE_STARS to false
-        is UserWalletItemUM.Balance.Loading -> null to false
-        is UserWalletItemUM.Balance.Locked -> stringResourceSafe(R.string.common_locked) to false
         is UserWalletItemUM.Balance.Loaded -> balance.value to balance.isFlickering
+        else -> null to false
     }
 }
 
@@ -392,6 +417,15 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 isEnabled = true,
                 onClick = {},
             ),
+            UserWalletItemUM(
+                id = UserWalletId("user_wallet_3".encodeToByteArray()),
+                name = stringReference("Multi Card"),
+                information = getInformation(cardCount = 3),
+                balance = UserWalletItemUM.Balance.NotShowing,
+                imageState = UserWalletItemUM.ImageState.MobileWallet,
+                isEnabled = true,
+                onClick = {},
+            ),
         )
 
     private fun getInformation(cardCount: Int): UserWalletItemUM.Information.Loaded {

common/ui/src/main/java/com/tangem/common/ui/userwallet/converter/UserWalletItemUMConverter.kt

@@ -2,8 +2,8 @@ package com.tangem.common.ui.userwallet.converter
 
 import com.tangem.common.ui.R
 import com.tangem.common.ui.userwallet.state.UserWalletItemUM
-import com.tangem.core.ui.components.label.entity.LabelUM
 import com.tangem.core.ui.components.label.entity.LabelStyle
+import com.tangem.core.ui.components.label.entity.LabelUM
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
@@ -12,7 +12,6 @@ import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.card.common.util.getCardsCount
-import com.tangem.domain.models.ArtworkModel
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.wallet.UserWallet
@@ -37,10 +36,10 @@ class UserWalletItemUMConverter(
     private val isBalanceHidden: Boolean = false,
     private val authMode: Boolean = false,
     private val endIcon: UserWalletItemUM.EndIcon = UserWalletItemUM.EndIcon.None,
-    private val artwork: ArtworkModel? = null,
+    artwork: UserWalletItemUM.ImageState? = null,
 ) : Converter<UserWallet, UserWalletItemUM> {
 
-    private val artworkUMConverter = ArtworkUMConverter()
+    private val artwork = artwork ?: UserWalletItemUM.ImageState.Loading
 
     override fun convert(value: UserWallet): UserWalletItemUM {
         return with(value) {
@@ -52,7 +51,7 @@ class UserWalletItemUMConverter(
                 isEnabled = isEnabled(userWallet = this),
                 endIcon = endIcon,
                 onClick = { onClick(value.walletId) },
-                imageState = getImageState(userWallet = value),
+                imageState = artwork,
                 label = getLabelOrNull(userWallet = this),
             )
         }
@@ -73,14 +72,6 @@ class UserWalletItemUMConverter(
         }
     }
 
-    private fun getImageState(userWallet: UserWallet): UserWalletItemUM.ImageState {
-        return when {
-            userWallet is UserWallet.Hot -> UserWalletItemUM.ImageState.MobileWallet
-            artwork != null -> UserWalletItemUM.ImageState.Image(artworkUMConverter.convert(artwork))
-            else -> UserWalletItemUM.ImageState.Loading
-        }
-    }
-
     private fun getInfo(userWallet: UserWallet): UserWalletItemUM.Information.Loaded {
         val text = when (userWallet) {
             is UserWallet.Cold -> {
@@ -100,8 +91,9 @@ class UserWalletItemUMConverter(
 
     private fun getBalanceInfo(userWallet: UserWallet): UserWalletItemUM.Balance {
         return when {
-            isBalanceHidden -> UserWalletItemUM.Balance.Hidden
             userWallet.isLocked -> UserWalletItemUM.Balance.Locked
+            authMode -> UserWalletItemUM.Balance.NotShowing
+            isBalanceHidden -> UserWalletItemUM.Balance.Hidden
             balance == null -> UserWalletItemUM.Balance.Loading
             else -> {
                 when (balance) {

common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt

@@ -28,6 +28,8 @@ data class UserWalletItemUM(
 
         data object Hidden : Balance()
 
+        data object NotShowing : Balance()
+
         data object Locked : Balance()
 
         data object Failed : Balance()