Updated on 2026-08-14

data/swap/src/main/java/com/tangem/data/swap/DefaultSwapTransactionRepository.kt

@@ -13,7 +13,7 @@ import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.datasource.local.preferences.PreferencesKeys
 import com.tangem.datasource.local.preferences.utils.getObjectList
 import com.tangem.datasource.local.preferences.utils.getObjectListSync
-import com.tangem.datasource.local.preferences.utils.getObjectMapSync
+import com.tangem.datasource.local.preferences.utils.getObjectMap
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
@@ -24,9 +24,8 @@ import com.tangem.domain.swap.models.SwapTransactionModel
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.extensions.addOrReplace
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
 
 internal class DefaultSwapTransactionRepository(
     private val appPreferencesStore: AppPreferencesStore,
@@ -95,36 +94,34 @@ internal class DefaultSwapTransactionRepository(
         }
     }
 
-    override suspend fun getTransactions(
+    override fun getTransactions(
         userWallet: UserWallet,
         cryptoCurrencyId: CryptoCurrency.ID,
-    ): Flow<List<SwapTransactionListModel>?> {
-        return withContext(dispatchers.io) {
-            val txStatuses = appPreferencesStore.getObjectMapSync<SwapStatusDTO>(
-                key = PreferencesKeys.SWAP_TRANSACTIONS_STATUSES_KEY,
-            )
-            appPreferencesStore.getObjectList<SwapTransactionListDTO>(
-                key = PreferencesKeys.SWAP_TRANSACTIONS_KEY,
-            ).map { savedTransactions ->
-                val currencyTxs = savedTransactions
-                    ?.filter {
-                        it.userWalletId == userWallet.walletId.stringValue &&
-                            (
-                                it.toCryptoCurrencyId == cryptoCurrencyId.value ||
-                                    it.fromCryptoCurrencyId == cryptoCurrencyId.value
-                                )
-                    }
+    ): Flow<List<SwapTransactionListModel>?> = combine(
+        flow = appPreferencesStore.getObjectList<SwapTransactionListDTO>(
+            key = PreferencesKeys.SWAP_TRANSACTIONS_KEY,
+        ),
+        flow2 = appPreferencesStore.getObjectMap<SwapStatusDTO>(
+            key = PreferencesKeys.SWAP_TRANSACTIONS_STATUSES_KEY,
+        ),
+    ) { savedTransactions, txStatuses ->
+        val currencyTxs = savedTransactions
+            ?.filter {
+                it.userWalletId == userWallet.walletId.stringValue &&
+                    (
+                        it.toCryptoCurrencyId == cryptoCurrencyId.value ||
+                            it.fromCryptoCurrencyId == cryptoCurrencyId.value
+                        )
+            }
 
-                currencyTxs?.mapNotNull {
-                    listConverter.convertBack(
-                        value = it,
-                        userWallet = userWallet,
-                        txStatuses = txStatuses,
-                    )
-                }
-            }.flowOn(dispatchers.io)
+        currencyTxs?.mapNotNull {
+            listConverter.convertBack(
+                value = it,
+                userWallet = userWallet,
+                txStatuses = txStatuses,
+            )
         }
-    }
+    }.flowOn(dispatchers.default)
 
     override suspend fun removeTransaction(
         userWalletId: UserWalletId,
@@ -188,7 +185,7 @@ internal class DefaultSwapTransactionRepository(
             )
 
             val updatesMap = savedMap.toMutableMap()
-            updatesMap[txId] = savedStatusConverter.convertBack(
+            updatesMap[txId] = savedStatusConverter.convert(
                 status.copy(
                     refundTokensResponse = refundTokenCurrency?.let {
                         userTokensResponseFactory.createResponseToken(refundTokenCurrency)

data/swap/src/main/java/com/tangem/data/swap/converter/transaction/SavedSwapStatusConverter.kt

@@ -6,9 +6,9 @@ import com.tangem.domain.swap.models.SwapStatus
 import com.tangem.domain.swap.models.SwapStatusModel
 import com.tangem.utils.converter.TwoWayConverter
 
-internal class SavedSwapStatusConverter : TwoWayConverter<SwapStatusDTO, SwapStatusModel> {
+internal class SavedSwapStatusConverter : TwoWayConverter<SwapStatusModel, SwapStatusDTO> {
 
-    override fun convert(value: SwapStatusDTO) = SwapStatusModel(
+    override fun convertBack(value: SwapStatusDTO) = SwapStatusModel(
         providerId = value.providerId,
         status = SwapStatus.entries.firstOrNull {
             it.name.lowercase() == value.status?.name?.lowercase()
@@ -22,7 +22,7 @@ internal class SavedSwapStatusConverter : TwoWayConverter<SwapStatusDTO, SwapSta
         averageDuration = value.averageDuration,
     )
 
-    override fun convertBack(value: SwapStatusModel) = SwapStatusDTO(
+    override fun convert(value: SwapStatusModel) = SwapStatusDTO(
         providerId = value.providerId,
         status = SavedSwapStatus.entries.firstOrNull {
             it.name.lowercase() == value.status?.name?.lowercase()

data/swap/src/main/java/com/tangem/data/swap/converter/transaction/SavedSwapTransactionConverter.kt

@@ -3,8 +3,10 @@ package com.tangem.data.swap.converter.transaction
 import com.tangem.data.common.currency.ResponseCryptoCurrenciesFactory
 import com.tangem.data.swap.models.SwapStatusDTO
 import com.tangem.data.swap.models.SwapTransactionDTO
+import com.tangem.data.swap.models.SwapTxTypeDTO
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.swap.models.SwapTransactionModel
+import com.tangem.domain.swap.models.SwapTxType
 import com.tangem.utils.converter.TwoWayConverter
 
 internal class SavedSwapTransactionConverter(
@@ -21,7 +23,10 @@ internal class SavedSwapTransactionConverter(
         fromCryptoAmount = value.fromCryptoAmount,
         toCryptoAmount = value.toCryptoAmount,
         provider = value.provider,
-        status = value.status,
+        status = value.status?.let(statusConverter::convert),
+        swapTxType = SwapTxTypeDTO.entries.firstOrNull {
+            it.name.lowercase() == value.swapTxType?.name?.lowercase()
+        },
     )
 
     override fun convertBack(value: SwapTransactionDTO) = SwapTransactionModel(
@@ -30,7 +35,10 @@ internal class SavedSwapTransactionConverter(
         fromCryptoAmount = value.fromCryptoAmount,
         toCryptoAmount = value.toCryptoAmount,
         provider = value.provider,
-        status = value.status,
+        status = value.status?.let(statusConverter::convertBack),
+        swapTxType = SwapTxType.entries.firstOrNull {
+            it.name.lowercase() == value.swapTxType?.name?.lowercase()
+        },
     )
 
     fun convertBack(
@@ -53,7 +61,10 @@ internal class SavedSwapTransactionConverter(
             fromCryptoAmount = value.fromCryptoAmount,
             toCryptoAmount = value.toCryptoAmount,
             provider = value.provider,
-            status = statusWithRefundCurrency?.let(statusConverter::convert),
+            status = statusWithRefundCurrency?.let(statusConverter::convertBack),
+            swapTxType = SwapTxType.entries.firstOrNull {
+                it.name.lowercase() == value.swapTxType?.name?.lowercase()
+            },
         )
     }
 }

data/swap/src/main/java/com/tangem/data/swap/models/SwapTransactionListDTO.kt

@@ -4,7 +4,6 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
 import com.tangem.domain.express.models.ExpressProvider
-import com.tangem.domain.swap.models.SwapStatusModel
 import java.math.BigDecimal
 
 @JsonClass(generateAdapter = true)
@@ -36,5 +35,7 @@ internal data class SwapTransactionDTO(
     @Json(name = "provider")
     val provider: ExpressProvider,
     @Json(name = "status")
-    val status: SwapStatusModel? = null,
+    val status: SwapStatusDTO? = null,
+    @Json(name = "swapTxType")
+    val swapTxType: SwapTxTypeDTO? = SwapTxTypeDTO.Swap,
 )

data/swap/src/main/java/com/tangem/data/swap/models/SwapTxTypeDTO.kt

@@ -0,0 +1,13 @@
+package com.tangem.data.swap.models
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = false)
+internal enum class SwapTxTypeDTO {
+    @Json(name = "Swap")
+    Swap,
+
+    @Json(name = "SendWithSwap")
+    SendWithSwap,
+}