Updated on 2026-08-14

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

@@ -2,6 +2,7 @@ package com.tangem.feature.swap
 
 import com.tangem.data.common.currency.ResponseCryptoCurrenciesFactory
 import com.tangem.data.common.currency.UserTokensResponseFactory
+import com.tangem.data.common.network.NetworkFactory
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.datasource.local.preferences.PreferencesKeys
 import com.tangem.datasource.local.preferences.utils.getObjectList
@@ -24,10 +25,14 @@ internal class DefaultSwapTransactionRepository(
     private val appPreferencesStore: AppPreferencesStore,
     private val dispatchers: CoroutineDispatcherProvider,
     responseCryptoCurrenciesFactory: ResponseCryptoCurrenciesFactory,
+    networkFactory: NetworkFactory,
 ) : SwapTransactionRepository {
 
     private val converter by lazy(LazyThreadSafetyMode.NONE) {
-        SavedSwapTransactionListConverter(responseCryptoCurrenciesFactory = responseCryptoCurrenciesFactory)
+        SavedSwapTransactionListConverter(
+            responseCryptoCurrenciesFactory = responseCryptoCurrenciesFactory,
+            networkFactory = networkFactory,
+        )
     }
     private val userTokensResponseFactory = UserTokensResponseFactory()
 
@@ -128,52 +133,25 @@ internal class DefaultSwapTransactionRepository(
             .flowOn(dispatchers.default)
     }
 
-    override suspend fun removeTransaction(
-        userWalletId: UserWalletId,
-        fromCryptoCurrency: CryptoCurrency,
-        toCryptoCurrency: CryptoCurrency,
-        txId: String,
-    ) {
+    override suspend fun removeTransaction(userWalletId: UserWalletId, txId: String) {
         clearTransactionsStatuses(txId = txId)
         appPreferencesStore.editData { mutablePreferences ->
             val savedList: List<SavedSwapTransactionListModelInner>? = mutablePreferences.getObjectList(
                 key = PreferencesKeys.SWAP_TRANSACTIONS_KEY,
             )
             val tokenTransactions = savedList
-                ?.firstOrNull {
-                    it.checkId(
-                        checkUserWalletId = userWalletId,
-                        fromCurrencyId = fromCryptoCurrency.id,
-                        toCurrencyId = toCryptoCurrency.id,
-                    )
-                }
-                ?.transactions
-                ?.filterNot { it.txId == txId }
+                ?.asSequence()
+                ?.map {
+                    it.copy(transactions = it.transactions.filterNot { it.txId == txId })
+                }?.filterNot { it.transactions.isEmpty() }
+                ?.toList()
 
-            val editedList =
-                if (tokenTransactions.isNullOrEmpty()) {
-                    savedList?.filterNot {
-                        it.checkId(
-                            checkUserWalletId = userWalletId,
-                            fromCurrencyId = fromCryptoCurrency.id,
-                            toCurrencyId = toCryptoCurrency.id,
-                        )
-                    }
-                } else {
-                    savedList.updateList(
-                        userWalletId = userWalletId,
-                        fromCryptoCurrency = fromCryptoCurrency,
-                        toCryptoCurrency = toCryptoCurrency,
-                        transactions = tokenTransactions,
-                    )
-                }
-
-            if (editedList.isNullOrEmpty()) {
+            if (tokenTransactions.isNullOrEmpty()) {
                 mutablePreferences.remove(key = PreferencesKeys.SWAP_TRANSACTIONS_KEY)
             } else {
                 mutablePreferences.setObject(
                     key = PreferencesKeys.SWAP_TRANSACTIONS_KEY,
-                    value = editedList,
+                    value = tokenTransactions,
                 )
             }
         }

features/swap/data/src/main/java/com/tangem/feature/swap/converters/SavedSwapTransactionListConverter.kt

@@ -1,8 +1,13 @@
 package com.tangem.feature.swap.converters
 
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.data.common.currency.ResponseCryptoCurrenciesFactory
 import com.tangem.data.common.currency.UserTokensResponseFactory
+import com.tangem.data.common.network.NetworkFactory
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.swap.domain.models.domain.ExchangeStatusModel
@@ -13,6 +18,7 @@ import com.tangem.utils.converter.Converter
 
 internal class SavedSwapTransactionListConverter(
     private val responseCryptoCurrenciesFactory: ResponseCryptoCurrenciesFactory,
+    private val networkFactory: NetworkFactory,
 ) : Converter<SavedSwapTransactionListModel, SavedSwapTransactionListModelInner> {
 
     private val userTokensResponseFactory = UserTokensResponseFactory()
@@ -43,13 +49,17 @@ internal class SavedSwapTransactionListConverter(
         return if (fromToken == null || toToken == null) {
             null
         } else {
+            val fromNetwork = createSwapTransactionNetwork(fromToken, userWallet) ?: return null
             val fromCryptoCurrency = responseCryptoCurrenciesFactory.createCurrency(
                 responseToken = fromToken,
                 userWallet = userWallet,
+                network = fromNetwork,
             ) ?: return null
+            val toNetwork = createSwapTransactionNetwork(fromToken, userWallet) ?: return null
             val toCryptoCurrency = responseCryptoCurrenciesFactory.createCurrency(
                 responseToken = toToken,
                 userWallet = userWallet,
+                network = toNetwork,
             ) ?: return null
 
             return SavedSwapTransactionListModel(
@@ -91,4 +101,22 @@ internal class SavedSwapTransactionListConverter(
         toTokensResponse = userTokensResponseFactory.createResponseToken(currency = toCryptoCurrency, accountId = null),
         transactions = tokenTransactions,
     )
+
+    private fun createSwapTransactionNetwork(token: UserTokensResponse.Token, userWallet: UserWallet): Network? {
+        val blockchain = Blockchain.fromNetworkId(token.networkId) ?: return null
+
+        return if (token.derivationPath == null) {
+            networkFactory.create(
+                blockchain = blockchain,
+                derivationPath = Network.DerivationPath.None,
+                userWallet = userWallet,
+            )
+        } else {
+            networkFactory.create(
+                blockchain = blockchain,
+                extraDerivationPath = token.derivationPath,
+                userWallet = userWallet,
+            )
+        }
+    }
 }

features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt

@@ -3,6 +3,7 @@ package com.tangem.feature.swap.di
 import com.squareup.moshi.Moshi
 import com.tangem.blockchainsdk.utils.ExcludedBlockchains
 import com.tangem.data.common.currency.ResponseCryptoCurrenciesFactory
+import com.tangem.data.common.network.NetworkFactory
 import com.tangem.datasource.api.express.TangemExpressApi
 import com.tangem.datasource.api.express.models.response.ExpressErrorResponse
 import com.tangem.datasource.crypto.DataSignatureVerifier
@@ -60,11 +61,13 @@ internal class SwapDataModule {
     fun provideSwapTransactionRepository(
         appPreferencesStore: AppPreferencesStore,
         responseCryptoCurrenciesFactory: ResponseCryptoCurrenciesFactory,
+        networkFactory: NetworkFactory,
         dispatcherProvider: CoroutineDispatcherProvider,
     ): SwapTransactionRepository {
         return DefaultSwapTransactionRepository(
             appPreferencesStore = appPreferencesStore,
             responseCryptoCurrenciesFactory = responseCryptoCurrenciesFactory,
+            networkFactory = networkFactory,
             dispatchers = dispatcherProvider,
         )
     }