Skip to content

Commit

Permalink
feat(wallet) propagate multi-transaction ID to Nim
Browse files Browse the repository at this point in the history
Bump status-go to include the propagation of multi-transaction ID for status-go APIs

Also

- Add leftover fix from SendModal layout

Updates: #7663
  • Loading branch information
stefandunca committed Mar 2, 2023
1 parent 806f6a8 commit a0170a3
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ proc init*(self: Controller) =
let accounts = self.getWalletAccounts()
let addresses = accounts.map(account => account.address)
self.delegate.setHistoryFetchState(addresses, isFetching = false)

self.events.on(SIGNAL_TRANSACTIONS_LOADED) do(e:Args):
let args = TransactionsLoadedArgs(e)
self.delegate.setHistoryFetchState(@[args.address], isFetching = false)
Expand Down
2 changes: 1 addition & 1 deletion src/app_service/service/transaction/dto.nim
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type
value*: string
fromAddress*: string
to*: string
chainId*: int
chainId*: int
maxFeePerGas*: string
maxPriorityFeePerGas*: string
input*: string
Expand Down
5 changes: 2 additions & 3 deletions src/app_service/service/transaction/service.nim
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ type
type
CryptoServicesArgs* = ref object of Args
data*: seq[CryptoRampDto]


QtObject:
type Service* = ref object of QObject
Expand All @@ -109,7 +108,7 @@ QtObject:
proc newService*(
events: EventEmitter,
threadpool: ThreadPool,
networkService: network_service.Service,
networkService: network_service.Service,
settingsService: settings_service.Service,
tokenService: token_service.Service,
): Service =
Expand Down Expand Up @@ -162,7 +161,7 @@ QtObject:
let address = watchTxResult["address"].getStr
let transactionReceipt = transactions.getTransactionReceipt(chainId, hash).result
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
let ev = TransactionMinedArgs(
data: watchTxResult["data"].getStr,
Expand Down
2 changes: 1 addition & 1 deletion ui/app/AppLayouts/Wallet/views/LeftTabView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Rectangle {
width: ListView.view.width - Style.current.padding * 2
highlighted: !ListView.view.footerItem.button.highlighted &&
RootStore.currentAccount.name === model.name
anchors.horizontalCenter: parent.horizontalCenter
anchors.horizontalCenter: !!parent ? parent.horizontalCenter : undefined
title: model.name
subTitle: LocaleUtils.currencyAmountToLocaleString(model.currencyBalance)
asset.emoji: !!model.emoji ? model.emoji: ""
Expand Down
2 changes: 1 addition & 1 deletion ui/imports/shared/popups/SendModal.qml
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ StatusDialog {
Layout.fillHeight: true

contentHeight: layout.height + Style.current.padding
contentWidth: parent.width

z: 0
objectName: "sendModalScroll"

Expand Down

0 comments on commit a0170a3

Please sign in to comment.