diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-06-13 08:06:39 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-06-13 08:17:16 +0800 |
| commit | a741cc4fc4fb68e3f460c70ea848bdf3d2d2c894 (patch) | |
| tree | 58652d4789e71a47a763096e746bd25904d91bfe /mascara/src/mascara.js | |
| parent | d05d9a5f57b9311d6f29539233f9065330e8bda4 (diff) | |
| parent | bbe0c73dca45542b519036bec2bae5feb1e55485 (diff) | |
| download | tangerine-wallet-browser-a741cc4fc4fb68e3f460c70ea848bdf3d2d2c894.tar.gz tangerine-wallet-browser-a741cc4fc4fb68e3f460c70ea848bdf3d2d2c894.tar.zst tangerine-wallet-browser-a741cc4fc4fb68e3f460c70ea848bdf3d2d2c894.zip | |
Merge branch 'master' into AddTokenList
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 // |