Merge pull request #4051

1215a6e Assume untrusted daemon in simple mode (j-berman) 499c2a4 qsTr scan tx error (j-berman) 3b0e66a Display clear error when user scans older tx via untrusted daemon (j-berman) 4cd6652 Update balance after calling scan_tx (j-berman)
monero-project · Sep 30, 2023 · 588b843 · 588b843
2 parents 8983cae + 1215a6e
commit 588b843
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/main.qml b/main.qml
@@ -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) {

diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml
@@ -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;