Merge pull request #2747

6940390 Wallet: implement 'Connecting' status, add 'disconnected' property (xiphon)
2020-01-30 16:32:56 -05:00
parent 21e8c7ca17 6940390a5e
commit 35b7a5f6bb
7 changed files with 73 additions and 48 deletions
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -717,6 +717,7 @@ Rectangle {
        //pageRoot.enabled = false;

        switch (currentWallet.connected()) {
+        case Wallet.ConnectionStatus_Connecting:
        case Wallet.ConnectionStatus_Disconnected:
            root.warningContent = messageNotConnected;
            break
--- a/pages/merchant/Merchant.qml
+++ b/pages/merchant/Merchant.qml
@@ -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