Updated on 2026-08-14

data/express/build.gradle.kts

@@ -25,6 +25,7 @@ dependencies {
     implementation(projects.domain.express.models)
     implementation(projects.domain.express)
     implementation(projects.domain.wallets.models)
+    implementation(projects.domain.txhistory)
     api(projects.domain.models)
 
     /** Other */

data/express/src/main/java/com/tangem/data/express/DefaultExpressRepository.kt

@@ -12,6 +12,7 @@ import com.tangem.domain.express.ExpressRepository
 import com.tangem.domain.express.models.ExpressProvider
 import com.tangem.domain.express.models.ExpressProviderType
 import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.txhistory.TxHistoryFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.extensions.filterIf
 import com.tangem.utils.logging.TangemLogger
@@ -21,6 +22,7 @@ internal class DefaultExpressRepository(
     private val expressHistoryDao: ExpressHistoryDao,
     private val appPreferencesStore: AppPreferencesStore,
     private val dispatchers: CoroutineDispatcherProvider,
+    private val txHistoryFeatureToggles: TxHistoryFeatureToggles,
 ) : ExpressRepository {
 
     override suspend fun getProviders(
@@ -37,7 +39,9 @@ internal class DefaultExpressRepository(
                     ),
                 ).getOrThrow()
 
-                expressHistoryDao.upsertProviders(providers.map { it.toEntity() })
+                if (txHistoryFeatureToggles.isNewTxHistoryEnabled) {
+                    expressHistoryDao.upsertProviders(providers.map { it.toEntity() })
+                }
 
                 providers.map(ExpressProviderConverter()::convert)
                     .filterIf(filterProviderTypes.isNotEmpty()) { it.type in filterProviderTypes }

data/express/src/main/java/com/tangem/data/express/di/ExpressDataModule.kt

@@ -13,6 +13,7 @@ import com.tangem.datasource.local.txhistory.db.dao.ExpressHistoryDao
 import com.tangem.domain.express.ExpressErrorResolver
 import com.tangem.domain.express.ExpressRepository
 import com.tangem.domain.express.ExpressServiceFetcher
+import com.tangem.domain.txhistory.TxHistoryFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -40,12 +41,14 @@ internal object ExpressDataModule {
         expressHistoryDao: ExpressHistoryDao,
         appPreferencesStore: AppPreferencesStore,
         dispatchers: CoroutineDispatcherProvider,
+        txHistoryFeatureToggles: TxHistoryFeatureToggles,
     ): ExpressRepository {
         return DefaultExpressRepository(
             tangemExpressApi = tangemExpressApi,
             expressHistoryDao = expressHistoryDao,
             appPreferencesStore = appPreferencesStore,
             dispatchers = dispatchers,
+            txHistoryFeatureToggles = txHistoryFeatureToggles,
         )
     }
 

data/onramp/build.gradle.kts

@@ -31,6 +31,7 @@ dependencies {
     implementation(projects.domain.appTheme.models)
     implementation(projects.domain.models)
     implementation(projects.domain.express.models)
+    implementation(projects.domain.txhistory)
 
     // region DI
 

data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt

@@ -26,11 +26,11 @@ import com.tangem.datasource.crypto.DataSignatureVerifier
 import com.tangem.datasource.exchangeservice.swap.ExpressUtils
 import com.tangem.datasource.local.converter.toEntity
 import com.tangem.datasource.local.onramp.countries.OnrampCountriesStore
+import com.tangem.datasource.local.onramp.country.OnrampCurrentCountryByIPStore
 import com.tangem.datasource.local.onramp.currencies.OnrampCurrenciesStore
 import com.tangem.datasource.local.onramp.pairs.OnrampPairsStore
 import com.tangem.datasource.local.onramp.paymentmethods.OnrampPaymentMethodsStore
 import com.tangem.datasource.local.onramp.quotes.OnrampQuotesStore
-import com.tangem.datasource.local.onramp.country.OnrampCurrentCountryByIPStore
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.datasource.local.preferences.PreferencesKeys
 import com.tangem.datasource.local.preferences.utils.getObject
@@ -48,6 +48,7 @@ import com.tangem.domain.onramp.model.error.OnrampPairsError
 import com.tangem.domain.onramp.model.error.OnrampRedirectError
 import com.tangem.domain.onramp.repositories.OnrampRepository
 import com.tangem.domain.tokens.model.Amount
+import com.tangem.domain.txhistory.TxHistoryFeatureToggles
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.logging.TangemLogger
@@ -75,6 +76,7 @@ internal class DefaultOnrampRepository(
     private val walletManagersFacade: WalletManagersFacade,
     private val dataSignatureVerifier: DataSignatureVerifier,
     private val expressHistoryDao: ExpressHistoryDao,
+    private val txHistoryFeatureToggles: TxHistoryFeatureToggles,
     moshi: Moshi,
 ) : OnrampRepository {
 
@@ -165,7 +167,9 @@ internal class DefaultOnrampRepository(
         )
             .getOrThrow()
 
-        expressHistoryDao.upsertOnramps(listOf(response.toEntity(ownerAddress = response.payoutAddress)))
+        if (txHistoryFeatureToggles.isNewTxHistoryEnabled) {
+            expressHistoryDao.upsertOnramps(listOf(response.toEntity(ownerAddress = response.payoutAddress)))
+        }
 
         statusConverter.convert(response)
     }

data/onramp/src/main/java/com/tangem/data/onramp/di/OnrampDataModule.kt

@@ -30,6 +30,7 @@ import com.tangem.datasource.local.txhistory.db.dao.ExpressHistoryDao
 import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.utils.coroutines.AppCoroutineScope
 import com.tangem.domain.onramp.repositories.*
+import com.tangem.domain.txhistory.TxHistoryFeatureToggles
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
@@ -58,6 +59,7 @@ internal object OnrampDataModule {
         dataSignatureVerifier: DataSignatureVerifier,
         onrampCurrentCountryByIPStore: OnrampCurrentCountryByIPStore,
         expressHistoryDao: ExpressHistoryDao,
+        txHistoryFeatureToggles: TxHistoryFeatureToggles,
         @NetworkMoshi moshi: Moshi,
     ): OnrampRepository {
         return DefaultOnrampRepository(
@@ -74,6 +76,7 @@ internal object OnrampDataModule {
             walletManagersFacade = walletManagersFacade,
             dataSignatureVerifier = dataSignatureVerifier,
             expressHistoryDao = expressHistoryDao,
+            txHistoryFeatureToggles = txHistoryFeatureToggles,
             moshi = moshi,
         )
     }