Make alert only show on the current wallet being synced (#583)

Author: Duddino

scripts/composables/use_wallet.js

@@ -66,11 +66,12 @@ function addWallet(wallet) {
     const currency = ref('USD');
     const price = ref(0.0);
     const sync = async () => {
-        await wallet.sync();
+        const result = await wallet.sync();
         balance.value = wallet.balance;
         shieldBalance.value = await wallet.getShieldBalance();
         pendingShieldBalance.value = await wallet.getPendingShieldBalance();
         isSynced.value = wallet.isSynced;
+        return result;
     };
     wallet.onShieldLoadedFromDisk(() => {
         hasShield.value = wallet.hasShield();

scripts/dashboard/Dashboard.vue

@@ -50,6 +50,12 @@ const { createAlert } = useAlerts();
 const wallets = useWallets();
 const { activeWallet, activeVault } = storeToRefs(wallets);
 
+watch(activeWallet, async (currentWallet) => {
+    const success = await currentWallet.sync();
+    if (success && activeWallet.value === currentWallet)
+        createAlert('success', translation.syncStatusFinished, 12500);
+});
+
 const needsToEncrypt = computed(() => {
     if (activeWallet.value.isHardwareWallet) {
         return false;
@@ -177,9 +183,7 @@ async function importWallet({
             }
 
             // Start syncing in the background
-            activeWallet.value.sync().then(() => {
-                createAlert('success', translation.syncStatusFinished, 12500);
-            });
+            activeWallet.value.sync();
             getEventEmitter().emit('wallet-import');
             return true;
         }

scripts/lock.js

@@ -5,18 +5,16 @@
  * @returns {T & { isLocked: () => bool }}
  */
 export const lockableFunction = (f) => {
-    let lock = false;
+    let promise = null;
 
     const g = async (...args) => {
-        try {
-            if (!lock) {
-                lock = true;
-                return await f(...args);
-            }
-        } finally {
-            lock = false;
+        if (!promise) {
+            promise = f(...args).finally(() => {
+                promise = null;
+            });
         }
+        return await promise;
     };
-    g.isLocked = () => lock;
+    g.isLocked = () => !!promise;
     return g;
 };

scripts/wallet.js

@@ -830,9 +830,7 @@ export class Wallet {
         return this.#historicalTxs.get();
     }
     sync = lockableFunction(async () => {
-        if (this.#isSynced) {
-            throw new Error('Attempting to sync when already synced');
-        }
+        if (!this.#masterKey || this.#isSynced) return false;
         // While syncing the wallet ( DB read + network sync) disable the event balance-update
         // This is done to avoid a huge spam of event.
         this.#eventEmitter.disableEvent('balance-update');
@@ -862,6 +860,7 @@ export class Wallet {
         this.#eventEmitter.enableEvent('new-tx');
         this.#eventEmitter.emit('balance-update');
         this.#eventEmitter.emit('new-tx');
+        return true;
     });
 
     async #transparentSync() {

tests/unit/lockable_function.spec.js

@@ -6,13 +6,14 @@ describe('Lockable function tests', () => {
     let test_function;
     const sleep_time = 1000;
     beforeEach(() => {
+        let counter = 0;
         test_function = lockableFunction(async (str_input) => {
             await sleep(sleep_time);
-            return str_input;
+            return `${str_input}-${counter++}`;
         });
     });
     it('Lockable function returns the correct value', async () => {
-        expect(await test_function('test_locks')).toBe('test_locks');
+        expect(await test_function('test_locks')).toBe('test_locks-0');
     });
     it('Lockable function gives the correct value for the lock', async () => {
         // At the beginning there is no lock
@@ -26,7 +27,13 @@ describe('Lockable function tests', () => {
         expect(test_function.isLocked()).toBeFalsy();
     });
     it("Calling when locked doesn't make the function run twice", async () => {
-        test_function('test_locks');
-        expect(await test_function('test_locks')).toBeUndefined();
+        const result = test_function('test_locks');
+        const result2 = test_function('test_locks');
+        expect(await Promise.all([result, result2])).toStrictEqual([
+            'test_locks-0',
+            'test_locks-0',
+        ]);
+        const result3 = await test_function('test_locks');
+        expect(result3).toBe('test_locks-1');
     });
 });