From 9f070d60238105bb5a76ce4e44c0ed80e4605618 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 15 Jun 2026 16:55:30 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../data/swap/DefaultSwapRepositoryV2.kt | 18 ------------ .../swap/converter/SwapStatusConverter.kt | 24 --------------- .../data/swap/DefaultSwapRepositoryV2Test.kt | 29 ------------------- .../tangem/domain/swap/SwapRepositoryV2.kt | 8 ----- 4 files changed, 79 deletions(-) delete mode 100644 data/swap/src/main/java/com/tangem/data/swap/converter/SwapStatusConverter.kt diff --git a/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt b/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt index 8aec84f31e..bc3c861de9 100644 --- a/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt +++ b/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt @@ -10,7 +10,6 @@ import com.tangem.core.configtoggle.FeatureToggles import com.tangem.core.configtoggle.feature.FeatureTogglesManager import com.tangem.data.common.api.safeApiCall import com.tangem.data.swap.converter.SwapDataConverter -import com.tangem.data.swap.converter.SwapStatusConverter import com.tangem.data.swap.converter.TokenInfoConverter import com.tangem.datasource.api.common.response.getOrThrow import com.tangem.datasource.api.express.TangemExpressApi @@ -65,7 +64,6 @@ internal class DefaultSwapRepositoryV2 @Inject constructor( private val swapDataConverter = SwapDataConverter() private val tokenInfoConverter = TokenInfoConverter() - private val exchangeStatusConverter = SwapStatusConverter() private val txDetailsMoshiAdapter = moshi.adapter(TxDetails::class.java) override suspend fun getPairs( @@ -404,22 +402,6 @@ internal class DefaultSwapRepositoryV2 @Inject constructor( } } - override suspend fun getExchangeStatus(userWallet: UserWallet, txId: String): SwapStatusModel = - withContext(coroutineDispatcher.io) { - exchangeStatusConverter.convert( - tangemExpressApi - .getExchangeStatus( - userWalletId = userWallet.walletId.stringValue, - refCode = ExpressUtils.getRefCode( - userWallet = userWallet, - appPreferencesStore = appPreferencesStore, - ), - txId = txId, - ) - .getOrThrow(), - ) - } - private suspend fun CoroutineScope.getPairsInternal( userWallet: UserWallet, initialCurrency: CryptoCurrency, diff --git a/data/swap/src/main/java/com/tangem/data/swap/converter/SwapStatusConverter.kt b/data/swap/src/main/java/com/tangem/data/swap/converter/SwapStatusConverter.kt deleted file mode 100644 index 33ae4fa064..0000000000 --- a/data/swap/src/main/java/com/tangem/data/swap/converter/SwapStatusConverter.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.tangem.data.swap.converter - -import com.tangem.datasource.api.express.models.response.ExchangeStatusResponse -import com.tangem.domain.swap.models.SwapStatus -import com.tangem.domain.swap.models.SwapStatusModel -import com.tangem.utils.converter.Converter - -internal class SwapStatusConverter : Converter { - override fun convert(value: ExchangeStatusResponse): SwapStatusModel { - return SwapStatusModel( - providerId = value.providerId, - status = SwapStatus.entries.firstOrNull { - it.name.lowercase() == value.status.name.lowercase() - }, - txId = value.externalTxId, - txExternalUrl = value.externalTxUrl, - txExternalId = value.externalTxId, - refundNetwork = value.refundNetwork, - refundContractAddress = value.refundContractAddress, - createdAt = value.createdAt, - averageDuration = value.averageDuration, - ) - } -} \ No newline at end of file diff --git a/data/swap/src/test/kotlin/com/tangem/data/swap/DefaultSwapRepositoryV2Test.kt b/data/swap/src/test/kotlin/com/tangem/data/swap/DefaultSwapRepositoryV2Test.kt index 8fd1a4d3a3..066ae28ee6 100644 --- a/data/swap/src/test/kotlin/com/tangem/data/swap/DefaultSwapRepositoryV2Test.kt +++ b/data/swap/src/test/kotlin/com/tangem/data/swap/DefaultSwapRepositoryV2Test.kt @@ -449,35 +449,6 @@ internal class DefaultSwapRepositoryV2Test { // endregion - // region getExchangeStatus - - @Test - fun `getExchangeStatus returns converted status model`() = runTest { - // Arrange - val statusResponse = ExchangeStatusResponse( - providerId = PROVIDER_ID, - status = ExchangeStatus.Finished, - externalTxId = "ext-tx-1", - externalTxUrl = "https://example.com/tx/1", - error = null, - ) - - coEvery { - tangemExpressApi.getExchangeStatus(any(), any(), any()) - } returns ApiResponse.Success(statusResponse) - - // Act - val result = repository.getExchangeStatus(userWallet = userWallet, txId = "tx-123") - - // Assert - assertThat(result.providerId).isEqualTo(PROVIDER_ID) - assertThat(result.status).isEqualTo(SwapStatus.Finished) - assertThat(result.txId).isEqualTo("ext-tx-1") - assertThat(result.txExternalUrl).isEqualTo("https://example.com/tx/1") - } - - // endregion - // region swapTransactionSent @Test diff --git a/domain/swap/src/main/java/com/tangem/domain/swap/SwapRepositoryV2.kt b/domain/swap/src/main/java/com/tangem/domain/swap/SwapRepositoryV2.kt index f852d6c8cc..553a550b0a 100644 --- a/domain/swap/src/main/java/com/tangem/domain/swap/SwapRepositoryV2.kt +++ b/domain/swap/src/main/java/com/tangem/domain/swap/SwapRepositoryV2.kt @@ -127,12 +127,4 @@ interface SwapRepositoryV2 { txHash: String, txExtraId: String?, ) - - /** - * Returns status [SwapStatusModel] on active swap - * - * @param userWallet selected user wallet - * @param txId transaction id in ExpressApi - */ - suspend fun getExchangeStatus(userWallet: UserWallet, txId: String): SwapStatusModel } \ No newline at end of file