Updated on 2026-08-14

2025-10-09 18:17:18 +07:00 · 2025-10-09 18:17:18 +07:00 · 4dc994e8cf
commit 4dc994e8cf
parent 161477c16a
16 changed files with 196 additions and 269 deletions
--- a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
+++ b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
@ -200,7 +200,7 @@ internal class ChildFactory @Inject constructor(
                createComponentChild(
                    context = context,
                    params = OnrampComponent.Params(
-                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param,
+                        userWalletId = route.userWalletId,
                        cryptoCurrency = route.currency,
                        source = route.source,
                        shouldLaunchSepa = route.shouldLaunchSepa,
@ -274,7 +274,7 @@ internal class ChildFactory @Inject constructor(
                createComponentChild(
                    context = context,
                    params = TokenDetailsComponent.Params(
-                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param
+                        userWalletId = route.userWalletId,
                        currency = route.currency,
                    ),
                    componentFactory = tokenDetailsComponentFactory,
@ -284,7 +284,7 @@ internal class ChildFactory @Inject constructor(
                createComponentChild(
                    context = context,
                    params = StakingComponent.Params(
-                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param,
+                        userWalletId = route.userWalletId,
                        cryptoCurrencyId = route.cryptoCurrencyId,
                        yieldId = route.yieldId,
                    ),
@ -297,7 +297,7 @@ internal class ChildFactory @Inject constructor(
                    params = SwapComponent.Params(
                        currencyFrom = route.currencyFrom,
                        currencyTo = route.currencyTo,
-                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param,
+                        userWalletId = route.userWalletId,
                        isInitialReverseOrder = route.isInitialReverseOrder,
                        screenSource = route.screenSource,
                    ),
@ -308,7 +308,7 @@ internal class ChildFactory @Inject constructor(
                createComponentChild(
                    context = context,
                    params = SendComponent.Params(
-                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param,
+                        userWalletId = route.userWalletId,
                        currency = route.currency,
                        transactionId = route.transactionId,
                        amount = route.amount,
--- a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
+++ b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
@ -11,7 +11,6 @@ import com.tangem.core.decompose.navigation.Route
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.feedback.models.WalletMetaInfo
 import com.tangem.domain.markets.TokenMarketParams
-import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.scan.ScanResponse
@ -51,50 +50,25 @@ sealed class AppRoute(val path: String) : Route {

    @Serializable
    data class CurrencyDetails(
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
        val currency: CryptoCurrency,
-    ) : AppRoute(path = "/currency_details/${portfolioId.stringValue}/${currency.id.value}") {
-        companion object {
-            operator fun invoke(userWalletId: UserWalletId, currency: CryptoCurrency) = CurrencyDetails(
-                portfolioId = PortfolioId(userWalletId),
-                currency = currency,
-            )
-        }
-    }
+    ) : AppRoute(path = "/currency_details/${userWalletId.stringValue}/${currency.id.value}")

    @Serializable
    data class Send(
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
        val currency: CryptoCurrency,
        val transactionId: String? = null,
        val amount: String? = null,
        val tag: String? = null,
        val destinationAddress: String? = null,
    ) : AppRoute(
-        path = "/send/${portfolioId.stringValue}/${currency.id.value}?" +
+        path = "/send/${userWalletId.stringValue}/${currency.id.value}?" +
            "&$transactionId" +
            "&$amount" +
            "&$tag" +
            "&$destinationAddress",
-    ) {
-        companion object {
-            operator fun invoke(
-                userWalletId: UserWalletId,
-                currency: CryptoCurrency,
-                transactionId: String? = null,
-                amount: String? = null,
-                tag: String? = null,
-                destinationAddress: String? = null,
-            ) = Send(
-                portfolioId = PortfolioId(userWalletId),
-                currency = currency,
-                transactionId = transactionId,
-                amount = amount,
-                tag = tag,
-                destinationAddress = destinationAddress,
-            )
-        }
-    }
+    )

    @Serializable
    data class Details(
@ -199,51 +173,26 @@ sealed class AppRoute(val path: String) : Route {
    data class Swap(
        val currencyFrom: CryptoCurrency,
        val currencyTo: CryptoCurrency? = null,
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
        val isInitialReverseOrder: Boolean = false,
        val screenSource: String,
    ) : AppRoute(
        path = "/swap" +
            "/${currencyFrom.id.value}" +
            "/${currencyTo?.id?.value}" +
-            "/${portfolioId.stringValue}" +
+            "/${userWalletId.stringValue}" +
            "/$isInitialReverseOrder",
-    ) {
-        companion object {
-            operator fun invoke(
-                userWalletId: UserWalletId,
-                currencyFrom: CryptoCurrency,
-                currencyTo: CryptoCurrency? = null,
-                isInitialReverseOrder: Boolean = false,
-                screenSource: String,
-            ) = Swap(
-                portfolioId = PortfolioId(userWalletId),
-                currencyFrom = currencyFrom,
-                currencyTo = currencyTo,
-                isInitialReverseOrder = isInitialReverseOrder,
-                screenSource = screenSource,
-            )
-        }
-    }
+    )

    @Serializable
    data object AppCurrencySelector : AppRoute(path = "/app_currency_selector")

    @Serializable
    data class Staking(
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
        val cryptoCurrencyId: CryptoCurrency.ID,
        val yieldId: String,
-    ) : AppRoute(path = "/staking/${portfolioId.stringValue}/${cryptoCurrencyId.value}/$yieldId") {
-        companion object {
-            operator fun invoke(userWalletId: UserWalletId, cryptoCurrencyId: CryptoCurrency.ID, yieldId: String) =
-                Staking(
-                    portfolioId = PortfolioId(userWalletId),
-                    cryptoCurrencyId = cryptoCurrencyId,
-                    yieldId = yieldId,
-                )
-        }
-    }
+    ) : AppRoute(path = "/staking/${userWalletId.stringValue}/${cryptoCurrencyId.value}/$yieldId")

    @Serializable
    data class PushNotification(
@ -287,25 +236,11 @@ sealed class AppRoute(val path: String) : Route {
    @Serializable
    data class Onramp(
        val source: OnrampSource,
-        val portfolioId: PortfolioId,
+        val userWalletId: UserWalletId,
        val currency: CryptoCurrency,
        val shouldLaunchSepa: Boolean = false,
-    ) : AppRoute(path = "/onramp/${portfolioId.stringValue}/${currency.symbol}"), RouteBundleParams {
+    ) : AppRoute(path = "/onramp/${userWalletId.stringValue}/${currency.symbol}"), RouteBundleParams {
        override fun getBundle(): Bundle = bundle(serializer())
-
-        companion object {
-            operator fun invoke(
-                source: OnrampSource,
-                userWalletId: UserWalletId,
-                currency: CryptoCurrency,
-                launchSepa: Boolean = false,
-            ) = Onramp(
-                source = source,
-                portfolioId = PortfolioId(userWalletId),
-                currency = currency,
-                shouldLaunchSepa = launchSepa,
-            )
-        }
    }

    @Serializable
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt
@ -4,10 +4,10 @@ import arrow.core.getOrElse
 import com.tangem.common.ui.expressStatus.ExpressStatusBottomSheetConfig
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.account.Account
 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.isLocked
 import com.tangem.domain.nft.analytics.NFTAnalyticsEvent
 import com.tangem.domain.redux.ReduxStateHolder
@ -45,9 +45,9 @@ internal interface WalletContentClickIntents {

    fun onDismissMarketsOnboarding()

-    fun onTokenItemClick(portfolioId: PortfolioId, currencyStatus: CryptoCurrencyStatus)
+    fun onTokenItemClick(userWalletId: UserWalletId, currencyStatus: CryptoCurrencyStatus)

-    fun onTokenItemLongClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus)
+    fun onTokenItemLongClick(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus)

    fun onAccountExpandClick(account: Account)

@ -138,13 +138,12 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
        }
    }

-    override fun onTokenItemClick(portfolioId: PortfolioId, currencyStatus: CryptoCurrencyStatus) {
-        router.openTokenDetails(portfolioId, currencyStatus)
+    override fun onTokenItemClick(userWalletId: UserWalletId, currencyStatus: CryptoCurrencyStatus) {
+        router.openTokenDetails(userWalletId, currencyStatus)
    }

-    override fun onTokenItemLongClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
+    override fun onTokenItemLongClick(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
        modelScope.launch(dispatchers.main) {
-            val userWalletId = portfolioId.userWalletId
            val userWallet = getUserWalletUseCase(userWalletId).getOrElse {
                Timber.e(
                    """
@ -160,7 +159,7 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
            getCryptoCurrencyActionsUseCase(userWallet = userWallet, cryptoCurrencyStatus = cryptoCurrencyStatus)
                .take(count = 1)
                .collectLatest {
-                    showActionsBottomSheet(it, userWallet, portfolioId)
+                    showActionsBottomSheet(it, userWallet)
                }
        }
    }
@ -175,17 +174,12 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
        accountDependencies.expandedAccountsHolder.collapseAccount(userWalletId, account.accountId)
    }

-    private fun showActionsBottomSheet(
-        tokenActionsState: TokenActionsState,
-        userWallet: UserWallet,
-        portfolioId: PortfolioId,
-    ) {
+    private fun showActionsBottomSheet(tokenActionsState: TokenActionsState, userWallet: UserWallet) {
        stateHolder.showBottomSheet(
            ActionsBottomSheetConfig(
                actions = MultiWalletCurrencyActionsConverter(
                    userWallet = userWallet,
                    clickIntents = currencyActionsClickIntents,
-                    portfolioId = portfolioId,
                ).convert(tokenActionsState),
            ),
            userWallet.walletId,
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt
@ -29,7 +29,6 @@ import com.tangem.domain.core.utils.lceError
 import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.exchange.RampStateManager
 import com.tangem.domain.markets.TokenMarketParams
-import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.ReceiveAddressModel
 import com.tangem.domain.models.TokenReceiveConfig
 import com.tangem.domain.models.currency.CryptoCurrency
@ -66,7 +65,6 @@ import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletEventSender
-import com.tangem.feature.wallet.presentation.wallet.utils.WalletFeatureUseCasesFacade
 import com.tangem.features.tokenreceive.TokenReceiveFeatureToggle
 import com.tangem.features.yield.supply.api.YieldSupplyFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@ -80,7 +78,7 @@ import javax.inject.Inject
 interface WalletCurrencyActionsClickIntents {

    fun onSendClick(
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        cryptoCurrencyStatus: CryptoCurrencyStatus,
        unavailabilityReason: ScenarioUnavailabilityReason,
    )
@ -88,32 +86,32 @@ interface WalletCurrencyActionsClickIntents {
    fun onSellClick(cryptoCurrencyStatus: CryptoCurrencyStatus, unavailabilityReason: ScenarioUnavailabilityReason)

    fun onBuyClick(
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        cryptoCurrencyStatus: CryptoCurrencyStatus,
        unavailabilityReason: ScenarioUnavailabilityReason,
    )

    fun onSwapClick(
        cryptoCurrencyStatus: CryptoCurrencyStatus,
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        unavailabilityReason: ScenarioUnavailabilityReason,
    )

    fun onReceiveClick(
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        cryptoCurrencyStatus: CryptoCurrencyStatus,
        event: AnalyticsEvent? = null,
    )

-    fun onStakeClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus, yield: Yield?)
+    fun onStakeClick(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus, yield: Yield?)

    fun onCopyAddressLongClick(cryptoCurrencyStatus: CryptoCurrencyStatus): TextReference?

-    fun onCopyAddressClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus)
+    fun onCopyAddressClick(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus)

-    fun onHideTokensClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus)
+    fun onHideTokensClick(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus)

-    fun onPerformHideToken(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus)
+    fun onPerformHideToken(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus)

    fun onExploreClick()

@ -135,7 +133,6 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
    private val walletManagersFacade: WalletManagersFacade,
    private val isDemoCardUseCase: IsDemoCardUseCase,
    private val getSingleCryptoCurrencyStatusUseCase: GetSingleCryptoCurrencyStatusUseCase,
-    private val useCasesFacade: WalletFeatureUseCasesFacade,
    private val getExploreUrlUseCase: GetExploreUrlUseCase,
    private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
    private val getStoryContentUseCase: GetStoryContentUseCase,
@ -154,10 +151,12 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
    private val yieldSupplyFeatureToggles: YieldSupplyFeatureToggles,
    private val needShowYieldSupplyDepositedWarningUseCase: NeedShowYieldSupplyDepositedWarningUseCase,
    private val saveViewedYieldSupplyWarningUseCase: SaveViewedYieldSupplyWarningUseCase,
+    private val isCryptoCurrencyCoinCouldHide: IsCryptoCurrencyCoinCouldHideUseCase,
+    private val removeCurrencyUseCase: RemoveCurrencyUseCase,
 ) : BaseWalletClickIntents(), WalletCurrencyActionsClickIntents {

    override fun onSendClick(
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        cryptoCurrencyStatus: CryptoCurrencyStatus,
        unavailabilityReason: ScenarioUnavailabilityReason,
    ) {
@ -181,27 +180,21 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
                        modelScope.launch {
                            saveViewedYieldSupplyWarningUseCase(cryptoCurrencyStatus.currency.name)
                            stateHolder.hideBottomSheet()
-                            navigateToSend(cryptoCurrencyStatus, portfolioId)
+                            navigateToSend(cryptoCurrencyStatus, userWalletId)
                        }
                    },
                )
            } else {
-                navigateToSend(cryptoCurrencyStatus, portfolioId)
+                navigateToSend(cryptoCurrencyStatus, userWalletId)
            }
        }
    }

    override fun onReceiveClick(
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        cryptoCurrencyStatus: CryptoCurrencyStatus,
        event: AnalyticsEvent?,
    ) {
-        val userWalletId = portfolioId.userWalletId
-        if (portfolioId is PortfolioId.Account) {
-            // todo account find address
-            TODO("account")
-        }
-
        analyticsEventHandler.send(
            event = TokenScreenAnalyticsEvent.ButtonWithParams.ButtonReceive(
                token = cryptoCurrencyStatus.currency.symbol,
@ -274,12 +267,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
        )
    }

-    override fun onCopyAddressClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
-        val userWalletId = portfolioId.userWalletId
-        if (portfolioId is PortfolioId.Account) {
-            // todo account find address
-            TODO("account")
-        }
+    override fun onCopyAddressClick(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
        analyticsEventHandler.send(
            event = TokenReceiveNewAnalyticsEvent.ButtonCopyAddress(
                token = cryptoCurrencyStatus.currency.symbol,
@ -301,7 +289,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
        }
    }

-    override fun onHideTokensClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
+    override fun onHideTokensClick(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
        analyticsEventHandler.send(
            event = TokenScreenAnalyticsEvent.ButtonRemoveToken(cryptoCurrencyStatus.currency.symbol),
        )
@ -309,19 +297,19 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
        modelScope.launch(dispatchers.main) {
            walletEventSender.send(
                event = WalletEvent.ShowAlert(
-                    state = getHideTokeAlertConfig(portfolioId, cryptoCurrencyStatus),
+                    state = getHideTokeAlertConfig(userWalletId, cryptoCurrencyStatus),
                ),
            )
        }
    }

    private suspend fun getHideTokeAlertConfig(
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        cryptoCurrencyStatus: CryptoCurrencyStatus,
    ): WalletAlertState.DefaultAlert {
        val currency = cryptoCurrencyStatus.currency
        val isCryptoCurrencyCoinCouldHide = currency is CryptoCurrency.Coin &&
-            !useCasesFacade.isCryptoCurrencyCoinCouldHide(portfolioId = portfolioId, cryptoCurrencyCoin = currency)
+            !isCryptoCurrencyCoinCouldHide(userWalletId = userWalletId, cryptoCurrencyCoin = currency)
        return if (isCryptoCurrencyCoinCouldHide) {
            WalletAlertState.DefaultAlert(
                title = resourceReference(
@ -347,14 +335,14 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
                    formatArgs = WrappedList(listOf(cryptoCurrencyStatus.currency.name)),
                ),
                message = resourceReference(R.string.token_details_hide_alert_message),
-                onConfirmClick = { onPerformHideToken(portfolioId, cryptoCurrencyStatus) },
+                onConfirmClick = { onPerformHideToken(userWalletId, cryptoCurrencyStatus) },
            )
        }
    }

-    override fun onPerformHideToken(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
+    override fun onPerformHideToken(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
        modelScope.launch(dispatchers.io) {
-            useCasesFacade.removeCurrencyUseCase(portfolioId, cryptoCurrencyStatus.currency)
+            removeCurrencyUseCase(userWalletId, cryptoCurrencyStatus.currency)
                .fold(
                    ifLeft = {
                        walletEventSender.send(
@ -362,7 +350,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
                        )
                    },
                    ifRight = {
-                        stateHolder.update(CloseBottomSheetTransformer(userWalletId = portfolioId.userWalletId))
+                        stateHolder.update(CloseBottomSheetTransformer(userWalletId = userWalletId))
                    },
                )
        }
@ -395,7 +383,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
    }

    override fun onBuyClick(
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        cryptoCurrencyStatus: CryptoCurrencyStatus,
        unavailabilityReason: ScenarioUnavailabilityReason,
    ) {
@ -411,7 +399,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(

        appRouter.push(
            AppRoute.Onramp(
-                portfolioId = portfolioId,
+                userWalletId = userWalletId,
                currency = cryptoCurrencyStatus.currency,
                source = OnrampSource.TOKEN_LONG_TAP,
            ),
@ -420,7 +408,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(

    override fun onSwapClick(
        cryptoCurrencyStatus: CryptoCurrencyStatus,
-        portfolioId: PortfolioId,
+        userWalletId: UserWalletId,
        unavailabilityReason: ScenarioUnavailabilityReason,
    ) {
        analyticsEventHandler.send(
@ -443,12 +431,12 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
                        modelScope.launch {
                            saveViewedYieldSupplyWarningUseCase(cryptoCurrencyStatus.currency.name)
                            stateHolder.hideBottomSheet()
-                            navigateToSwap(cryptoCurrencyStatus, portfolioId)
+                            navigateToSwap(cryptoCurrencyStatus, userWalletId)
                        }
                    },
                )
            } else {
-                navigateToSwap(cryptoCurrencyStatus, portfolioId)
+                navigateToSwap(cryptoCurrencyStatus, userWalletId)
            }
        }
    }
@ -489,15 +477,15 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
        }
    }

-    override fun onStakeClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus, yield: Yield?) {
-        stateHolder.update(CloseBottomSheetTransformer(userWalletId = portfolioId.userWalletId))
+    override fun onStakeClick(userWalletId: UserWalletId, cryptoCurrencyStatus: CryptoCurrencyStatus, yield: Yield?) {
+        stateHolder.update(CloseBottomSheetTransformer(userWalletId = userWalletId))

        modelScope.launch {
            val cryptoCurrency = cryptoCurrencyStatus.currency

            appRouter.push(
                AppRoute.Staking(
-                    portfolioId = portfolioId,
+                    userWalletId = userWalletId,
                    cryptoCurrencyId = cryptoCurrency.id,
                    yieldId = yield?.id ?: return@launch,
                ),
@ -766,21 +754,21 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
            needShowYieldSupplyDepositedWarningUseCase(cryptoCurrencyStatus)
    }

-    private fun navigateToSend(cryptoCurrencyStatus: CryptoCurrencyStatus, portfolioId: PortfolioId) {
-        stateHolder.update(CloseBottomSheetTransformer(userWalletId = portfolioId.userWalletId))
+    private fun navigateToSend(cryptoCurrencyStatus: CryptoCurrencyStatus, userWalletId: UserWalletId) {
+        stateHolder.update(CloseBottomSheetTransformer(userWalletId = userWalletId))
        val route = AppRoute.Send(
            currency = cryptoCurrencyStatus.currency,
-            portfolioId = portfolioId,
+            userWalletId = userWalletId,
        )

        appRouter.push(route)
    }

-    private fun navigateToSwap(cryptoCurrencyStatus: CryptoCurrencyStatus, portfolioId: PortfolioId) {
+    private fun navigateToSwap(cryptoCurrencyStatus: CryptoCurrencyStatus, userWalletId: UserWalletId) {
        appRouter.push(
            AppRoute.Swap(
                currencyFrom = cryptoCurrencyStatus.currency,
-                portfolioId = portfolioId,
+                userWalletId = userWalletId,
                screenSource = AnalyticsParam.ScreensSources.LongTap.value,
            ),
        )
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt
@ -365,7 +365,7 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
                        userWalletId = userWallet.walletId,
                        currency = cryptoCurrency,
                        source = OnrampSource.SEPA_BANNER,
-                        launchSepa = true,
+                        shouldLaunchSepa = true,
                    ),
                )
            }
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
@ -7,7 +7,6 @@ import com.tangem.common.routing.AppRoute.ManageTokens.Source
 import com.tangem.common.routing.AppRouter
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.navigation.url.UrlOpener
-import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.TokenReceiveConfig
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
@ -67,12 +66,12 @@ internal class DefaultWalletRouter @Inject constructor(
        urlOpener.openUrl(url)
    }

-    override fun openTokenDetails(portfolioId: PortfolioId, currencyStatus: CryptoCurrencyStatus) {
+    override fun openTokenDetails(userWalletId: UserWalletId, currencyStatus: CryptoCurrencyStatus) {
        val networkAddress = currencyStatus.value.networkAddress
        if (networkAddress != null && networkAddress.defaultAddress.value.isNotEmpty()) {
            router.push(
                AppRoute.CurrencyDetails(
-                    portfolioId = portfolioId,
+                    userWalletId = userWalletId,
                    currency = currencyStatus.currency,
                ),
            )
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt
@ -2,7 +2,6 @@ package com.tangem.feature.wallet.presentation.router

 import androidx.compose.runtime.Stable
 import com.arkivanov.decompose.router.slot.SlotNavigation
-import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.TokenReceiveConfig
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
@ -42,7 +41,7 @@ internal interface InnerWalletRouter {
    fun openUrl(url: String)

    /** Open token details screen */
-    fun openTokenDetails(portfolioId: PortfolioId, currencyStatus: CryptoCurrencyStatus)
+    fun openTokenDetails(userWalletId: UserWalletId, currencyStatus: CryptoCurrencyStatus)

    /** Open stories screen */
    fun openStoriesScreen()
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/TokenListAnalyticsSender.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/TokenListAnalyticsSender.kt
@ -14,7 +14,6 @@ import com.tangem.domain.analytics.model.WalletBalanceState
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isMultiCurrency
@ -38,33 +37,41 @@ internal class TokenListAnalyticsSender @Inject constructor(
    private val mutex = Mutex()
    private val loadingTraces = mutableMapOf<UserWalletId, Trace>()

-    suspend fun send(displayedUiState: WalletState?, userWallet: UserWallet, tokenList: TokenList) {
+    suspend fun send(
+        displayedUiState: WalletState?,
+        userWallet: UserWallet,
+        totalFiatBalance: TotalFiatBalance,
+        flattenCurrencies: List<CryptoCurrencyStatus>,
+    ) {
        if (screenLifecycleProvider.isBackgroundState.value) return
        if (displayedUiState == null || displayedUiState.pullToRefreshConfig.isRefreshing) return

-        if (tokenList.totalFiatBalance is TotalFiatBalance.Loading) {
-            startLoadingTraceIfNeeded(userWallet.walletId, tokenList)
+        if (totalFiatBalance is TotalFiatBalance.Loading) {
+            startLoadingTraceIfNeeded(userWallet.walletId, flattenCurrencies)
            return
        }

-        if (isTerminalState(tokenList.totalFiatBalance)) {
-            stopLoadingTraceIfNeeded(userWallet.walletId, tokenList.totalFiatBalance)
+        if (isTerminalState(totalFiatBalance)) {
+            stopLoadingTraceIfNeeded(userWallet.walletId, totalFiatBalance)
        }

-        val currenciesStatuses = tokenList.flattenCurrencies()
+        val currenciesStatuses = flattenCurrencies

-        sendBalanceLoadedEventIfNeeded(tokenList.totalFiatBalance, currenciesStatuses)
-        sendToppedUpEventIfNeeded(userWallet, tokenList.totalFiatBalance, currenciesStatuses)
+        sendBalanceLoadedEventIfNeeded(totalFiatBalance, currenciesStatuses)
+        sendToppedUpEventIfNeeded(userWallet, totalFiatBalance, currenciesStatuses)
        sendUnreachableNetworksEventIfNeeded(currenciesStatuses)
        sendTokenBalancesIfNeeded(currenciesStatuses)
    }

-    private suspend fun startLoadingTraceIfNeeded(userWalletId: UserWalletId, tokenList: TokenList) {
+    private suspend fun startLoadingTraceIfNeeded(
+        userWalletId: UserWalletId,
+        flattenCurrencies: List<CryptoCurrencyStatus>,
+    ) {
        mutex.withLock {
            if (!loadingTraces.containsKey(userWalletId)) {
                val trace = FirebasePerformance.getInstance().newTrace(BALANCE_LOADED_TRACE_NAME)
                trace.start()
-                trace.putAttribute(TOKENS_COUNT, tokenList.flattenCurrencies().size.toString())
+                trace.putAttribute(TOKENS_COUNT, flattenCurrencies.size.toString())
                loadingTraces[userWalletId] = trace
            }
        }
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt
@ -9,17 +9,16 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.ui.components.notifications.NotificationConfig.ButtonsState
 import com.tangem.core.ui.components.notifications.NotificationConfig.IconTint
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.domain.account.models.AccountStatusList
 import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.card.CardTypesResolver
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.core.lce.Lce
+import com.tangem.domain.core.lce.LceFlow
 import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.notifications.repository.NotificationsRepository
 import com.tangem.domain.onramp.GetOnrampCountryUseCase
@ -45,6 +44,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
 import timber.log.Timber
 import javax.inject.Inject

@ -70,72 +70,81 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
    fun create(userWallet: UserWallet, clickIntents: WalletClickIntents): Flow<ImmutableList<WalletNotification>> {
        val cardTypesResolver = (userWallet as? UserWallet.Cold)?.scanResponse?.cardTypesResolver

-        val tokenListFlow = if (accountDependencies.accountsFeatureToggles.isFeatureEnabled) {
+        val accountStatusList by lazy {
            val params = SingleAccountStatusListProducer.Params(userWallet.walletId)
            accountDependencies.singleAccountStatusListSupplier(params)
-        } else {
-            tokenListStore.getOrThrow(userWallet.walletId)
+                .map { it.totalFiatBalance to it.flattenCurrencies() }
+                .map { Lce.Content(it) }
        }
+
+        fun tokenListFlow(): LceFlow<TokenListError, Pair<TotalFiatBalance, List<CryptoCurrencyStatus>>> {
+            return if (accountDependencies.accountsFeatureToggles.isFeatureEnabled) {
+                accountStatusList
+            } else {
+                runCatching { tokenListStore.getOrThrow(userWallet.walletId) }
+                    .map { result -> result.map { lce -> lce.map { it.totalFiatBalance to it.flattenCurrencies() } } }
+                    .getOrNull()
+                    // in case of runtime change ft in tester menu
+                    ?: accountStatusList
+            }
+        }
+
+        // val params = SingleAccountStatusListProducer.Params(userWallet.walletId)
+        // val accountStatusListFlow = accountDependencies.singleAccountStatusListSupplier(params)
        return combine(
-            tokenListFlow,
+            // todo account just use it, after delete accountsFeatureToggles
+            // accountStatusListFlow,
            isReadyToShowRateAppUseCase(),
            isNeedToBackupUseCase(userWallet.walletId),
            seedPhraseNotificationUseCase(userWalletId = userWallet.walletId),
            shouldShowPromoWalletUseCase(userWalletId = userWallet.walletId, promoId = PromoId.Referral),
            shouldShowPromoWalletUseCase(userWalletId = userWallet.walletId, promoId = PromoId.Sepa),
            notificationsRepository.getShouldShowNotification(NotificationId.EnablePushesReminderNotification.key),
-        ) { array ->
-            val totalFiatBalance: Lce<TokenListError, TotalFiatBalance>
-            val flattenCurrencies: Lce<TokenListError, List<CryptoCurrencyStatus>>
-            if (accountDependencies.accountsFeatureToggles.isFeatureEnabled) {
-                val accountStatusList = array[0] as AccountStatusList
-                totalFiatBalance = Lce.Content(accountStatusList.totalFiatBalance)
-                flattenCurrencies = Lce.Content(accountStatusList.flattenCurrencies())
-            } else {
-                val maybeTokenList = array[0] as Lce<TokenListError, TokenList>
-                totalFiatBalance = maybeTokenList.map { it.totalFiatBalance }
-                flattenCurrencies = maybeTokenList.map { it.flattenCurrencies() }
+        ) { array -> array }
+            .combine(tokenListFlow()) { array, any: Any -> arrayOf(any).plus(elements = array) }
+            .map { array ->
+                val lceTokens = array[0] as Lce<TokenListError, Pair<TotalFiatBalance, List<CryptoCurrencyStatus>>>
+                val totalFiatBalance = lceTokens.map { it.first }
+                val flattenCurrencies = lceTokens.map { it.second }
+                val isReadyToShowRating = array[1] as Boolean
+                val isNeedToBackup = array[2] as Boolean
+                val seedPhraseIssueStatus = array[3] as SeedPhraseNotificationsStatus
+                val shouldShowReferralPromo = array[4] as Boolean
+                val shouldShowSepaBanner = array[5] as Boolean
+                val shouldShowEnablePushesReminderNotification = array[6] as Boolean
+
+                buildList {
+                    addUsedOutdatedDataNotification(totalFiatBalance)
+
+                    addCriticalNotifications(userWallet, seedPhraseIssueStatus, clickIntents)
+
+                    addFinishWalletActivationNotification(userWallet, totalFiatBalance, clickIntents)
+
+                    addReferralPromoNotification(cardTypesResolver, clickIntents, shouldShowReferralPromo)
+
+                    addSepaPromoNotification(userWallet, clickIntents, shouldShowSepaBanner)
+
+                    addInformationalNotifications(userWallet, cardTypesResolver, flattenCurrencies, clickIntents)
+
+                    addWarningNotifications(cardTypesResolver, flattenCurrencies, isNeedToBackup, clickIntents)
+
+                    addPushReminderNotification(
+                        clickIntents = clickIntents,
+                        shouldShowPushReminderBanner = shouldShowEnablePushesReminderNotification &&
+                            !notificationsRepository.isUserAllowToSubscribeOnPushNotifications(),
+                    )
+
+                    addYieldSupplyNotifications(flattenCurrencies)
+
+                    val hasCriticalOrWarning = any { notification ->
+                        notification is WalletNotification.Critical || notification is WalletNotification.Warning
+                    }
+
+                    if (!hasCriticalOrWarning) {
+                        addRateTheAppNotification(isReadyToShowRating, clickIntents)
+                    }
+                }.toImmutableList()
            }
-
-            val isReadyToShowRating = array[1] as Boolean
-            val isNeedToBackup = array[2] as Boolean
-            val seedPhraseIssueStatus = array[3] as SeedPhraseNotificationsStatus
-            val shouldShowReferralPromo = array[4] as Boolean
-            val shouldShowSepaBanner = array[5] as Boolean
-            val shouldShowEnablePushesReminderNotification = array[6] as Boolean
-
-            buildList {
-                addUsedOutdatedDataNotification(totalFiatBalance)
-
-                addCriticalNotifications(userWallet, seedPhraseIssueStatus, clickIntents)
-
-                addFinishWalletActivationNotification(userWallet, totalFiatBalance, clickIntents)
-
-                addReferralPromoNotification(cardTypesResolver, clickIntents, shouldShowReferralPromo)
-
-                addSepaPromoNotification(userWallet, clickIntents, shouldShowSepaBanner)
-
-                addInformationalNotifications(userWallet, cardTypesResolver, flattenCurrencies, clickIntents)
-
-                addWarningNotifications(cardTypesResolver, flattenCurrencies, isNeedToBackup, clickIntents)
-
-                addPushReminderNotification(
-                    clickIntents = clickIntents,
-                    shouldShowPushReminderBanner = shouldShowEnablePushesReminderNotification &&
-                        !notificationsRepository.isUserAllowToSubscribeOnPushNotifications(),
-                )
-
-                addYieldSupplyNotifications(flattenCurrencies)
-
-                val hasCriticalOrWarning = any { notification ->
-                    notification is WalletNotification.Critical || notification is WalletNotification.Warning
-                }
-
-                if (!hasCriticalOrWarning) {
-                    addRateTheAppNotification(isReadyToShowRating, clickIntents)
-                }
-            }.toImmutableList()
-        }
    }

    private fun MutableList<WalletNotification>.addUsedOutdatedDataNotification(
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetCryptoCurrencyActionsTransformer.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetCryptoCurrencyActionsTransformer.kt
@ -50,7 +50,7 @@ internal class SetCryptoCurrencyActionsTransformer(
                            dimContent = action.unavailabilityReason != ScenarioUnavailabilityReason.None,
                            onClick = {
                                clickIntents.onBuyClick(
-                                    portfolioId = portfolioId,
+                                    userWalletId = portfolioId.userWalletId,
                                    cryptoCurrencyStatus = cryptoCurrencyStatus,
                                    unavailabilityReason = action.unavailabilityReason,
                                )
@ -62,7 +62,10 @@ internal class SetCryptoCurrencyActionsTransformer(
                            enabled = true,
                            dimContent = action.unavailabilityReason != ScenarioUnavailabilityReason.None,
                            onClick = {
-                                clickIntents.onReceiveClick(portfolioId, cryptoCurrencyStatus = cryptoCurrencyStatus)
+                                clickIntents.onReceiveClick(
+                                    portfolioId.userWalletId,
+                                    cryptoCurrencyStatus = cryptoCurrencyStatus,
+                                )
                            },
                            onLongClick = {
                                clickIntents.onCopyAddressLongClick(cryptoCurrencyStatus = cryptoCurrencyStatus)
@ -87,7 +90,7 @@ internal class SetCryptoCurrencyActionsTransformer(
                            dimContent = action.unavailabilityReason != ScenarioUnavailabilityReason.None,
                            onClick = {
                                clickIntents.onSendClick(
-                                    portfolioId = portfolioId,
+                                    userWalletId = portfolioId.userWalletId,
                                    cryptoCurrencyStatus = cryptoCurrencyStatus,
                                    unavailabilityReason = action.unavailabilityReason,
                                )
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetVisaInfoTransformer.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetVisaInfoTransformer.kt
@ -9,7 +9,6 @@ import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.card.common.util.getCardsCount
-import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.visa.exception.RefreshTokenExpiredException
@ -153,7 +152,7 @@ internal class SetVisaInfoTransformer(
                dimContent = false,
                onClick = {
                    clickIntents.onReceiveClick(
-                        portfolioId = PortfolioId(userWalletId), // todo account Visa use Main account?
+                        userWalletId = userWalletId,
                        cryptoCurrencyStatus = cryptoCurrencyStatus,
                        event = MainScreenAnalyticsEvent.ButtonReceive,
                    )
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/MultiWalletCurrencyActionsConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/MultiWalletCurrencyActionsConverter.kt
@ -3,9 +3,9 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers.convert
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.card.common.util.cardTypesResolver
-import com.tangem.domain.models.PortfolioId
 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.tokens.model.ScenarioUnavailabilityReason
 import com.tangem.domain.tokens.model.TokenActionsState
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletCurrencyActionsClickIntents
@ -18,10 +18,11 @@ import kotlinx.collections.immutable.toImmutableList

 internal class MultiWalletCurrencyActionsConverter(
    private val userWallet: UserWallet,
-    private val portfolioId: PortfolioId,
    private val clickIntents: WalletCurrencyActionsClickIntents,
 ) : Converter<TokenActionsState, ImmutableList<TokenActionButtonConfig>> {

+    private val userWalletId: UserWalletId = userWallet.walletId
+
    override fun convert(value: TokenActionsState): ImmutableList<TokenActionButtonConfig> {
        return value.states
            .filterIfSingleWithToken()
@ -56,17 +57,17 @@ internal class MultiWalletCurrencyActionsConverter(
            is TokenActionsState.ActionState.Buy -> {
                title = resourceReference(R.string.common_buy)
                icon = R.drawable.ic_plus_24
-                action = { clickIntents.onBuyClick(portfolioId, cryptoCurrencyStatus, noneReason) }
+                action = { clickIntents.onBuyClick(userWalletId, cryptoCurrencyStatus, noneReason) }
            }
            is TokenActionsState.ActionState.Receive -> {
                title = resourceReference(R.string.common_receive)
                icon = R.drawable.ic_arrow_down_24
-                action = { clickIntents.onReceiveClick(portfolioId, cryptoCurrencyStatus) }
+                action = { clickIntents.onReceiveClick(userWalletId, cryptoCurrencyStatus) }
            }
            is TokenActionsState.ActionState.Stake -> {
                title = resourceReference(R.string.common_stake)
                icon = R.drawable.ic_staking_24
-                action = { clickIntents.onStakeClick(portfolioId, cryptoCurrencyStatus, actionsState.yield) }
+                action = { clickIntents.onStakeClick(userWalletId, cryptoCurrencyStatus, actionsState.yield) }
            }
            is TokenActionsState.ActionState.Sell -> {
                title = resourceReference(R.string.common_sell)
@ -76,7 +77,7 @@ internal class MultiWalletCurrencyActionsConverter(
            is TokenActionsState.ActionState.Send -> {
                title = resourceReference(R.string.common_send)
                icon = R.drawable.ic_arrow_up_24
-                action = { clickIntents.onSendClick(portfolioId, cryptoCurrencyStatus, noneReason) }
+                action = { clickIntents.onSendClick(userWalletId, cryptoCurrencyStatus, noneReason) }
            }
            is TokenActionsState.ActionState.Swap -> {
                title = resourceReference(R.string.swapping_swap_action)
@ -84,7 +85,7 @@ internal class MultiWalletCurrencyActionsConverter(
                action = {
                    clickIntents.onSwapClick(
                        cryptoCurrencyStatus = cryptoCurrencyStatus,
-                        portfolioId = portfolioId,
+                        userWalletId = userWalletId,
                        unavailabilityReason = noneReason,
                    )
                }
@ -92,12 +93,12 @@ internal class MultiWalletCurrencyActionsConverter(
            is TokenActionsState.ActionState.CopyAddress -> {
                title = resourceReference(R.string.common_copy_address)
                icon = R.drawable.ic_copy_24
-                action = { clickIntents.onCopyAddressClick(portfolioId, cryptoCurrencyStatus) }
+                action = { clickIntents.onCopyAddressClick(userWalletId, cryptoCurrencyStatus) }
            }
            is TokenActionsState.ActionState.HideToken -> {
                title = resourceReference(R.string.token_details_hide_token)
                icon = R.drawable.ic_hide_24
-                action = { clickIntents.onHideTokensClick(portfolioId, cryptoCurrencyStatus) }
+                action = { clickIntents.onHideTokensClick(userWalletId, cryptoCurrencyStatus) }
            }
            is TokenActionsState.ActionState.Analytics -> {
                title = resourceReference(R.string.common_analytics)
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt
@ -41,14 +41,12 @@ internal class TokenListStateConverter(

    private val onTokenClick: (accountId: AccountId?, currencyStatus: CryptoCurrencyStatus) -> Unit =
        { accountId, currencyStatus ->
-            val id = accountId?.let { PortfolioId(accountId) } ?: PortfolioId(selectedWallet.walletId)
-            clickIntents.onTokenItemClick(id, currencyStatus)
+            clickIntents.onTokenItemClick(selectedWallet.walletId, currencyStatus)
        }

    private val onTokenLongClick: (accountId: AccountId?, currencyStatus: CryptoCurrencyStatus) -> Unit =
        { accountId, currencyStatus ->
-            val id = accountId?.let { PortfolioId(accountId) } ?: PortfolioId(selectedWallet.walletId)
-            clickIntents.onTokenItemLongClick(id, currencyStatus)
+            clickIntents.onTokenItemLongClick(selectedWallet.walletId, currencyStatus)
        }

    private fun tokenStatusConverter(accountId: AccountId? = null) = TokenItemStateConverter(
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicTokenListSubscriber.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicTokenListSubscriber.kt
@ -8,7 +8,9 @@ import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.core.lce.LceFlow
 import com.tangem.domain.core.utils.getOrElse
 import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
@ -63,7 +65,10 @@ internal abstract class BasicTokenListSubscriber : WalletSubscriber() {
            flow = tokenListFlow(coroutineScope)
                .onEach { maybeTokenList ->
                    coroutineScope.launch {
-                        sendTokenListAnalytics(maybeTokenList)
+                        sendTokenListAnalytics(
+                            flattenCurrencies = maybeTokenList.getOrNull()?.flattenCurrencies(),
+                            totalFiatBalance = maybeTokenList.getOrNull()?.totalFiatBalance,
+                        )
                    }.saveIn(sendAnalyticsJobHolder)
                }
                .distinctUntilChanged()
@ -140,12 +145,14 @@ internal abstract class BasicTokenListSubscriber : WalletSubscriber() {

    private fun createAccountListFlow(coroutineScope: CoroutineScope): Flow<*> = combine(
        flow = accountListFlow(coroutineScope)
-            // todo account analytics for account total balance
-            /*.onEach { maybeTokenList ->
+            .onEach { accountStatusList ->
                coroutineScope.launch {
-                    sendTokenListAnalytics(maybeTokenList)
+                    sendTokenListAnalytics(
+                        flattenCurrencies = accountStatusList.flattenCurrencies(),
+                        totalFiatBalance = accountStatusList.totalFiatBalance,
+                    )
                }.saveIn(sendAnalyticsJobHolder)
-            }*/
+            }
            .distinctUntilChanged()
            .onEach { accountList ->
                // todo account see[onAccountListReceived]
@ -207,13 +214,17 @@ internal abstract class BasicTokenListSubscriber : WalletSubscriber() {
        }
    }

-    private suspend fun sendTokenListAnalytics(maybeTokenList: Lce<TokenListError, TokenList>) {
+    private suspend fun sendTokenListAnalytics(
+        flattenCurrencies: List<CryptoCurrencyStatus>?,
+        totalFiatBalance: TotalFiatBalance?,
+    ) {
        val displayedState = stateHolder.getWalletStateIfSelected(userWallet.walletId)

        tokenListAnalyticsSender.send(
            displayedUiState = displayedState,
            userWallet = userWallet,
-            tokenList = maybeTokenList.getOrNull() ?: return,
+            flattenCurrencies = flattenCurrencies ?: return,
+            totalFiatBalance = totalFiatBalance ?: return,
        )
    }

--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyAccountContent.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyAccountContent.kt
@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.tokenlist.PortfolioListItem
 import com.tangem.core.ui.components.tokenlist.PortfolioTokensListItem
 import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
@ -59,6 +60,7 @@ internal fun LazyListScope.portfolioTokensList(
        contentType = { _, item -> item::class.java },
        itemContent = { tokenIndex, token ->
            val indexWithHeader = tokenIndex.inc()
+            val lastIndex = tokens.lastIndex.inc()
            val isPreview = LocalInspectionMode.current
            val appear = remember {
                MutableTransitionState(isPreview).apply { targetState = true }
@ -69,11 +71,12 @@ internal fun LazyListScope.portfolioTokensList(
                    .animateItem()
                    .roundedShapeItemDecoration(
                        currentIndex = indexWithHeader,
-                        lastIndex = tokens.lastIndex.inc(),
+                        lastIndex = lastIndex,
                        backgroundColor = TangemTheme.colors.background.primary,
                    ),
                visibleState = appear,
            ) {
+                val modifier = if (indexWithHeader == lastIndex) Modifier.padding(bottom = 8.dp) else Modifier
                PortfolioTokensListItem(
                    state = token,
                    isBalanceHidden = isBalanceHidden,
@ -114,10 +117,15 @@ private fun LazyListScope.portfolioItem(
                modifier = anchorModifier,
                visibleState = appear,
            ) {
+                val modifier = if (portfolio.tokens.isEmpty()) {
+                    Modifier.padding(vertical = 8.dp)
+                } else {
+                    Modifier.padding(top = 8.dp)
+                }
                PortfolioListItem(
                    state = portfolio,
                    isBalanceHidden = isBalanceHidden,
-                    modifier = Modifier.padding(top = TangemTheme.dimens.spacing8),
+                    modifier = modifier,
                )
            }
        } else {
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/WalletFeatureUseCasesFacade.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/WalletFeatureUseCasesFacade.kt
@ -1,24 +0,0 @@
-package com.tangem.feature.wallet.presentation.wallet.utils
-
-import com.tangem.domain.models.PortfolioId
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.domain.tokens.IsCryptoCurrencyCoinCouldHideUseCase
-import com.tangem.domain.tokens.RemoveCurrencyUseCase
-import javax.inject.Inject
-
-class WalletFeatureUseCasesFacade @Inject constructor(
-    private val isCryptoCurrencyCoinCouldHide: IsCryptoCurrencyCoinCouldHideUseCase,
-    private val removeCurrencyUseCase: RemoveCurrencyUseCase,
-) {
-
-    suspend fun isCryptoCurrencyCoinCouldHide(portfolioId: PortfolioId, cryptoCurrencyCoin: CryptoCurrency.Coin) =
-        when (portfolioId) {
-            is PortfolioId.Account -> TODO("account")
-            is PortfolioId.Wallet -> isCryptoCurrencyCoinCouldHide(portfolioId.userWalletId, cryptoCurrencyCoin)
-        }
-
-    suspend fun removeCurrencyUseCase(portfolioId: PortfolioId, currency: CryptoCurrency) = when (portfolioId) {
-        is PortfolioId.Account -> TODO("account")
-        is PortfolioId.Wallet -> removeCurrencyUseCase(portfolioId.userWalletId, currency)
-    }
-}