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

fix(@desktop/wallet): avoid duplicate Approve when performing a Swap 

Closes #15330
This commit is contained in:
Dario Gabriel Lipicar 2024-06-30 19:10:06 -03:00 committed by dlipicar
parent 25127bfd63
commit 9cf4c59ba0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app_service/service/transaction/service.nim
View File

@ -400,6 +400,10 @@ QtObject:
except Exception as e: except Exception as e:
self.sendTransactionSentSignal(from_addr, to_addr, uuid, @[], RpcResponse[JsonNode](), fmt"Error sending token transfer transaction: {e.msg}") self.sendTransactionSentSignal(from_addr, to_addr, uuid, @[], RpcResponse[JsonNode](), fmt"Error sending token transfer transaction: {e.msg}")
proc mustIgnoreApprovalRequests(sendType: SendType): bool =
# Swap requires approvals to be done in advance in a separate Tx
return sendType == SendType.Swap
# in case of collectibles transfer, assetKey is used to get the contract address and token id # in case of collectibles transfer, assetKey is used to get the contract address and token id
# in case of asset transfer, asset is valid and used to get the asset symbol and contract address # in case of asset transfer, asset is valid and used to get the asset symbol and contract address
proc transferToken( proc transferToken(
@ -461,7 +465,7 @@ QtObject:
if not route.gasFees.eip1559Enabled: if not route.gasFees.eip1559Enabled:
gasFees = $route.gasFees.gasPrice gasFees = $route.gasFees.gasPrice
if route.approvalRequired: if route.approvalRequired and not mustIgnoreApprovalRequests(sendType):
let approvalPath = self.createApprovalPath(route, mtCommand.fromAddress, toContractAddress, gasFees) let approvalPath = self.createApprovalPath(route, mtCommand.fromAddress, toContractAddress, gasFees)
paths.add(approvalPath) paths.add(approvalPath)