status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(@desktop/wallet): Show total fees instead of approval fees if approve is needed on the swapmodal 

fixes #15505
This commit is contained in:
Khushboo Mehta 2024-07-11 00:03:37 +02:00 committed by Khushboo-dev-cpp
parent ad612a794c
commit 758bba1ac0
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
storybook/qmlTests/tests/tst_SwapModal.qml
View File

@ -1340,7 +1340,7 @@ Item {
compare(signButton.text, qsTr("Approve %1").arg(root.swapAdaptor.fromToken.symbol)) compare(signButton.text, qsTr("Approve %1").arg(root.swapAdaptor.fromToken.symbol))
// TODO: note that there is a loss of precision as the approvalGasFees is currently passes as float from the backend and not string. // TODO: note that there is a loss of precision as the approvalGasFees is currently passes as float from the backend and not string.
compare(maxFeesValue.text, root.swapAdaptor.currencyStore.formatCurrencyAmount( compare(maxFeesValue.text, root.swapAdaptor.currencyStore.formatCurrencyAmount(
root.swapAdaptor.swapOutputData.approvalGasFees, root.swapAdaptor.swapOutputData.totalFees,
root.swapAdaptor.currencyStore.currentCurrency)) root.swapAdaptor.currencyStore.currentCurrency))
// simulate user click on approve button and approval failed // simulate user click on approve button and approval failed
@ -1354,7 +1354,7 @@ Item {
compare(signButton.text, qsTr("Approving %1").arg(root.swapAdaptor.fromToken.symbol)) compare(signButton.text, qsTr("Approving %1").arg(root.swapAdaptor.fromToken.symbol))
// TODO: note that there is a loss of precision as the approvalGasFees is currently passes as float from the backend and not string. // TODO: note that there is a loss of precision as the approvalGasFees is currently passes as float from the backend and not string.
compare(maxFeesValue.text, root.swapAdaptor.currencyStore.formatCurrencyAmount( compare(maxFeesValue.text, root.swapAdaptor.currencyStore.formatCurrencyAmount(
root.swapAdaptor.swapOutputData.approvalGasFees, root.swapAdaptor.swapOutputData.totalFees,
root.swapAdaptor.currencyStore.currentCurrency)) root.swapAdaptor.currencyStore.currentCurrency))
// simulate approval tx was unsuccessful // simulate approval tx was unsuccessful
@ -1368,7 +1368,7 @@ Item {
compare(signButton.text, qsTr("Approve %1").arg(root.swapAdaptor.fromToken.symbol)) compare(signButton.text, qsTr("Approve %1").arg(root.swapAdaptor.fromToken.symbol))
// TODO: note that there is a loss of precision as the approvalGasFees is currently passes as float from the backend and not string. // TODO: note that there is a loss of precision as the approvalGasFees is currently passes as float from the backend and not string.
compare(maxFeesValue.text, root.swapAdaptor.currencyStore.formatCurrencyAmount( compare(maxFeesValue.text, root.swapAdaptor.currencyStore.formatCurrencyAmount(
root.swapAdaptor.swapOutputData.approvalGasFees, root.swapAdaptor.swapOutputData.totalFees,
root.swapAdaptor.currencyStore.currentCurrency)) root.swapAdaptor.currencyStore.currentCurrency))
// simulate user click on approve button and successful approval tx made // simulate user click on approve button and successful approval tx made
@ -1383,7 +1383,7 @@ Item {
compare(signButton.text, qsTr("Approving %1").arg(root.swapAdaptor.fromToken.symbol)) compare(signButton.text, qsTr("Approving %1").arg(root.swapAdaptor.fromToken.symbol))
// TODO: note that there is a loss of precision as the approvalGasFees is currently passes as float from the backend and not string. // TODO: note that there is a loss of precision as the approvalGasFees is currently passes as float from the backend and not string.
compare(maxFeesValue.text, root.swapAdaptor.currencyStore.formatCurrencyAmount( compare(maxFeesValue.text, root.swapAdaptor.currencyStore.formatCurrencyAmount(
root.swapAdaptor.swapOutputData.approvalGasFees, root.swapAdaptor.swapOutputData.totalFees,
root.swapAdaptor.currencyStore.currentCurrency)) root.swapAdaptor.currencyStore.currentCurrency))
// simulate approval tx was successful // simulate approval tx was successful
@ -1521,7 +1521,6 @@ Item {
root.swapFormData.fromTokensKey = "ETH" root.swapFormData.fromTokensKey = "ETH"
root.swapFormData.fromTokenAmount = valueToExchangeString root.swapFormData.fromTokenAmount = valueToExchangeString
root.swapFormData.toTokenKey = data.key root.swapFormData.toTokenKey = data.key
console.error("root.swapFormData.toTokenKey = ",root.swapFormData.toTokenKey)
// Launch popup // Launch popup
launchAndVerfyModal() launchAndVerfyModal()

2
storybook/stubs/shared/stores/CurrenciesStore.qml
View File

@ -24,7 +24,7 @@ QtObject {
} }
function getFiatValue(balance, cryptoSymbol) { function getFiatValue(balance, cryptoSymbol) {
return balance return parseFloat(balance)
} }
function getCurrencyAmount(amount, symbol) { function getCurrencyAmount(amount, symbol) {

7
ui/app/AppLayouts/Wallet/popups/swap/SwapModal.qml
View File

@ -358,17 +358,10 @@ StatusDialog {
} }
if(root.swapAdaptor.validSwapProposalReceived) { if(root.swapAdaptor.validSwapProposalReceived) {
if(root.swapAdaptor.swapOutputData.approvalNeeded) {
let approvalGasFeesFiat = root.swapAdaptor.currencyStore.getFiatValue(root.swapAdaptor.swapOutputData.approvalGasFees, Constants.ethToken)
return root.swapAdaptor.currencyStore.formatCurrencyAmount(
approvalGasFeesFiat,
root.swapAdaptor.currencyStore.currentCurrency)
} else {
return root.swapAdaptor.currencyStore.formatCurrencyAmount( return root.swapAdaptor.currencyStore.formatCurrencyAmount(
root.swapAdaptor.swapOutputData.totalFees, root.swapAdaptor.swapOutputData.totalFees,
root.swapAdaptor.currencyStore.currentCurrency) root.swapAdaptor.currencyStore.currentCurrency)
} }
}
return "--" return "--"
} }