Browse Source

qml: check max comment length for lnurl-pay, characters remaining indicator, styling.

patch-4
Sander van Grieken 2 years ago
parent
commit
ff0f180fab
  1. 29
      electrum/gui/qml/components/LnurlPayRequestDialog.qml
  2. 1
      electrum/gui/qml/components/SendDialog.qml

29
electrum/gui/qml/components/LnurlPayRequestDialog.qml

@ -23,10 +23,20 @@ ElDialog {
color: "#aa000000" color: "#aa000000"
} }
padding: 0
property bool valid: comment.text.length <= invoiceParser.lnurlData['comment_allowed']
ColumnLayout {
width: parent.width
spacing: 0
GridLayout { GridLayout {
columns: 2 columns: 2
width: parent.width Layout.fillWidth: true
Layout.leftMargin: constants.paddingLarge
Layout.rightMargin: constants.paddingLarge
Label { Label {
text: qsTr('Provider') text: qsTr('Provider')
@ -66,12 +76,23 @@ ElDialog {
Layout.minimumHeight: 80 Layout.minimumHeight: 80
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
placeholderText: qsTr('Enter an (optional) message for the receiver') placeholderText: qsTr('Enter an (optional) message for the receiver')
color: text.length > invoiceParser.lnurlData['comment_allowed'] ? constants.colorError : Material.foreground
} }
Button { Label {
Layout.columnSpan: 2 visible: invoiceParser.lnurlData['comment_allowed'] > 0
Layout.alignment: Qt.AlignHCenter text: qsTr('%1 characters remaining').arg(Math.max(0, (invoiceParser.lnurlData['comment_allowed'] - comment.text.length) ))
color: constants.mutedForeground
font.pixelSize: constants.fontSizeSmall
}
}
FlatButton {
Layout.topMargin: constants.paddingLarge
Layout.fillWidth: true
text: qsTr('Proceed') text: qsTr('Proceed')
icon.source: '../../icons/confirmed.png'
enabled: valid
onClicked: { onClicked: {
invoiceParser.lnurlGetInvoice(invoiceParser.lnurlData['min_sendable_sat'], comment.text) invoiceParser.lnurlGetInvoice(invoiceParser.lnurlData['min_sendable_sat'], comment.text)
dialog.close() dialog.close()

1
electrum/gui/qml/components/SendDialog.qml

@ -32,7 +32,6 @@ ElDialog {
function dispatch(data) { function dispatch(data) {
if (bitcoin.isRawTx(data)) { if (bitcoin.isRawTx(data)) {
// app.stack.push(Qt.resolvedUrl('TxDetails.qml'), { rawtx: text })
txFound(data) txFound(data)
} else { } else {
invoiceParser.recipient = data invoiceParser.recipient = data

Loading…
Cancel
Save