Merge pull request #189 from blocknative/fix/wallet-connect-disconnect

Improve disconnect for wallet connect.

Closes #188

Author: lnbc1QWFyb24

src/interfaces.ts

@@ -94,7 +94,10 @@ export interface Helpers {
   getAddress: (provider: any) => Promise<string | any>
   getNetwork: (provider: any) => Promise<number | any>
   getBalance: (provider: any) => Promise<string | any>
-  resetWalletState: (options: { disconnected?: boolean }) => void
+  resetWalletState: (options: {
+    disconnected?: boolean
+    walletName?: string
+  }) => void
 }
 
 export interface WalletInterface {

src/modules/select/wallets/wallet-connect.ts

@@ -30,7 +30,7 @@ function walletConnect(
       provider.autoRefreshOnNetworkChange = false
 
       provider.wc.on('disconnect', () => {
-        resetWalletState({ disconnected: true })
+        resetWalletState({ disconnected: true, walletName: 'WalletConnect' })
       })
 
       return {

src/stores.ts

@@ -75,54 +75,55 @@ export const walletInterface: WalletInterfaceStore = createWalletInterfaceStore(
 )
 
 walletInterface.subscribe((walletInterface: WalletInterface | null) => {
-  if (walletInterface) {
-    const currentState = get(state)
-    // reset state
-    currentState.balance && balance.reset()
-    currentState.address && address.reset()
-    currentState.network && network.reset()
+  // clear all current intervals if they exist
+  currentSyncerIntervals.forEach(
+    (interval: number | undefined) => interval && clearInterval(interval)
+  )
 
-    // clear all current intervals if they exist
-    currentSyncerIntervals.forEach(
-      (interval: number | undefined) => interval && clearInterval(interval)
-    )
+  const currentState = get(state)
 
+  // reset state
+  currentState.balance && balance.reset()
+  currentState.address && address.reset()
+  currentState.network && network.reset()
+
+  if (walletInterface) {
     // start syncing state and save intervals
     currentSyncerIntervals = [
       address.setStateSyncer(walletInterface.address),
       network.setStateSyncer(walletInterface.network),
       balance.setStateSyncer(walletInterface.balance)
     ]
+  } else {
+    wallet.update(() => ({
+      name: undefined,
+      provider: undefined,
+      connect: undefined,
+      instance: undefined,
+      url: undefined,
+      loading: undefined
+    }))
   }
 })
 
-export function resetWalletState(options: { disconnected?: boolean } = {}) {
-  // clear all current intervals if they exist
-  currentSyncerIntervals.forEach(
-    (interval: number | undefined) => interval && clearInterval(interval)
-  )
-
+export function resetWalletState(
+  options: { disconnected?: boolean; walletName?: string } = {}
+) {
   walletInterface.update((currentInterface: WalletInterface | null) => {
-    const { disconnected } = options
-    !disconnected &&
-      currentInterface &&
-      currentInterface.disconnect &&
-      currentInterface.disconnect()
-    return null
-  })
-
-  wallet.update(() => ({
-    name: undefined,
-    provider: undefined,
-    connect: undefined,
-    instance: undefined,
-    url: undefined,
-    loading: undefined
-  }))
+    if (
+      !options.walletName ||
+      (currentInterface && currentInterface.name === options.walletName)
+    ) {
+      const { disconnected } = options
+      !disconnected &&
+        currentInterface &&
+        currentInterface.disconnect &&
+        currentInterface.disconnect()
+      return null
+    }
 
-  balance.reset()
-  address.reset()
-  network.reset()
+    return currentInterface
+  })
 
   app.update(store => ({
     ...store,