Merge pull request #1793

85cd428 Merchant page (xmrdsc)

1 files changed, 23 insertions, 0 deletions

diff --git a/main.qml b/main.qml
index d23cb5e5..4cde64e3 100644
--- a/main.qml
+++ b/main.qml
@@ -86,6 +86,11 @@ ApplicationWindow {
     // true if wallet ever synchronized
     property bool walletInitialized : false
 
+    // Current selected address / subaddress (Receive page)
+    property var current_address
+    property var current_address_label: "Primary"
+    property int current_subaddress_table_index: 0
+
     function altKeyReleased() { ctrlPressed = false; }
 
     function showPageRequest(page) {
@@ -1371,6 +1376,15 @@ ApplicationWindow {
                 updateBalance();
             }
 
+            onMerchantClicked: {
+                middlePanel.state = "Merchant";
+                middlePanel.flickable.contentY = 0;
+                if(isMobile) {
+                    hideMenu();
+                }
+                updateBalance();
+            }
+
             onTxkeyClicked: {
                 middlePanel.state = "TxKey";
                 middlePanel.flickable.contentY = 0;
@@ -1825,6 +1839,15 @@ ApplicationWindow {
         onTriggered: checkUpdates()
     }
 
+    function titlebarToggleOrange(flag){
+        // toggle titlebar orange style
+        if(flag !== undefined){
+            titleBar.orange = flag;
+        } else {
+            titleBar.orange = !titleBar.orange;
+        }
+    }
+
     function releaseFocus() {
         // Workaround to release focus from textfield when scrolling (https://bugreports.qt.io/browse/QTBUG-34867)
         if(isAndroid) {