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(@desktop/browser): wrong screen is shown when claiming tokens in simpledapp.eth 

Reverted changes done in `991e04ef955f853cb34efddc3d1ef2529f2d0375`
PR: https://github.com/status-im/status-desktop/pull/5502

Fixes #5721
This commit is contained in:
Sale Djenic 2022-05-16 11:49:40 +02:00 committed by saledjenic
parent db3722cd4f
commit 04b864ddd2
2 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/app/AppLayouts/Browser/BrowserLayout.qml
View File

@ -152,28 +152,28 @@ Rectangle {
return _internal.accessDialogComponent.createObject(browserWindow)
}
createSendTransactionModalComponent: function(request) {
browserWindow.sendTransactionModal.selectedAccount = {
return _internal.sendTransactionModalComponent.createObject(browserWindow, {
trxData: request.payload.params[0].data || "",
selectedAccount: {
name: WalletStore.dappBrowserAccount.name,
address: request.payload.params[0].from,
iconColor: WalletStore.dappBrowserAccount.color,
assets: WalletStore.dappBrowserAccount.assets
}
browserWindow.sendTransactionModal.selectedRecipient = {
},
selectedRecipient: {
address: request.payload.params[0].to,
identicon: "",
name: RootStore.activeChannelName,
type: RecipientSelector.Type.Address
}
browserWindow.sendTransactionModal.selectedAmountAsset = {
},
selectedAsset: {
name: "ETH",
symbol: "ETH",
address: Constants.zeroAddress
}
browserWindow.sendTransactionModal.selectedAmount = RootStore.getWei2Eth(request.payload.params[0].value, 18)
browserWindow.sendTransactionModal.open()
},
selectedFiatAmount: "42", // TODO calculate that
selectedAmount: RootStore.getWei2Eth(request.payload.params[0].value, 18)
})
}
createSignMessageModalComponent: function(request) {
return _internal.signMessageModalComponent.createObject(browserWindow, {

12
ui/app/mainui/AppMain.qml
View File

@ -848,9 +848,6 @@ Item {
this.active = false
}
property var selectedAccount
property var selectedRecipient
property var selectedAmount
property var selectedAmountAsset
sourceComponent: SendModal {
anchors.centerIn: parent
store: appMain.rootStore
@ -867,15 +864,6 @@ Item {
if (!!sendModal.selectedAccount) {
item.preSelectedAccount = sendModal.selectedAccount
}
if (!!sendModal.selectedRecipient) {
item.preSelectedRecipient = sendModal.selectedRecipient
}
if (!!sendModal.selectedAmount) {
item.advancedHeader.amountToSendInput.text = sendModal.selectedAmount
}
if (!!sendModal.selectedAmountAsset) {
item.advancedHeader.assetSelector.selectedAsset = sendModal.selectedAmountAsset
}
}
}