Merge pull request #2230

484d403 NetworkStatusItem: correctly display remote node status (selsta)

2 files changed, 1 insertions, 4 deletions

diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml
index 7533be81..77ef4afa 100644
--- a/components/NetworkStatusItem.qml
+++ b/components/NetworkStatusItem.qml
@@ -41,7 +41,7 @@ Rectangle {
         if (status == Wallet.ConnectionStatus_Connected) {
             if(!appWindow.daemonSynced)
                 return qsTr("Synchronizing")
-            if(appWindow.remoteNodeConnected)
+            if(persistentSettings.useRemoteNode)
                 return qsTr("Remote node")
             return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected")
         }
diff --git a/main.qml b/main.qml
index f0e37f36..9d514699 100644
--- a/main.qml
+++ b/main.qml
@@ -76,7 +76,6 @@ ApplicationWindow {
     property bool isMining: false
     property int walletMode: persistentSettings.walletMode
     property var cameraUi
-    property bool remoteNodeConnected: false
     property bool androidCloseTapped: false;
     property int userLastActive;  // epoch
     // Default daemon addresses
@@ -607,7 +606,6 @@ ApplicationWindow {
         currentDaemonAddress = persistentSettings.remoteNodeAddress;
         currentWallet.initAsync(currentDaemonAddress);
         walletManager.setDaemonAddressAsync(currentDaemonAddress);
-        remoteNodeConnected = true;
     }
 
     function disconnectRemoteNode() {
@@ -619,7 +617,6 @@ ApplicationWindow {
         currentDaemonAddress = localDaemonAddress
         currentWallet.initAsync(currentDaemonAddress);
         walletManager.setDaemonAddressAsync(currentDaemonAddress);
-        remoteNodeConnected = false;
     }
 
     function onHeightRefreshed(bcHeight, dCurrentBlock, dTargetBlock) {