Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt

@@ -68,7 +68,6 @@ fun FragmentActivity.addOnBackPressedDispatcher(
 
 private fun fragmentFactory(screen: AppScreen): Fragment {
     return when (screen) {
-//        AppScreen.Home -> TestLeapfrogFragment()
         AppScreen.Home -> HomeFragment()
         AppScreen.OnboardingNote -> OnboardingNoteFragment()
         AppScreen.OnboardingWallet -> OnboardingWalletFragment()

app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt

@@ -184,16 +184,10 @@ private fun handleSecurityAction(
 private fun prepareAllowedSecurityOptions(
     card: Card?, currentSecurityOption: SecurityOption?,
 ): EnumSet<SecurityOption> {
-    val prohibitDefaultPin = card?.settings?.isResettingUserCodesAllowed != true
-
-    val allowedSecurityOptions = EnumSet.noneOf(SecurityOption::class.java)
+    val allowedSecurityOptions = EnumSet.of(SecurityOption.LongTap)
 
     if (card?.isTangemTwin() == true) {
         allowedSecurityOptions.add(SecurityOption.PassCode)
-        allowedSecurityOptions.add(SecurityOption.LongTap)
-    }
-    if ((currentSecurityOption == SecurityOption.LongTap) || !prohibitDefaultPin) {
-        allowedSecurityOptions.add(SecurityOption.LongTap)
     }
     if (currentSecurityOption == SecurityOption.AccessCode) {
         allowedSecurityOptions.add(SecurityOption.AccessCode)

app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt

@@ -103,11 +103,10 @@ private fun handleWalletAction(action: Action) {
         }
         OnboardingWalletAction.ProceedBackup -> {
             val newAction = when (val backupState = backupService.currentState) {
-                BackupService.State.Preparing -> BackupAction.IntroduceBackup
                 BackupService.State.FinalizingPrimaryCard -> BackupAction.PrepareToWritePrimaryCard
                 is BackupService.State.FinalizingBackupCard ->
                     BackupAction.PrepareToWriteBackupCard(backupState.index)
-                BackupService.State.Finished -> BackupAction.FinishBackup
+                else -> BackupAction.IntroduceBackup
             }
             store.dispatch(newAction)
         }
@@ -115,15 +114,13 @@ private fun handleWalletAction(action: Action) {
             when (walletState.backupState.backupStep) {
                 BackupStep.InitBackup, BackupStep.Finished -> store.dispatch(NavigationAction.PopBackTo())
                 BackupStep.ScanOriginCard, BackupStep.AddBackupCards, BackupStep.EnterAccessCode,
-                BackupStep.ReenterAccessCode, BackupStep.SetAccessCode,
+                BackupStep.ReenterAccessCode, BackupStep.SetAccessCode, BackupStep.WritePrimaryCard
                 -> {
                     store.dispatch(BackupAction.DiscardBackup)
                     store.dispatch(NavigationAction.PopBackTo())
                 }
-                is BackupStep.WriteBackupCard, BackupStep.WritePrimaryCard ->
+                is BackupStep.WriteBackupCard ->
                     store.dispatch(GlobalAction.ShowDialog(BackupDialog.BackupInProgress))
-
-
             }
         }
     }

app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt

@@ -10,20 +10,19 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.tabs.TabLayoutMediator
 import com.tangem.common.CardIdFormatter
 import com.tangem.common.core.CardIdDisplayFormat
-import com.tangem.tap.common.extensions.addOnBackPressedDispatcher
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.leapfrogWidget.LeapfrogWidget
 import com.tangem.tap.common.postUi
+import com.tangem.tap.features.FragmentOnBackPressedHandler
+import com.tangem.tap.features.addBackPressHandler
 import com.tangem.tap.features.home.redux.HomeMiddleware
 import com.tangem.tap.features.onboarding.products.wallet.redux.*
 import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.AccessCodeDialog
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.fragment_onboarding_wallet.*
-import kotlinx.android.synthetic.main.fragment_onboarding_wallet.toolbar
-import kotlinx.android.synthetic.main.fragment_wallet_details.*
 import kotlinx.android.synthetic.main.layout_onboarding_buttons_add_cards.*
 import kotlinx.android.synthetic.main.layout_onboarding_buttons_common.*
 import kotlinx.android.synthetic.main.view_confetti.*
@@ -31,7 +30,7 @@ import kotlinx.android.synthetic.main.view_onboarding_progress.*
 import org.rekotlin.StoreSubscriber
 
 class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
-    StoreSubscriber<OnboardingWalletState> {
+    StoreSubscriber<OnboardingWalletState>, FragmentOnBackPressedHandler {
 
     private var accessCodeDialog: AccessCodeDialog? = null
     private lateinit var cardsWidget: BackupCardsWidget
@@ -41,11 +40,6 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
         postponeEnterTransition()
         setHasOptionsMenu(true)
 
-
-        activity?.addOnBackPressedDispatcher {
-            store.dispatch(OnboardingWalletAction.OnBackPressed)
-        }
-
         val inflater = TransitionInflater.from(requireContext())
         enterTransition = inflater.inflateTransition(R.transition.fade)
         exitTransition = inflater.inflateTransition(R.transition.fade)
@@ -68,7 +62,7 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
         store.dispatch(OnboardingWalletAction.Init)
         toolbar.setNavigationOnClickListener { activity?.onBackPressed() }
 
-//        store.dispatch(OnboardingWalletAction.LoadArtwork)
+        addBackPressHandler(this)
     }
 
     override fun onStart() {
@@ -381,4 +375,8 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
             backupStep == BackupStep.ScanOriginCard || backupStep == BackupStep.AddBackupCards
         menu.getItem(0).isVisible = shopMenuShouldBeVisible
     }
+
+    override fun handleOnBackPressed() {
+        store.dispatch(OnboardingWalletAction.OnBackPressed)
+    }
 }