Merge pull request #675 from PolymathNetwork/feat/metamask-changes

remove deprecated functions

Author: ross-rosario

packages/new-polymath-sdk/src/browserUtils.ts

@@ -14,6 +14,7 @@ interface Ethereum extends HttpProvider {
   networkVersion: string;
   _metamask?: {
     isApproved: () => Promise<boolean>;
+    isUnlocked: () => Promise<boolean>;
   };
   enable(): Promise<any>;
 }
@@ -117,14 +118,10 @@ export async function getCurrentAddress() {
   const support = getBrowserSupport();
 
   if (isModern(win)) {
-    // Special check for Metamask to know if it is locked or not
     if (win.ethereum._metamask) {
-      const isApproved = await win.ethereum._metamask.isApproved();
-      if (isApproved) {
-        accounts = await web3.eth.getAccounts();
-        if (!accounts.length) {
-          throw new PolymathError({ code: ErrorCodes.WalletIsLocked });
-        }
+      const isUnlocked = await win.ethereum._metamask.isUnlocked();
+      if (!isUnlocked) {
+        throw new PolymathError({ code: ErrorCodes.WalletIsLocked });
       }
     }
     await enableWallet();

packages/polymath-ui/src/components/EthNetworkWrapper/actions.js

@@ -149,11 +149,11 @@ export const init = (networks: Array<string>) => async (dispatch: Function) => {
   if (
     !accounts.length &&
     newProviderInjected &&
-    window.ethereum._metamask.isApproved
+    window.ethereum._metamask.isUnlocked // compatibility check on the MM version
   ) {
-    const isMetamaskApproved = await window.ethereum._metamask.isApproved();
+    const isMetamaskUnlocked = await window.ethereum._metamask.isUnlocked();
 
-    if (!isMetamaskApproved) {
+    if (isMetamaskUnlocked) {
       dispatch(requestAuthorization());
       return dispatch(fail(ERROR_ACCESS_REQUESTED));
     }