From fd08217cb6e1d89a5a7d26df02d00d2fdf5e93a7 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 20 Oct 2025 13:56:57 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../components/common/WcNavigationUtils.kt | 4 ++-- .../model/WcSendTransactionModel.kt | 18 ++++++++---------- .../transaction/routes/WcTransactionRoutes.kt | 4 +--- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt index dd7da71fa0..7a34577605 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt @@ -10,8 +10,8 @@ import com.tangem.features.send.v2.api.params.FeeSelectorParams.FeeSelectorDetai import com.tangem.features.walletconnect.connections.components.AlertsComponentV2 import com.tangem.features.walletconnect.connections.utils.WcAlertsFactory.createCommonTransactionAppInfoAlertUM import com.tangem.features.walletconnect.transaction.components.send.WcCustomAllowanceComponent -import com.tangem.features.walletconnect.transaction.components.send.WcSendingProcessComponent import com.tangem.features.walletconnect.transaction.components.send.WcSendMultipleTransactionsComponent +import com.tangem.features.walletconnect.transaction.components.send.WcSendingProcessComponent import com.tangem.features.walletconnect.transaction.entity.common.WcCommonTransactionModel import com.tangem.features.walletconnect.transaction.model.WcSendTransactionModel import com.tangem.features.walletconnect.transaction.routes.WcTransactionRoutes @@ -65,7 +65,7 @@ internal fun getWcCommonScreen( WcSendMultipleTransactionsComponent( appComponentContext = appComponentContext, model = model, - onConfirm = config.onConfirm, + onConfirm = { model.onMultiTransactionConfirm() }, ) } WcTransactionRoutes.TransactionProcess -> { diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt index 8b201362c2..9e386e1956 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt @@ -148,7 +148,7 @@ internal class WcSendTransactionModel @Inject constructor( sign = { if (isMultipleSignRequired(useCase)) { analytics.send(SolanaLargeTransaction(useCase.rawSdkRequest.dAppMetaData.name)) - openMultipleTransaction(useCase) + openMultipleTransaction() } else { useCase.sign() } @@ -173,15 +173,13 @@ internal class WcSendTransactionModel @Inject constructor( } } - private fun openMultipleTransaction(useCase: WcSignUseCase<*>) { - stackNavigation.pushNew( - WcTransactionRoutes.MultipleTransactions( - onConfirm = { - useCase.sign() - stackNavigation.pushNew(WcTransactionRoutes.TransactionProcess) - }, - ), - ) + private fun openMultipleTransaction() { + stackNavigation.pushNew(WcTransactionRoutes.MultipleTransactions) + } + + fun onMultiTransactionConfirm() { + useCase.sign() + stackNavigation.pushNew(WcTransactionRoutes.TransactionProcess) } /** diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/routes/WcTransactionRoutes.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/routes/WcTransactionRoutes.kt index cc1d9513d7..40b2a98e49 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/routes/WcTransactionRoutes.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/routes/WcTransactionRoutes.kt @@ -44,9 +44,7 @@ internal sealed class WcTransactionRoutes : TangemBottomSheetConfigContent, Rout } @Serializable - data class MultipleTransactions( - val onConfirm: () -> Unit, - ) : WcTransactionRoutes() + data object MultipleTransactions : WcTransactionRoutes() @Serializable data object TransactionProcess : WcTransactionRoutes()