From de83a10c20371c1f55dbc9c2e13dcb20f44caacc Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Tue, 4 Oct 2022 16:33:22 +0200
Subject: [PATCH] qml: restore Save button in InvoiceDialog, restore invoice
 list view, now from menu

---
 electrum/gui/qml/components/InvoiceDialog.qml | 25 +++++++++----------
 .../gui/qml/components/WalletMainView.qml     | 14 +++++++++++
 electrum/gui/qml/components/main.qml          |  4 +++
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/electrum/gui/qml/components/InvoiceDialog.qml b/electrum/gui/qml/components/InvoiceDialog.qml
index 518e867bd..988b1e7ac 100644
--- a/electrum/gui/qml/components/InvoiceDialog.qml
+++ b/electrum/gui/qml/components/InvoiceDialog.qml
@@ -30,13 +30,6 @@ ElDialog {
         height: parent.height
         columns: 2
 
-        Rectangle {
-            height: 1
-            Layout.fillWidth: true
-            Layout.columnSpan: 2
-            color: Material.accentColor
-        }
-
         Label {
             text: qsTr('Amount to send')
             color: Material.accentColor
@@ -290,7 +283,7 @@ ElDialog {
             Layout.alignment: Qt.AlignHCenter
             spacing: constants.paddingMedium
 
-            Button {
+            FlatButton {
                 text: qsTr('Delete')
                 icon.source: '../../icons/delete.png'
                 visible: invoice_key != ''
@@ -300,6 +293,17 @@ ElDialog {
                 }
             }
 
+            FlatButton {
+                text: qsTr('Save')
+                icon.source: '../../icons/save.png'
+                visible: invoice_key == ''
+                enabled: invoice.canSave
+                onClicked: {
+                    invoice.save_invoice()
+                    dialog.close()
+                }
+            }
+
             FlatButton {
                 text: qsTr('Pay')
                 icon.source: '../../icons/confirmed.png'
@@ -309,11 +313,6 @@ ElDialog {
                         invoice.save_invoice()
                     dialog.close()
                     doPay() // only signal here
-                    // if (invoice.invoiceType == Invoice.OnchainInvoice) {
-                    //     doPay() // only signal here
-                    // } else if (invoice.invoiceType == Invoice.LightningInvoice) {
-                    //     doPay() // only signal here
-                    // }
                 }
             }
         }
diff --git a/electrum/gui/qml/components/WalletMainView.qml b/electrum/gui/qml/components/WalletMainView.qml
index 9680ae19d..9f2f59ff3 100644
--- a/electrum/gui/qml/components/WalletMainView.qml
+++ b/electrum/gui/qml/components/WalletMainView.qml
@@ -12,8 +12,22 @@ Item {
 
     property string title: Daemon.currentWallet ? Daemon.currentWallet.name : ''
 
+    function openInvoice(key) {
+        var dialog = invoiceDialog.createObject(app, { invoice: invoiceParser, invoice_key: key })
+        dialog.open()
+        return dialog
+    }
+
     property QtObject menu: Menu {
         id: menu
+        MenuItem {
+            icon.color: 'transparent'
+            action: Action {
+                text: qsTr('Invoices');
+                onTriggered: menu.openPage(Qt.resolvedUrl('Invoices.qml'))
+                icon.source: '../../icons/tab_receive.png'
+            }
+        }
         MenuItem {
             icon.color: 'transparent'
             action: Action {
diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml
index 0d3cf58cd..6a914bc1d 100644
--- a/electrum/gui/qml/components/main.qml
+++ b/electrum/gui/qml/components/main.qml
@@ -118,6 +118,10 @@ ApplicationWindow
         anchors.fill: parent
 
         initialItem: Qt.resolvedUrl('WalletMainView.qml')
+
+        function getRoot() {
+            return mainStackView.get(0)
+        }
     }
 
     Timer {