diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-06-13 01:36:48 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-13 01:36:48 +0800 |
commit | 2d5a6729719bc4134e88b046f38c7f08a258d0f5 (patch) | |
tree | 57aedf2ce31bc11be4f6e30d81f54b5ef82e2218 /mascara/src/mascara.js | |
parent | 4298d80127c51e096f9ad6ce2a20e95e30033a4a (diff) | |
parent | 3d1d38a2c0cd04d637b878d0a0be7f505f406a97 (diff) | |
download | tangerine-wallet-browser-2d5a6729719bc4134e88b046f38c7f08a258d0f5.tar tangerine-wallet-browser-2d5a6729719bc4134e88b046f38c7f08a258d0f5.tar.gz tangerine-wallet-browser-2d5a6729719bc4134e88b046f38c7f08a258d0f5.tar.bz2 tangerine-wallet-browser-2d5a6729719bc4134e88b046f38c7f08a258d0f5.tar.lz tangerine-wallet-browser-2d5a6729719bc4134e88b046f38c7f08a258d0f5.tar.xz tangerine-wallet-browser-2d5a6729719bc4134e88b046f38c7f08a258d0f5.tar.zst tangerine-wallet-browser-2d5a6729719bc4134e88b046f38c7f08a258d0f5.zip |
Merge pull request #1572 from MetaMask/mascaraUpkeep
Mascara upkeep
Diffstat (limited to 'mascara/src/mascara.js')
-rw-r--r-- | mascara/src/mascara.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mascara/src/mascara.js b/mascara/src/mascara.js index 0fc2868e1..1655d1f64 100644 --- a/mascara/src/mascara.js +++ b/mascara/src/mascara.js @@ -1,6 +1,6 @@ const Web3 = require('web3') const setupProvider = require('./lib/setup-provider.js') - +const setupDappAutoReload = require('../../app/scripts/lib/auto-reload.js') const MASCARA_ORIGIN = process.env.MASCARA_ORIGIN || 'http://localhost:9001' console.log('MASCARA_ORIGIN:', MASCARA_ORIGIN) @@ -14,8 +14,7 @@ const provider = setupProvider({ instrumentForUserInteractionTriggers(provider) const web3 = new Web3(provider) -global.web3 = web3 - +setupDappAutoReload(web3, provider.publicConfigStore) // // ui stuff // |