Updated on 2026-08-14

app/src/main/java/com/tangem/tap/TapApplication.kt

@@ -11,9 +11,9 @@ import com.tangem.blockchain.common.BlockchainSdkConfig
 import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.blockchain.network.BlockchainSdkRetrofitBuilder
 import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.domain.DomainLayer
 import com.tangem.domain.common.LogConfig
-import com.tangem.network.common.MoshiConverter
 import com.tangem.tap.common.AndroidAssetReader
 import com.tangem.tap.common.AssetReader
 import com.tangem.tap.common.analytics.Analytics
@@ -156,6 +156,7 @@ class TapApplication : Application(), ImageLoaderFactory {
         appStateHolder.userTokensRepository = userTokensRepository
     }
 
+    //todo refactor: move to datasource and provide via DI
     private fun initMoshiConverter() {
         fun appAdapters(): List<Any> = listOf(
             BigDecimalAdapter(),

app/src/main/java/com/tangem/tap/domain/RatesRepository.kt

@@ -2,7 +2,7 @@ package com.tangem.tap.domain
 
 import com.tangem.common.services.Result
 import com.tangem.domain.common.ThrottlerWithValues
-import com.tangem.network.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.TangemTechService
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.store
 import java.math.BigDecimal

app/src/main/java/com/tangem/tap/domain/TapErrors.kt

@@ -2,7 +2,7 @@ package com.tangem.tap.domain
 
 import androidx.annotation.StringRes
 import com.tangem.common.core.TangemError
-import com.tangem.network.api.tangemTech.TangemTechError
+import com.tangem.datasource.api.tangemTech.TangemTechError
 import com.tangem.wallet.R
 
 interface TapErrors

app/src/main/java/com/tangem/tap/domain/tokens/Currency.kt

@@ -3,7 +3,7 @@ package com.tangem.tap.domain.tokens
 import com.squareup.moshi.JsonClass
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.domain.common.extensions.fromNetworkId
-import com.tangem.network.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.CoinsResponse
 
 @JsonClass(generateAdapter = true)
 data class CurrencyFromJson(

app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt

@@ -6,9 +6,9 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.getListOfCoins
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.network.api.tangemTech.CoinsResponse
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.tap.common.AssetReader
 
 class LoadAvailableCoinsService(

app/src/main/java/com/tangem/tap/domain/tokens/OldUserTokensRepository.kt

@@ -7,8 +7,8 @@ import com.tangem.blockchain.common.DerivationStyle
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.getTokens
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.tap.common.FileReader
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.domain.tokens.models.TokenDao

app/src/main/java/com/tangem/tap/domain/tokens/UserTokensNetworkService.kt

@@ -2,8 +2,8 @@ package com.tangem.tap.domain.tokens
 
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.services.Result
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.api.tangemTech.UserTokensResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.UserTokensResponse
 import com.tangem.tap.domain.NoDataError
 
 class UserTokensNetworkService(private val tangemTechService: TangemTechService) {

app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt

@@ -3,10 +3,10 @@ package com.tangem.tap.domain.tokens
 import android.content.Context
 import com.tangem.blockchain.common.DerivationStyle
 import com.tangem.common.services.Result
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.UserTokensResponse
 import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.util.userWalletId
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.api.tangemTech.UserTokensResponse
 import com.tangem.tap.common.AndroidFileReader
 import com.tangem.tap.domain.NoDataError
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork

app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt

@@ -2,9 +2,9 @@ package com.tangem.tap.domain.tokens
 
 import com.squareup.moshi.JsonAdapter
 import com.tangem.Log
+import com.tangem.datasource.api.tangemTech.UserTokensResponse
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.domain.common.CardDTO
-import com.tangem.network.api.tangemTech.UserTokensResponse
-import com.tangem.network.common.MoshiConverter
 import com.tangem.tap.common.FileReader
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.models.toCurrencies

app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt

@@ -10,7 +10,7 @@ import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toHexString
 import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.operations.wallet.CreateWalletResponse
 import com.tangem.tap.common.AssetReader
 import com.tangem.tap.tangemSdkManager
@@ -85,7 +85,7 @@ class TwinCardsManager(
         }
 
         private fun getAdapter(): JsonAdapter<List<Issuer>> {
-            return MoshiConverter.defaultMoshi().adapter(
+            return com.tangem.datasource.api.common.MoshiConverter.defaultMoshi().adapter(
                 Types.newParameterizedType(List::class.java, Issuer::class.java),
             )
         }

app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectRepository.kt

@@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Types
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toHexString
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectSession
 import com.tangem.tap.features.details.redux.walletconnect.WalletForSession
 import com.trustwallet.walletconnect.models.WCPeerMeta
@@ -18,7 +18,7 @@ import java.nio.charset.Charset
 class WalletConnectRepository(val context: Application) {
     private val moshi = MoshiConverter.defaultMoshi()
     private val walletConnectAdapter: JsonAdapter<List<SessionDao>> = moshi.adapter(
-        Types.newParameterizedType(List::class.java, SessionDao::class.java)
+        Types.newParameterizedType(List::class.java, SessionDao::class.java),
     )
 
     fun saveSession(session: WalletConnectSession) {
@@ -76,7 +76,6 @@ class WalletConnectRepository(val context: Application) {
     }
 }
 
-
 @JsonClass(generateAdapter = true)
 data class SessionDao(
     val peerId: String,
@@ -91,7 +90,7 @@ data class SessionDao(
             remotePeerId = remotePeerId,
             wallet = wallet,
             session = session,
-            peerMeta = peerMeta
+            peerMeta = peerMeta,
         )
     }
 
@@ -102,7 +101,7 @@ data class SessionDao(
                 remotePeerId = session.remotePeerId,
                 wallet = session.wallet,
                 session = session.session,
-                peerMeta = session.peerMeta
+                peerMeta = session.peerMeta,
             )
         }
     }

app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt

@@ -12,13 +12,13 @@ import com.tangem.common.extensions.isZero
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.successOr
 import com.tangem.domain.common.util.UserWalletId
-import com.tangem.network.api.paymentology.AttestationResponse
-import com.tangem.network.api.paymentology.PaymentologyApiService
-import com.tangem.network.api.paymentology.RegisterKYCRequest
-import com.tangem.network.api.paymentology.RegisterWalletRequest
-import com.tangem.network.api.paymentology.RegisterWalletResponse
-import com.tangem.network.api.paymentology.RegistrationResponse
-import com.tangem.network.api.paymentology.tryExtractError
+import com.tangem.datasource.api.paymentology.AttestationResponse
+import com.tangem.datasource.api.paymentology.PaymentologyApiService
+import com.tangem.datasource.api.paymentology.RegisterKYCRequest
+import com.tangem.datasource.api.paymentology.RegisterWalletRequest
+import com.tangem.datasource.api.paymentology.RegisterWalletResponse
+import com.tangem.datasource.api.paymentology.RegistrationResponse
+import com.tangem.datasource.api.paymentology.tryExtractError
 import com.tangem.operations.attestation.AttestWalletKeyResponse
 import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.domain.getFirstToken
@@ -79,7 +79,7 @@ class SaltPayActivationManager(
         }
     }
 
-    suspend fun requestAttestationChallenge(): Result<AttestationResponse> {
+    suspend fun requestAttestationChallenge(): Result<com.tangem.datasource.api.paymentology.AttestationResponse> {
         return paymentologyService.requestAttestationChallenge(cardId, cardPublicKey)
             .successOr { return it }
             .tryExtractError()
@@ -94,8 +94,8 @@ class SaltPayActivationManager(
     suspend fun registerWallet(
         attestResponse: AttestWalletKeyResponse,
         pinCode: String,
-    ): Result<RegisterWalletResponse> {
-        val request = RegisterWalletRequest(
+    ): Result<com.tangem.datasource.api.paymentology.RegisterWalletResponse> {
+        val request = com.tangem.datasource.api.paymentology.RegisterWalletRequest(
             cardId = cardId,
             publicKey = cardPublicKey,
             walletPublicKey = walletPublicKey,
@@ -152,12 +152,13 @@ class SaltPayActivationManager(
         )
     }
 
-    private fun makeRegisterKYCRequest(): RegisterKYCRequest = RegisterKYCRequest(
-        cardId = cardId,
-        publicKey = cardPublicKey,
-        kycProvider = "UTORG",
-        kycRefId = kycUrlProvider.kycRefId,
-    )
+    private fun makeRegisterKYCRequest(): com.tangem.datasource.api.paymentology.RegisterKYCRequest =
+        com.tangem.datasource.api.paymentology.RegisterKYCRequest(
+            cardId = cardId,
+            publicKey = cardPublicKey,
+            kycProvider = "UTORG",
+            kycRefId = kycUrlProvider.kycRefId,
+        )
 
     companion object {
         fun stub(): SaltPayActivationManager = SaltPayActivationManager(

app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt

@@ -8,8 +8,8 @@ import com.tangem.common.extensions.guard
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.successOr
 import com.tangem.domain.common.extensions.withMainContext
-import com.tangem.network.api.paymentology.KYCStatus
-import com.tangem.network.api.paymentology.RegistrationResponse
+import com.tangem.datasource.api.paymentology.KYCStatus
+import com.tangem.datasource.api.paymentology.RegistrationResponse
 import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
@@ -295,7 +295,7 @@ suspend fun SaltPayActivationManager.update(
 private fun determineStep(
     currentStep: SaltPayActivationStep,
     amountToClaim: Amount?,
-    response: RegistrationResponse.Item,
+    response: com.tangem.datasource.api.paymentology.RegistrationResponse.Item,
 ): SaltPayActivationStep {
     fun getStepBaseOnAmountToClaim(amount: Amount?): SaltPayActivationStep = when (amount) {
         null -> SaltPayActivationStep.Success
@@ -315,25 +315,25 @@ private fun determineStep(
         response.kycStatus != null -> {
             when (currentStep) {
                 SaltPayActivationStep.KycWaiting -> when (response.kycStatus) {
-                    KYCStatus.NOT_STARTED, KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
-                    KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
-                    KYCStatus.CORRECTION_REQUESTED, KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
-                    KYCStatus.APPROVED -> getStepBaseOnAmountToClaim(amountToClaim)
+                    com.tangem.datasource.api.paymentology.KYCStatus.NOT_STARTED, com.tangem.datasource.api.paymentology.KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
+                    com.tangem.datasource.api.paymentology.KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
+                    com.tangem.datasource.api.paymentology.KYCStatus.CORRECTION_REQUESTED, com.tangem.datasource.api.paymentology.KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
+                    com.tangem.datasource.api.paymentology.KYCStatus.APPROVED -> getStepBaseOnAmountToClaim(amountToClaim)
                     else -> SaltPayActivationStep.KycIntro
                 }
                 SaltPayActivationStep.KycReject -> when (response.kycStatus) {
-                    KYCStatus.NOT_STARTED, KYCStatus.STARTED -> SaltPayActivationStep.KycStart
-                    KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
-                    KYCStatus.CORRECTION_REQUESTED -> SaltPayActivationStep.KycStart
-                    KYCStatus.REJECTED -> SaltPayActivationStep.KycStart
-                    KYCStatus.APPROVED -> getStepBaseOnAmountToClaim(amountToClaim)
+                    com.tangem.datasource.api.paymentology.KYCStatus.NOT_STARTED, com.tangem.datasource.api.paymentology.KYCStatus.STARTED -> SaltPayActivationStep.KycStart
+                    com.tangem.datasource.api.paymentology.KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
+                    com.tangem.datasource.api.paymentology.KYCStatus.CORRECTION_REQUESTED -> SaltPayActivationStep.KycStart
+                    com.tangem.datasource.api.paymentology.KYCStatus.REJECTED -> SaltPayActivationStep.KycStart
+                    com.tangem.datasource.api.paymentology.KYCStatus.APPROVED -> getStepBaseOnAmountToClaim(amountToClaim)
                     else -> SaltPayActivationStep.KycIntro
                 }
                 else -> when (response.kycStatus) {
-                    KYCStatus.NOT_STARTED, KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
-                    KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
-                    KYCStatus.CORRECTION_REQUESTED, KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
-                    KYCStatus.APPROVED -> getStepBaseOnAmountToClaim(amountToClaim)
+                    com.tangem.datasource.api.paymentology.KYCStatus.NOT_STARTED, com.tangem.datasource.api.paymentology.KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
+                    com.tangem.datasource.api.paymentology.KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
+                    com.tangem.datasource.api.paymentology.KYCStatus.CORRECTION_REQUESTED, com.tangem.datasource.api.paymentology.KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
+                    com.tangem.datasource.api.paymentology.KYCStatus.APPROVED -> getStepBaseOnAmountToClaim(amountToClaim)
                     else -> SaltPayActivationStep.KycIntro
                 }
             }
@@ -413,7 +413,7 @@ private suspend fun checkGasIfNeeded(
 }
 
 @Throws(SaltPayActivationError::class)
-fun RegistrationResponse.Item.toSaltPayStep(currentStep: SaltPayActivationStep): SaltPayActivationStep {
+fun com.tangem.datasource.api.paymentology.RegistrationResponse.Item.toSaltPayStep(currentStep: SaltPayActivationStep): SaltPayActivationStep {
     return when {
         passed != true -> throw SaltPayActivationError.CardNotPassed(this.error)
         disabledByAdmin == true -> throw SaltPayActivationError.CardDisabled(this.error)
@@ -426,10 +426,10 @@ fun RegistrationResponse.Item.toSaltPayStep(currentStep: SaltPayActivationStep):
 
         kycStatus != null -> {
             when (kycStatus) {
-                KYCStatus.NOT_STARTED, KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
-                KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
-                KYCStatus.CORRECTION_REQUESTED, KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
-                KYCStatus.APPROVED -> SaltPayActivationStep.Claim
+                com.tangem.datasource.api.paymentology.KYCStatus.NOT_STARTED, com.tangem.datasource.api.paymentology.KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
+                com.tangem.datasource.api.paymentology.KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
+                com.tangem.datasource.api.paymentology.KYCStatus.CORRECTION_REQUESTED, com.tangem.datasource.api.paymentology.KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
+                com.tangem.datasource.api.paymentology.KYCStatus.APPROVED -> SaltPayActivationStep.Claim
                 null -> throw UnsupportedOperationException()
             }
         }

app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt

@@ -6,7 +6,7 @@ import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.common.extensions.guard
 import com.tangem.domain.common.SaltPayWorkaround
 import com.tangem.domain.common.ScanResponse
-import com.tangem.network.api.paymentology.PaymentologyApiService
+import com.tangem.datasource.api.paymentology.PaymentologyApiService
 import com.tangem.tap.common.toggleWidget.WidgetState
 import com.tangem.tap.domain.extensions.makeSaltPayWalletManager
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.GnosisRegistrator

app/src/main/java/com/tangem/tap/features/wallet/models/Currency.kt

@@ -5,7 +5,7 @@ import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.features.addCustomToken.CustomCurrency
-import com.tangem.network.api.tangemTech.TokenResponse
+import com.tangem.datasource.api.tangemTech.TokenResponse
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain

app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt

@@ -1,8 +1,8 @@
 package com.tangem.tap.features.wallet.redux.middlewares
 
 import com.tangem.common.services.Result
-import com.tangem.network.api.tangemTech.CurrenciesResponse
-import com.tangem.network.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.CurrenciesResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
 import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.MainScreen

app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt

@@ -6,7 +6,7 @@ import com.tangem.common.extensions.calculateSha512
 import com.tangem.common.extensions.toHexString
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.createRetrofitInstance
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager

app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt

@@ -6,7 +6,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
 import com.tangem.domain.common.extensions.withIOContext
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.createRetrofitInstance
 import com.tangem.tap.common.extensions.urlEncode
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
 import com.tangem.tap.features.wallet.models.Currency

app/src/main/java/com/tangem/tap/network/payid/PayIdService.kt

@@ -3,7 +3,7 @@ package com.tangem.tap.network.payid
 import com.squareup.moshi.JsonClass
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.createRetrofitInstance
 import retrofit2.Retrofit
 
 class PayIdService {

app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyService.kt

@@ -2,7 +2,7 @@ package com.tangem.tap.network.payid
 
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.createRetrofitInstance
 
 /**
 [REDACTED_AUTHOR]

app/src/main/java/com/tangem/tap/persistence/FiatCurrenciesPrefStorage.kt

@@ -3,7 +3,7 @@ package com.tangem.tap.persistence
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.tangem.common.json.MoshiJsonConverter
-import com.tangem.network.api.tangemTech.CurrenciesResponse
+import com.tangem.datasource.api.tangemTech.CurrenciesResponse
 import com.tangem.tap.common.entities.FiatCurrency
 
 /**

app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.common.MoshiConverter
 import java.util.*
 
 class PreferencesStorage(applicationContext: Application) {