From cd4418dc458c0d6c01fd0fd75feab2721fdbac50 Mon Sep 17 00:00:00 2001 From: stoffu Date: Sat, 7 Apr 2018 14:09:28 +0900 Subject: [PATCH 1/2] Receive: make tracking optional --- pages/Receive.qml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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() { From a9331a757fd779580ff96764e301a9a5963094bf Mon Sep 17 00:00:00 2001 From: stoffu Date: Sat, 7 Apr 2018 14:10:31 +0900 Subject: [PATCH 2/2] Set daemon address to WalletManager (requires #3576) --- main.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main.qml b/main.qml index b481985c..9e41ecbb 100644 --- a/main.qml +++ b/main.qml @@ -419,7 +419,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; } @@ -428,6 +430,7 @@ ApplicationWindow { persistentSettings.useRemoteNode = false; currentDaemonAddress = localDaemonAddress currentWallet.initAsync(currentDaemonAddress); + walletManager.setDaemonAddress(currentDaemonAddress); remoteNodeConnected = false; }