Updated on 2026-08-14

2023-07-12 17:24:46 +03:00 · 2023-07-12 17:24:46 +03:00 · ab96b860d8
commit ab96b860d8
parent 26f5a1da82 ffc38eb02d
87 changed files with 630 additions and 146 deletions
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@ -5,6 +5,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import coil.ImageLoader
 import coil.ImageLoaderFactory
+import com.orhanobut.logger.Logger
 import com.tangem.Log
 import com.tangem.LogFormat
 import com.tangem.blockchain.common.BlockchainSdkConfig
@ -14,12 +15,14 @@ import com.tangem.core.analytics.Analytics
 import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
 import com.tangem.data.source.preferences.PreferencesDataSource
 import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.datasource.api.common.createNetworkLoggingInterceptor
 import com.tangem.datasource.asset.AssetReader
 import com.tangem.datasource.config.ConfigManager
 import com.tangem.datasource.config.FeaturesLocalLoader
 import com.tangem.datasource.config.models.Config
 import com.tangem.datasource.connection.NetworkConnectionManager
 import com.tangem.domain.DomainLayer
+import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.common.LogConfig
 import com.tangem.domain.wallets.legacy.WalletManagersRepository
 import com.tangem.feature.learn2earn.domain.api.Learn2earnInteractor
@ -59,7 +62,6 @@ import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.wallet.BuildConfig
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.runBlocking
-import okhttp3.logging.HttpLoggingInterceptor
 import org.rekotlin.Store
 import timber.log.Timber
 import javax.inject.Inject
@ -151,6 +153,9 @@ class TapApplication : Application(), ImageLoaderFactory {
    @Inject
    lateinit var tokenDetailsFeatureToggles: TokenDetailsFeatureToggles

+    @Inject
+    lateinit var scanCardProcessor: ScanCardProcessor
+
    override fun onCreate() {
        super.onCreate()

@ -168,12 +173,19 @@ class TapApplication : Application(), ImageLoaderFactory {
                    walletConnectRepository = walletConnect2Repository,
                    walletConnectSessionsRepository = walletConnectSessionsRepository,
                    tokenDetailsFeatureToggles = tokenDetailsFeatureToggles,
+                    scanCardProcessor = scanCardProcessor,
                ),
            ),
        )

        if (BuildConfig.DEBUG) {
-            Timber.plant(Timber.DebugTree())
+            Timber.plant(
+                object : Timber.DebugTree() {
+                    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+                        Logger.log(priority, tag, message, t)
+                    }
+                },
+            )
        }

        foregroundActivityObserver = ForegroundActivityObserver()
@ -192,7 +204,7 @@ class TapApplication : Application(), ImageLoaderFactory {

        if (LogConfig.network.blockchainSdkNetwork) {
            BlockchainSdkRetrofitBuilder.interceptors = listOf(
-                HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY },
+                createNetworkLoggingInterceptor(),
            )
        }

--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/DetailsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/DetailsScreen.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/IntroductionProcess.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/IntroductionProcess.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
@ -13,7 +13,6 @@ sealed class MainScreen(
    class ScreenOpened : MainScreen("Screen opened")
    class ButtonScanCard : MainScreen("Button - Scan Card")
    class ButtonMyWallets : MainScreen("Button - My Wallets")
-    class ButtonBuy : MainScreen("Button - Buy")

    class EnableBiometrics(state: AnalyticsParam.OnOffState) : MainScreen(
        event = "Enable Biometric",
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/ManageTokens.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/ManageTokens.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.features.addCustomToken.CustomCurrency
 import com.tangem.tap.common.extensions.filterNotNull
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/MyWallets.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/MyWallets.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 sealed class MyWallets(
    event: String,
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
@ -72,26 +72,8 @@ sealed class Onboarding(
        class SetupFinished : Twins("Twin Setup Finished")
    }

-    class PinScreenOpened : Onboarding("Onboarding", "PIN screen opened")
-    class ButtonSetPinCode : Onboarding("Onboarding", "Button - Set PIN Code")
-    class CardConnectionScreenOpened : Onboarding("Onboarding", "Card Connection Screen Opened")
-    class ButtonConnect : Onboarding("Onboarding", "Button - Connect")
-    class PinCodeSet : Onboarding("Onboarding", "PIN Code Set")
-
-    class KYCScreenOpened : Onboarding("Onboarding", "KYC screen opened")
-    class KYCStarted : Onboarding("Onboarding", "KYC Started")
-    class KYCInProgress : Onboarding("Onboarding", "KYC In Progress")
-    class KYCRejected : Onboarding("Onboarding", "KYC Rejected")
-
-    class ClaimScreenOpened : Onboarding("Onboarding", "Claim Screen Opened")
-    class ButtonClaim : Onboarding("Onboarding", "Button - Claim")
-    class ClaimWasSuccessfully : Onboarding("Onboarding", "Claim Was Successfully")
-
    class ButtonChat : Onboarding("Onboarding", "Button - Chat")

-    class NotEnoughGasError : Onboarding("Onboarding", "Not Enough Gas Error")
-    class CardNotPassedError : Onboarding("Onboarding", "Card Not Passed Error")
-
    class EnableBiometrics(state: AnalyticsParam.OnOffState) : Onboarding(
        category = "Onboarding / Biometric",
        event = "Enable Biometric",
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Portfolio.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.tap.features.details.ui.details.SocialNetwork

 /**
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Shop.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Shop.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.tap.common.extensions.filterNotNull

 /**
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Token.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Token.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.tap.common.analytics.events.AnalyticsParam.CurrencyType

 /**
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.common.analytics.events

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt
@ -1,8 +1,8 @@
 package com.tangem.tap.common.analytics.handlers.appsFlyer

 import com.appsflyer.AFInAppEventType
-import com.tangem.core.analytics.AnalyticsEvent
 import com.tangem.core.analytics.api.AnalyticsHandler
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
 import com.tangem.tap.common.analytics.events.Shop

--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt
@ -1,9 +1,9 @@
 package com.tangem.tap.common.analytics.handlers.firebase

 import com.google.firebase.analytics.FirebaseAnalytics
-import com.tangem.core.analytics.AnalyticsEvent
 import com.tangem.core.analytics.api.AnalyticsHandler
 import com.tangem.core.analytics.api.ErrorEventHandler
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
 import com.tangem.tap.common.analytics.converters.AnalyticsErrorConverter
 import com.tangem.tap.common.analytics.events.Shop
--- a/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt
@ -1,7 +1,7 @@
 package com.tangem.tap.common.analytics.paramsInterceptor

-import com.tangem.core.analytics.AnalyticsEvent
 import com.tangem.core.analytics.api.ParamsInterceptor
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.ProductType
 import com.tangem.domain.models.scan.ScanResponse
--- a/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/LinkedCardContextInterceptor.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/LinkedCardContextInterceptor.kt
@ -1,14 +1,14 @@
 package com.tangem.tap.common.analytics.paramsInterceptor

-import com.tangem.core.analytics.AnalyticsEvent
 import com.tangem.core.analytics.api.ParamsInterceptor
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.domain.models.scan.ScanResponse

 /**
 [REDACTED_AUTHOR]
 */
 class LinkedCardContextInterceptor(
-    private val scanResponse: ScanResponse,
+    scanResponse: ScanResponse,
    val parent: LinkedCardContextInterceptor? = null,
 ) : ParamsInterceptor {

--- a/app/src/main/java/com/tangem/tap/common/images/Coil.kt
+++ b/app/src/main/java/com/tangem/tap/common/images/Coil.kt
@ -4,8 +4,8 @@ import android.content.Context
 import android.util.Log
 import coil.ImageLoader
 import coil.util.Logger
+import com.tangem.datasource.api.common.createNetworkLoggingInterceptor
 import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
 import timber.log.Timber

 private const val COIL_LOG_TAG = "COIL"
@ -18,14 +18,7 @@ fun createCoilImageLoader(context: Context, logEnabled: Boolean = false): ImageL
            logger(CoilTimberLogger())
            okHttpClient {
                OkHttpClient.Builder()
-                    .addNetworkInterceptor(
-                        HttpLoggingInterceptor { message ->
-                            Timber.tag(COIL_LOG_TAG).d(message)
-                        }
-                            .apply {
-                                level = HttpLoggingInterceptor.Level.BODY
-                            },
-                    )
+                    .addNetworkInterceptor(createNetworkLoggingInterceptor())
                    .build()
            }
        }
--- a/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
@ -0,0 +1,18 @@
+package com.tangem.tap.di.domain
+
+import com.tangem.domain.card.ScanCardProcessor
+import com.tangem.tap.domain.scanCard.DefaultScanCardProcessor
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object CardDomainModule {
+
+    @Provides
+    @Singleton
+    fun provideScanCardUseCase(): ScanCardProcessor = DefaultScanCardProcessor()
+}
--- a/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
@ -0,0 +1,26 @@
+package com.tangem.tap.di.domain
+
+import com.tangem.domain.tokens.GetTokenListUseCase
+import com.tangem.domain.tokens.repository.NetworksRepository
+import com.tangem.domain.tokens.repository.QuotesRepository
+import com.tangem.domain.tokens.repository.TokensRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.scopes.ViewModelScoped
+
+@Module
+@InstallIn(ViewModelComponent::class)
+internal object TokensDomainModule {
+
+    @Provides
+    @ViewModelScoped
+    fun provideGetTokenListUseCase(
+        tokensRepository: TokensRepository,
+        quotesRepository: QuotesRepository,
+        networksRepository: NetworksRepository,
+        dispatchers: CoroutineDispatcherProvider,
+    ) = GetTokenListUseCase(tokensRepository, quotesRepository, networksRepository, dispatchers)
+}
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/DefaultScanCardProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/DefaultScanCardProcessor.kt
@ -2,21 +2,22 @@ package com.tangem.tap.domain.scanCard

 import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemError
-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
+import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.store

 // TODO: Remove this object after feature toggle was removed and use ScanCardUseCase instead
-internal object ScanCardProcessor {
+internal class DefaultScanCardProcessor : ScanCardProcessor {
    private val isNewCardScanningEnabled: Boolean
        get() = store.state.daggerGraphState
            .get(DaggerGraphState::customTokenFeatureToggles)
            .isNewCardScanningEnabled

-    suspend fun scan(
-        cardId: String? = null,
-        allowsRequestAccessCodeFromRepository: Boolean = false,
+    override suspend fun scan(
+        cardId: String?,
+        allowsRequestAccessCodeFromRepository: Boolean,
    ): CompletionResult<ScanResponse> {
        return if (isNewCardScanningEnabled) {
            UseCaseScanProcessor.scan(cardId, allowsRequestAccessCodeFromRepository)
@ -26,15 +27,15 @@ internal object ScanCardProcessor {
    }

    @Suppress("LongParameterList")
-    suspend fun scan(
-        analyticsEvent: AnalyticsEvent? = null,
-        cardId: String? = null,
-        onProgressStateChange: suspend (showProgress: Boolean) -> Unit = {},
-        onScanStateChange: suspend (scanInProgress: Boolean) -> Unit = {},
-        onWalletNotCreated: suspend () -> Unit = {},
-        disclaimerWillShow: () -> Unit = {},
-        onFailure: suspend (error: TangemError) -> Unit = {},
-        onSuccess: suspend (scanResponse: ScanResponse) -> Unit = {},
+    override suspend fun scan(
+        analyticsEvent: AnalyticsEvent?,
+        cardId: String?,
+        onProgressStateChange: suspend (showProgress: Boolean) -> Unit,
+        onScanStateChange: suspend (scanInProgress: Boolean) -> Unit,
+        onWalletNotCreated: suspend () -> Unit,
+        disclaimerWillShow: () -> Unit,
+        onFailure: suspend (error: TangemError) -> Unit,
+        onSuccess: suspend (scanResponse: ScanResponse) -> Unit,
    ) {
        if (isNewCardScanningEnabled) {
            UseCaseScanProcessor.scan(
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
@ -6,7 +6,7 @@ import com.tangem.common.core.TangemSdkError
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
 import com.tangem.core.analytics.Analytics
-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.common.extensions.withMainContext
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt
@ -3,7 +3,7 @@ package com.tangem.tap.domain.scanCard
 import arrow.fx.coroutines.resourceScope
 import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemError
-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.card.ScanCardException
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/chains/AnalyticsChain.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/chains/AnalyticsChain.kt
@ -3,7 +3,7 @@ package com.tangem.tap.domain.scanCard.chains
 import arrow.core.Either
 import arrow.core.right
 import com.tangem.core.analytics.Analytics
-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.domain.card.ScanCardException
 import com.tangem.domain.core.chain.Chain
 import com.tangem.domain.models.scan.ScanResponse
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
@ -31,8 +31,7 @@ class ResetToFactorySettingsTask : CardSessionRunnable<Card> {
    }

    private fun resetBackup(session: CardSession, callback: (result: CompletionResult<Card>) -> Unit) {
-        val backupStatus = session.environment.card?.backupStatus
-        if (backupStatus == null || backupStatus == Card.BackupStatus.NoBackup) {
+        if (session.environment.card?.backupStatus?.isActive != true) {
            callback(CompletionResult.Success(session.environment.card!!))
            return
        }
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt
@ -4,6 +4,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.extensions.guard
 import com.tangem.core.analytics.Analytics
+import com.tangem.datasource.api.common.createNetworkLoggingInterceptor
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.common.analytics.events.WalletConnect
@ -36,7 +37,6 @@ import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.logging.HttpLoggingInterceptor
 import timber.log.Timber
 import java.util.*
 import java.util.concurrent.TimeUnit
@ -56,8 +56,9 @@ class WalletConnectManager {
            .addInterceptor(RetryInterceptor())
            .build()
    }
+
    private val interceptor by lazy {
-        HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY }
+        createNetworkLoggingInterceptor()
    }

    private var sessions: MutableMap<Topic, WalletConnectActiveData> = mutableMapOf()
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
@ -25,7 +25,6 @@ import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.model.builders.UserWalletBuilder
 import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
-import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.domain.userWalletList.di.provideBiometricImplementation
 import com.tangem.tap.domain.userWalletList.di.provideRuntimeImplementation
 import com.tangem.tap.domain.userWalletList.isLockedSync
@ -33,6 +32,7 @@ import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.onboarding.products.twins.redux.CreateTwinWalletMode
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.tangemSdkManager
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
@ -74,7 +74,8 @@ class DetailsMiddleware {
            is DetailsAction.AccessCodeRecovery -> accessCodeRecoveryMiddleware.handle(state, action)
            DetailsAction.ScanCard -> {
                scope.launch {
-                    ScanCardProcessor.scan(allowsRequestAccessCodeFromRepository = true)
+                    store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor)
+                        .scan(allowsRequestAccessCodeFromRepository = true)
                        .doOnSuccess { scanResponse ->
                            // if we use biometric, scanResponse in GlobalState is null, and crashes NPE on twin cards
                            store.dispatch(GlobalAction.SaveScanResponse(scanResponse))
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.features.home.redux

-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.entities.IndeterminateProgressButton
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@ -5,7 +5,7 @@ import com.tangem.common.doOnResult
 import com.tangem.common.doOnSuccess
 import com.tangem.common.extensions.guard
 import com.tangem.core.analytics.Analytics
-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.models.scan.ScanResponse
@ -21,12 +21,12 @@ import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.model.builders.UserWalletBuilder
-import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.features.home.BELARUS_COUNTRY_CODE
 import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
 import com.tangem.tap.features.home.redux.HomeMiddleware.BUY_WALLET_URL
 import com.tangem.tap.features.send.redux.states.ButtonState
 import com.tangem.tap.features.signin.redux.SignInAction
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
@ -78,7 +78,7 @@ private fun readCard(analyticsEvent: AnalyticsEvent?) = scope.launch {
        useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes,
    )

-    ScanCardProcessor.scan(
+    store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor).scan(
        analyticsEvent = analyticsEvent,
        onProgressStateChange = { showProgress ->
            if (showProgress) {
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
@ -3,7 +3,7 @@ package com.tangem.tap.features.wallet.redux
 import android.content.Context
 import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.address.AddressType
-import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.wallets.models.UserWallet
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
@ -15,10 +15,10 @@ import com.tangem.tap.common.extensions.dispatchErrorNotification
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapError
-import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.features.wallet.redux.models.WalletDialog
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.userWalletsListManager
@ -102,7 +102,8 @@ class MultiWalletMiddleware {
    }

    private fun scanAndUpdateCard(selectedUserWallet: UserWallet) = scope.launch(Dispatchers.Default) {
-        ScanCardProcessor.scan(selectedUserWallet.cardId, allowsRequestAccessCodeFromRepository = true)
+        store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor)
+            .scan(cardId = selectedUserWallet.cardId, allowsRequestAccessCodeFromRepository = true)
            .flatMap { scanResponse ->
                userWalletsListManager.update(
                    userWalletId = selectedUserWallet.walletId,
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
@ -20,8 +20,8 @@ import com.tangem.tap.domain.model.TotalFiatBalance
 import com.tangem.tap.domain.model.WalletStoreModel
 import com.tangem.tap.domain.model.builders.UserWalletBuilder
 import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
-import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.domain.userWalletList.unlockIfLockable
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.firstOrNull
@ -133,7 +133,7 @@ internal class WalletSelectorMiddleware {
            useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes,
        )

-        ScanCardProcessor.scan(
+        store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor).scan(
            analyticsEvent = Basic.CardWasScanned(AnalyticsParam.ScannedFrom.MyWallets),
            onWalletNotCreated = {
                // No need to rollback policy, continue with the policy set before the card scan
@ -208,7 +208,7 @@ internal class WalletSelectorMiddleware {
    private suspend fun unlockUserWalletWithScannedCard(userWallet: UserWallet): CompletionResult<Unit> {
        Analytics.send(MyWallets.Button.WalletUnlockTapped())
        tangemSdkManager.changeDisplayedCardIdNumbersCount(userWallet.scanResponse)
-        return ScanCardProcessor.scan()
+        return store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor).scan()
            .map { scanResponse ->
                val scannedUserWalletId = UserWalletIdBuilder.scanResponse(scanResponse).build()
                if (scannedUserWalletId == userWallet.walletId) {
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@ -16,10 +16,10 @@ import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.model.builders.UserWalletBuilder
-import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.domain.userWalletList.unlockIfLockable
 import com.tangem.tap.features.intentHandler.handlers.WalletConnectLinkIntentHandler
 import com.tangem.tap.features.signin.redux.SignInAction
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import kotlinx.coroutines.launch
 import org.rekotlin.Middleware
 import timber.log.Timber
@ -103,7 +103,7 @@ internal class WelcomeMiddleware {
        tangemSdkManager.setAccessCodeRequestPolicy(
            useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes,
        )
-        ScanCardProcessor.scan(
+        store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor).scan(
            analyticsEvent = Basic.CardWasScanned(AnalyticsParam.ScannedFrom.SignIn),
            onSuccess = { scanResponse ->
                scope.launch { onCardScanned(scanResponse) }
--- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
@ -2,6 +2,7 @@ package com.tangem.tap.proxy.redux

 import com.tangem.datasource.asset.AssetReader
 import com.tangem.datasource.connection.NetworkConnectionManager
+import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.features.tester.api.TesterRouter
 import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
@ -27,6 +28,7 @@ data class DaggerGraphState(
    val walletConnectInteractor: WalletConnectInteractor? = null,
    val tokenDetailsFeatureToggles: TokenDetailsFeatureToggles? = null,
    val tokenDetailsRouter: TokenDetailsRouter? = null,
+    val scanCardProcessor: ScanCardProcessor? = null,
 ) : StateType {

    inline fun <reified T> get(getDependency: DaggerGraphState.() -> T?): T {