From c2e95c92ae66dfafa0ab0a4fca54951118cf9e45 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 5 Jun 2023 19:37:50 +0800
Subject: [PATCH] Updated on 2026-08-14

---
 .../welcome/redux/WelcomeMiddleware.kt         | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
index 6bd65c13eb..36f85b0311 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -1,13 +1,10 @@
 package com.tangem.tap.features.welcome.redux
 
 import android.content.Intent
+import com.tangem.common.*
 import com.tangem.common.core.TangemSdkError
-import com.tangem.common.doOnFailure
-import com.tangem.common.doOnResult
-import com.tangem.common.doOnSuccess
-import com.tangem.common.flatMap
-import com.tangem.common.map
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.extensions.dispatchOnMain
@@ -21,12 +18,6 @@ import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.domain.userWalletList.unlockIfLockable
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.message.SaltPayActivationError
 import com.tangem.tap.features.signin.redux.SignInAction
-import com.tangem.tap.intentHandler
-import com.tangem.tap.preferencesStorage
-import com.tangem.tap.scope
-import com.tangem.tap.store
-import com.tangem.tap.tangemSdkManager
-import com.tangem.tap.userWalletsListManager
 import kotlinx.coroutines.launch
 import org.rekotlin.Middleware
 import timber.log.Timber
@@ -121,9 +112,10 @@ internal class WelcomeMiddleware {
     }
 
     private fun handleInitialIntent(intent: Intent?) {
-        val isBackgroundScanWasHandled = intentHandler.handleBackgroundScan(intent, hasSavedUserWallets = true)
+        val isBackgroundScanNotHandled = !intentHandler.handleBackgroundScan(intent, hasSavedUserWallets = true)
+        val hasNotIncompletedBackup = !backupService.hasIncompletedBackup
 
-        if (!isBackgroundScanWasHandled) {
+        if (isBackgroundScanNotHandled && hasNotIncompletedBackup) {
             store.dispatchOnMain(WelcomeAction.ProceedWithBiometrics)
         }
     }