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(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:
Stefan 2023-02-15 16:55:16 +02:00 committed by Stefan Dunca
parent 806f6a8b33
commit a0170a3fda
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,6 @@ 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
events: EventEmitter events: EventEmitter
@ -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,

2
ui/app/AppLayouts/Wallet/views/LeftTabView.qml
View File

@ -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: ""

2
ui/imports/shared/popups/SendModal.qml
View File

@ -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"

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit 93de01e32e8e8bfa57e0c1f76b525b815cf0c08d Subproject commit 7c7c3a1f1335ea166b7839217d9ec37b74ad0191