Updated on 2026-08-14

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt

@@ -243,10 +243,6 @@ internal class WalletModel @Inject constructor(
                     } else {
                         null
                     }
-                    val isBackedUp = when (selectedWallet) {
-                        is UserWallet.Cold -> selectedWallet.scanResponse.card.backupStatus?.isActive == true
-                        is UserWallet.Hot -> selectedWallet.backedUp
-                    }
                     val result = getAppThemeModeUseCase().firstOrNull()
                     val theme = result?.getOrElse { AppThemeMode.FOLLOW_SYSTEM } ?: AppThemeMode.FOLLOW_SYSTEM
                     val appCurrency = getSelectedAppCurrencyUseCase.invokeSync().getOrElse { AppCurrency.Default }.code
@@ -254,7 +250,7 @@ internal class WalletModel @Inject constructor(
                         WalletScreenAnalyticsEvent.MainScreen.ScreenOpened(
                             hasMobileWallet = hasMobileWallet,
                             accountsCount = accountsCount,
-                            isBackedUp = isBackedUp,
+                            isBackedUp = selectedWallet.isBackedUpForAnalytics(),
                             theme = theme.value,
                             isImported = selectedWallet.isImported(),
                             referralId = appsFlyerStore.get()?.refcode,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/TangemPayClickIntents.kt

@@ -18,9 +18,9 @@ import com.tangem.domain.feedback.GetWalletMetaInfoUseCase
 import com.tangem.domain.feedback.SendFeedbackEmailUseCase
 import com.tangem.domain.feedback.models.FeedbackEmailType
 import com.tangem.domain.feedback.models.WalletMetaInfo
+import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.pay.TangemPayDetailsConfig
 import com.tangem.domain.pay.TangemPayEligibilityManager
 import com.tangem.domain.pay.flow.PaymentAccountStatusFetcher
 import com.tangem.domain.pay.model.TangemPayEntryPoint
@@ -40,7 +40,7 @@ internal interface TangemPayIntents {
 
     fun onRefreshPayToken(userWallet: UserWallet)
 
-    fun openDetails(userWalletId: UserWalletId, config: TangemPayDetailsConfig)
+    fun openDetails(status: AccountStatus.Payment)
 
     fun onKycProgressClicked(userWalletId: UserWalletId)
 
@@ -110,11 +110,8 @@ internal class TangemPayClickIntentsImplementor @Inject constructor(
         }
     }
 
-    override fun openDetails(userWalletId: UserWalletId, config: TangemPayDetailsConfig) {
-        router.openTangemPayDetails(
-            userWalletId = userWalletId,
-            config = config,
-        )
+    override fun openDetails(status: AccountStatus.Payment) {
+        router.openTangemPayDetails(status = status)
     }
 
     override fun onKycProgressClicked(userWalletId: UserWalletId) {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt

@@ -12,13 +12,13 @@ import com.tangem.core.ui.DesignFeatureToggles
 import com.tangem.core.ui.ds.row.token.TangemTokenRowUM
 import com.tangem.domain.models.TokenReceiveConfig
 import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.qrscanning.models.QrSendTarget
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.pay.TangemPayDetailsConfig
+import com.tangem.domain.qrscanning.models.QrSendTarget
 import com.tangem.domain.tokens.model.details.NavigationAction
 import com.tangem.domain.tokens.model.details.TokenAction
 import com.tangem.feature.wallet.child.organizetokens.OrganizeTokensComponent
@@ -142,8 +142,8 @@ internal class DefaultWalletRouter @Inject constructor(
         router.push(route = AppRoute.TangemPayOnboarding(mode = mode))
     }
 
-    override fun openTangemPayDetails(userWalletId: UserWalletId, config: TangemPayDetailsConfig) {
-        router.push(AppRoute.TangemPayDetails(userWalletId = userWalletId, config = config))
+    override fun openTangemPayDetails(status: AccountStatus.Payment) {
+        router.push(AppRoute.TangemPayDetails(status = status))
     }
 
     override fun openYieldSupplyBottomSheet(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt

@@ -7,13 +7,13 @@ import com.tangem.common.routing.AppRoute
 import com.tangem.core.ui.ds.row.token.TangemTokenRowUM
 import com.tangem.domain.models.TokenReceiveConfig
 import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.qrscanning.models.QrSendTarget
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.pay.TangemPayDetailsConfig
+import com.tangem.domain.qrscanning.models.QrSendTarget
 import com.tangem.domain.tokens.model.details.NavigationAction
 import com.tangem.domain.tokens.model.details.TokenAction
 import com.tangem.feature.wallet.child.organizetokens.OrganizeTokensComponent
@@ -82,7 +82,7 @@ internal interface InnerWalletRouter {
 
     fun openTangemPayOnboarding(mode: AppRoute.TangemPayOnboarding.Mode)
 
-    fun openTangemPayDetails(userWalletId: UserWalletId, config: TangemPayDetailsConfig)
+    fun openTangemPayDetails(status: AccountStatus.Payment)
 
     /** Open BS abput yield supply active and all money deposited in AAVE */
     fun openYieldSupplyBottomSheet(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt

@@ -1,56 +1,14 @@
 package com.tangem.feature.wallet.presentation.wallet.analytics
 
 import com.tangem.core.analytics.models.*
-import com.tangem.domain.models.wallet.UserWalletId
 
 sealed class WalletScreenAnalyticsEvent {
 
-    sealed class Basic(
-        event: String,
-        params: Map<String, String> = mapOf(),
-    ) : AnalyticsEvent(category = "Basic", event = event, params = params) {
-
-        class WalletToppedUp(userWalletId: UserWalletId, walletType: AnalyticsParam.WalletType) :
-            Basic(
-                event = "Topped up",
-                params = mapOf(AnalyticsParam.CURRENCY to walletType.value),
-            ),
-            OneTimeAnalyticsEvent, AppsFlyerIncludedEvent {
-
-            override val oneTimeEventId: String = id + userWalletId.stringValue
-        }
-
-        class CardWasScanned(source: AnalyticsParam.ScreensSources) : Basic(
-            event = "Card Was Scanned",
-            params = mapOf(
-                AnalyticsParam.SOURCE to source.value,
-            ),
-        )
-
-        class BalanceLoaded(balance: AnalyticsParam.CardBalanceState, tokensCount: Int?) : Basic(
-            event = "Balance Loaded",
-            params = buildMap {
-                put(AnalyticsParam.BALANCE, balance.value)
-                tokensCount?.let { put(AnalyticsParam.TOKENS_COUNT, it.toString()) }
-            },
-        ), AppsFlyerIncludedEvent
-
-        class TokenBalance(balance: AnalyticsParam.EmptyFull, token: String) : Basic(
-            event = "Token Balance",
-            params = mapOf(
-                AnalyticsParam.STATE to balance.value,
-                AnalyticsParam.TOKEN_PARAM to token,
-            ),
-        )
-    }
-
     sealed class MainScreen(
         event: String,
         params: Map<String, String> = mapOf(),
     ) : AnalyticsEvent(category = "Main Screen", event = event, params = params) {
 
-        class ScreenOpenedLegacy : MainScreen(event = "Screen opened")
-
         data class ScreenOpened(
             private val hasMobileWallet: Boolean,
             private val accountsCount: Int?,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/TokenListAnalyticsSender.kt

@@ -8,6 +8,7 @@ import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.common.extensions.isZero
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.core.analytics.models.Basic
 import com.tangem.core.analytics.models.event.MainScreenAnalyticsEvent
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.analytics.CheckIsWalletToppedUpUseCase
@@ -18,7 +19,6 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isMultiCurrency
-import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent.Basic
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent.MainScreen
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.utils.ScreenLifecycleProvider
@@ -206,7 +206,12 @@ internal class TokenListAnalyticsSender @Inject constructor(
                 AnalyticsParam.WalletType.SingleCurrency(currency.currency.name)
             }
 
-            analyticsEventHandler.send(Basic.WalletToppedUp(userWallet.walletId, walletType))
+            analyticsEventHandler.send(
+                Basic.ToppedUp(
+                    userWalletId = userWallet.walletId.stringValue,
+                    walletType = walletType,
+                ),
+            )
         }
     }
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TangemPayMainBlockConverter.kt

@@ -12,16 +12,12 @@ import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.account.PaymentAccountStatusValue
 import com.tangem.domain.models.kyc.KycStatus
-import com.tangem.domain.pay.TangemPayDetailsConfig
-import com.tangem.domain.visa.model.TangemPayCardFrozenState
 import com.tangem.feature.wallet.child.wallet.model.intents.TangemPayIntents
 import com.tangem.features.tangempay.entity.TangemPayMainUM
 import com.tangem.utils.converter.Converter
 import java.math.BigDecimal
 import java.util.Currency
 
-private const val POLYGON_CHAIN_ID = 137
-
 internal class TangemPayMainBlockConverter(
     private val tangemPayClickIntents: TangemPayIntents,
     private val isRedesignEnabled: Boolean,
@@ -63,24 +59,9 @@ internal class TangemPayMainBlockConverter(
                     currencyCode = statusValue.fiatBalance.currency,
                     balance = statusValue.fiatBalance.availableBalance,
                 ),
-                balanceSubtitle = stringReference("USDC"), // TODO hardcode for now
+                balanceSubtitle = stringReference(statusValue.cryptoCurrency.symbol),
                 shouldShowOnlyCacheWarning = statusValue.source == StatusSource.ONLY_CACHE,
-                onClick = {
-                    // Dummy config for deactivated account just to open details screen
-                    tangemPayClickIntents.openDetails(
-                        userWalletId = value.account.userWalletId,
-                        config = TangemPayDetailsConfig(
-                            customerId = "",
-                            cardId = "",
-                            isPinSet = false,
-                            cardFrozenState = TangemPayCardFrozenState.Unfrozen,
-                            cardNumberEnd = "",
-                            chainId = POLYGON_CHAIN_ID,
-                            displayName = null,
-                            isTangemPayDeactivated = true,
-                        ),
-                    )
-                },
+                onClick = { tangemPayClickIntents.openDetails(value) },
             )
             is PaymentAccountStatusValue.Loaded -> {
                 val card = statusValue.cards.firstOrNull() ?: return TangemPayMainUM.TemporaryUnavailable
@@ -91,27 +72,9 @@ internal class TangemPayMainBlockConverter(
                         currencyCode = statusValue.currencyCode,
                         balance = statusValue.fiatBalance.availableBalance,
                     ),
-                    balanceSubtitle = stringReference("USDC"), // TODO hardcode for now
+                    balanceSubtitle = stringReference(statusValue.cryptoCurrency.symbol),
                     shouldShowOnlyCacheWarning = statusValue.source == StatusSource.ONLY_CACHE,
-                    onClick = {
-                        tangemPayClickIntents.openDetails(
-                            value.account.userWalletId,
-                            TangemPayDetailsConfig(
-                                customerId = statusValue.customerId,
-                                cardId = card.id,
-                                isPinSet = card.hasPinCode,
-                                cardFrozenState = if (card.isFrozen) {
-                                    TangemPayCardFrozenState.Frozen
-                                } else {
-                                    TangemPayCardFrozenState.Unfrozen
-                                },
-                                cardNumberEnd = card.lastDigits,
-                                chainId = POLYGON_CHAIN_ID,
-                                displayName = card.displayName,
-                                isTangemPayDeactivated = false,
-                            ),
-                        )
-                    },
+                    onClick = { tangemPayClickIntents.openDetails(value) },
                 )
             }
         }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/PrimaryCurrencySubscriber.kt

@@ -3,12 +3,12 @@ package com.tangem.feature.wallet.presentation.wallet.subscribers
 import com.tangem.common.extensions.isZero
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.core.analytics.models.Basic
 import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetPrimaryCurrencyTransformer
 import dagger.assisted.Assisted
@@ -70,7 +70,7 @@ internal class PrimaryCurrencySubscriber @AssistedInject constructor(
         cardBalanceState?.let { balanceState ->
             // do not send tokens count for single currency wallet
             analyticsEventHandler.send(
-                event = WalletScreenAnalyticsEvent.Basic.BalanceLoaded(
+                event = Basic.BalanceLoaded(
                     balance = balanceState,
                     tokensCount = null,
                 ),

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen2.kt

@@ -209,16 +209,27 @@ private fun WalletContent2(
                 .fillMaxSize()
                 .hazeSourceTangem(zIndex = -2f),
         ) {
-            NorthernLightsBackground(
-                containerColor = if (LocalIsInDarkTheme.current) {
-                    TangemTheme.colors2.surface.level1
-                } else {
-                    TangemTheme.colors2.surface.level2
-                },
+            val backgroundColor = if (LocalIsInDarkTheme.current) {
+                TangemTheme.colors2.surface.level1
+            } else {
+                TangemTheme.colors2.surface.level2
+            }
+            Box(
                 modifier = Modifier
-                    .graphicsLayer { alpha = 1 - behavior.state.collapsedFraction * 2 }
-                    .matchParentSize(),
+                    .matchParentSize()
+                    .background(backgroundColor),
             )
+            val isSheetExpanded by remember {
+                derivedStateOf { bottomSheetState.targetValue == TangemSheetValue.Expanded }
+            }
+            if (!isSheetExpanded) {
+                NorthernLightsBackground(
+                    containerColor = backgroundColor,
+                    modifier = Modifier
+                        .graphicsLayer { alpha = 1 - behavior.state.collapsedFraction * 2 }
+                        .matchParentSize(),
+                )
+            }
 
             WalletPagerIndicator(
                 pagerState = walletsPagerState,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContent.kt

@@ -34,6 +34,7 @@ import com.tangem.common.ui.tokens.NonContentItemContent
 import com.tangem.common.ui.tokens.SlideInItemVisibility
 import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.components.account.AccountIconSize
+import com.tangem.core.ui.components.account.toBoxSize
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.tokenlist.NON_CONTENT_TOKENS_LIST_KEY
 import com.tangem.core.ui.components.tokenlist.TokenListItem
@@ -382,12 +383,14 @@ internal fun PortfolioRowItem(
                             headIcon
                         }
 
+                        val iconBoxSize = when (headIcon) {
+                            is TangemIconUM.Empty -> TangemTheme.dimens2.x9
+                            else -> size.toBoxSize()
+                        }
                         TangemIcon(
                             tangemIconUM = sizedHeadIcon,
                             modifier = modifier
-                                .conditionalCompose(headIcon is TangemIconUM.Empty) {
-                                    size(TangemTheme.dimens2.x9)
-                                }
+                                .size(iconBoxSize)
                                 .sharedBounds(
                                     sharedContentState = iconSharedContentState,
                                     animatedVisibilityScope = animatedContentScope,