mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Re-enable dapp reload on network change
We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform. Makes it easy to re-implement the change.
This commit is contained in:
parent
299abee666
commit
3a6cc3c8fd
@ -7,7 +7,6 @@
|
|||||||
- Fix bug where account reset did not work with custom RPC providers.
|
- Fix bug where account reset did not work with custom RPC providers.
|
||||||
- Fix for Brave i18n getAcceptLanguages [#4270](https://github.com/MetaMask/metamask-extension/issues/4270)
|
- Fix for Brave i18n getAcceptLanguages [#4270](https://github.com/MetaMask/metamask-extension/issues/4270)
|
||||||
- Fix bug where nonce mutex was never released
|
- Fix bug where nonce mutex was never released
|
||||||
- Stop reloading browser page on Ethereum network change
|
|
||||||
- Add phishing notice
|
- Add phishing notice
|
||||||
|
|
||||||
## 4.7.4 Tue Jun 05 2018
|
## 4.7.4 Tue Jun 05 2018
|
||||||
|
@ -3,6 +3,7 @@ cleanContextForImports()
|
|||||||
require('web3/dist/web3.min.js')
|
require('web3/dist/web3.min.js')
|
||||||
const log = require('loglevel')
|
const log = require('loglevel')
|
||||||
const LocalMessageDuplexStream = require('post-message-stream')
|
const LocalMessageDuplexStream = require('post-message-stream')
|
||||||
|
const setupDappAutoReload = require('./lib/auto-reload.js')
|
||||||
const MetamaskInpageProvider = require('./lib/inpage-provider.js')
|
const MetamaskInpageProvider = require('./lib/inpage-provider.js')
|
||||||
restoreContextAfterImports()
|
restoreContextAfterImports()
|
||||||
|
|
||||||
@ -38,7 +39,11 @@ web3.setProvider = function () {
|
|||||||
}
|
}
|
||||||
log.debug('MetaMask - injected web3')
|
log.debug('MetaMask - injected web3')
|
||||||
|
|
||||||
|
setupDappAutoReload(web3, inpageProvider.publicConfigStore)
|
||||||
|
|
||||||
// export global web3, with usage-detection and deprecation warning
|
// export global web3, with usage-detection and deprecation warning
|
||||||
|
|
||||||
|
/* TODO: Uncomment this area once auto-reload.js has been deprecated:
|
||||||
let hasBeenWarned = false
|
let hasBeenWarned = false
|
||||||
global.web3 = new Proxy(web3, {
|
global.web3 = new Proxy(web3, {
|
||||||
get: (_web3, key) => {
|
get: (_web3, key) => {
|
||||||
@ -55,6 +60,7 @@ global.web3 = new Proxy(web3, {
|
|||||||
_web3[key] = value
|
_web3[key] = value
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
*/
|
||||||
|
|
||||||
// set web3 defaultAccount
|
// set web3 defaultAccount
|
||||||
inpageProvider.publicConfigStore.subscribe(function (state) {
|
inpageProvider.publicConfigStore.subscribe(function (state) {
|
||||||
|
61
app/scripts/lib/auto-reload.js
Normal file
61
app/scripts/lib/auto-reload.js
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
module.exports = setupDappAutoReload
|
||||||
|
|
||||||
|
function setupDappAutoReload (web3, observable) {
|
||||||
|
// export web3 as a global, checking for usage
|
||||||
|
let hasBeenWarned = false
|
||||||
|
let reloadInProgress = false
|
||||||
|
let lastTimeUsed
|
||||||
|
let lastSeenNetwork
|
||||||
|
|
||||||
|
global.web3 = new Proxy(web3, {
|
||||||
|
get: (_web3, key) => {
|
||||||
|
// show warning once on web3 access
|
||||||
|
if (!hasBeenWarned && key !== 'currentProvider') {
|
||||||
|
console.warn('MetaMask: web3 will be deprecated in the near future in favor of the ethereumProvider \nhttps://github.com/MetaMask/faq/blob/master/detecting_metamask.md#web3-deprecation')
|
||||||
|
hasBeenWarned = true
|
||||||
|
}
|
||||||
|
// get the time of use
|
||||||
|
lastTimeUsed = Date.now()
|
||||||
|
// return value normally
|
||||||
|
return _web3[key]
|
||||||
|
},
|
||||||
|
set: (_web3, key, value) => {
|
||||||
|
// set value normally
|
||||||
|
_web3[key] = value
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
observable.subscribe(function (state) {
|
||||||
|
// if reload in progress, no need to check reload logic
|
||||||
|
if (reloadInProgress) return
|
||||||
|
|
||||||
|
const currentNetwork = state.networkVersion
|
||||||
|
|
||||||
|
// set the initial network
|
||||||
|
if (!lastSeenNetwork) {
|
||||||
|
lastSeenNetwork = currentNetwork
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// skip reload logic if web3 not used
|
||||||
|
if (!lastTimeUsed) return
|
||||||
|
|
||||||
|
// if network did not change, exit
|
||||||
|
if (currentNetwork === lastSeenNetwork) return
|
||||||
|
|
||||||
|
// initiate page reload
|
||||||
|
reloadInProgress = true
|
||||||
|
const timeSinceUse = Date.now() - lastTimeUsed
|
||||||
|
// if web3 was recently used then delay the reloading of the page
|
||||||
|
if (timeSinceUse > 500) {
|
||||||
|
triggerReset()
|
||||||
|
} else {
|
||||||
|
setTimeout(triggerReset, 500)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// reload the page
|
||||||
|
function triggerReset () {
|
||||||
|
global.location.reload()
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user