Merge pull request #194 from blocknative/develop

Release 1.2.2

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",

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/torus.ts

@@ -80,6 +80,7 @@ function torus(options: TorusOptions & CommonWalletOptions): WalletModule {
     },
     desktop: true,
     mobile: true,
+    url: 'https://app.tor.us/',
     preferred
   }
 }

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,18 +75,19 @@ 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)
+  )
+
+  const currentState = get(state)
 
-    // clear all current intervals if they exist
-    currentSyncerIntervals.forEach(
-      (interval: number | undefined) => interval && clearInterval(interval)
-    )
+  // 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),
@@ -96,33 +97,54 @@ walletInterface.subscribe((walletInterface: WalletInterface | null) => {
   }
 })
 
-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
-  })
+    // no interface then don't do anything
+    if (!currentInterface) {
+      return currentInterface
+    }
 
-  wallet.update(() => ({
-    name: undefined,
-    provider: undefined,
-    connect: undefined,
-    instance: undefined,
-    url: undefined,
-    loading: undefined
-  }))
+    // 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
+    }
 
-  balance.reset()
-  address.reset()
-  network.reset()
+    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
+    }
+
+    return currentInterface
+  })
 
   app.update(store => ({
     ...store,
@@ -155,14 +177,13 @@ function createWalletStateSliceStore(options: {
   const { subscribe, set } = writable(initialState)
 
   let currentState: string | number | null | undefined
-  const unsubscribe = subscribe(store => {
+  subscribe(store => {
     currentState = store
   })
 
   return {
     subscribe,
     reset: () => {
-      unsubscribe()
       set(undefined)
     },
     setStateSyncer: (stateSyncer: StateSyncer) => {

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) },