Fix Double sync (#257)

PIVX-Labs · Nov 9, 2023 · 2f18af7 · 2f18af7
1 parent d0d57c8
commit 2f18af7
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 4 deletions.
diff --git a/locale/de/translation.toml b/locale/de/translation.toml
@@ -315,3 +315,4 @@ MIGRATION_ACCOUNT_FAILURE = "Wiederherstellen deines Accounts fehlgeschlagen. Bi
 APP_INSTALLED = "Anwendung installiert!" # App Installed!
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/locale/en/translation.toml b/locale/en/translation.toml
@@ -315,3 +315,4 @@ MIGRATION_ACCOUNT_FAILURE = "Failed to recover your account. Please reimport it.
 APP_INSTALLED = "App Installed!" # App Installed!
 CONFIRM_POPUP_DELETE_ACCOUNT = "This will delete all your data, including masternodes contacts and private keys!" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "Are you sure?" # Are you sure?
+WALLET_NOT_SYNCED = "Please try again when wallet finishes syncing!" # Please try again when wallet finishes syncing!
diff --git a/locale/es-mx/translation.toml b/locale/es-mx/translation.toml
@@ -315,3 +315,4 @@ PROMO_NOT_ENOUGH = "" # You don't have enough {ticker} to create that code!
 PROMO_ALREADY_CREATED = "" # You've already created that code!
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/locale/fr/translation.toml b/locale/fr/translation.toml
@@ -315,3 +315,4 @@ PROMO_NOT_ENOUGH = "" # You don't have enough {ticker} to create that code!
 PROMO_ALREADY_CREATED = "" # You've already created that code!
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/locale/it/translation.toml b/locale/it/translation.toml
@@ -315,3 +315,4 @@ PROMO_NOT_ENOUGH = "" # You don't have enough {ticker} to create that code!
 PROMO_ALREADY_CREATED = "" # You've already created that code!
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/locale/nl/translation.toml b/locale/nl/translation.toml
@@ -315,3 +315,4 @@ MIGRATION_ACCOUNT_FAILURE = "Het herstellen van je account is mislukt. Importeer
 APP_INSTALLED = "App geïnstalleerd!" # App Installed!
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/locale/ph/translation.toml b/locale/ph/translation.toml
@@ -315,3 +315,4 @@ PROMO_NOT_ENOUGH = "" # You don't have enough {ticker} to create that code!
 PROMO_ALREADY_CREATED = "" # You've already created that code!
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/locale/pt-br/translation.toml b/locale/pt-br/translation.toml
@@ -115,3 +115,4 @@ CONFIRM_POPUP_VOTE_HTML = "Tem certeza? Demora 60 minutos para mudar o voto" # A
 FAILED_TO_IMPORT_HARDWARE = "" # <b> Failed to import Hardware Wallet</b>.
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/locale/pt-pt/translation.toml b/locale/pt-pt/translation.toml
@@ -115,3 +115,4 @@ CONFIRM_POPUP_VOTE_HTML = "Tem a certeza? Demora 60 minutos para mudar de voto"
 FAILED_TO_IMPORT_HARDWARE = "" # <b> Failed to import Hardware Wallet</b>.
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/locale/template/translation.toml b/locale/template/translation.toml
@@ -327,6 +327,7 @@ WALLET_HARDWARE_NO_ACCESS = "<b>The OS denied access</b> Please check your Opera
 WALLET_HARDWARE_CONNECTION_LOST = "<b>Lost connection to {hardwareWallet} </b><br>It seems the {hardwareWallet} was unplugged mid-operation, oops!"
 WALLET_HARDWARE_BUSY = "<b>{hardwareWallet} is waiting</b><br>Please unlock your {hardwareWallet} or finish it's current prompt"
 WALLET_HARDWARE_ERROR = "<b> {hardwareWallet} </b><br> {error}"
+WALLET_NOT_SYNCED = "Please try again when wallet finishes syncing!"
 CONFIRM_POPUP_VOTE = "Confirm Vote"
 CONFIRM_POPUP_VOTE_HTML = "Are you sure? It takes 60 minutes to change vote"
 CONFIRM_POPUP_TRANSACTION = "Confirm your transaction"

diff --git a/locale/uwu/translation.toml b/locale/uwu/translation.toml
@@ -315,3 +315,4 @@ APP_INSTALLED = "App Instawlled!" # App Installed!
 FAILED_TO_IMPORT_HARDWARE = "" # <b> Failed to import Hardware Wallet</b>.
 CONFIRM_POPUP_DELETE_ACCOUNT = "" # This will delete all your data, including masternodes contacts and private keys!
 CONFIRM_POPUP_DELETE_ACCOUNT_TITLE = "" # Are you sure?
+WALLET_NOT_SYNCED = "" # Please try again when wallet finishes syncing!
diff --git a/scripts/dashboard/Dashboard.vue b/scripts/dashboard/Dashboard.vue
@@ -172,6 +172,7 @@ async function importWallet({ type, secret, password = '' }) {
         key = await parseSecret(secret, password);
     }
     if (key) {
+        const isAlreadyLoaded = wallet.isLoaded();
         wallet.setMasterKey(key);
         isImported.value = true;
         jdenticonValue.value = wallet.getAddress();
@@ -184,10 +185,11 @@ async function importWallet({ type, secret, password = '' }) {
 
         if (needsToEncrypt.value) showEncryptModal.value = true;
         isViewOnly.value = wallet.isViewOnly();
-
-        await mempool.loadFromDisk();
-        await getNetwork().walletFullSync();
-
+        // Don't reload an already loaded wallet!
+        if (!isAlreadyLoaded) {
+            await mempool.loadFromDisk();
+            getNetwork().walletFullSync();
+        }
         getEventEmitter().emit('wallet-import');
         return true;
     }

diff --git a/scripts/settings.js b/scripts/settings.js
@@ -465,6 +465,11 @@ async function setAnalytics(level, fSilent = false) {
  * Log out from the current wallet
  */
 export async function logOut() {
+    const cNet = getNetwork();
+    if (!cNet.fullSynced && wallet.isLoaded()) {
+        createAlert('warning', `${ALERTS.WALLET_NOT_SYNCED}`, 3000);
+        return;
+    }
     const fContinue = await confirmPopup({
         title: `${ALERTS.CONFIRM_POPUP_DELETE_ACCOUNT_TITLE}`,
         html: `
@@ -492,6 +497,12 @@ export async function logOut() {
  * Toggle between Mainnet and Testnet
  */
 export async function toggleTestnet() {
+    const cNet = getNetwork();
+    if (!cNet.fullSynced && wallet.isLoaded()) {
+        createAlert('warning', `${ALERTS.WALLET_NOT_SYNCED}`, 3000);
+        doms.domTestnetToggler.checked = cChainParams.current.isTestnet;
+        return;
+    }
     const cNextNetwork = cChainParams.current.isTestnet
         ? cChainParams.main
         : cChainParams.testnet;