Updated on 2026-08-14

app/src/main/assets/tangem-app-config

@@ -1 +1 @@
-Subproject commit a1658496e777b611fc990ef2bc1a1a1fd48bc1e6
+Subproject commit 897f0f7c402fd53c5ee1fa4ab601ecd4e43ff389

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

@@ -85,7 +85,7 @@ class TwinCardsManager(
         }
 
         private fun getAdapter(): JsonAdapter<List<Issuer>> {
-            return com.tangem.datasource.api.common.MoshiConverter.defaultMoshi().adapter(
+            return MoshiConverter.defaultMoshi().adapter(
                 Types.newParameterizedType(List::class.java, Issuer::class.java),
             )
         }

app/src/main/java/com/tangem/tap/domain/walletStores/repository/di/RepositoryProvider.kt

@@ -1,7 +1,7 @@
 package com.tangem.tap.domain.walletStores.repository.di
 
 import com.tangem.blockchain.common.WalletManagerFactory
-import com.tangem.network.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.TangemTechService
 import com.tangem.tap.domain.walletStores.repository.WalletAmountsRepository
 import com.tangem.tap.domain.walletStores.repository.WalletManagersRepository
 import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository

app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletAmountsRepository.kt

@@ -14,9 +14,9 @@ import com.tangem.common.flatMap
 import com.tangem.common.flatMapOnFailure
 import com.tangem.common.map
 import com.tangem.common.services.Result
+import com.tangem.datasource.api.tangemTech.TangemTechService
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.util.UserWalletId
-import com.tangem.network.api.tangemTech.TangemTechService
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.replaceByOrAdd
 import com.tangem.tap.domain.model.UserWallet

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

@@ -79,7 +79,7 @@ class SaltPayActivationManager(
         }
     }
 
-    suspend fun requestAttestationChallenge(): Result<com.tangem.datasource.api.paymentology.AttestationResponse> {
+    suspend fun requestAttestationChallenge(): Result<AttestationResponse> {
         return paymentologyService.requestAttestationChallenge(cardId, cardPublicKey)
             .successOr { return it }
             .tryExtractError()
@@ -94,8 +94,8 @@ class SaltPayActivationManager(
     suspend fun registerWallet(
         attestResponse: AttestWalletKeyResponse,
         pinCode: String,
-    ): Result<com.tangem.datasource.api.paymentology.RegisterWalletResponse> {
-        val request = com.tangem.datasource.api.paymentology.RegisterWalletRequest(
+    ): Result<RegisterWalletResponse> {
+        val request = RegisterWalletRequest(
             cardId = cardId,
             publicKey = cardPublicKey,
             walletPublicKey = walletPublicKey,
@@ -152,8 +152,8 @@ class SaltPayActivationManager(
         )
     }
 
-    private fun makeRegisterKYCRequest(): com.tangem.datasource.api.paymentology.RegisterKYCRequest =
-        com.tangem.datasource.api.paymentology.RegisterKYCRequest(
+    private fun makeRegisterKYCRequest(): RegisterKYCRequest =
+        RegisterKYCRequest(
             cardId = cardId,
             publicKey = cardPublicKey,
             kycProvider = "UTORG",

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

@@ -295,7 +295,7 @@ suspend fun SaltPayActivationManager.update(
 private fun determineStep(
     currentStep: SaltPayActivationStep,
     amountToClaim: Amount?,
-    response: com.tangem.datasource.api.paymentology.RegistrationResponse.Item,
+    response: 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) {
-                    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)
+                    KYCStatus.NOT_STARTED, KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
+                    KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
+                    KYCStatus.CORRECTION_REQUESTED, KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
+                    KYCStatus.APPROVED -> getStepBaseOnAmountToClaim(amountToClaim)
                     else -> SaltPayActivationStep.KycIntro
                 }
                 SaltPayActivationStep.KycReject -> when (response.kycStatus) {
-                    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)
+                    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)
                     else -> SaltPayActivationStep.KycIntro
                 }
                 else -> when (response.kycStatus) {
-                    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)
+                    KYCStatus.NOT_STARTED, KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
+                    KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
+                    KYCStatus.CORRECTION_REQUESTED, KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
+                    KYCStatus.APPROVED -> getStepBaseOnAmountToClaim(amountToClaim)
                     else -> SaltPayActivationStep.KycIntro
                 }
             }
@@ -413,7 +413,7 @@ private suspend fun checkGasIfNeeded(
 }
 
 @Throws(SaltPayActivationError::class)
-fun com.tangem.datasource.api.paymentology.RegistrationResponse.Item.toSaltPayStep(currentStep: SaltPayActivationStep): SaltPayActivationStep {
+fun 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 com.tangem.datasource.api.paymentology.RegistrationResponse.Item.toSaltPaySt
 
         kycStatus != null -> {
             when (kycStatus) {
-                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
+                KYCStatus.NOT_STARTED, KYCStatus.STARTED -> SaltPayActivationStep.KycIntro
+                KYCStatus.WAITING_FOR_APPROVAL -> SaltPayActivationStep.KycWaiting
+                KYCStatus.CORRECTION_REQUESTED, KYCStatus.REJECTED -> SaltPayActivationStep.KycReject
+                KYCStatus.APPROVED -> SaltPayActivationStep.Claim
                 null -> throw UnsupportedOperationException()
             }
         }

core/datasource/src/main/java/com/tangem/datasource/api/common/Interceptors.kt

@@ -7,7 +7,7 @@ import okhttp3.Response
 [REDACTED_AUTHOR]
  */
 open class AddHeaderInterceptor(
-    private val headers: Map<String, String>
+    private val headers: Map<String, String>,
 ) : Interceptor {
 
     override fun intercept(chain: Interceptor.Chain): Response {
@@ -21,10 +21,10 @@ open class AddHeaderInterceptor(
     }
 }
 
-class CacheControlHttpInterceptor(maxAgeSeconds: Int) : AddHeaderInterceptor(mapOf(
-    "Cache-Control" to "max-age=$maxAgeSeconds",
-))
+class CacheControlHttpInterceptor(maxAgeSeconds: Int) : AddHeaderInterceptor(
+    mapOf("Cache-Control" to "max-age=$maxAgeSeconds"),
+)
 
-class CardPublicKeyHttpInterceptor(cardPublicKeyHex: String) : AddHeaderInterceptor(mapOf(
-    "card_public_key" to cardPublicKeyHex,
-))
+class CardPublicKeyHttpInterceptor(cardPublicKeyHex: String) : AddHeaderInterceptor(
+    mapOf("card_public_key" to cardPublicKeyHex),
+)

core/datasource/src/main/java/com/tangem/datasource/api/common/NetworError.kt

@@ -1,19 +0,0 @@
-package com.tangem.datasource.api.common
-
-/**
-[REDACTED_AUTHOR]
- */
-// sealed interface NetworkModuleMessage : ModuleMessage
-//
-// sealed class NetworkError(
-//     subCode: Int,
-//     override val message: String,
-//     override val data: Any?,
-// ) : NetworkModuleMessage, ModuleError() {
-//     override val code: Int = ModuleErrorCode.NETWORK + subCode
-//
-//     companion object {
-//         // base code used for all error in the module
-//         // const val CODE_ANY_OTHER = 100..199, 200..299
-//     }
-// }

domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt

@@ -342,7 +342,7 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
 
     private suspend fun requestInfoAboutToken(
         contractAddress: String,
-    ): List<com.tangem.datasource.api.tangemTech.CoinsResponse.Coin> {
+    ): List<CoinsResponse.Coin> {
         val tangemTechServiceManager = requireNotNull(hubState.tangemTechServiceManager)
         dispatchOnMain(Screen.UpdateTokenFields(listOf(ContractAddress to ViewStates.TokenField(isLoading = true))))
 
@@ -432,8 +432,8 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
     )
 
     private suspend fun fillTokenFields(
-        token: com.tangem.datasource.api.tangemTech.CoinsResponse.Coin,
-        coinNetwork: com.tangem.datasource.api.tangemTech.CoinsResponse.Coin.Network,
+        token: CoinsResponse.Coin,
+        coinNetwork: CoinsResponse.Coin.Network,
     ) {
         val blockchain = Blockchain.fromNetworkId(coinNetwork.networkId) ?: Blockchain.Unknown
         Network.setFieldValue(Field.Data(blockchain, false))

domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt

@@ -48,7 +48,7 @@ data class AddCustomTokenState(
     val form: Form = Form(listOf()),
     val formValidators: Map<CustomTokenFieldId, CustomTokenValidator<out Any>> = createFormValidators(),
     val formErrors: Map<CustomTokenFieldId, AddCustomTokenError> = emptyMap(),
-    val foundToken: com.tangem.datasource.api.tangemTech.CoinsResponse.Coin? = null,
+    val foundToken: CoinsResponse.Coin? = null,
     val warnings: Set<AddCustomTokenError.Warning> = emptySet(),
     val screenState: ScreenState = createInitialScreenState(),
     val tangemTechServiceManager: AddCustomTokenService? = null,

network/build/.transforms/0a0a9b6fcdf800647341aabb7296a58d/results.bin

@@ -1 +0,0 @@
-i/

network/build/.transforms/10b56b612fced146421785dc9c798db5/results.bin

@@ -1 +0,0 @@
-o/jetified-network.jar

network/build/.transforms/129172ef9b6bb005a6da315416650247/results.bin

@@ -1 +0,0 @@
-i/

network/build/.transforms/5502ea290d619da65e391069e65e2fa9/results.bin

@@ -1 +0,0 @@
-o/jetified-network

network/build/.transforms/616278befc6f71b7ce9b02b5deafc7e4/results.bin

@@ -1 +0,0 @@
-o/jetified-network

network/build/.transforms/631b83fd2688ae40c00f4c5be3549138/results.bin

@@ -1 +0,0 @@
-o/jetified-network.jar

network/build/.transforms/6a76cf0cfeadcf7e00cd3bdb30b05405/results.bin

@@ -1 +0,0 @@
-o/jetified-network.jar

network/build/.transforms/882f21e6ea520a732fa9828baf6837a4/results.bin

@@ -1 +0,0 @@
-i/

network/build/.transforms/9e88dd083bb632e3aaf29dc1b80c8bc4/results.bin

@@ -1 +0,0 @@
-o/jetified-network.jar

network/build/.transforms/b37124a83829aa553636076c9ead584a/results.bin

@@ -1 +0,0 @@
-i/

network/build/.transforms/c4301af1e3ac6220228773d71e26c811/results.bin

@@ -1 +0,0 @@
-i/

network/build/.transforms/dda44431310664cbf70b6a6d8e9af52f/results.bin

@@ -1 +0,0 @@
-i/