PasswordDialog: hide balance when passwordDialog is open ✨

monero-project · Dec 13, 2018 · 4322d43 · 4322d43
1 parent 59fc48b
commit 4322d43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
@@ -44,6 +44,7 @@ Item {
     property alias password: passwordInput.text
     property string walletName
     property string errorText
+    property bool tempHideBalanceFlag
 
     // same signals as Dialog has
     signal accepted()
@@ -61,6 +62,9 @@ Item {
         root.visible = true;
         passwordInput.forceActiveFocus();
         passwordInput.text = ""
+        tempHideBalanceFlag = persistentSettings.hideBalance;
+        persistentSettings.hideBalance = true;
+        appWindow.updateBalance()
     }
 
     function showError(errorText) {
@@ -73,6 +77,8 @@ Item {
         middlePanel.enabled = true
         titleBar.enabled = true
         root.visible = false;
+        persistentSettings.hideBalance = tempHideBalanceFlag;
+        appWindow.updateBalance()
         closeCallback();
     }
 

diff --git a/main.qml b/main.qml
@@ -353,12 +353,9 @@ ApplicationWindow {
     }
 
     function updateBalance() {
-        if (!currentWallet)
-            return;
-
         var balance_unlocked = qsTr("HIDDEN");
         var balance = qsTr("HIDDEN");
-        if(!persistentSettings.hideBalance){
+        if(!persistentSettings.hideBalance && currentWallet){
             balance_unlocked = walletManager.displayAmount(currentWallet.unlockedBalance(currentWallet.currentSubaddressAccount));
             balance = walletManager.displayAmount(currentWallet.balance(currentWallet.currentSubaddressAccount));
         }