Merge pull request #275 from blocknative/fix/syncer-intervals

make state not updated after interval cancelled.

Closes #274

Author: lnbc1QWFyb24

src/interfaces.ts

@@ -243,18 +243,20 @@ export interface WalletInterfaceStore {
   update: (
     updater: (walletInterface: WalletInterface | null) => WalletInterface | null
   ) => void
-  set: (walletInterface: WalletInterface) => void | never
+  set: (walletInterface: WalletInterface | null) => void | never
 }
 
 export interface WalletStateSliceStore {
   subscribe: (subscriber: (store: any) => void) => () => void
   reset: () => void
-  setStateSyncer: (stateSyncer: StateSyncer) => number | undefined
+  setStateSyncer: (
+    stateSyncer: StateSyncer
+  ) => { clear: () => void } | undefined
 }
 
 export interface BalanceStore {
   subscribe: (subscriber: (store: any) => void) => () => void
-  setStateSyncer: (stateSyncer: StateSyncer) => number | undefined
+  setStateSyncer: (stateSyncer: StateSyncer) => undefined
   reset: () => void
 }
 

src/stores.ts

@@ -1,6 +1,6 @@
 import { getBlocknative } from './services'
 import { writable, derived, get } from 'svelte/store'
-import { wait, makeCancelable } from './utilities'
+import { wait, makeCancelable, createInterval } from './utilities'
 import { validateWalletInterface, validateType } from './validation'
 import {
   WritableStore,
@@ -70,7 +70,7 @@ export const state = derived(
 )
 
 // keep track of intervals that are syncing state so they can be cleared
-let currentSyncerIntervals: (number | undefined)[] = []
+let currentSyncerIntervals: ({ clear: () => void } | undefined)[] = []
 
 export const walletInterface: WalletInterfaceStore = createWalletInterfaceStore(
   null
@@ -79,7 +79,8 @@ export const walletInterface: WalletInterfaceStore = createWalletInterfaceStore(
 walletInterface.subscribe((walletInterface: WalletInterface | null) => {
   // clear all current intervals if they exist
   currentSyncerIntervals.forEach(
-    (interval: number | undefined) => interval && clearInterval(interval)
+    (interval: { clear: () => void } | undefined) =>
+      interval && interval.clear()
   )
 
   const currentState = get(state)
@@ -138,7 +139,7 @@ export function resetWalletState(options?: {
         url: undefined
       }))
 
-      disconnected &&
+      !disconnected &&
         currentInterface.disconnect &&
         currentInterface.disconnect()
 
@@ -175,8 +176,10 @@ function createWalletInterfaceStore(
   return {
     subscribe,
     update,
-    set: (walletInterface: WalletInterface) => {
-      validateWalletInterface(walletInterface)
+    set: (walletInterface: WalletInterface | null) => {
+      if (walletInterface) {
+        validateWalletInterface(walletInterface)
+      }
       set(walletInterface)
     }
   }
@@ -228,11 +231,11 @@ function createWalletStateSliceStore(options: {
       }
 
       if (get) {
-        const interval: any = setInterval(() => {
+        const interval: any = createInterval(() => {
           get()
             .then(newVal => {
               if (newVal || currentState !== initialState) {
-                set(newVal)
+                interval.status.active && set(newVal)
               }
             })
             .catch((err: any) => {

src/utilities.ts

@@ -270,3 +270,16 @@ export function isPromise(val: any): val is Promise<any> {
   }
   return false
 }
+
+export function createInterval(func: any, interval: number) {
+  const id = setInterval(func, interval)
+  const status = { active: true }
+
+  return {
+    status,
+    clear: () => {
+      clearInterval(id)
+      status.active = false
+    }
+  }
+}