Updated on 2026-08-14

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

@@ -16,12 +16,11 @@ import com.tangem.core.decompose.context.child
 import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.DesignFeatureToggles
-import com.tangem.features.promobanners.api.NewPromoBannersFeatureToggles
-import com.tangem.features.promobanners.api.PromoBannersBlockComponent
 import com.tangem.core.ui.components.bottomsheets.state.BottomSheetState
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
 import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.core.ui.decompose.ComposableDialogComponent
+import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.domain.tokens.model.details.TokenAction
 import com.tangem.feature.wallet.child.organizetokens.OrganizeTokensComponent
 import com.tangem.feature.wallet.child.tokenActions.TokenActionsComponent
@@ -32,13 +31,14 @@ import com.tangem.feature.wallet.presentation.wallet.ui.WalletScreen
 import com.tangem.feature.wallet.presentation.wallet.ui.WalletScreen2
 import com.tangem.feature.wallet.presentation.wallet.ui.components.visa.KycRejectedComponent
 import com.tangem.feature.walletsettings.component.RenameWalletComponent
-import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.features.biometry.AskBiometryComponent
 import com.tangem.features.feed.entry.components.FeedEntryComponent
+import com.tangem.features.promobanners.api.NewPromoBannersFeatureToggles
+import com.tangem.features.promobanners.api.PromoBannersBlockComponent
 import com.tangem.features.pushnotifications.api.PushNotificationsBottomSheetComponent
 import com.tangem.features.pushnotifications.api.PushNotificationsParams
-import com.tangem.features.tangempay.component.TangemPayMainBlockComponent
 import com.tangem.features.send.v2.api.NetworkSelectionComponent
+import com.tangem.features.tangempay.component.TangemPayMainBlockComponent
 import com.tangem.features.tokenreceive.TokenReceiveComponent
 import com.tangem.features.yield.supply.api.YieldSupplyDepositedWarningComponent
 import dagger.assisted.Assisted
@@ -231,6 +231,7 @@ internal class WalletComponent @AssistedInject constructor(
         if (designFeatureToggles.isRedesignEnabled) {
             WalletScreen2(
                 state = uiState,
+                tangemPayComponent = tangemPayMainBlockComponent,
                 bottomSheetContent = {
                     BottomSheetContent(
                         bottomSheetState = bottomSheetState,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt

@@ -17,6 +17,7 @@ import com.tangem.feature.wallet.presentation.common.WalletPreviewDataLegacy.top
 import com.tangem.feature.wallet.presentation.preview.WalletBalancePreview
 import com.tangem.feature.wallet.presentation.preview.WalletPreviewData
 import com.tangem.feature.wallet.presentation.wallet.state.model.*
+import com.tangem.features.tangempay.entity.TangemPayMainUM
 import kotlinx.collections.immutable.persistentListOf
 
 internal object WalletScreenPreviewData {
@@ -167,7 +168,7 @@ internal object WalletScreenPreviewData {
             isFlickering = false,
             onItemClick = {},
         ),
-        tangemPayState = TangemPayState.Loading,
+        tangemPayMainUM = TangemPayMainUM.Loading,
     )
 
     private val walletEmpty = WalletUM.Content(
@@ -182,7 +183,7 @@ internal object WalletScreenPreviewData {
         notificationsCarousel = persistentListOf(),
         tokensListUM = WalletTokensListUM.Empty(onEmptyClick = {}),
         nftState = WalletNFTItemUM.Hidden,
-        tangemPayState = TangemPayState.Empty,
+        tangemPayMainUM = TangemPayMainUM.Empty,
     )
 
     private val walletAccountDefault = walletDefault.copy(

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

@@ -168,6 +168,8 @@ internal class WalletWarningsAnalyticsSender @Inject constructor(
             WalletNotificationUM.SomeNetworksUnreachable,
             is WalletNotificationUM.UsedOutdatedData,
             is WalletNotificationUM.CloreMigration,
+            is WalletNotificationUM.TangemPayRefreshNeeded,
+            WalletNotificationUM.TangemPayUnreachable,
             -> null
         }
     }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetWalletNotificationsFactory.kt

@@ -3,6 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.domain
 import com.tangem.common.ui.userwallet.ext.walletInterationIcon
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.ui.ds.message.TangemMessageEffect
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.card.CardTypesResolver
 import com.tangem.domain.card.common.util.cardTypesResolver
@@ -10,12 +11,15 @@ import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.hotwallet.GetAccessCodeSkippedUseCase
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.account.PaymentAccountStatusValue
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.isMultiCurrency
 import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
+import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNotificationUM
 import com.tangem.hot.sdk.model.HotWalletId
@@ -56,6 +60,10 @@ internal class GetWalletNotificationsFactory @Inject constructor(
             val totalFiatBalance = accountList.totalFiatBalance
             val flattenCurrencies = accountList.flattenCurrencies()
 
+            val paymentAccountStatus = accountList.accountStatuses
+                .filterIsInstance<AccountStatus.Payment>()
+                .firstOrNull()
+
             buildList {
                 addUsedOutdatedDataNotification(totalFiatBalance)
 
@@ -82,6 +90,14 @@ internal class GetWalletNotificationsFactory @Inject constructor(
                     isNeedToBackup = isNeedToBackup,
                     clickIntents = clickIntents,
                 )
+
+                if (paymentAccountStatus != null) {
+                    addTangemPayWarnings(
+                        status = paymentAccountStatus,
+                        userWallet = userWallet,
+                        walletClickIntents = clickIntents,
+                    )
+                }
             }.sortedBy { it.type.ordinal }.toImmutableList()
         }
     }
@@ -200,6 +216,34 @@ internal class GetWalletNotificationsFactory @Inject constructor(
         )
     }
 
+    private fun MutableList<WalletNotificationUM>.addTangemPayWarnings(
+        status: AccountStatus.Payment,
+        userWallet: UserWallet,
+        walletClickIntents: WalletClickIntents,
+    ) {
+        val notification = when (status.value) {
+            is PaymentAccountStatusValue.Error.NotSynced -> WalletNotificationUM.TangemPayRefreshNeeded(
+                buttonText = when (userWallet) {
+                    is UserWallet.Cold -> resourceReference(id = R.string.home_button_scan)
+                    is UserWallet.Hot -> resourceReference(id = R.string.tangempay_sync_needed_restore_access)
+                },
+                onRefreshClick = { walletClickIntents.onRefreshPayToken(userWallet) },
+                shouldShowProgress = false,
+            )
+            is PaymentAccountStatusValue.NotCreated -> null // TODO(Main redesign)
+            is PaymentAccountStatusValue.Error.Unavailable -> WalletNotificationUM.TangemPayUnreachable
+            is PaymentAccountStatusValue.Error.CardIssueFailed,
+            is PaymentAccountStatusValue.Error.ExposedDevice,
+            is PaymentAccountStatusValue.IssuingCard,
+            is PaymentAccountStatusValue.Loaded,
+            is PaymentAccountStatusValue.Loading,
+            is PaymentAccountStatusValue.Locked,
+            is PaymentAccountStatusValue.UnderReview,
+            -> null
+        }
+        notification?.let(::add)
+    }
+
     private fun MutableList<WalletNotificationUM>.addNoAccountWarning(cryptoCurrencyStatus: CryptoCurrencyStatus?) {
         val noAccountStatus = cryptoCurrencyStatus?.value as? CryptoCurrencyStatus.NoAccount
         if (noAccountStatus != null) {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletNotificationUM.kt

@@ -7,10 +7,7 @@ import com.tangem.core.ui.ds.image.TangemIconUM
 import com.tangem.core.ui.ds.message.TangemMessageButtonUM
 import com.tangem.core.ui.ds.message.TangemMessageEffect
 import com.tangem.core.ui.ds.message.TangemMessageUM
-import com.tangem.core.ui.extensions.pluralReference
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.impl.R
 import kotlinx.collections.immutable.persistentListOf
@@ -297,6 +294,43 @@ internal sealed class WalletNotificationUM(val messageUM: TangemMessageUM, val t
         ),
         type = WalletNotificationType.Warning,
     )
+
+    data class TangemPayRefreshNeeded(
+        private val onRefreshClick: () -> Unit,
+        private val buttonText: TextReference,
+        private val shouldShowProgress: Boolean,
+    ) : WalletNotificationUM(
+        messageUM = TangemMessageUM(
+            id = "TangemPayRefreshNeeded",
+            title = resourceReference(id = R.string.tangempay_payment_account_sync_needed),
+            subtitle = resourceReference(id = R.string.tangempay_use_tangem_device_to_restore_payment_account),
+            buttonsUM = persistentListOf(
+                TangemMessageButtonUM(
+                    text = buttonText,
+                    iconRes = R.drawable.ic_tangem_24,
+                    onClick = onRefreshClick,
+                    type = TangemButtonType.Primary,
+                    isLoading = shouldShowProgress,
+                ),
+            ),
+            messageEffect = TangemMessageEffect.Card,
+            isCentered = true,
+        ),
+        type = WalletNotificationType.Warning,
+    )
+
+    data object TangemPayUnreachable : WalletNotificationUM(
+        messageUM = TangemMessageUM(
+            id = "TangemPayUnreachable",
+            title = resourceReference(id = R.string.tangempay_temporarily_unavailable),
+            subtitle = resourceReference(id = R.string.tangempay_service_unreachable_try_later),
+            iconUM = TangemIconUM.Icon(
+                iconRes = R.drawable.ic_attention_default_24,
+                tintReference = { TangemTheme.colors2.graphic.status.attention },
+            ),
+        ),
+        type = WalletNotificationType.Warning,
+    )
     // endregion
 
     // region Promo

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletUM.kt

@@ -3,6 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.model
 import androidx.compose.runtime.Immutable
 import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfig
 import com.tangem.core.ui.ds.button.TangemButtonUM
+import com.tangem.features.tangempay.entity.TangemPayMainUM
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
@@ -23,7 +24,7 @@ internal sealed interface WalletUM {
 
     val type: WalletType
 
-    val tangemPayState: TangemPayState
+    val tangemPayMainUM: TangemPayMainUM
 
     data class Content(
         override val pullToRefreshConfig: PullToRefreshConfig,
@@ -34,7 +35,7 @@ internal sealed interface WalletUM {
         override val tokensListUM: WalletTokensListUM,
         override val nftState: WalletNFTItemUM,
         override val type: WalletType,
-        override val tangemPayState: TangemPayState,
+        override val tangemPayMainUM: TangemPayMainUM,
     ) : WalletUM
 
     data class Locked(
@@ -47,6 +48,6 @@ internal sealed interface WalletUM {
         override val pullToRefreshConfig = PullToRefreshConfig(false, {})
         override val tokensListUM: WalletTokensListUM = WalletTokensListUM.Locked
         override val nftState: WalletNFTItemUM = WalletNFTItemUM.Hidden
-        override val tangemPayState: TangemPayState = TangemPayState.Empty
+        override val tangemPayMainUM: TangemPayMainUM = TangemPayMainUM.Empty
     }
 }

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

@@ -7,16 +7,13 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.staking.model.StakingAvailability
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.state.model.*
-import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.MultiWalletBalanceUMTransformer
-import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.MultiWalletCardStateConverter
-import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.TangemPayMainBlockConverter
-import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.TokenListStateConverter
-import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.WalletTokensListUMConverter
+import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.*
 import com.tangem.feature.wallet.presentation.wallet.state.utils.enableButtons
-import com.tangem.utils.logging.TangemLogger
 import com.tangem.features.tangempay.entity.TangemPayMainUM
+import com.tangem.utils.logging.TangemLogger
 import java.math.BigDecimal
 
+@Suppress("LongParameterList")
 internal class SetTokenListTransformer(
     private val params: TokenConverterParams,
     private val userWallet: UserWallet,
@@ -26,10 +23,14 @@ internal class SetTokenListTransformer(
     private val stakingAvailabilityMap: Map<CryptoCurrency, StakingAvailability> = emptyMap(),
     private val shouldShowMainPromo: Boolean,
     private val isAccountsModeEnabled: Boolean,
+    private val isRedesignEnabled: Boolean,
 ) : WalletStateTransformer(userWallet.walletId) {
 
     private val tangemPayConverter by lazy {
-        TangemPayMainBlockConverter(tangemPayClickIntents = clickIntents)
+        TangemPayMainBlockConverter(
+            tangemPayClickIntents = clickIntents,
+            isRedesignEnabled = isRedesignEnabled,
+        )
     }
 
     override fun transform(prevState: WalletState): WalletState {
@@ -59,6 +60,7 @@ internal class SetTokenListTransformer(
             is WalletUM.Content -> {
                 walletUM.copy(
                     walletsBalanceUM = walletUM.walletsBalanceUM.toLoadedState2(),
+                    tangemPayMainUM = walletUM.tangemPayMainUM.toLoadedState(),
                     tokensListUM = toLoadedState(),
                     buttons = walletUM.enableButtons(),
                 )

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

@@ -1,10 +1,13 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers.converter
 
+import androidx.compose.ui.text.SpanStyle
 import com.tangem.common.ui.R
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.format.bigdecimal.formatStyled
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.account.PaymentAccountStatusValue
@@ -21,6 +24,7 @@ private const val POLYGON_CHAIN_ID = 137
 
 internal class TangemPayMainBlockConverter(
     private val tangemPayClickIntents: TangemPayIntents,
+    private val isRedesignEnabled: Boolean,
 ) : Converter<AccountStatus.Payment, TangemPayMainUM> {
     @Suppress("LongMethod", "CyclomaticComplexMethod")
     override fun convert(value: AccountStatus.Payment): TangemPayMainUM {
@@ -102,9 +106,21 @@ internal class TangemPayMainBlockConverter(
 
     private fun getBalanceText(currencyCode: String, balance: BigDecimal): TextReference {
         val currency = Currency.getInstance(currencyCode)
-        val formattedBalance = balance.format {
-            fiat(fiatCurrencyCode = currency.currencyCode, fiatCurrencySymbol = currency.symbol)
+        val formattedBalance = if (isRedesignEnabled) {
+            balance.formatStyled {
+                fiat(
+                    fiatCurrencyCode = currency.currencyCode,
+                    fiatCurrencySymbol = currency.symbol,
+                    spanStyleReference = { SpanStyle(color = TangemTheme.colors2.text.neutral.secondary) },
+                )
+            }
+        } else {
+            stringReference(
+                balance.format {
+                    fiat(fiatCurrencyCode = currency.currencyCode, fiatCurrencySymbol = currency.symbol)
+                },
+            )
         }
-        return stringReference(formattedBalance)
+        return formattedBalance
     }
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt

@@ -69,7 +69,7 @@ internal class WalletLoadingStateFactory(
                 is UserWallet.Cold -> WalletType.Cold
                 is UserWallet.Hot -> WalletType.Hot
             },
-            tangemPayState = TangemPayState.Empty,
+            tangemPayMainUM = TangemPayMainUM.Empty,
         )
     }
 

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

@@ -17,9 +17,9 @@ import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetTokenListErrorTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetTokenListTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.TokenConverterParams
+import com.tangem.utils.logging.TangemLogger
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
-import com.tangem.utils.logging.TangemLogger
 import java.math.BigDecimal
 
 /**
@@ -103,6 +103,7 @@ internal abstract class BasicAccountListSubscriber : BasicWalletSubscriber() {
                 stakingAvailabilityMap = stakingAvailabilityMap,
                 shouldShowMainPromo = shouldShowMainPromo,
                 isAccountsModeEnabled = isAccountMode,
+                isRedesignEnabled = true,
             ),
         )
     }
@@ -165,6 +166,7 @@ internal abstract class BasicAccountListSubscriber : BasicWalletSubscriber() {
                 stakingAvailabilityMap = stakingAvailabilityMap,
                 shouldShowMainPromo = shouldShowMainPromo,
                 isAccountsModeEnabled = false,
+                isRedesignEnabled = false,
             ),
         )
     }

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

@@ -12,6 +12,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.HorizontalPager
@@ -68,6 +69,8 @@ import com.tangem.feature.wallet.presentation.wallet.ui.components.common.Wallet
 import com.tangem.feature.wallet.presentation.wallet.ui.components.common.WalletPagerIndicator
 import com.tangem.feature.wallet.presentation.wallet.ui.components.common.WalletTopBar
 import com.tangem.feature.wallet.presentation.wallet.ui.utils.lazyListStateMapSaver
+import com.tangem.features.tangempay.component.TangemPayMainBlockComponent
+import com.tangem.features.tangempay.entity.TangemPayMainUM
 import kotlinx.coroutines.launch
 import kotlin.math.abs
 
@@ -77,6 +80,7 @@ private const val MARKET_HINT_THRESHOLD = 0.5f
 @Composable
 internal fun WalletScreen2(
     state: WalletScreenState,
+    tangemPayComponent: TangemPayMainBlockComponent,
     bottomSheetContent: @Composable (() -> Unit),
     bottomSheetHeaderHeightProvider: () -> Dp,
     onBottomSheetStateChange: (BottomSheetState) -> Unit,
@@ -104,6 +108,7 @@ internal fun WalletScreen2(
     WalletContent2(
         state = state,
         walletsPagerState = walletsPagerState,
+        tangemPayComponent = tangemPayComponent,
         behavior = behavior,
         bottomSheetContent = bottomSheetContent,
         bottomSheetHeaderHeightProvider = bottomSheetHeaderHeightProvider,
@@ -128,6 +133,7 @@ internal fun WalletScreen2(
 private fun WalletContent2(
     state: WalletScreenState,
     walletsPagerState: PagerState,
+    tangemPayComponent: TangemPayMainBlockComponent,
     behavior: TangemCollapsingAppBarBehavior,
     bottomSheetHeaderHeightProvider: () -> Dp,
     onBottomSheetStateChange: (BottomSheetState) -> Unit,
@@ -257,6 +263,7 @@ private fun WalletContent2(
                                 currentWallet = currentWallet,
                                 listState = listState,
                                 isBalanceHidden = state.isHidingMode,
+                                tangemPayComponent = tangemPayComponent,
                                 contentPadding = contentPadding,
                                 modifier = Modifier
                                     .fillMaxSize()
@@ -565,6 +572,14 @@ private fun WalletScreen2_Preview(@PreviewParameter(WalletScreen2PreviewProvider
     TangemThemePreviewRedesign {
         WalletScreen2(
             state = data,
+            tangemPayComponent = object : TangemPayMainBlockComponent {
+                override fun LazyListScope.tangemPayMainContent(
+                    state: TangemPayMainUM,
+                    isBalanceHidden: Boolean,
+                    modifier: Modifier,
+                ) {
+                }
+            },
             bottomSheetContent = {
                 Text("Markets Content")
             },

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

@@ -3,9 +3,9 @@ package com.tangem.feature.wallet.presentation.wallet.ui.components
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.ui.Modifier
 import com.tangem.core.ui.ds.button.TangemButton
-import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletUM
-import com.tangem.feature.wallet.presentation.wallet.ui.components.visa.TangemPayMainScreenBlock
+import com.tangem.features.tangempay.component.TangemPayMainBlockComponent
+import com.tangem.features.tangempay.entity.TangemPayMainUM
 
 internal fun LazyListScope.nftCollections2(state: WalletUM, itemModifier: Modifier) {
     (state as? WalletUM.Content)?.let { content ->
@@ -33,17 +33,13 @@ internal fun LazyListScope.organizeTokens2(state: WalletUM, itemModifier: Modifi
     }
 }
 
-internal fun LazyListScope.tangemPay(walletUM: WalletUM, isBalanceHiding: Boolean, modifier: Modifier = Modifier) {
-    if (walletUM is WalletState.MultiCurrency) {
-        item(
-            key = "TangemPayMainScreenBlock",
-            contentType = walletUM.tangemPayState::class.java,
-        ) {
-            TangemPayMainScreenBlock(
-                state = walletUM.tangemPayState,
-                isBalanceHidden = isBalanceHiding,
-                modifier = modifier,
-            )
-        }
+internal fun LazyListScope.tangemPay(
+    tangemPayComponent: TangemPayMainBlockComponent,
+    tangemPayUM: TangemPayMainUM,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    with(tangemPayComponent) {
+        tangemPayMainContent(modifier = modifier, state = tangemPayUM, isBalanceHidden = isBalanceHidden)
     }
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletContent.kt

@@ -23,6 +23,7 @@ import com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency
 import com.tangem.feature.wallet.presentation.wallet.ui.components.nftCollections2
 import com.tangem.feature.wallet.presentation.wallet.ui.components.organizeTokens2
 import com.tangem.feature.wallet.presentation.wallet.ui.components.tangemPay
+import com.tangem.features.tangempay.component.TangemPayMainBlockComponent
 import kotlinx.collections.immutable.toPersistentList
 
 @Composable
@@ -30,6 +31,7 @@ internal fun WalletListContent(
     currentWallet: WalletUM,
     isBalanceHidden: Boolean,
     listState: LazyListState,
+    tangemPayComponent: TangemPayMainBlockComponent,
     contentPadding: PaddingValues,
     modifier: Modifier = Modifier,
 ) {
@@ -57,8 +59,9 @@ internal fun WalletListContent(
             )
 
             tangemPay(
-                walletUM = currentWallet,
-                isBalanceHiding = isBalanceHidden,
+                tangemPayComponent = tangemPayComponent,
+                tangemPayUM = currentWallet.tangemPayMainUM,
+                isBalanceHidden = isBalanceHidden,
                 modifier = itemModifier,
             )