From 5ebe3f50921f5b7516640c99b4c18df713839103 Mon Sep 17 00:00:00 2001
From: thotbot <thotbot@protonmail.com>
Date: Mon, 13 Apr 2020 23:15:14 +0200
Subject: [PATCH] Settings: move Merchant menu entry

---
 LeftPanel.qml                     | 26 --------------------------
 fonts/FontAwesome/FontAwesome.qml |  1 +
 main.qml                          |  6 ------
 pages/settings/SettingsWallet.qml | 14 +++++++++++++-
 4 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/LeftPanel.qml b/LeftPanel.qml
index 74ca6feb..21f1e0a2 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -64,7 +64,6 @@ Rectangle {
     signal addressBookClicked()
     signal miningClicked()
     signal signClicked()
-    signal merchantClicked()
     signal accountClicked()
 
     function selectItem(pos) {
@@ -72,7 +71,6 @@ Rectangle {
         if(pos === "History") menuColumn.previousButton = historyButton
         else if(pos === "Transfer") menuColumn.previousButton = transferButton
         else if(pos === "Receive")  menuColumn.previousButton = receiveButton
-        else if(pos === "Merchant")  menuColumn.previousButton = merchantButton
         else if(pos === "AddressBook") menuColumn.previousButton = addressBookButton
         else if(pos === "Mining") menuColumn.previousButton = miningButton
         else if(pos === "TxKey")  menuColumn.previousButton = txkeyButton
@@ -454,30 +452,6 @@ Rectangle {
                 anchors.leftMargin: 20
             }
 
-            // ------------- Merchant tab ---------------
-
-            MoneroComponents.MenuButton {
-                id: merchantButton
-                visible: appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                text: qsTr("Merchant") + translationManager.emptyString
-                symbol: qsTr("U") + translationManager.emptyString
-                under: receiveButton
-                onClicked: {
-                    parent.previousButton.checked = false
-                    parent.previousButton = merchantButton
-                    panel.merchantClicked()
-                }
-            }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: merchantButton.present && appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 20
-            }
-
             // ------------- History tab ---------------
 
             MoneroComponents.MenuButton {
diff --git a/fonts/FontAwesome/FontAwesome.qml b/fonts/FontAwesome/FontAwesome.qml
index 2362ff5d..aad426ca 100644
--- a/fonts/FontAwesome/FontAwesome.qml
+++ b/fonts/FontAwesome/FontAwesome.qml
@@ -149,6 +149,7 @@ Object {
     property string caretUp : "\uf0d8"
     property string cartArrowDown : "\uf218"
     property string cartPlus : "\uf217"
+    property string cashRegister: "\uf788"
     property string cc : "\uf20a"
     property string ccAmex : "\uf1f3"
     property string ccDinersClub : "\uf24c"
diff --git a/main.qml b/main.qml
index 5c171400..694aee27 100644
--- a/main.qml
+++ b/main.qml
@@ -1619,12 +1619,6 @@ ApplicationWindow {
                     updateBalance();
                 }
 
-                onMerchantClicked: {
-                    middlePanel.state = "Merchant";
-                    middlePanel.flickable.contentY = 0;
-                    updateBalance();
-                }
-
                 onTxkeyClicked: {
                     middlePanel.state = "TxKey";
                     middlePanel.flickable.contentY = 0;
diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml
index da9b5e60..29a99f23 100644
--- a/pages/settings/SettingsWallet.qml
+++ b/pages/settings/SettingsWallet.qml
@@ -116,7 +116,6 @@ Rectangle {
 
         MoneroComponents.SettingsListItem {
             iconText: FontAwesome.ellipsisH
-            isLast: true
             description: qsTr("Change the password of your wallet.") + translationManager.emptyString
             title: qsTr("Change wallet password") + translationManager.emptyString
 
@@ -137,6 +136,19 @@ Rectangle {
                 passwordDialog.open()
             }
         }
+
+        MoneroComponents.SettingsListItem {
+            iconText: FontAwesome.cashRegister
+            isLast: true
+            description: qsTr("Receive Monero for your business, easily.") + translationManager.emptyString
+            title: qsTr("Enter merchant mode") + translationManager.emptyString
+
+            onClicked: {
+                middlePanel.state = "Merchant";
+                middlePanel.flickable.contentY = 0;
+                updateBalance();
+            }
+        }
     }
 
     Component.onCompleted: {