diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-08-15 01:44:42 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-08-15 01:44:42 +0800 |
| commit | 96d789d2cffa91da9d65be0de75d2e864d309305 (patch) | |
| tree | b3cea0eb6a4638244fd99bf64509c69b0b720a7a /package.json | |
| parent | 7918240833871648dea6f9787519ba20f1e51899 (diff) | |
| parent | 742aa8bb11c1273151ad907171061d4c5e4d1dca (diff) | |
| download | tangerine-wallet-browser-96d789d2cffa91da9d65be0de75d2e864d309305.tar.gz tangerine-wallet-browser-96d789d2cffa91da9d65be0de75d2e864d309305.tar.zst tangerine-wallet-browser-96d789d2cffa91da9d65be0de75d2e864d309305.zip | |
Merge branch 'develop' into network-remove-provider-engine
Override package-lock and fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/package.json b/package.json index 81ab01120..e4d1246a3 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,8 @@ ] }, "dependencies": { - "@material-ui/core": "^1.0.0", + "@material-ui/core": "1.0.0", + "@zxing/library": "^0.7.0", "abi-decoder": "^1.0.9", "asmcrypto.js": "0.22.0", "async": "^2.5.0", @@ -97,6 +98,7 @@ "debounce-stream": "^2.0.0", "deep-extend": "^0.5.1", "detect-node": "^2.0.3", + "detectrtc": "^1.3.6", "disc": "^1.3.2", "dnode": "^1.2.2", "end-of-stream": "^1.1.0", @@ -105,11 +107,11 @@ "eth-bin-to-ops": "^1.0.1", "eth-block-tracker": "^4.0.1", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", - "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-middleware": "^2.4.0", "eth-keyring-controller": "^3.1.4", "eth-ens-namehash": "^2.0.8", - "eth-hd-keyring": "^2.0.0", + "eth-hd-keyring": "^1.2.2", + "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", "eth-method-registry": "^1.0.0", "eth-phishing-detect": "^1.1.4", @@ -209,6 +211,7 @@ "vreme": "^3.0.2", "web3": "^0.20.1", "web3-stream-provider": "^3.0.1", + "webrtc-adapter": "^6.3.0", "xtend": "^4.0.1" }, "devDependencies": { @@ -247,7 +250,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "^4.0.0", + "eth-keyring-controller": "^3.3.1", "file-loader": "^1.1.11", "fs-extra": "^6.0.1", "fs-promise": "^2.0.3", |