Merge pull request #1286

cd4418d Receive: make tracking optional
a9331a7 Set daemon address to WalletManager (requires #3576)

2 files changed, 12 insertions, 2 deletions

diff --git a/main.qml b/main.qml
index c48ddcb3..d3a56796 100644
--- a/main.qml
+++ b/main.qml
@@ -420,7 +420,9 @@ ApplicationWindow {
     function connectRemoteNode() {
         console.log("connecting remote node");
         persistentSettings.useRemoteNode = true;
-        currentWallet.initAsync(persistentSettings.remoteNodeAddress);
+        currentDaemonAddress = persistentSettings.remoteNodeAddress;
+        currentWallet.initAsync(currentDaemonAddress);
+        walletManager.setDaemonAddress(currentDaemonAddress);
         remoteNodeConnected = true;
     }
 
@@ -429,6 +431,7 @@ ApplicationWindow {
         persistentSettings.useRemoteNode = false;
         currentDaemonAddress = localDaemonAddress
         currentWallet.initAsync(currentDaemonAddress);
+        walletManager.setDaemonAddress(currentDaemonAddress);
         remoteNodeConnected = false;
     }
 
diff --git a/pages/Receive.qml b/pages/Receive.qml
index e5f8df19..a67e2124 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -72,7 +72,7 @@ Rectangle {
     }
 
     function update() {
-        if (!appWindow.currentWallet) {
+        if (!appWindow.currentWallet || !trackingEnabled.checked) {
             setTrackingLineText("-")
             return
         }
@@ -325,6 +325,11 @@ Rectangle {
                 }
             }
 
+            CheckBox {
+                id: trackingEnabled
+                text: qsTr("Enable") + translationManager.emptyString
+            }
+
             TextEdit {
                 id: trackingLine
                 readOnly: true
@@ -407,6 +412,8 @@ Rectangle {
 
         update()
         timer.running = true
+
+        trackingEnabled.checked = false
     }
 
     function onPageClosed() {