Updated on 2026-08-14

data/visa/src/main/kotlin/com/tangem/data/pay/util/TangemPayErrorConverter.kt

@@ -2,7 +2,7 @@ package com.tangem.data.pay.util
 
 import com.squareup.moshi.Moshi
 import com.tangem.datasource.api.common.response.ApiResponseError
-import com.tangem.datasource.api.pay.models.response.VisaErrorResponse
+import com.tangem.datasource.api.pay.models.response.TangemPayErrorResponse
 import com.tangem.datasource.di.NetworkMoshi
 import com.tangem.domain.visa.error.VisaApiError
 import com.tangem.utils.converter.Converter
@@ -14,7 +14,7 @@ internal class TangemPayErrorConverter @Inject constructor(
     @NetworkMoshi moshi: Moshi,
 ) : Converter<Throwable, VisaApiError> {
 
-    private val visaErrorAdapter by lazy { moshi.adapter(VisaErrorResponse::class.java) }
+    private val tangemPayErrorAdapter by lazy { moshi.adapter(TangemPayErrorResponse::class.java) }
 
     override fun convert(value: Throwable): VisaApiError {
         return if (value is ApiResponseError.HttpException) {
@@ -23,7 +23,7 @@ internal class TangemPayErrorConverter @Inject constructor(
 
             val errorBody = value.errorBody ?: return VisaApiError.UnknownWithoutCode
             return runCatching {
-                visaErrorAdapter.fromJson(errorBody)?.error?.code ?: value.code.numericCode
+                tangemPayErrorAdapter.fromJson(errorBody)?.error?.code ?: value.code.numericCode
             }.map {
                 VisaApiError.fromBackendError(it)
             }.getOrElse {

data/visa/src/main/kotlin/com/tangem/data/visa/DefaultTangemPayRemoteDataSource.kt

@@ -0,0 +1,87 @@
+package com.tangem.data.visa
+
+import arrow.core.Either
+import com.squareup.moshi.Moshi
+import com.tangem.datasource.api.common.response.ApiResponseError
+import com.tangem.datasource.api.common.response.getOrThrow
+import com.tangem.datasource.api.pay.TangemPayAuthApi
+import com.tangem.datasource.api.pay.models.request.GenerateNonceByCustomerWalletRequest
+import com.tangem.datasource.api.pay.models.request.GetTokenByCustomerWalletRequest
+import com.tangem.datasource.api.pay.models.response.TangemPayErrorResponse
+import com.tangem.datasource.di.NetworkMoshi
+import com.tangem.domain.visa.datasource.TangemPayRemoteDataSource
+import com.tangem.domain.visa.error.VisaApiError
+import com.tangem.domain.visa.model.TangemPayAuthTokens
+import com.tangem.domain.visa.model.VisaAuthChallenge
+import com.tangem.domain.visa.model.VisaAuthSession
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+internal class DefaultTangemPayRemoteDataSource @Inject constructor(
+    @NetworkMoshi private val moshi: Moshi,
+    private val tangemPayAuthApi: TangemPayAuthApi,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : TangemPayRemoteDataSource {
+
+    private val errorAdapter by lazy { moshi.adapter(TangemPayErrorResponse::class.java) }
+
+    override suspend fun getCustomerWalletAuthChallenge(
+        customerWalletAddress: String,
+        customerWalletId: String,
+    ): Either<VisaApiError, VisaAuthChallenge.Wallet> = withContext(dispatchers.io) {
+        request {
+            tangemPayAuthApi.generateNonceByCustomerWallet(
+                request = GenerateNonceByCustomerWalletRequest(
+                    customerWalletAddress = customerWalletAddress,
+                    customerWalletId = customerWalletId,
+                ),
+            ).getOrThrow()
+        }.map { response ->
+            VisaAuthChallenge.Wallet(
+                challenge = response.nonce,
+                session = VisaAuthSession(response.sessionId),
+            )
+        }
+    }
+
+    override suspend fun getTokenWithCustomerWallet(
+        sessionId: String,
+        signature: String,
+        nonce: String,
+    ): Either<VisaApiError, TangemPayAuthTokens> = withContext(dispatchers.io) {
+        request {
+            tangemPayAuthApi.getTokenByCustomerWallet(
+                request = GetTokenByCustomerWalletRequest(
+                    authType = "customer_wallet",
+                    sessionId = sessionId,
+                    signature = signature,
+                    messageFormat = "Tangem Pay wants to sign in with your account. Nonce: $nonce",
+                ),
+            ).getOrThrow()
+        }.map { response ->
+            TangemPayAuthTokens(
+                accessToken = response.accessToken,
+                expiresAt = response.expiresAt,
+                refreshToken = response.refreshToken,
+                refreshExpiresAt = response.refreshExpiresAt,
+            )
+        }
+    }
+
+    private suspend fun <T : Any> request(requestBlock: suspend () -> T): Either<VisaApiError, T> {
+        return runCatching {
+            Either.Right(requestBlock())
+        }.getOrElse { responseError ->
+            if (responseError is ApiResponseError.HttpException &&
+                responseError.errorBody != null
+            ) {
+                val errorCode =
+                    errorAdapter.fromJson(responseError.errorBody)?.error?.code ?: responseError.code.numericCode
+                return Either.Left(VisaApiError.fromBackendError(errorCode))
+            }
+
+            return Either.Left(VisaApiError.UnknownWithoutCode)
+        }
+    }
+}

data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaActivationRepository.kt

@@ -10,15 +10,16 @@ import com.tangem.datasource.api.common.config.ApiEnvironment
 import com.tangem.datasource.api.common.config.managers.ApiConfigsManager
 import com.tangem.datasource.api.common.response.ApiResponseError
 import com.tangem.datasource.api.common.response.getOrThrow
-import com.tangem.datasource.api.pay.TangemPayApi
-import com.tangem.datasource.api.pay.models.request.*
-import com.tangem.datasource.api.pay.models.response.VisaErrorResponseJsonAdapter
+import com.tangem.datasource.api.pay.models.request.SetPinCodeRequest
+import com.tangem.datasource.api.pay.models.response.TangemPayErrorResponse
+import com.tangem.datasource.api.visa.VisaApi
+import com.tangem.datasource.api.visa.models.request.*
 import com.tangem.datasource.di.NetworkMoshi
 import com.tangem.datasource.local.visa.VisaAuthTokenStorage
+import com.tangem.domain.visa.datasource.VisaAuthRemoteDataSource
 import com.tangem.domain.visa.error.VisaApiError
 import com.tangem.domain.visa.model.*
 import com.tangem.domain.visa.repository.VisaActivationRepository
-import com.tangem.domain.visa.datasource.VisaAuthRemoteDataSource
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -29,7 +30,7 @@ import kotlinx.coroutines.withContext
 internal class DefaultVisaActivationRepository @AssistedInject constructor(
     @Assisted private val visaCardId: VisaCardId,
     @NetworkMoshi private val moshi: Moshi,
-    private val visaApi: TangemPayApi,
+    private val visaApi: VisaApi,
     private val dispatcherProvider: CoroutineDispatcherProvider,
     private val visaAuthTokenStorage: VisaAuthTokenStorage,
     private val visaAuthRemoteDataSource: VisaAuthRemoteDataSource,
@@ -37,7 +38,7 @@ internal class DefaultVisaActivationRepository @AssistedInject constructor(
     private val apiConfigsManager: ApiConfigsManager,
 ) : VisaActivationRepository {
 
-    private val visaErrorAdapter = VisaErrorResponseJsonAdapter(moshi)
+    private val errorAdapter by lazy { moshi.adapter(TangemPayErrorResponse::class.java) }
 
     override suspend fun getActivationRemoteState(): Either<VisaApiError, VisaActivationRemoteState> =
         withContext(dispatcherProvider.io) {
@@ -187,7 +188,7 @@ internal class DefaultVisaActivationRepository @AssistedInject constructor(
                 responseError.errorBody != null
             ) {
                 val errorCode =
-                    visaErrorAdapter.fromJson(responseError.errorBody!!)?.error?.code ?: responseError.code.numericCode
+                    errorAdapter.fromJson(responseError.errorBody!!)?.error?.code ?: responseError.code.numericCode
                 return Either.Left(VisaApiError.fromBackendError(errorCode))
             }
 
@@ -207,7 +208,7 @@ internal class DefaultVisaActivationRepository @AssistedInject constructor(
             }.getOrElse { responseError ->
                 if (responseError is ApiResponseError.HttpException && responseError.errorBody != null) {
                     val errorCode =
-                        visaErrorAdapter.fromJson(responseError.errorBody!!)?.error?.code
+                        errorAdapter.fromJson(responseError.errorBody!!)?.error?.code
                             ?: responseError.code.numericCode
                     Either.Left(VisaApiError.fromBackendError(errorCode))
                 } else {

data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaAuthRemoteDataSource.kt

@@ -4,33 +4,35 @@ import arrow.core.Either
 import com.squareup.moshi.Moshi
 import com.tangem.datasource.api.common.response.ApiResponseError
 import com.tangem.datasource.api.common.response.getOrThrow
-import com.tangem.datasource.api.pay.TangemPayApi
-import com.tangem.datasource.api.pay.TangemPayAuthApi
-import com.tangem.datasource.api.pay.models.request.*
-import com.tangem.datasource.api.pay.models.response.VisaErrorResponseJsonAdapter
+import com.tangem.datasource.api.pay.models.request.RefreshTokenByCardIdRequest
+import com.tangem.datasource.api.pay.models.response.TangemPayErrorResponse
+import com.tangem.datasource.api.visa.VisaApi
+import com.tangem.datasource.api.visa.models.request.*
 import com.tangem.datasource.di.NetworkMoshi
 import com.tangem.domain.visa.datasource.VisaAuthRemoteDataSource
 import com.tangem.domain.visa.error.VisaApiError
-import com.tangem.domain.visa.model.*
+import com.tangem.domain.visa.model.VisaAuthChallenge
+import com.tangem.domain.visa.model.VisaAuthSession
+import com.tangem.domain.visa.model.VisaAuthSignedChallenge
+import com.tangem.domain.visa.model.VisaAuthTokens
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 internal class DefaultVisaAuthRemoteDataSource @Inject constructor(
     @NetworkMoshi private val moshi: Moshi,
-    private val visaAuthApi: TangemPayApi,
-    private val tangemPayAuthApi: TangemPayAuthApi,
+    private val visaApi: VisaApi,
     private val dispatchers: CoroutineDispatcherProvider,
 ) : VisaAuthRemoteDataSource {
 
-    private val visaErrorAdapter = VisaErrorResponseJsonAdapter(moshi)
+    private val errorAdapter by lazy { moshi.adapter(TangemPayErrorResponse::class.java) }
 
     override suspend fun getCardAuthChallenge(
         cardId: String,
         cardPublicKey: String,
     ): Either<VisaApiError, VisaAuthChallenge.Card> = withContext(dispatchers.io) {
         request {
-            visaAuthApi.generateNonceByCardId(
+            visaApi.generateNonceByCardId(
                 GenerateNoneByCardIdRequest(
                     cardId = cardId,
                     cardPublicKey = cardPublicKey,
@@ -49,7 +51,7 @@ internal class DefaultVisaAuthRemoteDataSource @Inject constructor(
         cardWalletAddress: String,
     ): Either<VisaApiError, VisaAuthChallenge.Wallet> = withContext(dispatchers.io) {
         request {
-            visaAuthApi.generateNonceByCardWallet(
+            visaApi.generateNonceByCardWallet(
                 GenerateNoneByCardWalletRequest(
                     cardWalletAddress = cardWalletAddress,
                     cardId = cardId,
@@ -63,56 +65,13 @@ internal class DefaultVisaAuthRemoteDataSource @Inject constructor(
         }
     }
 
-    override suspend fun getCustomerWalletAuthChallenge(
-        customerWalletAddress: String,
-        customerWalletId: String,
-    ): Either<VisaApiError, VisaAuthChallenge.Wallet> = withContext(dispatchers.io) {
-        request {
-            tangemPayAuthApi.generateNonceByCustomerWallet(
-                request = GenerateNonceByCustomerWalletRequest(
-                    customerWalletAddress = customerWalletAddress,
-                    customerWalletId = customerWalletId,
-                ),
-            ).getOrThrow()
-        }.map { response ->
-            VisaAuthChallenge.Wallet(
-                challenge = response.nonce,
-                session = VisaAuthSession(response.sessionId),
-            )
-        }
-    }
-
-    override suspend fun getTokenWithCustomerWallet(
-        sessionId: String,
-        signature: String,
-        nonce: String,
-    ): Either<VisaApiError, TangemPayAuthTokens> = withContext(dispatchers.io) {
-        request {
-            tangemPayAuthApi.getTokenByCustomerWallet(
-                request = GetTokenByCustomerWalletRequest(
-                    authType = "customer_wallet",
-                    sessionId = sessionId,
-                    signature = signature,
-                    messageFormat = "Tangem Pay wants to sign in with your account. Nonce: $nonce",
-                ),
-            ).getOrThrow()
-        }.map { response ->
-            TangemPayAuthTokens(
-                accessToken = response.accessToken,
-                expiresAt = response.expiresAt,
-                refreshToken = response.refreshToken,
-                refreshExpiresAt = response.refreshExpiresAt,
-            )
-        }
-    }
-
     override suspend fun getAccessTokens(
         signedChallenge: VisaAuthSignedChallenge,
     ): Either<VisaApiError, VisaAuthTokens> = withContext(dispatchers.io) {
         request {
             when (signedChallenge) {
                 is VisaAuthSignedChallenge.ByCardPublicKey -> {
-                    visaAuthApi.getAccessTokenByCardId(
+                    visaApi.getAccessTokenByCardId(
                         GetAccessTokenByCardIdRequest(
                             sessionId = signedChallenge.challenge.session.sessionId,
                             signature = signedChallenge.signature,
@@ -121,7 +80,7 @@ internal class DefaultVisaAuthRemoteDataSource @Inject constructor(
                     ).getOrThrow()
                 }
                 is VisaAuthSignedChallenge.ByWallet -> {
-                    visaAuthApi.getAccessTokenByCardWallet(
+                    visaApi.getAccessTokenByCardWallet(
                         GetAccessTokenByCardWalletRequest(
                             sessionId = signedChallenge.challenge.session.sessionId,
                             signature = signedChallenge.signature,
@@ -150,11 +109,11 @@ internal class DefaultVisaAuthRemoteDataSource @Inject constructor(
         request {
             when (refreshToken.authType) {
                 VisaAuthTokens.RefreshToken.Type.CardId ->
-                    visaAuthApi.refreshCardIdAccessToken(
+                    visaApi.refreshCardIdAccessToken(
                         RefreshTokenByCardIdRequest(refreshToken = refreshToken.value),
                     )
                 VisaAuthTokens.RefreshToken.Type.CardWallet ->
-                    visaAuthApi.refreshCardIdAccessToken(
+                    visaApi.refreshCardIdAccessToken(
                         RefreshTokenByCardIdRequest(refreshToken = refreshToken.value),
                     )
             }.getOrThrow()
@@ -169,7 +128,7 @@ internal class DefaultVisaAuthRemoteDataSource @Inject constructor(
     override suspend fun exchangeAccessToken(tokens: VisaAuthTokens): Either<VisaApiError, VisaAuthTokens> =
         withContext(dispatchers.io) {
             request {
-                visaAuthApi.exchangeAccessToken(
+                visaApi.exchangeAccessToken(
                     ExchangeAccessTokenRequest(
                         accessToken = tokens.accessToken,
                         refreshToken = tokens.refreshToken.value,
@@ -194,7 +153,7 @@ internal class DefaultVisaAuthRemoteDataSource @Inject constructor(
                 responseError.errorBody != null
             ) {
                 val errorCode =
-                    visaErrorAdapter.fromJson(responseError.errorBody!!)?.error?.code ?: responseError.code.numericCode
+                    errorAdapter.fromJson(responseError.errorBody!!)?.error?.code ?: responseError.code.numericCode
                 return Either.Left(VisaApiError.fromBackendError(errorCode))
             }
 

data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaRepository.kt

@@ -14,8 +14,8 @@ import com.tangem.data.common.cache.CacheRegistry
 import com.tangem.data.common.quote.QuotesFetcher
 import com.tangem.data.visa.config.VisaLibLoader
 import com.tangem.data.visa.utils.*
-import com.tangem.datasource.api.pay.TangemPayApi
-import com.tangem.datasource.api.pay.models.response.VisaTxHistoryResponse
+import com.tangem.datasource.api.visa.VisaApi
+import com.tangem.datasource.api.visa.models.response.VisaTxHistoryResponse
 import com.tangem.datasource.local.userwallet.UserWalletsStore
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.models.wallet.UserWallet
@@ -43,7 +43,7 @@ internal class DefaultVisaRepository @Inject constructor(
     private val userWalletsStore: UserWalletsStore,
     private val dispatchers: CoroutineDispatcherProvider,
     private val visaApiRequestMaker: VisaApiRequestMaker,
-    private val visaApi: TangemPayApi,
+    private val visaApi: VisaApi,
     private val visaCurrencyFactory: VisaCurrencyFactory,
 ) : VisaRepository {
 

data/visa/src/main/kotlin/com/tangem/data/visa/converter/VisaActivationStatusConverterWithState.kt

@@ -1,6 +1,6 @@
 package com.tangem.data.visa.converter
 
-import com.tangem.datasource.api.pay.models.response.CardActivationRemoteStateResponse
+import com.tangem.datasource.api.visa.models.response.CardActivationRemoteStateResponse
 import com.tangem.domain.visa.model.VisaActivationOrderInfo
 import com.tangem.domain.visa.model.VisaActivationRemoteState
 import com.tangem.utils.converter.Converter

data/visa/src/main/kotlin/com/tangem/data/visa/di/VisaDataModule.kt

@@ -1,10 +1,12 @@
 package com.tangem.data.visa.di
 
 import com.tangem.data.pay.datasource.DefaultTangemPayAuthDataSource
+import com.tangem.data.visa.DefaultTangemPayRemoteDataSource
 import com.tangem.data.visa.DefaultVisaActivationRepository
 import com.tangem.data.visa.DefaultVisaAuthRemoteDataSource
 import com.tangem.data.visa.MockVisaRepository
 import com.tangem.domain.pay.datasource.TangemPayAuthDataSource
+import com.tangem.domain.visa.datasource.TangemPayRemoteDataSource
 import com.tangem.domain.visa.repository.VisaActivationRepository
 import com.tangem.domain.visa.datasource.VisaAuthRemoteDataSource
 import com.tangem.domain.visa.repository.VisaRepository
@@ -22,22 +24,16 @@ internal interface VisaDataModule {
     @Singleton
     fun bindVisaAuthRemoteDataSource(repository: DefaultVisaAuthRemoteDataSource): VisaAuthRemoteDataSource
 
+    @Binds
+    @Singleton
+    fun bindTangemPayRemoteDataSource(impl: DefaultTangemPayRemoteDataSource): TangemPayRemoteDataSource
+
     @Binds
     @Singleton
     fun bindVisaActivationRepositoryFactory(
         repository: DefaultVisaActivationRepository.Factory,
     ): VisaActivationRepository.Factory
 
-    // Mocked
-    // @Binds
-    // @Singleton
-    // fun bindVisaActivationRepositoryFactory(
-    //     repository: MockVisaActivationRepository.Factory,
-    // ): VisaActivationRepository.Factory
-
-    // @Binds
-    // fun bindVisaRepository(repository: DefaultVisaRepository): VisaRepository
-
     // Mocked
     @Binds
     fun bindVisaRepository(repository: MockVisaRepository): VisaRepository

data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaApiRequestMaker.kt

@@ -5,8 +5,8 @@ import com.tangem.data.visa.model.AccessCodeData
 import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.common.response.ApiResponseError
 import com.tangem.datasource.api.common.response.getOrThrow
-import com.tangem.datasource.api.pay.TangemPayApi
 import com.tangem.datasource.api.pay.models.request.RefreshTokenByCardWalletRequest
+import com.tangem.datasource.api.visa.VisaApi
 import com.tangem.datasource.local.userwallet.UserWalletsStore
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.models.wallet.UserWallet
@@ -24,7 +24,7 @@ typealias VisaAuthorizationHeader = String
 
 internal class VisaApiRequestMaker @Inject constructor(
     private val userWalletsStore: UserWalletsStore,
-    private val visaAuthApi: TangemPayApi,
+    private val visaAuthApi: VisaApi,
     private val accessCodeDataConverter: AccessCodeDataConverter,
     private val dispatcherProvider: CoroutineDispatcherProvider,
 ) {

data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxDetailsFactory.kt

@@ -2,7 +2,7 @@ package com.tangem.data.visa.utils
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.externallinkprovider.TxExploreState
-import com.tangem.datasource.api.pay.models.response.VisaTxHistoryResponse
+import com.tangem.datasource.api.visa.models.response.VisaTxHistoryResponse
 import com.tangem.domain.visa.model.VisaTxDetails
 
 internal class VisaTxDetailsFactory {

data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryItemConverter.kt

@@ -1,6 +1,6 @@
 package com.tangem.data.visa.utils
 
-import com.tangem.datasource.api.pay.models.response.VisaTxHistoryResponse
+import com.tangem.datasource.api.visa.models.response.VisaTxHistoryResponse
 import com.tangem.domain.visa.model.VisaTxHistoryItem
 import com.tangem.utils.converter.Converter
 

data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryPagingSource.kt

@@ -3,7 +3,7 @@ package com.tangem.data.visa.utils
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
 import com.tangem.data.common.cache.CacheRegistry
-import com.tangem.datasource.api.pay.models.response.VisaTxHistoryResponse
+import com.tangem.datasource.api.visa.models.response.VisaTxHistoryResponse
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.visa.model.VisaTxHistoryItem
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider