From 5c8e3cc3d339c5e8b434969ef4b4620e1d4224b6 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 13 Dec 2022 18:44:22 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/tap/domain/TangemSdkManager.kt | 21 -------------------
 .../tasks/product/CreateProductWalletTask.kt  |  2 +-
 .../domain/tasks/product/ScanProductTask.kt   |  2 +-
 .../redux/OnboardingWalletMiddleware.kt       |  1 -
 .../saveWallet/redux/SaveWalletMiddleware.kt  | 11 ++++------
 5 files changed, 6 insertions(+), 31 deletions(-)

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 906a0f1306..51c1cea33a 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -38,7 +38,6 @@ import com.tangem.tap.domain.tasks.product.CreateProductWalletTaskResponse
 import com.tangem.tap.domain.tasks.product.ResetToFactorySettingsTask
 import com.tangem.tap.domain.tasks.product.ScanProductTask
 import com.tangem.tap.domain.tokens.UserTokensRepository
-import com.tangem.tap.domain.userWalletList.di.USER_WALLETS_BIOMETRIC_KEY_NAME
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
@@ -119,16 +118,6 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
             .map { CardDTO(it) }
     }
 
-    suspend fun unlockBiometricKeys(): CompletionResult<Unit> {
-        return biometricManager.authenticate(
-            mode = BiometricManager.AuthenticationMode.Keys(
-                USER_WALLETS_BIOMETRIC_KEY_NAME,
-                tangemSdk.config.userCodesBiometricKeyName,
-            ),
-        )
-            .map { /* no-op */ }
-    }
-
     suspend fun saveAccessCode(accessCode: String, cardsIds: Set<String>): CompletionResult<Unit> {
         return createUserCodeRepository().save(
             cardIds = cardsIds,
@@ -137,20 +126,10 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
                 stringValue = accessCode,
             ),
         )
-            .map {
-                biometricManager.unauthenticate(
-                    keyName = tangemSdk.config.userCodesBiometricKeyName,
-                )
-            }
     }
 
     suspend fun clearSavedUserCodes(): CompletionResult<Unit> {
         return createUserCodeRepository().clear()
-            .map {
-                biometricManager.unauthenticate(
-                    keyName = tangemSdk.config.userCodesBiometricKeyName,
-                )
-            }
     }
 
     suspend fun setPasscode(cardId: String?): CompletionResult<SuccessResponse> {
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
index a219814de1..98ce39259e 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
@@ -59,7 +59,7 @@ class CreateProductWalletTask(
     private val type: ProductType,
 ) : CardSessionRunnable<CreateProductWalletTaskResponse> {
 
-    override val allowsAccessCodeFromRepository: Boolean = false
+    override val allowsRequestAccessCodeFromRepository: Boolean = false
 
     override fun run(
         session: CardSession,
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
index 537500d0b4..e20a6cc197 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
@@ -45,7 +45,7 @@ class ScanProductTask(
     private val additionalBlockchainsToDerive: Collection<Blockchain>? = null,
 ) : CardSessionRunnable<ScanResponse> {
 
-    override val allowsAccessCodeFromRepository: Boolean
+    override val allowsRequestAccessCodeFromRepository: Boolean
         get() = !additionalBlockchainsToDerive.isNullOrEmpty()
 
     override fun run(
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index 761bdd1a53..37e629800a 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -234,7 +234,6 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
 
     when (action) {
         is BackupAction.StartBackup -> {
-            tangemSdkManager.setAccessCodeRequestPolicy(useBiometricsForAccessCode = false)
             Analytics.send(Onboarding.Backup.Started())
             backupService.discardSavedBackup()
             val primaryCard = scanResponse?.primaryCard
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
index aaa56a0789..d11d5139fb 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@@ -138,13 +138,10 @@ internal class SaveWalletMiddleware {
     ): CompletionResult<Unit> {
         return when {
             accessCode != null -> {
-                tangemSdkManager.unlockBiometricKeys()
-                    .flatMap {
-                        tangemSdkManager.saveAccessCode(
-                            accessCode = accessCode,
-                            cardsIds = cardsInWallet,
-                        )
-                    }
+                tangemSdkManager.saveAccessCode(
+                    accessCode = accessCode,
+                    cardsIds = cardsInWallet,
+                )
             }
             else -> {
                 CompletionResult.Success(Unit)