Browse Source

ui, fix payment failed

master
Sander van Grieken 3 years ago
parent
commit
dd58328534
  1. 6
      electrum/gui/qml/components/ReceiveDetailsDialog.qml
  2. 9
      electrum/gui/qml/components/ReceiveDialog.qml
  3. 4
      electrum/gui/qml/components/SendDialog.qml
  4. 6
      electrum/gui/qml/components/WalletMainView.qml
  5. 2
      electrum/gui/qml/qewallet.py

6
electrum/gui/qml/components/ReceiveDetailsDialog.qml

@ -11,18 +11,16 @@ import "controls"
ElDialog { ElDialog {
id: dialog id: dialog
title: qsTr('Edit payment request details')
property alias amount: amountBtc.text property alias amount: amountBtc.text
property alias description: message.text property alias description: message.text
property alias expiry: expires.currentValue property alias expiry: expires.currentValue
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Close standardButtons: Dialog.Close
implicitWidth: parent.width
height: parent.height
Overlay.modal: Rectangle { Overlay.modal: Rectangle {
color: "#aa000000" color: "#aa000000"
} }

9
electrum/gui/qml/components/ReceiveDialog.qml

@ -11,6 +11,8 @@ import "controls"
ElDialog { ElDialog {
id: dialog id: dialog
title: qsTr('Receive Payment')
property string _bolt11: request.bolt11 property string _bolt11: request.bolt11
property string _bip21uri: request.bip21 property string _bip21uri: request.bip21
property string _address: request.address property string _address: request.address
@ -21,9 +23,6 @@ ElDialog {
modal: true modal: true
standardButtons: Dialog.Close standardButtons: Dialog.Close
width: parent.width
height: parent.height
Overlay.modal: Rectangle { Overlay.modal: Rectangle {
color: "#aa000000" color: "#aa000000"
} }
@ -261,6 +260,10 @@ ElDialog {
ReceiveDetailsDialog { ReceiveDetailsDialog {
id: receiveDetailsDialog id: receiveDetailsDialog
width: parent.width * 0.9
anchors.centerIn: parent
onAccepted: { onAccepted: {
console.log('accepted') console.log('accepted')
Daemon.currentWallet.delete_request(request.key) Daemon.currentWallet.delete_request(request.key)

4
electrum/gui/qml/components/SendDialog.qml

@ -16,9 +16,6 @@ ElDialog {
modal: true modal: true
standardButtons: Dialog.Close standardButtons: Dialog.Close
width: parent.width
height: parent.height
Overlay.modal: Rectangle { Overlay.modal: Rectangle {
color: "#aa000000" color: "#aa000000"
} }
@ -42,7 +39,6 @@ ElDialog {
onClicked: { onClicked: {
var _mid = manualInputDialog.createObject(mainView) var _mid = manualInputDialog.createObject(mainView)
_mid.accepted.connect(function() { _mid.accepted.connect(function() {
console.log(_mid.recipient)
invoiceParser.recipient = _mid.recipient invoiceParser.recipient = _mid.recipient
}) })
_mid.open() _mid.open()

6
electrum/gui/qml/components/WalletMainView.qml

@ -215,6 +215,9 @@ Item {
Component { Component {
id: sendDialog id: sendDialog
SendDialog { SendDialog {
width: parent.width
height: parent.height
onClosed: destroy() onClosed: destroy()
} }
} }
@ -222,6 +225,9 @@ Item {
Component { Component {
id: receiveDialog id: receiveDialog
ReceiveDialog { ReceiveDialog {
width: parent.width
height: parent.height
onClosed: destroy() onClosed: destroy()
} }
} }

2
electrum/gui/qml/qewallet.py

@ -464,7 +464,7 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
fut = asyncio.run_coroutine_threadsafe(coro, self.wallet.network.asyncio_loop) fut = asyncio.run_coroutine_threadsafe(coro, self.wallet.network.asyncio_loop)
fut.result() fut.result()
except Exception as e: except Exception as e:
self.userNotify.emit(self.wallet, repr(e)) self.paymentFailed.emit(invoice.get_id(), repr(e))
threading.Thread(target=pay_thread).start() threading.Thread(target=pay_thread).start()

Loading…
Cancel
Save