Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SettingsWallet: Update scan transaction for changes to behavior in monero repo PR 8566 #4051

Merged
merged 4 commits into from
Sep 30, 2023
Merged

SettingsWallet: Update scan transaction for changes to behavior in monero repo PR 8566 #4051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4cd6652
Update balance after calling scan_tx
j-berman Oct 20, 2022
3b0e66a
Display clear error when user scans older tx via untrusted daemon
j-berman Oct 28, 2022
499c2a4
qsTr scan tx error
j-berman Oct 29, 2022
1215a6e
Assume untrusted daemon in simple mode
j-berman Oct 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ ApplicationWindow {
}

function isTrustedDaemon() {
return !persistentSettings.useRemoteNode || remoteNodesModel.currentRemoteNode().trusted;
return appWindow.walletMode >= 2 && (!persistentSettings.useRemoteNode || remoteNodesModel.currentRemoteNode().trusted);
}

function usefulName(path) {
Expand Down
12 changes: 11 additions & 1 deletion pages/settings/SettingsWallet.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,19 @@ Rectangle {
inputDialog.onAcceptedCallback = function() {
var txid = inputDialog.inputText.trim();
if (currentWallet.scanTransactions([txid])) {
updateBalance();
appWindow.showStatusMessage(qsTr("Transaction successfully scanned"), 3);
} else {
appWindow.showStatusMessage(qsTr("Failed to scan transaction") + ": " + currentWallet.errorString, 5);
console.error("Error: ", currentWallet.errorString);
if (currentWallet.errorString == "The wallet has already seen 1 or more recent transactions than the scanned tx") {
informationPopup.title = qsTr("Error") + translationManager.emptyString;
informationPopup.text = qsTr("The wallet has already seen 1 or more recent transactions than the scanned transaction.\n\nIn order to rescan the transaction, you can re-sync your wallet by resetting the wallet restore height in the Settings > Info page. Make sure to use a restore height from before your wallet's earliest transaction.") + translationManager.emptyString;
informationPopup.icon = StandardIcon.Critical
informationPopup.onCloseCallback = null
informationPopup.open();
} else {
appWindow.showStatusMessage(qsTr("Failed to scan transaction") + ": " + currentWallet.errorString, 5);
}
}
}
inputDialog.onRejectedCallback = null;
Expand Down