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

electrum/gui/qml/components/LnurlPayRequestDialog.qml

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

electrum/gui/qml/components/SendDialog.qml

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