From 05287c873a944f68897cb73186bc9db42b8e22af Mon Sep 17 00:00:00 2001 From: Lungu Cristian Date: Fri, 19 Jul 2024 16:33:22 +0300 Subject: [PATCH] fix(walletconnect)_: tx fees not sent (#15678) --- .../AppLayouts/Wallet/services/dapps/DAppsRequestHandler.qml | 1 - ui/imports/shared/stores/DAppsStore.qml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/app/AppLayouts/Wallet/services/dapps/DAppsRequestHandler.qml b/ui/app/AppLayouts/Wallet/services/dapps/DAppsRequestHandler.qml index a404f905e0..b21f5801c7 100644 --- a/ui/app/AppLayouts/Wallet/services/dapps/DAppsRequestHandler.qml +++ b/ui/app/AppLayouts/Wallet/services/dapps/DAppsRequestHandler.qml @@ -320,7 +320,6 @@ SQUtils.QObject { actionResult = store.signTransaction(request.topic, request.id, request.account.address, request.network.chainId, password, txObj) } else if (request.method === SessionRequest.methods.sendTransaction.name) { - let txObj = SessionRequest.methods.sendTransaction.getTxObjFromData(request.data) actionResult = store.sendTransaction(request.topic, request.id, request.account.address, request.network.chainId, password, txObj) } diff --git a/ui/imports/shared/stores/DAppsStore.qml b/ui/imports/shared/stores/DAppsStore.qml index 4c87413205..8507641544 100644 --- a/ui/imports/shared/stores/DAppsStore.qml +++ b/ui/imports/shared/stores/DAppsStore.qml @@ -57,8 +57,11 @@ QObject { if (txObj.data) { tx.data = txObj.data } if (txObj.from) { tx.from = txObj.from } if (txObj.gasLimit) { tx.gasLimit = stripLeadingZeros(txObj.gasLimit) } + if (txObj.gas) { tx.gas = stripLeadingZeros(txObj.gas) } if (txObj.gasPrice) { tx.gasPrice = stripLeadingZeros(txObj.gasPrice) } if (txObj.nonce) { tx.nonce = stripLeadingZeros(txObj.nonce) } + if (txObj.maxFeePerGas) { tx.maxFeePerGas = stripLeadingZeros(txObj.maxFeePerGas) } + if (txObj.maxPriorityFeePerGas) { tx.maxPriorityFeePerGas = stripLeadingZeros(txObj.maxPriorityFeePerGas) } if (txObj.to) { tx.to = txObj.to } if (txObj.value) { tx.value = stripLeadingZeros(txObj.value) } return tx