fix(wallet) duplicate entries in activity
The multi-transaction ID was not propagated. The status-go change fixes this. Close: #11754, #11404
This commit is contained in:
parent
3463d7a01f
commit
8941b218d5
|
@ -123,8 +123,7 @@ QtObject:
|
||||||
|
|
||||||
proc getPendingTransactions*(self: Service): seq[TransactionDto] =
|
proc getPendingTransactions*(self: Service): seq[TransactionDto] =
|
||||||
try:
|
try:
|
||||||
let chainIds = self.networkService.getNetworks().map(a => a.chainId)
|
let response = backend.getPendingTransactions().result
|
||||||
let response = backend.getPendingTransactionsByChainIDs(chainIds).result
|
|
||||||
if (response.kind == JArray and response.len > 0):
|
if (response.kind == JArray and response.len > 0):
|
||||||
return response.getElems().map(x => x.toPendingTransactionDto())
|
return response.getElems().map(x => x.toPendingTransactionDto())
|
||||||
|
|
||||||
|
@ -193,12 +192,6 @@ QtObject:
|
||||||
)
|
)
|
||||||
self.threadpool.start(arg)
|
self.threadpool.start(arg)
|
||||||
|
|
||||||
proc watchPendingTransactions*(self: Service): seq[TransactionDto] =
|
|
||||||
let pendingTransactions = self.getPendingTransactions()
|
|
||||||
for tx in pendingTransactions:
|
|
||||||
self.watchTransaction(tx.txHash, tx.fromAddress, tx.to, tx.typeValue, tx.input, tx.chainId, track = false)
|
|
||||||
return pendingTransactions
|
|
||||||
|
|
||||||
proc createApprovalPath*(self: Service, route: TransactionPathDto, from_addr: string, toAddress: Address, gasFees: string): TransactionBridgeDto =
|
proc createApprovalPath*(self: Service, route: TransactionPathDto, from_addr: string, toAddress: Address, gasFees: string): TransactionBridgeDto =
|
||||||
var txData = TransactionDataDto()
|
var txData = TransactionDataDto()
|
||||||
let approve = Approve(
|
let approve = Approve(
|
||||||
|
|
|
@ -98,8 +98,8 @@ rpc(getTokensBalancesForChainIDs, "wallet"):
|
||||||
accounts: seq[string]
|
accounts: seq[string]
|
||||||
tokens: seq[string]
|
tokens: seq[string]
|
||||||
|
|
||||||
rpc(getPendingTransactionsByChainIDs, "wallet"):
|
rpc(getPendingTransactions, "wallet"):
|
||||||
chainIds: seq[int]
|
discard
|
||||||
|
|
||||||
type
|
type
|
||||||
TransactionIdentity* = ref object
|
TransactionIdentity* = ref object
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit e922fc40d5307c688448e043f7e847ec0050c5d7
|
Subproject commit 524c21834b7249da97c1c3bc712763a1d37b786d
|
Loading…
Reference in New Issue