Updated on 2026-08-14

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/api/AddToPortfolioComponent.kt

@@ -1,18 +0,0 @@
-package com.tangem.features.feed.components.market.details.portfolio.add.api
-
-import com.tangem.core.decompose.factory.ComponentFactory
-import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
-
-internal interface AddToPortfolioComponent : ComposableBottomSheetComponent {
-
-    data class Params(
-        val addToPortfolioManager: AddToPortfolioManager,
-        val callback: Callback,
-    )
-
-    interface Callback {
-        fun onDismiss()
-    }
-
-    interface Factory : ComponentFactory<Params, AddToPortfolioComponent>
-}

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/api/AddToPortfolioManager.kt

@@ -1,38 +0,0 @@
-package com.tangem.features.feed.components.market.details.portfolio.add.api
-
-import com.tangem.domain.markets.TokenMarketInfo
-import com.tangem.domain.markets.TokenMarketParams
-import com.tangem.features.account.PortfolioFetcher
-import com.tangem.features.feed.components.market.details.portfolio.api.MarketsPortfolioComponent
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-
-internal interface AddToPortfolioManager {
-
-    val token: TokenMarketParams
-    val analyticsParams: MarketsPortfolioComponent.AnalyticsParams?
-    val portfolioFetcher: PortfolioFetcher
-
-    val state: StateFlow<State>
-
-    val allAvailableNetworks: Flow<List<TokenMarketInfo.Network>>
-    fun setTokenNetworks(networks: List<TokenMarketInfo.Network>)
-
-    sealed interface State {
-        data object Init : State
-        data class AvailableToAdd(
-            val availableToAddData: AvailableToAddData,
-        ) : State
-
-        data object NothingToAdd : State
-    }
-
-    interface Factory {
-        fun create(
-            scope: CoroutineScope,
-            token: TokenMarketParams,
-            analyticsParams: MarketsPortfolioComponent.AnalyticsParams?,
-        ): AddToPortfolioManager
-    }
-}

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/api/AvailableToAddData.kt

@@ -1,58 +0,0 @@
-package com.tangem.features.feed.components.market.details.portfolio.add.api
-
-import com.tangem.domain.markets.TokenMarketInfo
-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.network.Network
-import com.tangem.domain.models.wallet.UserWallet
-import com.tangem.domain.models.wallet.UserWalletId
-import kotlinx.serialization.Serializable
-
-internal data class AvailableToAddData(
-    val availableToAddWallets: Map<UserWalletId, AvailableToAddWallet>,
-) {
-    val isAvailableToAdd: Boolean
-        get() = availableToAddWallets.isNotEmpty()
-    val isSinglePortfolio: Boolean
-        get() = availableToAddWallets.size == 1 && availableToAddWallets.values.first().accounts.size == 1
-}
-
-internal data class AvailableToAddWallet(
-    val userWallet: UserWallet,
-    val accounts: List<AccountStatus>,
-    val availableNetworks: Set<TokenMarketInfo.Network>,
-    val availableToAddAccounts: Map<AccountId, AvailableToAddAccount>,
-)
-
-@Serializable
-internal data class AvailableToAddAccount(
-    val account: AccountStatus,
-    val availableNetworks: Set<TokenMarketInfo.Network>,
-    val addedNetworks: Set<Network>,
-) {
-    val isSingleNetwork: Boolean
-        get() = availableNetworks.size == 1
-
-    val availableToAddNetworks: Set<TokenMarketInfo.Network> = availableNetworks
-        .filter { available -> addedNetworks.none { added -> added.backendId == available.networkId } }
-        .toSet()
-
-    val addedMarketNetworks: Set<TokenMarketInfo.Network> = availableNetworks
-        .filter { available -> addedNetworks.any { added -> added.backendId == available.networkId } }
-        .toSet()
-}
-
-@Serializable
-internal data class SelectedPortfolio(
-    val userWallet: UserWallet,
-    val account: AvailableToAddAccount,
-    val isAccountMode: Boolean,
-    val isAvailableMorePortfolio: Boolean,
-)
-
-internal data class SelectedNetwork(
-    val selectedNetwork: TokenMarketInfo.Network,
-    val cryptoCurrency: CryptoCurrency,
-    val isAvailableMoreNetwork: Boolean,
-)

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/AddTokenComponent.kt

@@ -9,8 +9,8 @@ import com.tangem.core.decompose.factory.ComponentFactory
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.feed.components.market.details.portfolio.add.api.SelectedNetwork
-import com.tangem.features.feed.components.market.details.portfolio.add.api.SelectedPortfolio
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedNetwork
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedPortfolio
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.model.AddTokenModel
 import com.tangem.features.feed.components.market.details.portfolio.impl.analytics.PortfolioAnalyticsEvent
 import dagger.assisted.Assisted

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/ChooseNetworkComponent.kt

@@ -9,7 +9,7 @@ import com.tangem.core.decompose.factory.ComponentFactory
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.domain.markets.TokenMarketInfo
-import com.tangem.features.feed.components.market.details.portfolio.add.api.SelectedPortfolio
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedPortfolio
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.model.ChooseNetworkModel
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.ui.ChooseNetworkContent
 import dagger.assisted.Assisted

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/DefaultAddToPortfolioComponent.kt

@@ -32,7 +32,7 @@ import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.account.PortfolioSelectorComponent
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AddToPortfolioComponent
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioComponent
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.model.AddToPortfolioModel
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.model.AddToPortfolioRoutes
 import com.tangem.features.feed.impl.R

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/converter/AvailableToAddDataConverter.kt

@@ -12,9 +12,9 @@ import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.features.account.PortfolioFetcher
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AvailableToAddAccount
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AvailableToAddData
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AvailableToAddWallet
+import com.tangem.features.feed.components.market.details.portfolio.add.AvailableToAddAccount
+import com.tangem.features.feed.components.market.details.portfolio.add.AvailableToAddData
+import com.tangem.features.feed.components.market.details.portfolio.add.AvailableToAddWallet
 import javax.inject.Inject
 
 internal class AvailableToAddDataConverter @Inject constructor(

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/di/AddToPortfolioComponentModule.kt

@@ -1,7 +1,7 @@
 package com.tangem.features.feed.components.market.details.portfolio.add.impl.di
 
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AddToPortfolioComponent
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AddToPortfolioManager
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioComponent
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioManager
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.DefaultAddToPortfolioComponent
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.ui.DefaultAddToPortfolioManager
 import dagger.Binds

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/model/AddToPortfolioModel.kt

@@ -19,7 +19,12 @@ import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.features.account.PortfolioSelectorController
-import com.tangem.features.feed.components.market.details.portfolio.add.api.*
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioComponent
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioManager
+import com.tangem.features.feed.components.market.details.portfolio.add.AvailableToAddAccount
+import com.tangem.features.feed.components.market.details.portfolio.add.AvailableToAddData
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedNetwork
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedPortfolio
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.AddTokenComponent
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.ChooseNetworkComponent
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.TokenActionsComponent
@@ -91,6 +96,11 @@ internal class AddToPortfolioModel @Inject constructor(
                 channel.close()
             }
 
+            fun finishSuccessFlow(addedToken: CryptoCurrencyStatus) {
+                params.callback.onSuccess(addedToken.currency)
+                channel.close()
+            }
+
             val featureDataFlow: StateFlow<AvailableToAddData> = featureData
                 .filterIsInstance<AddToPortfolioManager.State.AvailableToAdd>()
                 .map { it.availableToAddData }
@@ -183,13 +193,17 @@ internal class AddToPortfolioModel @Inject constructor(
 
             messageSender.send(ToastMessage(message = resourceReference(R.string.markets_token_added)))
 
-            setupTokenActionsFlow(selectedPortfolio, addedToken)
-                .onEach { cryptoCurrencyData ->
-                    tokenActionsData.emit(cryptoCurrencyData)
-                    navigation.replaceAll(AddToPortfolioRoutes.TokenActions)
-                }
-                .onEmpty { finishFlow() }
-                .launchIn(this)
+            if (params.shouldSkipTokenActionsScreen) {
+                finishSuccessFlow(addedToken)
+            } else {
+                setupTokenActionsFlow(selectedPortfolio, addedToken)
+                    .onEach { cryptoCurrencyData ->
+                        tokenActionsData.emit(cryptoCurrencyData)
+                        navigation.replaceAll(AddToPortfolioRoutes.TokenActions)
+                    }
+                    .onEmpty { finishFlow() }
+                    .launchIn(this)
+            }
 
             callbackDelegate.onLaterClick.receiveAsFlow().first()
             finishFlow()
@@ -316,8 +330,8 @@ internal class AddToPortfolioModel @Inject constructor(
         network: TokenMarketInfo.Network,
         account: AvailableToAddAccount,
     ): CryptoCurrency? {
-        val accountIndex = when (account.account) {
-            is AccountStatus.CryptoPortfolio -> account.account.account.derivationIndex
+        val accountIndex = when (val accountStatus = account.account) {
+            is AccountStatus.CryptoPortfolio -> accountStatus.account.derivationIndex
         }
         return getTokenMarketCryptoCurrency(
             userWalletId = userWallet.walletId,

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/model/AddToPortfolioRoutes.kt

@@ -2,7 +2,7 @@ package com.tangem.features.feed.components.market.details.portfolio.add.impl.mo
 
 import androidx.compose.runtime.Immutable
 import com.tangem.core.decompose.navigation.Route
-import com.tangem.features.feed.components.market.details.portfolio.add.api.SelectedPortfolio
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedPortfolio
 import kotlinx.serialization.Serializable
 
 @Serializable

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/model/AddTokenModel.kt

@@ -13,8 +13,8 @@ import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
 import com.tangem.domain.account.status.usecase.ManageCryptoCurrenciesUseCase
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.wallets.usecase.ColdWalletAndHasMissedDerivationsUseCase
-import com.tangem.features.feed.components.market.details.portfolio.add.api.SelectedNetwork
-import com.tangem.features.feed.components.market.details.portfolio.add.api.SelectedPortfolio
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedNetwork
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedPortfolio
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.AddTokenComponent
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.model.AddTokenUiBuilder.Companion.toggleProgress
 import com.tangem.features.feed.impl.R

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/model/AddTokenUiBuilder.kt

@@ -13,8 +13,8 @@ import com.tangem.core.ui.extensions.iconResId
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.domain.models.account.AccountStatus
-import com.tangem.features.feed.components.market.details.portfolio.add.api.SelectedNetwork
-import com.tangem.features.feed.components.market.details.portfolio.add.api.SelectedPortfolio
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedNetwork
+import com.tangem.features.feed.components.market.details.portfolio.add.SelectedPortfolio
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.AddTokenComponent
 import com.tangem.features.feed.impl.R
 import javax.inject.Inject

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/add/impl/ui/DefaultAddToPortfolioManager.kt

@@ -3,9 +3,8 @@ package com.tangem.features.feed.components.market.details.portfolio.add.impl.ui
 import com.tangem.domain.markets.TokenMarketInfo
 import com.tangem.domain.markets.TokenMarketParams
 import com.tangem.features.account.PortfolioFetcher
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AddToPortfolioManager
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioManager
 import com.tangem.features.feed.components.market.details.portfolio.add.impl.converter.AvailableToAddDataConverter
-import com.tangem.features.feed.components.market.details.portfolio.api.MarketsPortfolioComponent
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -17,7 +16,7 @@ import kotlinx.coroutines.flow.*
 internal class DefaultAddToPortfolioManager @AssistedInject constructor(
     private val availableToAddDataConverter: AvailableToAddDataConverter,
     @Assisted override val token: TokenMarketParams,
-    @Assisted override val analyticsParams: MarketsPortfolioComponent.AnalyticsParams?,
+    @Assisted override val analyticsParams: AddToPortfolioManager.AnalyticsParams?,
     @Assisted val scope: CoroutineScope,
     dispatchers: CoroutineDispatcherProvider,
     portfolioFetcherFactory: PortfolioFetcher.Factory,
@@ -66,7 +65,7 @@ internal class DefaultAddToPortfolioManager @AssistedInject constructor(
         override fun create(
             scope: CoroutineScope,
             token: TokenMarketParams,
-            analyticsParams: MarketsPortfolioComponent.AnalyticsParams?,
+            analyticsParams: AddToPortfolioManager.AnalyticsParams?,
         ): DefaultAddToPortfolioManager
     }
 }

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/impl/DefaultMarketsPortfolioComponent.kt

@@ -14,7 +14,7 @@ import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
 import com.tangem.domain.markets.TokenMarketInfo
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AddToPortfolioComponent
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioComponent
 import com.tangem.features.feed.components.market.details.portfolio.api.MarketsPortfolioComponent
 import com.tangem.features.feed.components.market.details.portfolio.impl.model.MarketsPortfolioModel
 import com.tangem.features.feed.components.market.details.portfolio.impl.model.MarketsPortfolioRoute

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/impl/model/MarketsPortfolioModel.kt

@@ -31,7 +31,7 @@ import com.tangem.domain.models.wallet.isMultiCurrency
 import com.tangem.domain.transaction.usecase.ReceiveAddressesFactory
 import com.tangem.domain.wallets.usecase.ColdWalletAndHasMissedDerivationsUseCase
 import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AddToPortfolioComponent
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioComponent
 import com.tangem.features.feed.components.market.details.portfolio.api.MarketsPortfolioComponent
 import com.tangem.features.feed.components.market.details.portfolio.impl.analytics.PortfolioAnalyticsEvent
 import com.tangem.features.feed.components.market.details.portfolio.impl.loader.PortfolioData
@@ -50,7 +50,7 @@ import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
-import com.tangem.features.feed.components.market.details.portfolio.add.api.AddToPortfolioManager as NewAddToPortfolioManager
+import com.tangem.features.feed.components.market.details.portfolio.add.AddToPortfolioManager as NewAddToPortfolioManager
 
 @Suppress("LongParameterList", "LargeClass")
 @Stable
@@ -96,6 +96,7 @@ internal class MarketsPortfolioModel @Inject constructor(
     val bottomSheetNavigation: SlotNavigation<MarketsPortfolioRoute> = SlotNavigation()
     val addToPortfolioCallback = object : AddToPortfolioComponent.Callback {
         override fun onDismiss() = bottomSheetNavigation.dismiss()
+        override fun onSuccess(addedToken: CryptoCurrency) = bottomSheetNavigation.dismiss()
     }
 
     private val currentAppCurrency = getSelectedAppCurrencyUseCase()
@@ -184,7 +185,7 @@ internal class MarketsPortfolioModel @Inject constructor(
                 .create(
                     modelScope,
                     params.token,
-                    params.analyticsParams,
+                    params.analyticsParams?.source?.let { NewAddToPortfolioManager.AnalyticsParams(it) },
                 )
             newMarketsPortfolioDelegate = newMarketsPortfolioDelegateFactory.create(
                 scope = modelScope,