diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
index 4f5f112c24..5c76d3840a 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -257,6 +257,7 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
             allowUntrustedCards = true,
             filter = CardFilter(
                 allowedCardTypes = FirmwareVersion.FirmwareType.values().toList(),
+                maxFirmwareVersion = FirmwareVersion(major = 4, minor = 52),
             ),
         )
     }
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/data/di/OnboardingDataModule.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/data/di/OnboardingDataModule.kt
index 7089723d17..a853bf6c77 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/data/di/OnboardingDataModule.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/data/di/OnboardingDataModule.kt
@@ -1,6 +1,6 @@
 package com.tangem.feature.onboarding.data.di
 
-import android.app.Application
+import android.content.Context
 import com.tangem.crypto.bip39.Wordlist
 import com.tangem.feature.onboarding.data.DefaultMnemonicRepository
 import com.tangem.feature.onboarding.data.MnemonicRepository
@@ -8,6 +8,7 @@ import com.tangem.sdk.extensions.getWordlist
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
@@ -17,7 +18,7 @@ class OnboardingDataModule {
 
     @Provides
     @Singleton
-    fun provideSeedPhraseSdkRepository(application: Application): MnemonicRepository {
-        return DefaultMnemonicRepository(Wordlist.getWordlist(application))
+    fun provideSeedPhraseSdkRepository(@ApplicationContext context: Context): MnemonicRepository {
+        return DefaultMnemonicRepository(Wordlist.getWordlist(context))
     }
 }
\ No newline at end of file
diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
index 7e4bef9049..ad9c1c4dae 100644
--- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
+++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseViewModel.kt
@@ -170,7 +170,6 @@ class SeedPhraseViewModel @Inject constructor(
         val isCursorMoved = textFieldValue.selection != oldTextFieldValue.selection
 
         uiState = uiBuilder.importSeedPhrase.updateTextField(uiState, textFieldValue)
-        // uiState = uiBuilder.importSeedPhrase.updateCreateWalletButton(mediateState, enabled = false)
 
         val fieldState = uiState.importSeedPhraseState.tvSeedPhrase
         val inputMnemonic = fieldState.textFieldValue.text
@@ -201,9 +200,9 @@ class SeedPhraseViewModel @Inject constructor(
 
     private suspend fun validateMnemonic(inputMnemonic: String) {
         if (inputMnemonic.isEmpty() && uiState.importSeedPhraseState.error != null) {
+            val mediateState = uiBuilder.importSeedPhrase.updateCreateWalletButton(uiState, enabled = false)
             updateUi {
-                uiState = uiBuilder.importSeedPhrase.updateCreateWalletButton(uiState, enabled = false)
-                uiBuilder.importSeedPhrase.updateError(uiState, null)
+                uiBuilder.importSeedPhrase.updateError(mediateState, null)
             }
             return
         }
@@ -211,8 +210,8 @@ class SeedPhraseViewModel @Inject constructor(
         interactor.validateMnemonicString(inputMnemonic)
             .onSuccess { mnemonicComponents ->
                 importedMnemonicComponents = mnemonicComponents
-                uiState = uiBuilder.importSeedPhrase.updateCreateWalletButton(uiState, enabled = true)
-                updateUi { uiBuilder.importSeedPhrase.updateError(uiState, null) }
+                val mediateState = uiBuilder.importSeedPhrase.updateCreateWalletButton(uiState, enabled = true)
+                updateUi { uiBuilder.importSeedPhrase.updateError(mediateState, null) }
             }
             .onFailure {
                 uiState = uiBuilder.importSeedPhrase.updateCreateWalletButton(uiState, enabled = false)