From 4bf16417fb988c6d4c1fff250db2ce808a3c021f Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 28 Oct 2021 01:54:15 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../tap/domain/twins/TwinCardsManager.kt      | 13 +++--------
 .../twins/redux/TwinCardsMiddleware.kt        | 22 +++----------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
index e16ccd79cb..861f3db801 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
@@ -26,14 +26,9 @@ class TwinCardsManager(private val card: Card, assetReader: AssetReader) {
     private val issuerKeyPair: KeyPair = getIssuerKeys(assetReader, card.issuer.publicKey.toHexString())
 
     suspend fun createFirstWallet(message: Message): CompletionResult<CreateWalletResponse> {
-        val response = tangemSdkManager.runTaskAsync(
-            CreateFirstTwinWalletTask(), currentCardId, message
-        )
+        val response = tangemSdkManager.runTaskAsync(CreateFirstTwinWalletTask(), currentCardId, message)
         when (response) {
-            is CompletionResult.Success -> {
-                currentCardPublicKey = response.data.wallet.publicKey.toHexString()
-                return response
-            }
+            is CompletionResult.Success -> currentCardPublicKey = response.data.wallet.publicKey.toHexString()
             is CompletionResult.Failure -> {
                 (response.error as? TangemSdkError)?.let { error ->
                     FirebaseAnalyticsHandler.logCardSdkError(
@@ -42,13 +37,11 @@ class TwinCardsManager(private val card: Card, assetReader: AssetReader) {
                         card = card
                     )
                 }
-                return response
             }
         }
-
+        return response
     }
 
-
     suspend fun createSecondWallet(
         initialMessage: Message,
         preparingMessage: Message,
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
index f56502e209..26fbfb104b 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
@@ -72,7 +72,6 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
         if (twinCardsState.mode == CreateTwinWalletMode.CreateWallet) {
             onboardingManager?.activationFinished(getScanResponse().card.cardId)
             twinCardsState.pairCardId?.let { onboardingManager?.activationFinished(it) }
-
         }
     }
 
@@ -121,23 +120,9 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
         }
         is TwinCardsAction.SetStepOfScreen -> {
             when (action.step) {
-                TwinCardsStep.WelcomeOnly -> {
-                    preferencesStorage.saveTwinsOnboardingShown()
-                }
-                TwinCardsStep.Welcome -> {
-                    preferencesStorage.saveTwinsOnboardingShown()
-                }
-                TwinCardsStep.Warning -> {
-                }
-                TwinCardsStep.CreateFirstWallet -> {
-                }
-                TwinCardsStep.CreateSecondWallet -> {
-                }
-                TwinCardsStep.CreateThirdWallet -> {
-                }
-                TwinCardsStep.TopUpWallet -> {
-                    store.dispatch(TwinCardsAction.Balance.Update)
-                }
+                TwinCardsStep.WelcomeOnly -> preferencesStorage.saveTwinsOnboardingShown()
+                TwinCardsStep.Welcome -> preferencesStorage.saveTwinsOnboardingShown()
+                TwinCardsStep.TopUpWallet -> store.dispatch(TwinCardsAction.Balance.Update)
                 TwinCardsStep.Done -> {
                     finishCardActivation()
                     postUi(500) { store.dispatch(TwinCardsAction.Confetti.Show) }
@@ -200,7 +185,6 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
                 }
             }
         }
-
         is TwinCardsAction.Balance.Update -> {
             val walletManager = if (twinCardsState.walletManager != null) {
                 twinCardsState.walletManager