Merge pull request #1829

bd82898 PasswordDialog: hide balance when passwordDialog is open (xiphon)

2 files changed, 6 insertions, 1 deletions

diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index d0f442e4..01d91fec 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -61,6 +61,8 @@ Item {
         root.visible = true;
         passwordInput.forceActiveFocus();
         passwordInput.text = ""
+        appWindow.hideBalanceForced = true;
+        appWindow.updateBalance();
     }
 
     function showError(errorText) {
@@ -73,6 +75,8 @@ Item {
         middlePanel.enabled = true
         titleBar.enabled = true
         root.visible = false;
+        appWindow.hideBalanceForced = false;
+        appWindow.updateBalance();
         closeCallback();
     }
 
diff --git a/main.qml b/main.qml
index 168473f9..d3ada51d 100644
--- a/main.qml
+++ b/main.qml
@@ -48,6 +48,7 @@ ApplicationWindow {
     title: "Monero"
 
     property var currentItem
+    property bool hideBalanceForced: false
     property bool whatIsEnable: false
     property bool ctrlPressed: false
     property bool rightPanelExpanded: false
@@ -358,7 +359,7 @@ ApplicationWindow {
 
         var balance_unlocked = qsTr("HIDDEN");
         var balance = qsTr("HIDDEN");
-        if(!persistentSettings.hideBalance){
+        if(!hideBalanceForced && !persistentSettings.hideBalance){
             balance_unlocked = walletManager.displayAmount(currentWallet.unlockedBalance(currentWallet.currentSubaddressAccount));
             balance = walletManager.displayAmount(currentWallet.balance(currentWallet.currentSubaddressAccount));
         }