From 76a9691e0d668dd6f79ddd78caa9110f5e2b0307 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 8 Dec 2022 10:54:38 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt   | 2 +-
 .../com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt  | 1 -
 .../main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt  | 1 -
 app/src/main/java/com/tangem/tap/domain/twins/WrongTwinCard.kt | 3 +--
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt
index 3860732b7d..d812507524 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt
@@ -16,7 +16,7 @@ class CreateFirstTwinWalletTask : CardSessionRunnable<CreateWalletResponse> {
         callback: (result: CompletionResult<CreateWalletResponse>) -> Unit,
     ) {
         val card = session.environment.card
-        val publicKey = card?.getSingleWallet()?.publicKey
+        val publicKey = card?.wallets?.firstOrNull()?.publicKey
         if (publicKey != null) {
             if (TwinsHelper.getTwinCardNumber(card.cardId) == TwinCardNumber.Second) {
                 callback(CompletionResult.Failure(WrongTwinCard(TwinCardNumber.First)))
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
index cca9da3551..8950bc0a02 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
@@ -12,7 +12,6 @@ import com.tangem.domain.common.TwinsHelper
 import com.tangem.operations.wallet.CreateWalletResponse
 import com.tangem.operations.wallet.CreateWalletTask
 import com.tangem.operations.wallet.PurgeWalletCommand
-import com.tangem.tap.domain.extensions.getSingleWallet
 
 class CreateSecondTwinWalletTask(
     private val firstPublicKey: String,
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 2e2e0f9642..9aed6f968c 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
@@ -48,7 +48,6 @@ class TwinCardsManager(
     ): CompletionResult<CreateWalletResponse> {
         val task = CreateSecondTwinWalletTask(
             firstPublicKey = currentCardPublicKey!!,
-            firstCardId = firstCardId,
             issuerKeys = issuerKeyPair,
             preparingMessage = preparingMessage,
             creatingWalletMessage = creatingWalletMessage,
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/WrongTwinCard.kt b/app/src/main/java/com/tangem/tap/domain/twins/WrongTwinCard.kt
index 24d032e94f..d05d28217e 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/WrongTwinCard.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/WrongTwinCard.kt
@@ -5,8 +5,7 @@ import com.tangem.domain.common.TwinCardNumber
 import com.tangem.tap.tangemSdkManager
 import com.tangem.wallet.R
 
-data class WrongTwinCard(private val twinCardNumber: TwinCardNumber) : TangemError {
-    override val code: Int = 50005
+data class WrongTwinCard(private val twinCardNumber: TwinCardNumber) : TangemError(code = 50005) {
     override var customMessage: String = tangemSdkManager.getString(
         R.string.twin_error_same_card,
         twinCardNumber.number,