Merge pull request #193 from blocknative/fix/refine-wallet-reset

Refine the wallet reset functionality

Author: lnbc1QWFyb24

src/interfaces.ts

@@ -94,9 +94,9 @@ 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
-    walletName?: string
+  resetWalletState: (options?: {
+    disconnected: boolean
+    walletName: string
   }) => void
 }
 

src/stores.ts

@@ -94,31 +94,52 @@ walletInterface.subscribe((walletInterface: WalletInterface | null) => {
       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; walletName?: string } = {}
-) {
+export function resetWalletState(options?: {
+  disconnected: boolean
+  walletName: string
+}) {
   walletInterface.update((currentInterface: WalletInterface | null) => {
-    if (
-      !options.walletName ||
-      (currentInterface && currentInterface.name === options.walletName)
-    ) {
-      const { disconnected } = options
-      !disconnected &&
-        currentInterface &&
+    // no interface then don't do anything
+    if (!currentInterface) {
+      return currentInterface
+    }
+
+    // no options object, so do a full reset by disconnecting and setting interface to null
+    if (!options) {
+      wallet.update(() => ({
+        name: undefined,
+        provider: undefined,
+        connect: undefined,
+        instance: undefined,
+        url: undefined,
+        loading: undefined
+      }))
+
+      currentInterface.disconnect && currentInterface.disconnect()
+
+      return null
+    }
+
+    const { walletName, disconnected } = options
+
+    // if walletName is the same as the current interface name then do a full reset (checking if to do a disconnect)
+    if (currentInterface.name === walletName) {
+      wallet.update(() => ({
+        name: undefined,
+        provider: undefined,
+        connect: undefined,
+        instance: undefined,
+        url: undefined,
+        loading: undefined
+      }))
+
+      disconnected &&
         currentInterface.disconnect &&
         currentInterface.disconnect()
+
       return null
     }
 

src/utilities.ts

@@ -13,7 +13,8 @@ export function getNetwork(provider: any): Promise<number | any> {
       },
       (e: any, res: any) => {
         e && reject(e)
-        resolve(Number(res && res.result))
+        const result = res && res.result
+        resolve(result && Number(result))
       }
     )
   })
@@ -29,7 +30,8 @@ export function getAddress(provider: any): Promise<string | any> {
       },
       (e: any, res: any) => {
         e && reject(e)
-        resolve(res && res.result && res.result[0])
+        const result = res && res.result && res.result[0]
+        resolve(result)
       }
     )
   })
@@ -52,7 +54,8 @@ export function getBalance(provider: any): Promise<string | any> {
       },
       (e: any, res: any) => {
         e && reject(e)
-        resolve(res && res.result && new BigNumber(res.result).toString(10))
+        const result = res && res.result
+        resolve(result && new BigNumber(result).toString(10))
       }
     )
   })
@@ -70,7 +73,7 @@ export function createModernProviderInterface(provider: any): WalletInterface {
             // get the initial value
             getAddress(provider).then(func)
             provider.on('accountsChanged', (accounts: string[]) =>
-              func(accounts[0])
+              func(accounts && accounts[0])
             )
           }
         }
@@ -82,7 +85,9 @@ export function createModernProviderInterface(provider: any): WalletInterface {
           onChange: (func: (val: string | number) => void) => {
             // get initial value
             getNetwork(provider).then(func)
-            provider.on('networkChanged', func)
+            provider.on('networkChanged', (netId: string | number) =>
+              func(netId && Number(netId))
+            )
           }
         }
       : { get: () => getNetwork(provider) },