Updated on 2026-08-14

features/swap/domain/build.gradle.kts

@@ -38,6 +38,7 @@ dependencies {
     implementation(projects.domain.express.models)
     implementation(projects.domain.account)
     implementation(projects.domain.account.status)
+    implementation(projects.domain.visa.models)
 
     implementation(projects.features.swap.domain.api)
     implementation(projects.features.swap.domain.models)

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt

@@ -36,6 +36,7 @@ import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.quote.QuoteStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.pay.TangemPayWithdrawExchangeState
 import com.tangem.domain.quotes.QuotesRepository
 import com.tangem.domain.quotes.multi.MultiQuoteStatusFetcher
 import com.tangem.domain.tokens.*
@@ -1030,6 +1031,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
             exchangeData.transaction as? ExpressTransactionModel.CEX ?: return SwapTransactionState.Error.UnknownError
 
         if (isTangemPayWithdrawal) {
+            val networkAddress = currencyToSend.value.networkAddress
             return SwapTransactionState.TangemPayWithdrawalData(
                 cryptoAmount = amount.value,
                 cryptoCurrencyId = requireNotNull(currencyToSend.currency.id.rawCurrencyId),
@@ -1056,6 +1058,13 @@ internal class SwapInteractorImpl @AssistedInject constructor(
                     txExternalId = exchangeDataCex.externalTxId,
                     averageDuration = null,
                 ),
+                exchangeData = TangemPayWithdrawExchangeState(
+                    txId = exchangeDataCex.txId,
+                    fromNetwork = currencyToSend.currency.network.backendId,
+                    fromAddress = networkAddress?.defaultAddress?.value.orEmpty(),
+                    payInAddress = exchangeData.transaction.txTo,
+                    payInExtraId = exchangeDataCex.txExtraId,
+                ),
             )
         }
 

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ui/SwapTransactionState.kt

@@ -3,6 +3,7 @@ package com.tangem.feature.swap.domain.models.ui
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.pay.TangemPayWithdrawExchangeState
 import com.tangem.domain.transaction.error.SendTransactionError
 import com.tangem.feature.swap.domain.models.ExpressDataError
 import com.tangem.feature.swap.domain.models.SwapAmount
@@ -31,6 +32,7 @@ sealed class SwapTransactionState {
         val toAmount: String?,
         val toAmountValue: BigDecimal?,
         val storeData: StoreTransactionData,
+        val exchangeData: TangemPayWithdrawExchangeState,
     ) : SwapTransactionState() {
 
         data class StoreTransactionData(

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

@@ -1136,6 +1136,7 @@ internal class SwapModel @Inject constructor(
             cryptoAmount = swapTransactionState.cryptoAmount,
             cryptoCurrencyId = swapTransactionState.cryptoCurrencyId,
             receiverCexAddress = swapTransactionState.cexAddress,
+            exchangeData = swapTransactionState.exchangeData,
         )
             .onLeft {
                 startLoadingQuotesFromLastState()

features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayDetailsModel.kt

@@ -26,8 +26,8 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.pay.TangemPayCryptoCurrencyFactory
 import com.tangem.domain.pay.model.TangemPayCardBalance
 import com.tangem.domain.pay.model.TangemPayTopUpData
-import com.tangem.domain.pay.repository.CustomerOrderRepository
 import com.tangem.domain.pay.repository.TangemPayCardDetailsRepository
+import com.tangem.domain.pay.repository.TangemPayWithdrawRepository
 import com.tangem.domain.tangempay.TangemPayAnalyticsEvents
 import com.tangem.domain.visa.model.TangemPayCardFrozenState
 import com.tangem.domain.visa.model.TangemPayTxHistoryItem
@@ -79,7 +79,7 @@ internal class TangemPayDetailsModel @Inject constructor(
     private val cardDetailsEventListener: CardDetailsEventListener,
     private val txHistoryUpdateListener: TangemPayTxHistoryUpdateListener,
     private val tangemPayCryptoCurrencyFactory: TangemPayCryptoCurrencyFactory,
-    private val orderRepository: CustomerOrderRepository,
+    private val tangemPayWithdrawRepository: TangemPayWithdrawRepository,
     private val getUserWalletUseCase: GetUserWalletUseCase,
     private val sendFeedbackEmailUseCase: SendFeedbackEmailUseCase,
     private val expressTransactionsEventListener: ExpressTransactionsEventListener,
@@ -124,6 +124,7 @@ internal class TangemPayDetailsModel @Inject constructor(
         modelScope.launch {
             expressTransactionsEventListener.send(ExpressTransactionsEvent.Update)
         }
+        subscribeToWithdrawOrder()
     }
 
     fun onPause() {
@@ -148,6 +149,14 @@ internal class TangemPayDetailsModel @Inject constructor(
             .launchIn(modelScope)
     }
 
+    private fun subscribeToWithdrawOrder() {
+        modelScope.launch {
+            val userWallet = userWallet ?: getUserWalletUseCase(params.userWalletId).getOrNull()
+                ?: return@launch
+            tangemPayWithdrawRepository.pollWithdrawOrderIfNeeds(userWallet)
+        }
+    }
+
     override fun onClickPinCode() {
         analytics.send(TangemPayAnalyticsEvents.PinCodeClicked())
         if (!params.config.isPinSet) {
@@ -278,24 +287,28 @@ internal class TangemPayDetailsModel @Inject constructor(
         if (currentBalance == null || depositAddress == null) {
             showBottomSheetError(TangemPayDetailsErrorType.Withdraw)
         } else {
-            modelScope.launch {
-                val hasActiveWithdrawal = orderRepository.hasWithdrawOrder(userWalletId = params.userWalletId)
-                if (hasActiveWithdrawal) {
-                    showBottomSheetError(TangemPayDetailsErrorType.WithdrawInProgress)
-                } else {
-                    val userWallet = userWallet ?: getUserWalletUseCase(params.userWalletId).getOrNull()
-                    val currency = cryptoCurrency ?: userWallet?.let {
-                        tangemPayCryptoCurrencyFactory.create(userWallet = userWallet, chainId = params.config.chainId)
-                            .getOrNull()
-                    }
-                    if (currency != null) {
-                        uiMessageSender.send(
-                            message = TangemPayMessagesFactory.createWithdrawWarning(
-                                onGotItClick = { onConfirmWithdrawal(currency, currentBalance, depositAddress) },
-                            ),
-                        )
+            val userWallet = userWallet ?: getUserWalletUseCase(params.userWalletId).getOrNull()
+            if (userWallet == null) {
+                showBottomSheetError(TangemPayDetailsErrorType.Withdraw)
+            } else {
+                modelScope.launch {
+                    val hasActiveWithdrawal = tangemPayWithdrawRepository.hasWithdrawOrder(userWallet = userWallet)
+                    if (hasActiveWithdrawal) {
+                        showBottomSheetError(TangemPayDetailsErrorType.WithdrawInProgress)
                     } else {
-                        showBottomSheetError(TangemPayDetailsErrorType.Withdraw)
+                        val currency = cryptoCurrency ?: tangemPayCryptoCurrencyFactory.create(
+                            userWallet = userWallet,
+                            chainId = params.config.chainId,
+                        ).getOrNull()
+                        if (currency != null) {
+                            uiMessageSender.send(
+                                message = TangemPayMessagesFactory.createWithdrawWarning(
+                                    onGotItClick = { onConfirmWithdrawal(currency, currentBalance, depositAddress) },
+                                ),
+                            )
+                        } else {
+                            showBottomSheetError(TangemPayDetailsErrorType.Withdraw)
+                        }
                     }
                 }
             }