diff --git a/ui/app/AppLayouts/Browser/BrowserLayout.qml b/ui/app/AppLayouts/Browser/BrowserLayout.qml index a2e0badc6e..23c6099c6b 100644 --- a/ui/app/AppLayouts/Browser/BrowserLayout.qml +++ b/ui/app/AppLayouts/Browser/BrowserLayout.qml @@ -152,28 +152,28 @@ Rectangle { return _internal.accessDialogComponent.createObject(browserWindow) } createSendTransactionModalComponent: function(request) { - browserWindow.sendTransactionModal.selectedAccount = { - name: WalletStore.dappBrowserAccount.name, - address: request.payload.params[0].from, - iconColor: WalletStore.dappBrowserAccount.color, - assets: WalletStore.dappBrowserAccount.assets - } - browserWindow.sendTransactionModal.selectedRecipient = { - address: request.payload.params[0].to, - identicon: "", - name: RootStore.activeChannelName, - type: RecipientSelector.Type.Address - } - - browserWindow.sendTransactionModal.selectedAmountAsset = { - name: "ETH", - symbol: "ETH", - address: Constants.zeroAddress - } - browserWindow.sendTransactionModal.selectedAmount = RootStore.getWei2Eth(request.payload.params[0].value, 18) - - - browserWindow.sendTransactionModal.open() + 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 + }, + selectedRecipient: { + address: request.payload.params[0].to, + identicon: "", + name: RootStore.activeChannelName, + type: RecipientSelector.Type.Address + }, + selectedAsset: { + name: "ETH", + symbol: "ETH", + address: Constants.zeroAddress + }, + selectedFiatAmount: "42", // TODO calculate that + selectedAmount: RootStore.getWei2Eth(request.payload.params[0].value, 18) + }) } createSignMessageModalComponent: function(request) { return _internal.signMessageModalComponent.createObject(browserWindow, { diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml index 2431c32179..5af7815078 100644 --- a/ui/app/mainui/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -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 - } } }