diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/Card.kt b/app/src/main/java/com/tangem/tap/domain/extensions/Card.kt
index be6eb20dcb..aeef948edf 100644
--- a/app/src/main/java/com/tangem/tap/domain/extensions/Card.kt
+++ b/app/src/main/java/com/tangem/tap/domain/extensions/Card.kt
@@ -7,6 +7,8 @@ fun Card.getSingleWallet(): CardWallet? {
     return wallets.firstOrNull()
 }
 
+fun Card.hasWallets(): Boolean = wallets.isNotEmpty()
+
 fun Card.hasSignedHashes(): Boolean {
     return wallets.any { it.totalSignedHashes ?: 0 > 0 }
 }
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/CreateWalletsTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/CreateWalletsTask.kt
index 1443371141..e185b62b4c 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/CreateWalletsTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/CreateWalletsTask.kt
@@ -9,19 +9,15 @@ import com.tangem.operations.PreflightReadMode
 import com.tangem.operations.PreflightReadTask
 import com.tangem.operations.wallet.CreateWalletCommand
 
-class CreateWalletsTask(curves: List<EllipticCurve> = emptyList()) : CardSessionRunnable<Card> {
+class CreateWalletsTask(curves: List<EllipticCurve>? = null) : CardSessionRunnable<Card> {
 
-    private val curves = if (curves.isEmpty()) {
-        listOf(
-                EllipticCurve.Secp256k1,
-                EllipticCurve.Ed25519,
-                EllipticCurve.Secp256r1,
-        )
-    } else {
-        curves
-    }
+    private val curves = curves ?: listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Secp256r1,
+    )
 
-    var index = 0
+    private var index = 0
 
     override fun run(session: CardSession, callback: (result: CompletionResult<Card>) -> Unit) {
         val curve = curves[index]
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 ca90ead2c5..9f31169566 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
@@ -7,7 +7,7 @@ import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.common.CompletionResult
 import com.tangem.common.card.Card
-import com.tangem.common.card.EllipticCurve
+import com.tangem.common.card.FirmwareVersion
 import com.tangem.common.card.WalletData
 import com.tangem.common.core.CardSession
 import com.tangem.common.core.CardSessionRunnable
@@ -18,13 +18,11 @@ import com.tangem.operations.ScanTask
 import com.tangem.operations.issuerAndUserData.ReadIssuerDataCommand
 import com.tangem.tap.domain.TapSdkError
 import com.tangem.tap.domain.TapWorkarounds.isExcluded
-import com.tangem.tap.domain.TapWorkarounds.isMultiCurrencyWallet
 import com.tangem.tap.domain.TapWorkarounds.noteCurrency
 import com.tangem.tap.domain.extensions.getSingleWallet
 import com.tangem.tap.domain.twins.TwinCardsManager
 import com.tangem.tap.domain.twins.isTwinCard
 import com.tangem.tap.store
-import com.tangem.wallet.R
 
 data class ScanNoteResponse(
     val card: Card,
@@ -71,7 +69,7 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteRespons
 
                     if (card.isTwinCard()) {
                         dealWithTwinCard(card, session, callback)
-                    } else if (card.firmwareVersion.major >= 4) {
+                    } else if (card.firmwareVersion >= FirmwareVersion.MultiWalletAvailable) {
                         createMissingWalletsIfNeeded(card, session, callback)
                     } else {
                         callback(CompletionResult.Success(
@@ -88,14 +86,13 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteRespons
     ) {
         val walletData = session.environment.walletData
         if (card.wallets.isEmpty()) {
-            callback(CompletionResult.Success(
-                ScanNoteResponse(card, walletData)
-            ))
+            callback(CompletionResult.Success(ScanNoteResponse(card, walletData)))
             return
         }
 
         val curvesPresent = card.wallets.map { it.curve }
-        val curvesToCreate = EllipticCurve.values().subtract(curvesPresent)
+//        val curvesToCreate = EllipticCurve.values().subtract(curvesPresent)
+        val curvesToCreate = card.supportedCurves.subtract(curvesPresent)
 
         if (curvesToCreate.isEmpty()) {
             callback(CompletionResult.Success(ScanNoteResponse(card, walletData)))
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
index 0282a18d65..f422f7db7f 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
@@ -102,11 +102,11 @@ class TwinCardsManager(private val scanNoteResponse: ScanNoteResponse) {
         )
 
         fun verifyTwinPublicKey(issuerData: ByteArray, cardWalletPublicKey: ByteArray?): Boolean {
-            if (issuerData.size < 65) return false
+            if (issuerData.size < 65 || cardWalletPublicKey == null) return false
+
             val publicKey = issuerData.sliceArray(0 until 65)
             val signedKey = issuerData.sliceArray(65 until issuerData.size)
-            return (cardWalletPublicKey != null &&
-                    CryptoUtils.verify(cardWalletPublicKey, publicKey, signedKey))
+            return CryptoUtils.verify(cardWalletPublicKey, publicKey, signedKey)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/BaseStoreFragment.kt b/app/src/main/java/com/tangem/tap/features/send/BaseStoreFragment.kt
index 5ad9b1147a..9d19112f8a 100644
--- a/app/src/main/java/com/tangem/tap/features/send/BaseStoreFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/BaseStoreFragment.kt
@@ -37,7 +37,7 @@ abstract class BaseStoreFragment(layoutId: Int) : Fragment(layoutId) {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        toolbar.setNavigationOnClickListener { activity?.onBackPressed() }
+        toolbar?.setNavigationOnClickListener { activity?.onBackPressed() }
     }
 
     override fun onStart() {