move web3 instance checking to decryptwallet

MyEtherWallet · Sep 4, 2018 · 85d34d7 · 85d34d7
1 parent 795d427
commit 85d34d7
Show file tree

Hide file tree

Showing 4 changed files with 254 additions and 298 deletions.
diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js
@@ -451,6 +451,14 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
         return $scope.HDWallet.dPath;
     };
     $scope.scanMetamask = function() {
+        if (window.web3 === undefined) {
+            window.addEventListener('message', ({data}) => {
+              if (data && data.type && data.type === 'ETHEREUM_PROVIDER_SUCCESS') {
+                window.web3 = new Web3(ethereum); 
+              }
+            });
+            window.postMessage({ type: 'ETHEREUM_PROVIDER_REQUEST', web3: true }, '*');
+        }
         window.web3.eth.getAccounts(function (err, accounts) {
           if (err) $scope.notifier.danger(err + '. Are you sure you are on a secure (SSL / HTTPS) connection?')
           if (!accounts.length) {

diff --git a/app/scripts/main.js b/app/scripts/main.js
@@ -12,19 +12,6 @@ var bip39                    = require('bip39');
 var HDKey                    = require('hdkey');
 var xssFilters               = require('xss-filters');
 window.xssFilters            = xssFilters;
-var Web3                     = require('web3');
-if (window.web3 === undefined) {
-  window.addEventListener('message', ({data}) => {
-    if (data && data.type && data.type === 'ETHEREUM_PROVIDER_SUCCESS') {
-      // Use injected provider, start dapp...
-      window.web3 = new Web3(ethereum); // Should probably need to change this to the Metamask provider
-    }
-  });
-  window.postMessage({ type: 'ETHEREUM_PROVIDER_REQUEST' }, '*');
-} else {
-  window.web3 = new Web3(ethereum); // Should probably need to change this to the Metamask provider
-}
-console.log("Here now?")
 window.hd                    = { bip39: bip39, HDKey: HDKey };
 var BigNumber                = require('bignumber.js');
 window.BigNumber             = BigNumber;