Merge branch 'develop' into i3725-refactor-send-component-

1 files changed, 27 insertions, 10 deletions

diff --git a/package.json b/package.json
index c44d4d423..0e072088d 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,10 @@
     "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js",
     "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
     "test:integration:build": "gulp build:scss",
-    "test:e2e": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run'",
-    "test:e2e:run": "mocha test/e2e/metamask.spec --recursive",
+    "test:e2e:chrome": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:chrome'",
+    "test:e2e:firefox": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run:firefox'",
+    "test:e2e:run:chrome": "SELENIUM_BROWSER=chrome mocha test/e2e/chrome/metamask.spec --recursive",
+    "test:e2e:run:firefox": "SELENIUM_BROWSER=firefox mocha test/e2e/firefox/metamask.spec --recursive",
     "test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'",
     "test:screens:run": "node test/screens/new-ui.js",
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
@@ -42,7 +44,8 @@
     "announce": "node development/announcer.js",
     "version:bump": "node development/run-version-bump.js",
     "generateNotice": "node notices/notice-generator.js",
-    "deleteNotice": "node notices/notice-delete.js"
+    "deleteNotice": "node notices/notice-delete.js",
+    "storybook": "start-storybook -p 6006 -c .storybook"
   },
   "browserify": {
     "transform": [
@@ -76,10 +79,11 @@
     "classnames": "^2.2.5",
     "clone": "^2.1.1",
     "copy-to-clipboard": "^3.0.8",
+    "css-loader": "^0.28.11",
     "currency-formatter": "^1.4.2",
     "debounce": "^1.0.0",
     "debounce-stream": "^2.0.0",
-    "deep-extend": "^0.5.0",
+    "deep-extend": "^0.5.1",
     "detect-node": "^2.0.3",
     "disc": "^1.3.2",
     "dnode": "^1.2.2",
@@ -87,10 +91,9 @@
     "ensnare": "^1.0.0",
     "eslint-plugin-react": "^7.4.0",
     "eth-bin-to-ops": "^1.0.1",
-    "eth-block-tracker": "^2.3.0",
     "eth-contract-metadata": "^1.1.5",
     "eth-hd-keyring": "^1.2.1",
-    "eth-json-rpc-filters": "^1.2.5",
+    "eth-json-rpc-filters": "^1.2.6",
     "eth-json-rpc-infura": "^3.0.0",
     "eth-keyring-controller": "^2.2.0",
     "eth-phishing-detect": "^1.1.4",
@@ -111,6 +114,7 @@
     "extensionizer": "^1.0.0",
     "fast-json-patch": "^2.0.4",
     "fast-levenshtein": "^2.0.6",
+    "file-loader": "^1.1.11",
     "fuse.js": "^3.2.0",
     "gulp": "github:gulpjs/gulp#4.0",
     "gulp-autoprefixer": "^5.0.0",
@@ -132,6 +136,7 @@
     "lodash.shuffle": "^4.2.0",
     "lodash.uniqby": "^4.7.0",
     "loglevel": "^1.4.1",
+    "material-ui": "1.0.0-beta.44",
     "metamascara": "^2.0.0",
     "metamask-logo": "^2.1.4",
     "mkdirp": "^0.5.1",
@@ -185,12 +190,15 @@
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "^0.20.1",
-    "web3-provider-engine": "^13.8.0",
+    "web3-provider-engine": "^14.0.5",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
   "devDependencies": {
     "@sentry/cli": "^1.30.3",
+    "@storybook/addon-info": "^3.4.2",
+    "@storybook/addon-knobs": "^3.4.2",
+    "@storybook/react": "^3.4.2",
     "babel-core": "^6.24.1",
     "babel-eslint": "^8.0.0",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
@@ -204,10 +212,11 @@
     "brfs": "^1.4.3",
     "browserify": "^16.1.1",
     "chai": "^4.1.0",
-    "chromedriver": "^2.34.1",
+    "chromedriver": "2.36.0",
     "compression": "^1.7.1",
     "coveralls": "^3.0.0",
     "cross-env": "^5.1.4",
+    "css-loader": "^0.28.11",
     "deep-freeze-strict": "^1.1.1",
     "del": "^3.0.0",
     "envify": "^4.0.0",
@@ -217,9 +226,12 @@
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-mocha": "^5.0.0",
     "eslint-plugin-react": "^7.4.0",
-    "eth-json-rpc-middleware": "^1.2.7",
+    "eth-json-rpc-middleware": "^1.6.0",
+    "file-loader": "^1.1.11",
     "fs-promise": "^2.0.3",
     "ganache-cli": "^6.1.0",
+    "ganache-core": "^2.1.0",
+    "geckodriver": "^1.11.0",
     "gifencoder": "^1.1.0",
     "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
     "gulp-babel": "^7.0.0",
@@ -254,8 +266,10 @@
     "mocha-sinon": "^2.0.0",
     "nock": "^9.0.14",
     "node-sass": "^4.7.2",
+    "nsp": "^3.2.1",
     "nyc": "^11.0.3",
     "open": "0.0.5",
+    "path": "^0.12.7",
     "png-file-stream": "^1.0.0",
     "prompt": "^1.0.0",
     "proxyquire": "2.0.1",
@@ -266,14 +280,17 @@
     "react-test-renderer": "^15.6.2",
     "react-testutils-additions": "^15.2.0",
     "redux-test-utils": "^0.2.2",
+    "resolve-url-loader": "^2.3.0",
     "rimraf": "^2.6.2",
+    "sass-loader": "^7.0.1",
     "selenium-webdriver": "^3.5.0",
     "shell-parallel": "^1.0.3",
     "sinon": "^5.0.0",
+    "source-map": "^0.7.2",
+    "style-loader": "^0.21.0",
     "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",
     "testem": "^2.0.0",
-    "uglifyify": "^4.0.5",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
     "watchify": "^3.9.0"