mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 03:59:38 +00:00
Merge pull request #1829
bd82898
PasswordDialog: hide balance when passwordDialog is open (xiphon)
This commit is contained in:
commit
83f8508f56
2 changed files with 6 additions and 1 deletions
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
3
main.qml
3
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));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue