diff --git a/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt b/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt
index 20e273fda2..56262664e7 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkErrorMapper.kt
@@ -119,6 +119,8 @@ object TangemSdkErrorMapper {
             is TangemSdkError.UserCanceledBiometricsAuthentication -> error
             is TangemSdkError.EncryptionOperationFailed -> error
             is TangemSdkError.InvalidEncryptionKey -> error
+            is TangemSdkError.KeyGenerationException -> error
+            is TangemSdkError.MnemonicException -> error
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index dc76e27d7c..571653ff77 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -1,6 +1,5 @@
 package com.tangem.tap.features.wallet.ui
 
-import android.content.Context
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
@@ -10,7 +9,6 @@ import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionInflater
@@ -77,17 +75,10 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
         }
     }
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        lifecycle.addObserver(viewModel)
-        lifecycleScope.launchWhenCreated {
-            viewModel.launch()
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
+        activity?.lifecycle?.addObserver(viewModel)
 
         activity?.onBackPressedDispatcher?.addCallback(
             this,
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt
index c77510365e..93f1c5ff90 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt
@@ -57,6 +57,7 @@ internal class WalletViewModel @Inject constructor(
     }
 
     override fun onCreate(owner: LifecycleOwner) {
+        launch()
         val scanResponse = store.state.globalState.scanResponse
         if (scanResponse != null) {
             val currency = ParamCardCurrencyConverter().convert(scanResponse.cardTypesResolver)
@@ -77,7 +78,7 @@ internal class WalletViewModel @Inject constructor(
         analyticsEventHandler.send(MainScreen.ScreenOpened())
     }
 
-    fun launch() {
+    private fun launch() {
         val manager = store.state.globalState.userWalletsListManager
         if (manager != null) {
             bootstrapSelectedWalletStoresChanges(manager)
diff --git a/domain/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt b/domain/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt
index 5986ca0d5f..b84051a3c1 100644
--- a/domain/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt
+++ b/domain/src/main/java/com/tangem/domain/common/TangemCardTypesResolver.kt
@@ -5,7 +5,6 @@ import com.tangem.blockchain.common.Token
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.card.FirmwareVersion
 import com.tangem.common.card.WalletData
-import com.tangem.common.extensions.guard
 import com.tangem.domain.common.TapWorkarounds.getTangemNoteBlockchain
 import com.tangem.domain.common.TapWorkarounds.isSaltPay
 import com.tangem.domain.common.TapWorkarounds.isSaltPayVisa
@@ -40,18 +39,14 @@ class TangemCardTypesResolver(
         return when (productType) {
             ProductType.Start2Coin -> if (card.isTestCard) Blockchain.BitcoinTestnet else Blockchain.Bitcoin
             ProductType.SaltPay -> Blockchain.SaltPay
-            ProductType.Note -> card.getTangemNoteBlockchain() ?: Blockchain.Unknown // todo restored old logic
             else -> {
-                val blockchainName: String = walletData?.blockchain.guard {
-                    // TODO(hotfix [REDACTED_TASK_KEY], for note bnb, card determined as beacon blockchain, refactor later)
-                    //
-                    // if (productType == ProductType.Note) {
-                    //     return card.getTangemNoteBlockchain() ?: Blockchain.Unknown
-                    // } else {
-                    // }
-                    return Blockchain.Unknown
-                }
-                Blockchain.fromId(blockchainName)
+                val blockchainName: String = walletData?.blockchain
+                    ?: if (productType == ProductType.Note) {
+                        return card.getTangemNoteBlockchain() ?: Blockchain.Unknown
+                    } else {
+                        return Blockchain.Unknown
+                    }
+                Blockchain.fromBlockchainName(blockchainName)
             }
         }
     }
@@ -69,6 +64,21 @@ class TangemCardTypesResolver(
     }
 }
 
+private fun Blockchain.Companion.fromBlockchainName(blockchainName: String): Blockchain {
+    // workaround for BSC (BNB) notes cards
+    return when (blockchainName) {
+        "BINANCE" -> {
+            Blockchain.BSC
+        }
+        "BINANCE/test" -> {
+            Blockchain.BSCTestnet
+        }
+        else -> {
+            Blockchain.fromId(blockchainName)
+        }
+    }
+}
+
 enum class ProductType {
     Note, Twins, Wallet, SaltPay, Start2Coin
 }
\ No newline at end of file
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index c673ea6135..520a524cd0 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -68,9 +68,9 @@ kotlinSerialization = "1.4.1"
 # endregion Other libraries
 
 # region Tangem
-tangemBlockchainSdk = "develop-179"
+tangemBlockchainSdk = "develop-182"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
-tangemCardSdk = "develop-204"
+tangemCardSdk = "develop-206"
 # tangemCardSdk = "0.0.1" # Keep it! - used for local builds
 # endregion Tangem