fix(wallet-connectors): Fix wallet recognitions and connectors used, use injected by default

AugustoL · AugustoL · commit c90dd2ec3b64 · 2020-04-09T14:22:21.000-03:00
diff --git a/src/components/Web3ConnectStatus/index.jsx b/src/components/Web3ConnectStatus/index.jsx
@@ -9,6 +9,7 @@ import {
     injected,
     isChainIdSupported,
     web3ContextNames,
+    walletconnect
 } from 'provider/connectors';
 import Identicon from '../Identicon';
 import { useStores } from '../../contexts/storesContext';
@@ -84,24 +85,20 @@ const Web3ConnectStatus = observer((props) => {
     const {
         chainId,
         active,
+        account,
         connector,
         error,
     } = providerStore.getActiveWeb3React();
-    const { account, chainId: injectedChainId } = providerStore.getWeb3React(
-        web3ContextNames.injected
-    );
-
-    const contextNetwork = providerStore.getWeb3React(web3ContextNames.backup);
 
     if (!chainId) {
         throw new Error('No chain ID specified');
     }
-
+  
     let pending = undefined;
     let confirmed = undefined;
     let hasPendingTransactions = false;
 
-    if (account && isChainIdSupported(injectedChainId)) {
+    if (account && isChainIdSupported(chainId)) {
         pending = transactionStore.getPendingTransactions(account);
         confirmed = transactionStore.getConfirmedTransactions(account);
         hasPendingTransactions = !!pending.length;
@@ -115,17 +112,19 @@ const Web3ConnectStatus = observer((props) => {
     function getStatusIcon() {
         if (connector === injected) {
             return <Identicon />;
+        } else if (connector === walletconnect) {
+            return <img src="walletConnectIcon.svg" />;
         }
     }
 
     function getWeb3Status() {
         console.log('[GetWeb3Status]', {
             account,
-            injectedChainId: injectedChainId,
+            chainId: chainId,
             error,
         });
         // Wrong network
-        if (account && !isChainIdSupported(injectedChainId)) {
+        if (account && !isChainIdSupported(chainId)) {
             return (
                 <WrongNetworkButton onClick={toggleWalletModal}>
                     Wrong Network
@@ -157,10 +156,6 @@ const Web3ConnectStatus = observer((props) => {
         }
     }
 
-    if (!contextNetwork.active && !active) {
-        return null;
-    }
-
     return (
         <>
             {getWeb3Status()}
diff --git a/src/provider/connectors.ts b/src/provider/connectors.ts
@@ -1,5 +1,6 @@
 import { NetworkConnector } from 'provider/NetworkConnector';
 import { MetamaskConnector } from './MetamaskConnector';
+import { InjectedConnector } from '@web3-react/injected-connector'
 import { WalletConnectConnector } from '@web3-react/walletconnect-connector';
 
 export const INFURA_API_KEY = process.env.REACT_APP_KEY_INFURA_API_KEY;
@@ -56,7 +57,7 @@ export const backup = new NetworkConnector({
     pollingInterval: POLLING_INTERVAL,
 });
 
-export const injected = new MetamaskConnector({
+export const injected = new InjectedConnector({
     supportedChainIds: [1, 3, 4, 42, 66],
 });
 
