monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-03-22 23:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1001

Browse source 
c8dd663 hide balance in receive tab
This commit is contained in:
luigi1111 2017-12-17 12:35:13 -06:00
commit 1d71429b74
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
main.qml
View file

@ -144,6 +144,8 @@ ApplicationWindow {
else if(middlePanel.state === "Transfer") middlePanel.state = "Settings" else if(middlePanel.state === "Transfer") middlePanel.state = "Settings"
} }
if (middlePanel.state !== "Advanced") updateBalance();
leftPanel.selectItem(middlePanel.state) leftPanel.selectItem(middlePanel.state)
} }
@ -307,6 +309,11 @@ ApplicationWindow {
return path.replace(/.*[\/\\]/, '').replace(/\.keys$/, '') return path.replace(/.*[\/\\]/, '').replace(/\.keys$/, '')
} }
function updateBalance() {
middlePanel.unlockedBalanceText = leftPanel.unlockedBalanceText = middlePanel.state === "Receive" ? qsTr("HIDDEN") : walletManager.displayAmount(currentWallet.unlockedBalance);
middlePanel.balanceText = leftPanel.balanceText = middlePanel.state === "Receive" ? qsTr("HIDDEN") : walletManager.displayAmount(currentWallet.balance);
}
function onWalletConnectionStatusChanged(status){ function onWalletConnectionStatusChanged(status){
console.log("Wallet connection status changed " + status) console.log("Wallet connection status changed " + status)
middlePanel.updateStatus(); middlePanel.updateStatus();
@ -365,8 +372,7 @@ ApplicationWindow {
function onWalletUpdate() { function onWalletUpdate() {
console.log(">>> wallet updated") console.log(">>> wallet updated")
middlePanel.unlockedBalanceText = leftPanel.unlockedBalanceText = walletManager.displayAmount(currentWallet.unlockedBalance); updateBalance();
middlePanel.balanceText = leftPanel.balanceText = walletManager.displayAmount(currentWallet.balance);
// Update history if new block found since last update // Update history if new block found since last update
if(foundNewBlock) { if(foundNewBlock) {
foundNewBlock = false; foundNewBlock = false;
@ -1158,7 +1164,7 @@ ApplicationWindow {
onRejectedCallback(); onRejectedCallback();
} }
} }
PasswordDialog { PasswordDialog {
id: settingsPasswordDialog id: settingsPasswordDialog
z: parent.z + 1 z: parent.z + 1
@ -1263,16 +1269,16 @@ ApplicationWindow {
anchors.top: mobileHeader.bottom anchors.top: mobileHeader.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
onDashboardClicked: {middlePanel.state = "Dashboard"; if(isMobile) hideMenu()} onDashboardClicked: { middlePanel.state = "Dashboard"; if(isMobile) hideMenu(); updateBalance(); }
onTransferClicked: {middlePanel.state = "Transfer"; if(isMobile) hideMenu()} onTransferClicked: { middlePanel.state = "Transfer"; if(isMobile) hideMenu(); updateBalance(); }
onReceiveClicked: {middlePanel.state = "Receive"; if(isMobile) hideMenu()} onReceiveClicked: { middlePanel.state = "Receive"; if(isMobile) hideMenu(); updateBalance(); }
onTxkeyClicked: {middlePanel.state = "TxKey"; if(isMobile) hideMenu()} onTxkeyClicked: { middlePanel.state = "TxKey"; if(isMobile) hideMenu(); updateBalance(); }
onHistoryClicked: {middlePanel.state = "History"; if(isMobile) hideMenu()} onHistoryClicked: { middlePanel.state = "History"; if(isMobile) hideMenu(); updateBalance(); }
onAddressBookClicked: {middlePanel.state = "AddressBook"; if(isMobile) hideMenu()} onAddressBookClicked: { middlePanel.state = "AddressBook"; if(isMobile) hideMenu(); updateBalance(); }
onMiningClicked: {middlePanel.state = "Mining"; if(isMobile) hideMenu()} onMiningClicked: { middlePanel.state = "Mining"; if(isMobile) hideMenu(); updateBalance(); }
onSignClicked: {middlePanel.state = "Sign"; if(isMobile) hideMenu()} onSignClicked: { middlePanel.state = "Sign"; if(isMobile) hideMenu(); updateBalance(); }
onSettingsClicked: {middlePanel.state = "Settings"; if(isMobile) hideMenu()} onSettingsClicked: { middlePanel.state = "Settings"; if(isMobile) hideMenu(); updateBalance(); }
onKeysClicked: {settingsPasswordDialog.open(); if(isMobile) hideMenu()} onKeysClicked: { settingsPasswordDialog.open(); if(isMobile) hideMenu(); updateBalance(); }
} }
RightPanel { RightPanel {