aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-07-13 00:54:08 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-07-13 00:54:08 +0800
commit07d8bfaec51a798e090bd2521debeddaf53bf2f9 (patch)
tree735338e1dbaa38601376024ed6e4fa4d89c66a2c /package.json
parent2a0a7853249284cb27831890f3b62847ea27eb83 (diff)
parent0d4dbbec2abfa8c8015063d6e4a5ff0d34abe7b9 (diff)
downloadtangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar
tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.gz
tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.bz2
tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.lz
tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.xz
tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.zst
tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.zip
Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support
Diffstat (limited to 'package.json')
-rw-r--r--package.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/package.json b/package.json
index be1cd8d85..84db617bd 100644
--- a/package.json
+++ b/package.json
@@ -97,6 +97,7 @@
"eth-hd-keyring": "^1.2.1",
"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",
"eth-query": "^2.1.2",
"eth-sig-util": "^1.4.2",
@@ -180,6 +181,7 @@
"redux-logger": "^3.0.6",
"redux-thunk": "^2.2.0",
"request-promise": "^4.2.1",
+ "reselect": "^3.0.1",
"sandwich-expando": "^1.1.3",
"semaphore": "^1.0.5",
"semver": "^5.4.1",
@@ -286,6 +288,7 @@
"react-addons-test-utils": "^15.5.1",
"react-test-renderer": "^15.6.2",
"react-testutils-additions": "^15.2.0",
+ "redux-mock-store": "^1.5.3",
"redux-test-utils": "^0.2.2",
"resolve-url-loader": "^2.3.0",
"rimraf": "^2.6.2",