Merge pull request #2423

5df14ab Merchant: fix leaving the page (xiphon)

2 files changed, 1 insertions, 6 deletions

diff --git a/main.qml b/main.qml
index cf6ec446..d682d8a9 100644
--- a/main.qml
+++ b/main.qml
@@ -1569,14 +1569,12 @@ ApplicationWindow {
         states: [
             State {
                 name: "wizard"
-                PropertyChanges { target: leftPanel; visible: false }
                 PropertyChanges { target: middlePanel; visible: false }
                 PropertyChanges { target: wizard; visible: true }
                 PropertyChanges { target: resizeArea; visible: true }
                 PropertyChanges { target: titleBar; state: "essentials" }
             }, State {
                 name: "normal"
-                PropertyChanges { target: leftPanel; visible: true }
                 PropertyChanges { target: middlePanel; visible: true }
                 PropertyChanges { target: wizard; visible: false }
                 PropertyChanges { target: resizeArea; visible: true }
@@ -1589,6 +1587,7 @@ ApplicationWindow {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.bottom: parent.bottom
+            visible: rootItem.state == "normal" && middlePanel.state != "Merchant"
 
             onTransferClicked: {
                 middlePanel.state = "Transfer";
diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml
index 2ddc5255..93b78148 100644
--- a/pages/merchant/Merchant.qml
+++ b/pages/merchant/Merchant.qml
@@ -33,8 +33,6 @@ Item {
     property var    hiddenAmounts: []
 
     function onPageCompleted() {
-        appWindow.hideMenu();
-
         // prepare tracking
         trackingCheckbox.checked = root.enableTracking
         root.update();
@@ -56,8 +54,6 @@ Item {
         timer.running = false
         root.enableTracking = false
         trackingModel.clear()
-
-        appWindow.showMenu();
     }
 
     Image {