m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix

Browse Source
This commit is contained in:
kumavis 2017-11-29 08:27:47 -10:00
commit 327651e7fb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/controllers/network.js
View File

@ -53,7 +53,7 @@ module.exports = class NetworkController extends EventEmitter {
lookupNetwork () {
// Prevent firing when provider is not defined.
if (!this.ethQuery || !this.ethQuery.sendAsync) {
return
return log.warn('NetworkController - lookupNetwork aborted due to missing ethQuery')
}
this.ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
if (err) return this.setNetworkState('loading')

14
package.json
View File

@ -86,7 +86,7 @@
"etherscan-link": "^1.0.2",
"ethjs-contract": "^0.1.9",
"ethjs-ens": "^2.0.0",
"ethjs-query": "^0.2.9",
"ethjs-query": "^0.3.1",
"express": "^4.15.5",
"extension-link-enabler": "^1.0.0",
"extensionizer": "^1.0.0",
@ -126,9 +126,9 @@
"pump": "^1.0.2",
"pumpify": "^1.3.4",
"qrcode-npm": "0.0.3",
"react": "^15.0.2",
"react": "^15.6.2",
"react-addons-css-transition-group": "^15.6.0",
"react-dom": "^15.5.4",
"react-dom": "^15.6.2",
"react-hyperscript": "^3.0.0",
"react-markdown": "^3.0.0",
"react-redux": "^5.0.5",
@ -163,7 +163,7 @@
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"babel-register": "^6.7.2",
"babelify": "^7.2.0",
"babelify": "^8.0.0",
"beefy": "^2.1.5",
"brfs": "^1.4.3",
"browserify": "^14.4.0",
@ -172,7 +172,7 @@
"deep-freeze-strict": "^1.1.1",
"del": "^3.0.0",
"envify": "^4.0.0",
"enzyme": "^2.8.2",
"enzyme": "^3.2.0",
"eslint-plugin-chai": "0.0.1",
"eslint-plugin-mocha": "^4.9.0",
"eth-json-rpc-middleware": "^1.2.7",
@ -205,9 +205,9 @@
"open": "0.0.5",
"prompt": "^1.0.0",
"qs": "^6.2.0",
"qunit": "^1.0.0",
"qunitjs": "^2.4.1",
"react-addons-test-utils": "^15.5.1",
"react-test-renderer": "^15.5.4",
"react-test-renderer": "^15.6.2",
"react-testutils-additions": "^15.2.0",
"sinon": "^4.0.0",
"tape": "^4.5.1",