diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
index 820b159123..22a7e5ca87 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
@@ -1,8 +1,6 @@
 package com.tangem.tap.domain.tasks
 
 import com.tangem.*
-import com.tangem.blockchain.common.BlockchainSdkConfig
-import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.common.CompletionResult
 import com.tangem.common.card.Card
 import com.tangem.common.card.FirmwareVersion
@@ -123,11 +121,4 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanResponse> {
 //        if (card.isMultiCurrencyWallet()) return UpdateAppToUseThisCard()
         return null
     }
-
-    private fun getWalletManagerFactory(): WalletManagerFactory {
-        val blockchainSdkConfig = store.state.globalState.configManager?.config
-                ?.blockchainSdkConfig ?: BlockchainSdkConfig()
-        return WalletManagerFactory(blockchainSdkConfig)
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
index 14884b13f6..d2622417f7 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
@@ -7,6 +7,7 @@ import com.tangem.tap.domain.TapWorkarounds.isStart2Coin
 import com.tangem.tap.domain.extensions.isWalletDataSupported
 import com.tangem.tap.domain.extensions.signedHashesCount
 import com.tangem.tap.domain.extensions.toSendableAmounts
+import com.tangem.tap.domain.twins.isTangemTwin
 import com.tangem.tap.features.wallet.models.hasPendingTransactions
 import org.rekotlin.Action
 import java.util.*
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/OnboardingTwinsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/OnboardingTwinsFragment.kt
index 791c31589c..684d05324e 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/OnboardingTwinsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/OnboardingTwinsFragment.kt
@@ -10,7 +10,6 @@ import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.withMainContext
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
-import com.tangem.tap.domain.twins.TwinsHelper
 import com.tangem.tap.features.twins.redux.TwinCardsAction
 import com.tangem.tap.features.wallet.redux.Artwork
 import com.tangem.tap.scope
@@ -37,9 +36,8 @@ class OnboardingTwinsFragment : Fragment(R.layout.fragment_twin_cards_welcome) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        store.dispatch(TwinCardsAction.SetOnboardingShown))
-        val secondTwinNumber =
-                store.state.twinCardsState?.cardNumber?.pairNumber()?.number ?: ""
+        store.dispatch(TwinCardsAction.SetOnboardingShown)
+        val secondTwinNumber = store.state.twinCardsState.cardNumber?.pairNumber()?.number ?: ""
         val text = getString(R.string.twins_onboarding_description_format, secondTwinNumber)
         tv_twin_cards_description_1.text = text