Updated on 2026-08-14

data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt

@@ -280,4 +280,27 @@ internal class DefaultTransactionRepository(
             else -> null
         }
     }
+
+    override suspend fun prepareForSend(
+        transactionData: TransactionData,
+        signer: TransactionSigner,
+        userWalletId: UserWalletId,
+        network: Network,
+    ): Result<ByteArray> = withContext(coroutineDispatcherProvider.io) {
+        val blockchain = Blockchain.fromId(network.id.value)
+        val walletManager = walletManagersFacade.getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = network.derivationPath.value,
+        )
+        val preparer = walletManager as? TransactionPreparer ?: kotlin.run {
+            Timber.e("${walletManager?.wallet?.blockchain} does not support TransactionBuilder")
+            error("Wallet manager does not support TransactionPreparer")
+        }
+
+        when (val prepareForSend = preparer.prepareForSend(transactionData, signer)) {
+            is com.tangem.blockchain.extensions.Result.Failure -> Result.failure(prepareForSend.error)
+            is com.tangem.blockchain.extensions.Result.Success -> Result.success(prepareForSend.data)
+        }
+    }
 }

data/wallet-connect/build.gradle.kts

@@ -14,9 +14,9 @@ dependencies {
     /* Project - Domain */
     implementation(projects.domain.walletConnect)
     implementation(projects.domain.walletConnect.models)
+    implementation(projects.domain.transaction)
     implementation(projects.domain.wallets)
     implementation(projects.domain.wallets.models)
-    implementation(projects.domain.card)
     implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.models)

data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/ethereum/DefaultWcPersonalEthSignUseCase.kt

@@ -1,12 +1,10 @@
 package com.tangem.data.walletconnect.network.ethereum
 
 import arrow.core.left
-import arrow.core.right
 import com.tangem.blockchain.blockchains.ethereum.EthereumUtils
 import com.tangem.blockchain.blockchains.ethereum.EthereumUtils.toKeccak
 import com.tangem.blockchain.common.HEX_PREFIX
 import com.tangem.blockchain.extensions.isAscii
-import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toDecompressedPublicKey
 import com.tangem.data.walletconnect.respond.WcRespondService
@@ -14,9 +12,7 @@ import com.tangem.data.walletconnect.sign.BaseWcSignUseCase
 import com.tangem.data.walletconnect.sign.OnSign
 import com.tangem.data.walletconnect.sign.SignStateConverter.toResult
 import com.tangem.data.walletconnect.sign.WcMethodUseCaseContext
-import com.tangem.domain.card.models.TwinKey
-import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.common.TapWorkarounds.isTangemTwins
+import com.tangem.domain.transaction.usecase.SignUseCase
 import com.tangem.domain.walletconnect.model.WcEthMethod
 import com.tangem.domain.walletconnect.usecase.ethereum.WcPersonalEthSignUseCase
 import com.tangem.domain.walletconnect.usecase.sign.WcSignState
@@ -30,29 +26,17 @@ internal class DefaultWcPersonalEthSignUseCase(
     override val context: WcMethodUseCaseContext,
     private val method: WcEthMethod.PersonalEthSign,
     private val walletManagersFacade: WalletManagersFacade,
-    private val cardRepository: CardSdkConfigRepository,
+    private val signUseCase: SignUseCase,
 ) : BaseWcSignUseCase<Nothing, WcPersonalEthSignUseCase.SignModel>(),
     WcPersonalEthSignUseCase {
 
     override val onSign: OnSign<WcPersonalEthSignUseCase.SignModel> = collector@{ state ->
         val hashToSign = LegacySdkHelper.createMessageData(state.signModel.rawMsg)
         val userWallet = session.wallet
-        val card = userWallet.scanResponse.card
-        val isCardNotBackedUp = card.backupStatus?.isActive != true && !card.isTangemTwins
         val walletManager = walletManagersFacade.getOrCreateWalletManager(userWallet.walletId, network)
             ?: return@collector
 
-        val signer = cardRepository.getCommonSigner(
-            cardId = card.cardId.takeIf { isCardNotBackedUp },
-            twinKey = TwinKey.getOrNull(scanResponse = userWallet.scanResponse),
-        )
-
-        val signResult = when (val signResult = signer.sign(hashToSign, walletManager.wallet.publicKey)) {
-            is CompletionResult.Failure -> signResult.error.left()
-            is CompletionResult.Success -> signResult.data.right()
-        }
-
-        val signedHash = signResult
+        val signedHash = signUseCase(hashToSign, userWallet, network)
             .onLeft { emit(state.toResult(it.left())) }
             .getOrNull() ?: return@collector