diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index 8a592c14ad..76a9bc46f1 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -16,7 +16,8 @@ import com.tangem.tap.domain.configurable.config.ConfigManager
 import com.tangem.tap.domain.extensions.*
 import com.tangem.tap.domain.tasks.product.ScanResponse
 import com.tangem.tap.domain.tokens.CardCurrencies
-import com.tangem.tap.domain.twins.TwinsHelper
+import com.tangem.tap.domain.twins.getTwinCardNumber
+import com.tangem.tap.domain.twins.getTwinsCardId
 import com.tangem.tap.domain.twins.isTangemTwin
 import com.tangem.tap.features.tokens.redux.TokensAction
 import com.tangem.tap.features.wallet.redux.Currency
@@ -90,8 +91,8 @@ class TapWalletManager {
             store.dispatch(WalletAction.SetIfTestnetCard(data.card.isTestCard))
             store.dispatch(WalletAction.MultiWallet.SetIsMultiwalletAllowed(data.card.isMultiwalletAllowed))
             if (data.card.isTangemTwin()) {
-                val secondCardId = TwinsHelper.getTwinsCardId(data.card.cardId)
-                val cardNumber = TwinsHelper.getTwinCardNumber(data.card.cardId)
+                val secondCardId = data.card.getTwinsCardId()
+                val cardNumber = data.card.getTwinCardNumber()
                 if (secondCardId != null && cardNumber != null) {
                     store.dispatch(WalletAction.TwinsAction.SetTwinCard(
                             secondCardId, cardNumber, isCreatingTwinCardsAllowed = true
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
index 3493d1c322..cdb63d456b 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
@@ -123,19 +123,12 @@ private class ScanTwinProcessor : ProductCommandProcessor<ScanResponse> {
                         callback(CompletionResult.Success(ScanResponse(card, ProductType.Twin, null)))
                         return@run
                     }
-                    val verified = TwinCardsManager.verifyTwinPublicKey(
-                            readDataResult.data.issuerData, publicKey
-                    )
+                    val verified = TwinCardsManager.verifyTwinPublicKey(readDataResult.data.issuerData, publicKey)
                     if (verified) {
                         val twinPublicKey = readDataResult.data.issuerData.sliceArray(0 until 65)
-                        callback(CompletionResult.Success(
-                                ScanResponse(
-                                        card,
-                                        ProductType.Twin,
-                                        session.environment.walletData,
-                                        twinPublicKey.toHexString())
-                        ))
-                        return@run
+                        val walletData = session.environment.walletData
+                        val response = ScanResponse(card, ProductType.Twin, walletData, twinPublicKey.toHexString())
+                        callback(CompletionResult.Success(response))
                     } else {
                         callback(CompletionResult.Success(ScanResponse(card, ProductType.Twin, null)))
                     }
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/TwinsHelper.kt b/app/src/main/java/com/tangem/tap/domain/twins/TwinsHelper.kt
index f8e5de93fe..8c66c05bfa 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/TwinsHelper.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/TwinsHelper.kt
@@ -2,7 +2,6 @@ package com.tangem.tap.domain.twins
 
 import com.tangem.common.card.Card
 import com.tangem.tap.common.extensions.isEven
-import com.tangem.tap.domain.twins.TwinsHelper.Companion.getTwinCardNumber
 
 class TwinsHelper {
     companion object {
@@ -53,16 +52,16 @@ class TwinsHelper {
 
 private fun String.calculateLuhn(): Int {
     val checksum = this.reversed()
-        .mapIndexed { index, c ->
-            val digit = if (c in '0'..'9') c - '0' else c - 'A'
-            if (!index.isEven()) {
-                digit
-            } else {
-                val newDigit = digit * 2
-                if (newDigit >= 10) newDigit - 9 else newDigit
-            }
-        }.sum()
-        .rem(10)
+            .mapIndexed { index, c ->
+                val digit = if (c in '0'..'9') c - '0' else c - 'A'
+                if (!index.isEven()) {
+                    digit
+                } else {
+                    val newDigit = digit * 2
+                    if (newDigit >= 10) newDigit - 9 else newDigit
+                }
+            }.sum()
+            .rem(10)
     return (10 - checksum) % 10
 }
 
@@ -76,7 +75,15 @@ enum class TwinCardNumber(val number: Int) {
 }
 
 fun Card.isTangemTwin(): Boolean {
-    return getTwinCardNumber(cardId) != null
+    return TwinsHelper.getTwinCardNumber(cardId) != null
+}
+
+fun Card.getTwinCardNumber(): TwinCardNumber? {
+    return TwinsHelper.getTwinCardNumber(this.cardId)
+}
+
+fun Card.getTwinsCardId(): String? {
+    return TwinsHelper.getTwinsCardId(this.cardId)
 }
 
 fun Card.getTwinCardIdForUser(): String {
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 04bcd51f32..4e45d765d7 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,7 +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.TwinsHelper
+import com.tangem.tap.domain.twins.getTwinCardNumber
 import com.tangem.tap.domain.twins.isTangemTwin
 import com.tangem.tap.features.details.redux.twins.CreateTwinWalletReducer
 import com.tangem.tap.features.details.redux.twins.CreateTwinWalletState
@@ -49,7 +49,7 @@ private fun handlePrepareScreen(action: DetailsAction.PrepareScreen, state: Deta
     val twinsState = if (action.card.isTangemTwin()) {
         CreateTwinWalletState(
                 scanResponse = action.scanResponse,
-                twinCardNumber = TwinsHelper.getTwinCardNumber(action.card.cardId),
+                twinCardNumber = action.card.getTwinCardNumber(),
                 createTwinWallet = null,
                 showAlert = false,
                 allowRecreatingWallet = action.isCreatingTwinWalletAllowed