diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-06-19 03:37:01 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-06-19 03:37:01 +0800 |
| commit | ea0dcdd3124ec65d3145f0ac7790a6172603d88c (patch) | |
| tree | b071efe391d00f40805bb36a5c0f137eca14b8b7 /app/scripts/inpage.js | |
| parent | ef31eeccb244592aa17dd677e854e106c9bb5848 (diff) | |
| parent | d910c35e90d0d725e86b7743538b6c6c429f26f0 (diff) | |
| download | tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.gz tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.bz2 tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.lz tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.xz tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.tar.zst tangerine-wallet-browser-ea0dcdd3124ec65d3145f0ac7790a6172603d88c.zip | |
Merge branch 'develop' into v4.8.0
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) { |