Skip to content

Commit

Permalink
hide balance in receive tab
Browse files Browse the repository at this point in the history
  • Loading branch information
User committed Dec 11, 2017
1 parent 7e80164 commit 0896b14
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
34 changes: 21 additions & 13 deletions main.qml
Expand Up @@ -67,6 +67,7 @@ ApplicationWindow {
property bool qrScannerEnabled: (typeof builtWithScanner != "undefined") && builtWithScanner
property int blocksToSync: 1
property var isMobile: (appWindow.width > 700 && !isAndroid) ? false : true
property var isBalanceVisible : false
property var cameraUi
property bool remoteNodeConnected: false
property bool androidCloseTapped: false;
Expand Down Expand Up @@ -144,6 +145,9 @@ ApplicationWindow {
else if(middlePanel.state === "Transfer") middlePanel.state = "Settings"
}

isBalanceVisible = middlePanel.state === "Receive";
updateBalance();

leftPanel.selectItem(middlePanel.state)
}

Expand Down Expand Up @@ -307,6 +311,11 @@ ApplicationWindow {
return path.replace(/.*[\/\\]/, '').replace(/\.keys$/, '')
}

function updateBalance() {
middlePanel.unlockedBalanceText = leftPanel.unlockedBalanceText = isBalanceVisible ? "HIDDEN" : walletManager.displayAmount(currentWallet.unlockedBalance);
middlePanel.balanceText = leftPanel.balanceText = isBalanceVisible ? "HIDDEN" : walletManager.displayAmount(currentWallet.balance);
}

function onWalletConnectionStatusChanged(status){
console.log("Wallet connection status changed " + status)
middlePanel.updateStatus();
Expand Down Expand Up @@ -365,8 +374,7 @@ ApplicationWindow {

function onWalletUpdate() {
console.log(">>> wallet updated")
middlePanel.unlockedBalanceText = leftPanel.unlockedBalanceText = walletManager.displayAmount(currentWallet.unlockedBalance);
middlePanel.balanceText = leftPanel.balanceText = walletManager.displayAmount(currentWallet.balance);
updateBalance();
// Update history if new block found since last update
if(foundNewBlock) {
foundNewBlock = false;
Expand Down Expand Up @@ -1144,7 +1152,7 @@ ApplicationWindow {
onRejectedCallback();
}
}

PasswordDialog {
id: settingsPasswordDialog
z: parent.z + 1
Expand Down Expand Up @@ -1249,16 +1257,16 @@ ApplicationWindow {
anchors.top: mobileHeader.bottom
anchors.left: parent.left
anchors.bottom: parent.bottom
onDashboardClicked: {middlePanel.state = "Dashboard"; if(isMobile) hideMenu()}
onTransferClicked: {middlePanel.state = "Transfer"; if(isMobile) hideMenu()}
onReceiveClicked: {middlePanel.state = "Receive"; if(isMobile) hideMenu()}
onTxkeyClicked: {middlePanel.state = "TxKey"; if(isMobile) hideMenu()}
onHistoryClicked: {middlePanel.state = "History"; if(isMobile) hideMenu()}
onAddressBookClicked: {middlePanel.state = "AddressBook"; if(isMobile) hideMenu()}
onMiningClicked: {middlePanel.state = "Mining"; if(isMobile) hideMenu()}
onSignClicked: {middlePanel.state = "Sign"; if(isMobile) hideMenu()}
onSettingsClicked: {middlePanel.state = "Settings"; if(isMobile) hideMenu()}
onKeysClicked: {settingsPasswordDialog.open(); if(isMobile) hideMenu()}
onDashboardClicked: { middlePanel.state = "Dashboard"; if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
onTransferClicked: { middlePanel.state = "Transfer"; if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
onReceiveClicked: { middlePanel.state = "Receive"; if(isMobile) hideMenu(); isBalanceVisible = true; updateBalance(); }
onTxkeyClicked: { middlePanel.state = "TxKey"; if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
onHistoryClicked: { middlePanel.state = "History"; if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
onAddressBookClicked: { middlePanel.state = "AddressBook"; if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
onMiningClicked: { middlePanel.state = "Mining"; if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
onSignClicked: { middlePanel.state = "Sign"; if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
onSettingsClicked: { middlePanel.state = "Settings"; if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
onKeysClicked: { settingsPasswordDialog.open(); if(isMobile) hideMenu(); isBalanceVisible = false; updateBalance(); }
}

RightPanel {
Expand Down

0 comments on commit 0896b14

Please sign in to comment.