Merge pull request #137 from blocknative/fix/select-wallet-twice

Only allow wallet to be instantiated once.

Closes #136

Author: lnbc1QWFyb24

src/modules/select/wallets/authereum.ts

@@ -24,32 +24,33 @@ function authereum(options: {
     iconSrc: authereumIcon,
     wallet: async () => {
       const { default: Authereum } = await import('authereum')
-      const authereum = new Authereum({
+      const instance = new Authereum({
         networkName: networkName(networkId),
         disableNotifications: true
       })
 
-      const provider = authereum.getProvider()
+      const provider = instance.getProvider()
 
       return {
         provider,
+        instance,
         interface: {
           name: 'Authereum',
           connect: () => provider.enable(),
-          disconnect: () => authereum.logout(),
+          disconnect: () => instance.logout(),
           loading: new Promise((resolve: () => void) => {
-            authereum.on('openPopup', resolve)
+            instance.on('openPopup', resolve)
           }),
           address: {
-            get: () => authereum.getAccountAddress()
+            get: () => instance.getAccountAddress()
           },
           network: {
             get: () => Promise.resolve(networkId)
           },
           balance: {
             get: async () => {
-              const loggedIn = await authereum.isAuthenticated()
-              return loggedIn && authereum.getBalance()
+              const loggedIn = await instance.isAuthenticated()
+              return loggedIn && instance.getBalance()
             }
           }
         }

src/modules/select/wallets/fortmatic.ts

@@ -30,22 +30,17 @@ function fortmatic(options: SdkWalletOptions): WalletModule {
     optional: true
   })
 
-  let instance: any
-  let provider: any
-
   return {
     name: 'Fortmatic',
     svg: fortmaticIcon,
     wallet: async (helpers: Helpers) => {
-      if (!instance) {
-        const { default: Fortmatic } = await import('fortmatic')
+      const { default: Fortmatic } = await import('fortmatic')
 
-        instance = new Fortmatic(
-          apiKey,
-          networkId === 1 ? undefined : networkName(networkId)
-        )
-        provider = instance.getProvider()
-      }
+      const instance = new Fortmatic(
+        apiKey,
+        networkId === 1 ? undefined : networkName(networkId)
+      )
+      const provider = instance.getProvider()
 
       const { BigNumber } = helpers
 

src/modules/select/wallets/portis.ts

@@ -20,18 +20,13 @@ function portis(options: SdkWalletOptions): WalletModule {
     optional: true
   })
 
-  let instance: any
-  let provider: any
-
   return {
     name: 'Portis',
     svg: portisIcon,
     wallet: async (helpers: Helpers) => {
-      if (!instance) {
-        const { default: Portis } = await import('@portis/web3')
-        instance = new Portis(apiKey, networkName(networkId))
-        provider = instance.provider
-      }
+      const { default: Portis } = await import('@portis/web3')
+      const instance = new Portis(apiKey, networkName(networkId))
+      const provider = instance.provider
 
       const { BigNumber } = helpers
 

src/modules/select/wallets/squarelink.ts

@@ -29,22 +29,17 @@ function squarelink(options: SdkWalletOptions): WalletModule {
     optional: true
   })
 
-  let instance: any
-  let provider: any
-
   return {
     name: 'Squarelink',
     svg: sqlkIcon,
     wallet: async (helpers: Helpers) => {
-      if (!instance) {
-        const { default: Squarelink } = await import('squarelink')
+      const { default: Squarelink } = await import('squarelink')
 
-        instance = new Squarelink(apiKey, networkName(networkId), {
-          useSync: true
-        })
+      const instance = new Squarelink(apiKey, networkName(networkId), {
+        useSync: true
+      })
 
-        provider = instance.getProviderSync()
-      }
+      const provider = instance.getProviderSync()
 
       const { BigNumber } = helpers
 

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

@@ -30,23 +30,19 @@ function walletConnect(options: WalletConnectOptions): WalletModule {
     optional: true
   })
 
-  let provider: any
-
   return {
     name: 'WalletConnect',
     svg: walletConnectIcon,
     wallet: async () => {
-      if (!provider) {
-        const { default: WalletConnectProvider } = await import(
-          '@walletconnect/web3-provider'
-        )
+      const { default: WalletConnectProvider } = await import(
+        '@walletconnect/web3-provider'
+      )
 
-        provider = new WalletConnectProvider({
-          infuraId: infuraKey
-        })
+      const provider = new WalletConnectProvider({
+        infuraId: infuraKey
+      })
 
-        provider.autoRefreshOnNetworkChange = false
-      }
+      provider.autoRefreshOnNetworkChange = false
 
       return {
         provider,
@@ -64,10 +60,6 @@ function walletConnect(options: WalletConnectOptions): WalletModule {
                   })
                 )
             }),
-          disconnect: () => {
-            provider.close()
-            provider = undefined
-          },
           address: {
             onChange: func => {
               provider

src/views/WalletSelect.svelte

@@ -105,6 +105,13 @@
   }
 
   async function handleWalletSelect(module: WalletModule) {
+    const currentWalletInterface = get(walletInterface)
+
+    if (currentWalletInterface && currentWalletInterface.name === module.name) {
+      finish({ completed: true })
+      return
+    }
+
     loadingWallet = module.name
 
     const {