feat(wallet) propagate multi-transaction ID to Nim
Bump status-go to include the propagation of multi-transaction ID for status-go APIs Also - Add leftover fix from SendModal layout Updates: #7663
This commit is contained in:
parent
806f6a8b33
commit
a0170a3fda
|
@ -62,7 +62,7 @@ proc init*(self: Controller) =
|
||||||
let accounts = self.getWalletAccounts()
|
let accounts = self.getWalletAccounts()
|
||||||
let addresses = accounts.map(account => account.address)
|
let addresses = accounts.map(account => account.address)
|
||||||
self.delegate.setHistoryFetchState(addresses, isFetching = false)
|
self.delegate.setHistoryFetchState(addresses, isFetching = false)
|
||||||
|
|
||||||
self.events.on(SIGNAL_TRANSACTIONS_LOADED) do(e:Args):
|
self.events.on(SIGNAL_TRANSACTIONS_LOADED) do(e:Args):
|
||||||
let args = TransactionsLoadedArgs(e)
|
let args = TransactionsLoadedArgs(e)
|
||||||
self.delegate.setHistoryFetchState(@[args.address], isFetching = false)
|
self.delegate.setHistoryFetchState(@[args.address], isFetching = false)
|
||||||
|
|
|
@ -51,7 +51,7 @@ type
|
||||||
value*: string
|
value*: string
|
||||||
fromAddress*: string
|
fromAddress*: string
|
||||||
to*: string
|
to*: string
|
||||||
chainId*: int
|
chainId*: int
|
||||||
maxFeePerGas*: string
|
maxFeePerGas*: string
|
||||||
maxPriorityFeePerGas*: string
|
maxPriorityFeePerGas*: string
|
||||||
input*: string
|
input*: string
|
||||||
|
|
|
@ -88,7 +88,6 @@ type
|
||||||
type
|
type
|
||||||
CryptoServicesArgs* = ref object of Args
|
CryptoServicesArgs* = ref object of Args
|
||||||
data*: seq[CryptoRampDto]
|
data*: seq[CryptoRampDto]
|
||||||
|
|
||||||
|
|
||||||
QtObject:
|
QtObject:
|
||||||
type Service* = ref object of QObject
|
type Service* = ref object of QObject
|
||||||
|
@ -109,7 +108,7 @@ QtObject:
|
||||||
proc newService*(
|
proc newService*(
|
||||||
events: EventEmitter,
|
events: EventEmitter,
|
||||||
threadpool: ThreadPool,
|
threadpool: ThreadPool,
|
||||||
networkService: network_service.Service,
|
networkService: network_service.Service,
|
||||||
settingsService: settings_service.Service,
|
settingsService: settings_service.Service,
|
||||||
tokenService: token_service.Service,
|
tokenService: token_service.Service,
|
||||||
): Service =
|
): Service =
|
||||||
|
@ -162,7 +161,7 @@ QtObject:
|
||||||
let address = watchTxResult["address"].getStr
|
let address = watchTxResult["address"].getStr
|
||||||
let transactionReceipt = transactions.getTransactionReceipt(chainId, hash).result
|
let transactionReceipt = transactions.getTransactionReceipt(chainId, hash).result
|
||||||
if transactionReceipt != nil and transactionReceipt.kind != JNull:
|
if transactionReceipt != nil and transactionReceipt.kind != JNull:
|
||||||
discard transactions.deletePendingTransaction(chainId, hash)
|
# Pending transaction will be deleted by backend after transfering multi-transaction info to history
|
||||||
echo watchTxResult["data"].getStr
|
echo watchTxResult["data"].getStr
|
||||||
let ev = TransactionMinedArgs(
|
let ev = TransactionMinedArgs(
|
||||||
data: watchTxResult["data"].getStr,
|
data: watchTxResult["data"].getStr,
|
||||||
|
|
|
@ -148,7 +148,7 @@ Rectangle {
|
||||||
width: ListView.view.width - Style.current.padding * 2
|
width: ListView.view.width - Style.current.padding * 2
|
||||||
highlighted: !ListView.view.footerItem.button.highlighted &&
|
highlighted: !ListView.view.footerItem.button.highlighted &&
|
||||||
RootStore.currentAccount.name === model.name
|
RootStore.currentAccount.name === model.name
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: !!parent ? parent.horizontalCenter : undefined
|
||||||
title: model.name
|
title: model.name
|
||||||
subTitle: LocaleUtils.currencyAmountToLocaleString(model.currencyBalance)
|
subTitle: LocaleUtils.currencyAmountToLocaleString(model.currencyBalance)
|
||||||
asset.emoji: !!model.emoji ? model.emoji: ""
|
asset.emoji: !!model.emoji ? model.emoji: ""
|
||||||
|
|
|
@ -341,7 +341,7 @@ StatusDialog {
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
|
|
||||||
contentHeight: layout.height + Style.current.padding
|
contentHeight: layout.height + Style.current.padding
|
||||||
contentWidth: parent.width
|
|
||||||
z: 0
|
z: 0
|
||||||
objectName: "sendModalScroll"
|
objectName: "sendModalScroll"
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 93de01e32e8e8bfa57e0c1f76b525b815cf0c08d
|
Subproject commit 7c7c3a1f1335ea166b7839217d9ec37b74ad0191
|
Loading…
Reference in New Issue