diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-06-17 11:41:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-17 11:41:56 +0800 |
| commit | 01c9d81c9feda0f80d3c2006fac208a00c1a64cb (patch) | |
| tree | 95666b56bac6a7aa3571be1b6c99c899403e3577 /app/scripts/inpage.js | |
| parent | 299abee666d7f8347e062afff4f2fae47c7f6968 (diff) | |
| parent | 3a6cc3c8fd1cf16b744af61104472887d6d37fb3 (diff) | |
| download | tangerine-wallet-browser-01c9d81c9feda0f80d3c2006fac208a00c1a64cb.tar tangerine-wallet-browser-01c9d81c9feda0f80d3c2006fac208a00c1a64cb.tar.gz tangerine-wallet-browser-01c9d81c9feda0f80d3c2006fac208a00c1a64cb.tar.bz2 tangerine-wallet-browser-01c9d81c9feda0f80d3c2006fac208a00c1a64cb.tar.lz tangerine-wallet-browser-01c9d81c9feda0f80d3c2006fac208a00c1a64cb.tar.xz tangerine-wallet-browser-01c9d81c9feda0f80d3c2006fac208a00c1a64cb.tar.zst tangerine-wallet-browser-01c9d81c9feda0f80d3c2006fac208a00c1a64cb.zip | |
Merge pull request #4585 from MetaMask/ReenableDappReload
Re-enable dapp reload on network change
Diffstat (limited to 'app/scripts/inpage.js')
| -rw-r--r-- | app/scripts/inpage.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 070f5d247..7dd7fda02 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -3,6 +3,7 @@ cleanContextForImports() require('web3/dist/web3.min.js') const log = require('loglevel') const LocalMessageDuplexStream = require('post-message-stream') +const setupDappAutoReload = require('./lib/auto-reload.js') const MetamaskInpageProvider = require('./lib/inpage-provider.js') restoreContextAfterImports() @@ -38,7 +39,11 @@ web3.setProvider = function () { } log.debug('MetaMask - injected web3') +setupDappAutoReload(web3, inpageProvider.publicConfigStore) + // export global web3, with usage-detection and deprecation warning + +/* TODO: Uncomment this area once auto-reload.js has been deprecated: let hasBeenWarned = false global.web3 = new Proxy(web3, { get: (_web3, key) => { @@ -55,6 +60,7 @@ global.web3 = new Proxy(web3, { _web3[key] = value }, }) +*/ // set web3 defaultAccount inpageProvider.publicConfigStore.subscribe(function (state) { |