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): Fix for - Recipient of the transaction message is not notified that transaction is completed 

Also fixes broken UI when sending/receveing transactions from chat

fixes #2915
This commit is contained in:
Khushboo Mehta 2022-01-10 17:42:36 +01:00 committed by Khushboo-dev-cpp
parent 7f058f3141
commit 35388b0f6d
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/imports/shared/popups/SignTransactionModal.qml
View File

@ -89,7 +89,7 @@ StatusModal {
initialItem: groupPreview initialItem: groupPreview
isLastGroup: stack.currentGroup === groupSignTx isLastGroup: stack.currentGroup === groupSignTx
onGroupActivated: { onGroupActivated: {
root.title = group.headerText root.header.title = group.headerText
btnNext.text = group.footerText btnNext.text = group.footerText
} }
TransactionFormGroup { TransactionFormGroup {
@ -126,8 +126,8 @@ StatusModal {
RecipientSelector { RecipientSelector {
id: selectRecipient id: selectRecipient
visible: false visible: false
accounts: root.store.walletModelInst.accountsView.accounts accounts: root.store.accounts
contacts: root.store.profileModelInst.contacts.addedContacts contacts: root.store.addedContacts
selectedRecipient: root.selectedRecipient selectedRecipient: root.selectedRecipient
readOnly: true readOnly: true
} }
@ -282,7 +282,6 @@ StatusModal {
rightButtons: [ rightButtons: [
StatusButton { StatusButton {
id: btnNext id: btnNext
anchors.right: parent.right
//% "Next" //% "Next"
text: qsTrId("next") text: qsTrId("next")
enabled: stack.currentGroup.isValid && !stack.currentGroup.isPending enabled: stack.currentGroup.isValid && !stack.currentGroup.isPending

25
ui/imports/shared/views/chat/TransactionBubbleView.qml
View File

@ -4,6 +4,7 @@ import shared 1.0
import shared.panels 1.0 import shared.panels 1.0
import shared.popups 1.0 import shared.popups 1.0
import shared.views.chat 1.0 import shared.views.chat 1.0
import shared.controls 1.0
import shared.controls.chat 1.0 import shared.controls.chat 1.0
Item { Item {
@ -189,7 +190,7 @@ Item {
SendTransactionButton { SendTransactionButton {
// outgoing: root.outgoing // outgoing: root.outgoing
acc: root.store.walletModelInst.accountsView.focusedAccount acc: root.store.currentAccount
selectedAsset: token selectedAsset: token
selectedAmount: tokenAmount selectedAmount: tokenAmount
selectedFiatAmount: fiatValue selectedFiatAmount: fiatValue
@ -218,17 +219,21 @@ Item {
Component { Component {
id: signTxComponent id: signTxComponent
SignTransactionModal { SignTransactionModal {
anchors.centerIn: parent
store: root.store store: root.store
selectedAsset: root.selectedAsset selectedAsset: token
selectedAmount: root.selectedAmount selectedAmount: tokenAmount
selectedRecipient: root.selectedRecipient selectedRecipient: {
selectedFiatAmount: root.selectedFiatAmount return {
onOpened: { address: commandParametersObject.address,
root.store.walletModelInst.gasView.getGasPrice(); identicon: root.store.chatsModelInst.channelView.activeChannel.identicon,
} name: root.store.chatsModelInst.channelView.activeChannel.name,
onClosed: { type: RecipientSelector.Type.Contact
destroy(); }
} }
selectedFiatAmount: fiatValue
onOpened: root.store.walletModelInst.gasView.getGasPrice();
onClosed: destroy();
} }
} }