Updated on 2026-08-14

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/OnrampStatusFactory.kt

@@ -68,12 +68,12 @@ internal class OnrampStatusFactory @AssistedInject constructor(
         }
     }
 
-    suspend fun removeTransactionOnBottomSheetClosed() {
+    suspend fun removeTransactionOnBottomSheetClosed(isForceDispose: Boolean) {
         val state = currentStateProvider()
         val bottomSheetConfig = state.bottomSheetConfig?.content as? ExpressStatusBottomSheetConfig ?: return
         val selectedTx = bottomSheetConfig.value as? ExpressTransactionStateUM.OnrampUM ?: return
 
-        if (selectedTx.activeStatus.isTerminal) {
+        if (selectedTx.activeStatus.isAutoDisposable || isForceDispose) {
             onrampRemoveTransactionUseCase(externalTxId = selectedTx.info.txExternalId)
         }
     }

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

@@ -30,12 +30,12 @@ internal class OnrampStatusFactory @Inject constructor(
     private val dispatchers: CoroutineDispatcherProvider,
 ) {
 
-    suspend fun removeTransactionOnBottomSheetClosed() {
+    suspend fun removeTransactionOnBottomSheetClosed(forceDispose: Boolean) {
         val state = stateHolder.getSelectedWallet()
         val bottomSheetConfig = state.bottomSheetConfig?.content as? ExpressStatusBottomSheetConfig ?: return
         val selectedTx = bottomSheetConfig.value as? ExpressTransactionStateUM.OnrampUM ?: return
 
-        if (selectedTx.activeStatus.isTerminal) {
+        if (selectedTx.activeStatus.isAutoDisposable || forceDispose) {
             onrampRemoveTransactionUseCase(externalTxId = selectedTx.info.txExternalId)
         }
     }

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

@@ -16,6 +16,8 @@ internal sealed interface WalletAlertState {
         open val confirmButtonText: TextReference = resourceReference(id = R.string.common_ok)
         open val isWarningConfirmButton: Boolean = false
         abstract val onConfirmClick: (() -> Unit)?
+        open val cancelButtonText: TextReference? = null
+        open val onCancelClick: (() -> Unit)? = null
     }
 
     @Immutable
@@ -107,4 +109,14 @@ internal sealed interface WalletAlertState {
 
         override val onConfirmClick: (() -> Unit)? = null
     }
+
+    data class ConfirmExpressStatusHide(
+        override val onConfirmClick: (() -> Unit),
+        override val onCancelClick: (() -> Unit),
+    ) : Basic() {
+        override val title: TextReference = resourceReference(R.string.express_status_hide_dialog_title)
+        override val message: TextReference = resourceReference(R.string.express_status_hide_dialog_text)
+        override val confirmButtonText: TextReference = resourceReference(R.string.common_hide)
+        override val cancelButtonText: TextReference = resourceReference(R.string.common_cancel)
+    }
 }

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

@@ -62,9 +62,7 @@ internal class SingleWalletOnrampTransactionConverter(
                         value.timestamp.toTimeFormat(),
                     ),
                 ),
-                toAmount = stringReference(
-                    value.toAmount.format { crypto(currency) },
-                ),
+                toAmount = stringReference(value.toAmount.format { crypto(currency) }),
                 toFiatAmount = stringReference(
                     status.fiatRate?.multiply(value.toAmount).format {
                         fiat(
@@ -94,6 +92,7 @@ internal class SingleWalletOnrampTransactionConverter(
                     analyticsEventHandler.send(TokenOnrampAnalyticsEvent.GoToProvider)
                     clickIntents.onGoToProviderClick(it)
                 },
+                onDisposeExpressStatus = clickIntents::onConfirmDisposeExpressStatus,
                 onClick = {
                     val analyticEvent = TokenOnrampAnalyticsEvent.OnrampStatusOpened(
                         tokenSymbol = currency.symbol,

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

@@ -21,7 +21,7 @@ internal class WalletEventSender @Inject constructor(
         stateHolder.update(transformer = SendEventTransformer(event = event, onConsume = ::onConsume))
     }
 
-    private fun onConsume() {
+    fun onConsume() {
         stateHolder.update {
             it.copy(event = consumedEvent())
         }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletContentClickIntents.kt

@@ -15,12 +15,14 @@ import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.feature.wallet.presentation.wallet.domain.OnrampStatusFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.unwrap
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
+import com.tangem.feature.wallet.presentation.wallet.state.model.*
 import com.tangem.feature.wallet.presentation.wallet.state.model.ActionsBottomSheetConfig
-import com.tangem.feature.wallet.presentation.wallet.state.model.WalletBottomSheetConfig
+import com.tangem.feature.wallet.presentation.wallet.state.model.WalletEvent
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.OpenBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.MultiWalletCurrencyActionsConverter
+import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletEventSender
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.coroutines.flow.collectLatest
@@ -54,6 +56,10 @@ internal interface WalletContentClickIntents {
     fun onGoToProviderClick(externalTxId: String)
 
     fun onExpressTransactionClick(txId: String)
+
+    fun onConfirmDisposeExpressStatus()
+
+    fun onDisposeExpressStatus()
 }
 
 @Suppress("LongParameterList")
@@ -70,6 +76,7 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
     private val shouldShowMarketsTooltipUseCase: ShouldShowMarketsTooltipUseCase,
     private val dispatchers: CoroutineDispatcherProvider,
     private val reduxStateHolder: ReduxStateHolder,
+    private val walletEventSender: WalletEventSender,
 ) : BaseWalletClickIntents(), WalletContentClickIntents {
 
     override fun onBackClick() = router.popBackStack()
@@ -185,7 +192,7 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
         val userWalletId = stateHolder.getSelectedWalletId()
         if (stateHolder.getSelectedWallet().bottomSheetConfig?.content is ExpressStatusBottomSheetConfig) {
             viewModelScope.launch(dispatchers.main) {
-                onrampStatusFactory.removeTransactionOnBottomSheetClosed()
+                onrampStatusFactory.removeTransactionOnBottomSheetClosed(forceDispose = false)
             }
         }
         stateHolder.update(CloseBottomSheetTransformer(userWalletId))
@@ -211,4 +218,28 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
             )
         }
     }
+
+    override fun onConfirmDisposeExpressStatus() {
+        walletEventSender.send(
+            WalletEvent.ShowAlert(
+                WalletAlertState.ConfirmExpressStatusHide(
+                    onConfirmClick = {
+                        walletEventSender.onConsume()
+                        onDisposeExpressStatus()
+                    },
+                    onCancelClick = walletEventSender::onConsume,
+                ),
+            ),
+        )
+    }
+
+    override fun onDisposeExpressStatus() {
+        val userWalletId = stateHolder.getSelectedWalletId()
+        if (stateHolder.getSelectedWallet().bottomSheetConfig?.content is ExpressStatusBottomSheetConfig) {
+            viewModelScope.launch(dispatchers.main) {
+                onrampStatusFactory.removeTransactionOnBottomSheetClosed(forceDispose = true)
+            }
+        }
+        stateHolder.update(CloseBottomSheetTransformer(userWalletId))
+    }
 }