wownero
/
wow-app
Archived
4
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #2604

Browse Source 
50cb726 do not ask to start daemon if in remote node mode (tobtoht)
pull/2/head
luigi1111 5 years ago
parent 66f5b7310f 50cb72656a
commit bd3b26c33d
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
main.qml
Unescape View File

@ -466,7 +466,7 @@ ApplicationWindow {
// update local daemon status.
const isDisconnected = status === Wallet.ConnectionStatus_Disconnected;
if (walletManager.isDaemonLocal(currentDaemonAddress)) {
if (!persistentSettings.useRemoteNode) {
daemonRunning = !isDisconnected;
} else {
daemonRunning = false;
@ -476,7 +476,7 @@ ApplicationWindow {
middlePanel.transferView.updatePriorityDropdown();
// If wallet isnt connected, advanced wallet mode and no daemon is running - Ask
if (appWindow.walletMode >= 2 && walletManager.isDaemonLocal(currentDaemonAddress) && !walletInitialized && isDisconnected) {
if (appWindow.walletMode >= 2 && !persistentSettings.useRemoteNode && !walletInitialized && isDisconnected) {
daemonManager.runningAsync(persistentSettings.nettype, function(running) {
if (!running) {
daemonManagerDialog.open();

10
pages/Mining.qml
Unescape View File

@ -57,13 +57,13 @@ Rectangle {
MoneroComponents.WarningBox {
Layout.bottomMargin: 8
text: qsTr("Mining is only available on local daemons.") + translationManager.emptyString
visible: !walletManager.isDaemonLocal(appWindow.currentDaemonAddress)
visible: persistentSettings.useRemoteNode
}
MoneroComponents.WarningBox {
Layout.bottomMargin: 8
text: qsTr("Your daemon must be synchronized before you can start mining") + translationManager.emptyString
visible: walletManager.isDaemonLocal(appWindow.currentDaemonAddress) && !appWindow.daemonSynced
visible: !persistentSettings.useRemoteNode && !appWindow.daemonSynced
}
MoneroComponents.TextPlain {
@ -199,7 +199,7 @@ Rectangle {
} else {
errorPopup.title = qsTr("Error starting mining") + translationManager.emptyString;
errorPopup.text = qsTr("Couldn't start mining.<br>") + translationManager.emptyString
if (!walletManager.isDaemonLocal(appWindow.currentDaemonAddress))
if (persistentSettings.useRemoteNode)
errorPopup.text += qsTr("Mining is only available on local daemons. Run a local daemon to be able to mine.<br>") + translationManager.emptyString
errorPopup.icon = StandardIcon.Critical
errorPopup.open()
@ -259,7 +259,7 @@ Rectangle {
}
function onMiningStatus(isMining) {
var daemonReady = walletManager.isDaemonLocal(appWindow.currentDaemonAddress) && appWindow.daemonSynced
var daemonReady = !persistentSettings.useRemoteNode && appWindow.daemonSynced
appWindow.isMining = isMining;
updateStatusText()
startSoloMinerButton.enabled = !appWindow.isMining && daemonReady
@ -284,7 +284,7 @@ Rectangle {
function onPageCompleted() {
console.log("Mining page loaded");
update()
timer.running = walletManager.isDaemonLocal(appWindow.currentDaemonAddress)
timer.running = !persistentSettings.useRemoteNode
}
function onPageClosed() {

4
pages/Transfer.qml
Unescape View File

@ -558,7 +558,7 @@ Rectangle {
id: importKeyImagesButton
text: qsTr("Import key images") + translationManager.emptyString
small: true
visible: appWindow.viewOnly && walletManager.isDaemonLocal(appWindow.currentDaemonAddress)
visible: appWindow.viewOnly && !persistentSettings.useRemoteNode
enabled: pageRoot.enabled
onClicked: {
console.log("Transfer: import key images clicked")
@ -710,7 +710,7 @@ Rectangle {
function updateStatus() {
var messageNotConnected = qsTr("Wallet is not connected to daemon.");
if(appWindow.walletMode >= 2) messageNotConnected += root.startLinkText;
if(appWindow.walletMode >= 2 && !persistentSettings.useRemoteNode) messageNotConnected += root.startLinkText;
pageRoot.enabled = true;
if(typeof currentWallet === "undefined") {
root.warningContent = messageNotConnected;