From 893620c76b4f611e47841cfd2c0cee9b1114ac59 Mon Sep 17 00:00:00 2001
From: Vadim <varasev@gmail.com>
Date: Wed, 4 Dec 2019 10:28:53 +0300
Subject: [PATCH] Remove subscriber for MetaMask legacy account switcher

---
 src/utils/getWeb3.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/utils/getWeb3.js b/src/utils/getWeb3.js
index d69a135..a7d2294 100644
--- a/src/utils/getWeb3.js
+++ b/src/utils/getWeb3.js
@@ -37,14 +37,16 @@ export default async function getWeb3(netId = defaultNetId, onAccountChange) {
       console.error('Unlock your wallet')
     }
 
-    let currentAccount = defaultAccount ? defaultAccount.toLowerCase() : ''
-    web3.currentProvider.publicConfigStore.on('update', function(obj) {
-      const account = obj.selectedAddress
-      if (account && account !== currentAccount) {
-        currentAccount = account
-        onAccountChange(account)
-      }
-    })
+    if (web3.currentProvider.publicConfigStore) {
+      let currentAccount = defaultAccount ? defaultAccount.toLowerCase() : ''
+      web3.currentProvider.publicConfigStore.on('update', function(obj) {
+        const account = obj.selectedAddress
+        if (account && account !== currentAccount) {
+          currentAccount = account
+          onAccountChange(account)
+        }
+      })
+    }
 
     const web3NetId = await web3.eth.net.getId()
     if (web3NetId === netId) {