rework accounts loading

masa-finance · Mar 7, 2023 · b1b214d · b1b214d
1 parent 09618ce
commit b1b214d
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/src/provider/use-metamask.ts b/src/provider/use-metamask.ts
@@ -25,7 +25,6 @@ export const useMetamask = ({
     let metamaskConnected = false;
 
     if (!disabled && window?.ethereum && !isConnected) {
-      let hasAccounts = false;
       let accounts: Maybe<string[]>;
 
       try {
@@ -43,24 +42,18 @@ export const useMetamask = ({
       }
 
       if (accounts && Array.isArray(accounts)) {
-        hasAccounts = accounts.length > 0;
+        const signer = getWeb3Provider()?.getSigner();
+        if (accounts.length > 0 && signer) {
+          setProvider?.(signer);
+          metamaskConnected = true;
+
+          localStorage.setItem(`metamask-connected-${accounts[0]}`, 'true');
+        } else {
+          console.error('Unable to get signer from metamask');
+        }
       } else {
         console.error('No accounts returned from metamask');
       }
-
-      const signer = getWeb3Provider()?.getSigner();
-
-      if (hasAccounts && signer) {
-        setProvider?.(signer);
-        metamaskConnected = true;
-
-        localStorage.setItem(
-          `metamask-connected-${await signer.getAddress()}`,
-          'true'
-        );
-      } else {
-        console.error('Unable to get signer from metamask');
-      }
     }
 
     if (masa?.config.verbose) {