Updated on 2026-08-14

features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapComponent.kt

@@ -13,7 +13,6 @@ import com.arkivanov.decompose.router.slot.childSlot
 import com.arkivanov.decompose.router.slot.dismiss
 import com.arkivanov.essenty.lifecycle.subscribe
 import com.tangem.common.ui.bottomsheet.permission.state.GiveTxPermissionState
-import com.tangem.common.ui.swapStoriesScreen.SwapStoriesScreen
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
@@ -162,17 +161,6 @@ internal class DefaultSwapComponent @AssistedInject constructor(
             label = "",
         ) { screen ->
             when (screen) {
-                SwapNavScreen.PromoStories -> {
-                    val storiesConfig = model.uiState.storiesConfig
-                    if (storiesConfig != null) {
-                        SwapStoriesScreen(config = storiesConfig)
-                    } else {
-                        SwapScreen(
-                            stateHolder = model.uiState,
-                            feeSelectorBlockComponent = feeSelectorBlockComponent,
-                        )
-                    }
-                }
                 SwapNavScreen.Main -> SwapScreen(
                     stateHolder = model.uiState,
                     feeSelectorBlockComponent = feeSelectorBlockComponent,

features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt

@@ -11,6 +11,7 @@ import com.arkivanov.decompose.router.slot.activate
 import com.arkivanov.decompose.router.slot.dismiss
 import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.blockchainsdk.utils.ExcludedBlockchains
+import com.tangem.common.routing.AppRoute
 import com.tangem.common.routing.AppRouter
 import com.tangem.common.ui.bottomsheet.permission.state.ApproveType
 import com.tangem.common.ui.bottomsheet.permission.state.GiveTxPermissionState.InProgress.getApproveTypeOrNull
@@ -60,8 +61,6 @@ import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.pay.WithdrawalResult
-import com.tangem.domain.promo.GetStoryContentUseCase
-import com.tangem.domain.promo.ShouldShowStoriesUseCase
 import com.tangem.domain.promo.models.StoryContentIds
 import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
 import com.tangem.domain.settings.usercountry.models.UserCountry
@@ -70,6 +69,7 @@ import com.tangem.domain.tangempay.GetTangemPayCurrencyStatusUseCase
 import com.tangem.domain.tangempay.GetTangemPayCustomerIdUseCase
 import com.tangem.domain.tangempay.TangemPayWithdrawUseCase
 import com.tangem.domain.account.status.usecase.GetFeePaidCryptoCurrencyStatusSyncUseCase
+import com.tangem.domain.promo.ShouldShowStoriesUseCase
 import com.tangem.domain.tokens.GetMinimumTransactionAmountSyncUseCase
 import com.tangem.domain.tokens.UpdateDelayedNetworkStatusUseCase
 import com.tangem.domain.transaction.error.GetFeeError
@@ -78,7 +78,6 @@ import com.tangem.domain.transaction.usecase.gasless.IsGaslessFeeSupportedForNet
 import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
-import com.tangem.feature.swap.analytics.StoriesEvents
 import com.tangem.feature.swap.analytics.SwapEvents
 import com.tangem.feature.swap.component.SwapFeeSelectorBlockComponent
 import com.tangem.feature.swap.converters.SwapTransactionErrorStateConverter
@@ -145,7 +144,6 @@ internal class SwapModel @Inject constructor(
     private val getMinimumTransactionAmountSyncUseCase: GetMinimumTransactionAmountSyncUseCase,
     private val getExplorerTransactionUrlUseCase: GetExplorerTransactionUrlUseCase,
     private val shouldShowStoriesUseCase: ShouldShowStoriesUseCase,
-    private val getStoryContentUseCase: GetStoryContentUseCase,
     getUserCountryUseCase: GetUserCountryUseCase,
     getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
     swapInteractorFactory: SwapInteractor.Factory,
@@ -352,12 +350,21 @@ internal class SwapModel @Inject constructor(
     var addToPortfolioManager: AddToPortfolioManager? = null
 
     init {
+        modelScope.launch {
+            val storyId = StoryContentIds.STORY_FIRST_TIME_SWAP.id
+            if (shouldShowStoriesUseCase.invokeSync(storyId)) {
+                router.push(
+                    AppRoute.Stories(
+                        storyId = storyId,
+                        nextScreen = null,
+                        screenSource = params.screenSource,
+                    ),
+                )
+            }
+        }
+
         userCountry = getUserCountryUseCase.invokeSync().getOrNull()
             ?: UserCountry.Other(Locale.getDefault().country)
-        modelScope.launch {
-            initStories()
-            swapRouter.openScreen(SwapNavScreen.PromoStories)
-        }
 
         modelScope.launch(dispatchers.io) {
             if (canUseFromAccountCurrencyStatus) {
@@ -613,21 +620,6 @@ internal class SwapModel @Inject constructor(
         }
     }
 
-    private fun initStories() {
-        modelScope.launch {
-            getStoryContentUseCase.invokeSync(StoryContentIds.STORY_FIRST_TIME_SWAP.id).fold(
-                ifLeft = {
-                    Timber.e("Unable to load stories for ${StoryContentIds.STORY_FIRST_TIME_SWAP.id}")
-                },
-                ifRight = { story ->
-                    if (story != null) {
-                        uiState = stateBuilder.createStoriesState(uiState, story)
-                    }
-                },
-            )
-        }
-    }
-
     private fun applyInitialTokenChoice(
         state: TokensDataStateExpress,
         selectedCurrency: CryptoCurrencyStatus?,
@@ -1832,16 +1824,6 @@ internal class SwapModel @Inject constructor(
             onSuccess = {
                 swapRouter.openScreen(SwapNavScreen.Success)
             },
-            onStoriesClose = { watchCount ->
-                analyticsEventHandler.send(
-                    StoriesEvents.SwapStories(
-                        source = params.screenSource,
-                        watchCount = watchCount.toString(),
-                    ),
-                )
-                modelScope.launch { shouldShowStoriesUseCase.neverToShow(StoryContentIds.STORY_FIRST_TIME_SWAP.id) }
-                swapRouter.openScreen(SwapNavScreen.Main)
-            },
             onOpenLearnMoreAboutApproveClick = {
                 urlOpener.openUrl(RESOURCE_TO_LEARN_ABOUT_APPROVING_IN_SWAP)
             },

features/swap/impl/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt

@@ -5,7 +5,6 @@ import androidx.compose.ui.text.input.TextFieldValue
 import com.tangem.common.ui.account.AccountTitleUM
 import com.tangem.common.ui.bottomsheet.permission.state.GiveTxPermissionState
 import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.common.ui.swapStoriesScreen.SwapStoriesUM
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
@@ -31,8 +30,6 @@ internal data class SwapStateHolder(
     val successState: SwapSuccessStateHolder? = null,
     val selectTokenState: SwapSelectTokenStateHolder? = null,
     val bottomSheetConfig: TangemBottomSheetConfig? = null,
-    val storiesConfig: SwapStoriesUM? = null,
-
     val swapButton: SwapButton,
     val shouldShowMaxAmount: Boolean,
     val tosState: TosState? = null,

features/swap/impl/src/main/java/com/tangem/feature/swap/models/UiActions.kt

@@ -21,7 +21,6 @@ data class UiActions(
     val openPermissionBottomSheet: () -> Unit,
     val onChangeApproveType: (ApproveType) -> Unit,
     // region new actions
-    val onStoriesClose: (Int) -> Unit,
     val onRetryClick: () -> Unit,
     val onClickFee: () -> Unit,
     val onSelectFeeType: (TxFee.Legacy) -> Unit,

features/swap/impl/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt

@@ -67,5 +67,5 @@ internal class SwapRouter(
 }
 
 enum class SwapNavScreen {
-    Main, Success, SelectToken, PromoStories
+    Main, Success, SelectToken
 }

features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt

@@ -7,7 +7,6 @@ import com.tangem.common.ui.account.CryptoPortfolioIconConverter
 import com.tangem.common.ui.account.toUM
 import com.tangem.common.ui.bottomsheet.permission.state.*
 import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.common.ui.swapStoriesScreen.SwapStoriesFactory
 import com.tangem.common.ui.userwallet.ext.walletInterationIcon
 import com.tangem.core.ui.HoldToConfirmButtonFeatureToggles
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
@@ -23,7 +22,6 @@ 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.isHotWallet
-import com.tangem.domain.promo.models.StoryContent
 import com.tangem.domain.transaction.usecase.gasless.IsGaslessFeeSupportedForNetwork
 import com.tangem.feature.swap.converters.TokensDataConverter
 import com.tangem.feature.swap.domain.models.ExpressDataError
@@ -135,15 +133,6 @@ internal class StateBuilder(
         )
     }
 
-    fun createStoriesState(uiStateHolder: SwapStateHolder, swapStory: StoryContent): SwapStateHolder {
-        return uiStateHolder.copy(
-            storiesConfig = SwapStoriesFactory.createStoriesState(
-                swapStory = swapStory,
-                onStoriesClose = actions.onStoriesClose,
-            ),
-        )
-    }
-
     fun createNoAvailableTokensToSwapState(
         uiStateHolder: SwapStateHolder,
         fromToken: CryptoCurrencyStatus,