Cleanup

makerdao · Jan 10, 2024 · 60a4fa7 · 60a4fa7
1 parent fd2b850
commit 60a4fa7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/modules/app/components/layout/header/AccountSelect.tsx b/modules/app/components/layout/header/AccountSelect.tsx
@@ -91,7 +91,9 @@ const AccountSelect = (): React.ReactElement => {
       // Temporarily close the connections modal to move focus to the WalletConnect modal
       handleModalToggle(connectionType, false);
 
+      // This is needed because of this issue https://github.com/MetaMask/metamask-extension/issues/3133
       checkInjectedProvider();
+
       await connection.connector.activate();
 
       setSelectedConnection(connection.type);

diff --git a/modules/web3/helpers/checkInjectedProvider.ts b/modules/web3/helpers/checkInjectedProvider.ts
@@ -1,12 +1,12 @@
-import * as env from 'detect-browser';
+import { detect as detectBrowser } from 'detect-browser';
 import { WindowPostMessageStream } from '@metamask/post-message-stream';
 import { initializeProvider } from '@metamask/providers';
 
 export function checkInjectedProvider() {
-  const injectedAvailable = !!window.ethereum;
-
-  if (!injectedAvailable) {
-    const browser = env.detect();
+  if (window.ethereum) {
+    return;
+  } else {
+    const browser = detectBrowser();
     if (browser && browser.name === 'firefox') {
       // Due to https://github.com/MetaMask/metamask-extension/issues/3133
       // setup background connection

diff --git a/modules/web3/hooks/useEagerlyConnect.ts b/modules/web3/hooks/useEagerlyConnect.ts
@@ -14,7 +14,9 @@ import { checkInjectedProvider } from '../helpers/checkInjectedProvider';
 
 export async function connect(connector: Connector) {
   try {
+    // This is needed because of this issue https://github.com/MetaMask/metamask-extension/issues/3133
     checkInjectedProvider();
+
     if (connector.connectEagerly) {
       await connector.connectEagerly();
     } else {