From 13753052bca90e602059370ebfca27e08c1bb8b8 Mon Sep 17 00:00:00 2001
From: Jaquee <jaquee.monero@gmail.com>
Date: Wed, 3 May 2017 15:29:23 +0200
Subject: [PATCH 1/2] UX: remove wide header

---
 main.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.qml b/main.qml
index 33b66929..7641abaa 100644
--- a/main.qml
+++ b/main.qml
@@ -500,7 +500,7 @@ ApplicationWindow {
             currentWallet.disposeTransaction(transaction);
 
         } else if (transaction.txCount == 0) {
-            informationPopup.title = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
+            informationPopup.title = qsTr("Error") + translationManager.emptyString
             informationPopup.text  = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
             informationPopup.icon = StandardIcon.Information
             informationPopup.onCloseCallback = null
@@ -613,7 +613,7 @@ ApplicationWindow {
             currentWallet.disposeTransaction(transaction);
 
         } else if (transaction.txCount == 0) {
-            informationPopup.title = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
+            informationPopup.title = qsTr("Error") + translationManager.emptyString
             informationPopup.text  = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
             informationPopup.icon = StandardIcon.Information
             informationPopup.onCloseCallback = null

From 443eb4782435fd5d126d0aec3a66e864e1ff7952 Mon Sep 17 00:00:00 2001
From: Jaquee <jaquee.monero@gmail.com>
Date: Wed, 3 May 2017 15:32:46 +0200
Subject: [PATCH 2/2] UX: move 'rescan spent' to settings and rename to 'Rescan
 wallet balance'

---
 pages/Settings.qml | 27 +++++++++++++++++++++++++--
 pages/Transfer.qml | 26 --------------------------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/pages/Settings.qml b/pages/Settings.qml
index b64d4752..038af0ae 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -82,7 +82,7 @@ Rectangle {
         }
 
         GridLayout {
-            columns: (isMobile)? 2 : 3
+            columns: (isMobile)? 2 : 4
             StandardButton {
                 id: closeWalletButton
                 text: qsTr("Close wallet") + translationManager.emptyString
@@ -123,7 +123,6 @@ Rectangle {
                 }
             }
 
-
 /*          Rescan cache - Disabled until we know it's needed
 
             StandardButton {
@@ -159,6 +158,30 @@ Rectangle {
                 }
             }
 */
+            StandardButton {
+                id: rescanSpentButton
+                text: qsTr("Rescan wallet balance") + translationManager.emptyString
+                shadowReleasedColor: "#FF4304"
+                shadowPressedColor: "#B32D00"
+                releasedColor: "#FF6C3C"
+                pressedColor: "#FF4304"
+                onClicked: {
+                    if (!currentWallet.rescanSpent()) {
+                        console.error("Error: ", currentWallet.errorString);
+                        informationPopup.title = qsTr("Error") + translationManager.emptyString;
+                        informationPopup.text  = qsTr("Error: ") + currentWallet.errorString
+                        informationPopup.icon  = StandardIcon.Critical
+                        informationPopup.onCloseCallback = null
+                        informationPopup.open();
+                    } else {
+                        informationPopup.title = qsTr("Information") + translationManager.emptyString
+                        informationPopup.text  = qsTr("Sucessfully rescanned spent outputs") + translationManager.emptyString
+                        informationPopup.icon  = StandardIcon.Information
+                        informationPopup.onCloseCallback = null
+                        informationPopup.open();
+                    }
+                }
+            }
         }
 
         //! Manage daemon
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 64f05473..7a3202ff 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -554,32 +554,6 @@ Rectangle {
                     submitTxDialog.open();
                 }
             }
-
-            StandardButton {
-                id: rescanSpentButton
-                text: qsTr("Rescan spent") + translationManager.emptyString
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
-                enabled: pageRoot.enabled
-                onClicked: {
-                    if (!currentWallet.rescanSpent()) {
-                        console.error("Error: ", currentWallet.errorString);
-                        informationPopup.title = qsTr("Error") + translationManager.emptyString;
-                        informationPopup.text  = qsTr("Error: ") + currentWallet.errorString
-                        informationPopup.icon  = StandardIcon.Critical
-                        informationPopup.onCloseCallback = null
-                        informationPopup.open();
-                    } else {
-                        informationPopup.title = qsTr("Information") + translationManager.emptyString
-                        informationPopup.text  = qsTr("Sucessfully rescanned spent outputs") + translationManager.emptyString
-                        informationPopup.icon  = StandardIcon.Information
-                        informationPopup.onCloseCallback = null
-                        informationPopup.open();
-                    }
-                }
-            }
         }