Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-12 19:27:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2747

Browse Source 
6940390 Wallet: implement 'Connecting' status, add 'disconnected' property (xiphon)
This commit is contained in:
luigi1111
2020-01-30 16:32:56 -05:00
parent 21e8c7ca17 6940390a5e
commit 35b7a5f6bb
7 changed files with 73 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pages/Transfer.qml
View File

@@ -717,6 +717,7 @@ Rectangle {
//pageRoot.enabled = false;
switch (currentWallet.connected()) {
case Wallet.ConnectionStatus_Connecting:
case Wallet.ConnectionStatus_Disconnected:
root.warningContent = messageNotConnected;
break

2
pages/merchant/Merchant.qml
View File

@@ -585,7 +585,7 @@ Item {
return
}
if (appWindow.currentWallet.connected() == Wallet.ConnectionStatus_Disconnected) {
if (appWindow.disconnected) {
root.trackingError = qsTr("WARNING: no connection to daemon");
trackingModel.clear();
return