diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config
index e80938f7d9..0cf3af21e6 160000
--- a/app/src/main/assets/tangem-app-config
+++ b/app/src/main/assets/tangem-app-config
@@ -1 +1 @@
-Subproject commit e80938f7d9ba378a91ac544a9170597e64afa696
+Subproject commit 0cf3af21e6f441e6323a1ba127ee7518168797df
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 274f14bfa5..43425eab48 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,6 +1,8 @@
 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
@@ -18,6 +20,7 @@ import com.tangem.tap.domain.extensions.getSingleWallet
 import com.tangem.tap.domain.tasks.product.ScanResponse
 import com.tangem.tap.domain.twins.TwinCardsManager
 import com.tangem.tap.domain.twins.isTangemTwin
+import com.tangem.tap.store
 
 class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanResponse> {
 
@@ -118,7 +121,6 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanResponse> {
     private fun getErrorIfExcludedCard(card: Card): TangemError? {
         if (card.isExcluded()) return TapSdkError.CardForDifferentApp
         // Disable new cards on the old version of the app // TODO: remove when cards are supported
-        if (card.isMultiCurrencyWallet() || card.isNote()) return UpdateAppToUseThisCard()
         // Disable new multi-currency HD wallet cards on the old version of the app
 //        if (card.isMultiCurrencyWallet()) return UpdateAppToUseThisCard()
         return null
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 b951b725bf..faa839cbe6 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
@@ -65,9 +65,7 @@ class TwinCardsManager(private val scanResponse: ScanResponse, context: Context)
             preparingMessage = preparingMessage,
             creatingWalletMessage = creatingWalletMessage
         )
-        val response = tangemSdkManager.runTaskAsync(
-                task, null, initialMessage
-        )
+        val response = tangemSdkManager.runTaskAsync(task, null, initialMessage)
         when (response) {
             is CompletionResult.Success -> {
                 secondCardPublicKey = response.data.wallet.publicKey.toHexString()
@@ -116,14 +114,6 @@ class TwinCardsManager(private val scanResponse: ScanResponse, context: Context)
             return CryptoUtils.verify(cardWalletPublicKey, publicKey, signedKey)
         }
 
-        fun verifyTwinPublicKey(issuerData: ByteArray, cardWalletPublicKey: ByteArray?): Boolean {
-            if (issuerData.size < 65) 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))
-        }
-
         private fun getIssuerKeys(context: Context, publicKey: String): KeyPair {
             val issuer = getIssuers(context).first { it.publicKey == publicKey }
             return KeyPair(
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 b22f25959e..d2bb330e40 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
@@ -191,10 +191,9 @@ private fun prepareAllowedSecurityOptions(
 ): EnumSet<SecurityOption> {
     val prohibitDefaultPin = card?.settings?.isResettingUserCodesAllowed != true
 
-    val prohibitDefaultPin = card?.settings?.isRemovingAccessCodeAllowed != true
     val allowedSecurityOptions = EnumSet.noneOf(SecurityOption::class.java)
 
-    if (card?.isTwinCard() == true) {
+    if (card?.isTangemTwin() == true) {
         allowedSecurityOptions.add(SecurityOption.PassCode)
     }
     if ((currentSecurityOption == SecurityOption.LongTap) || !prohibitDefaultPin) {