Fix merge conflicts. Modify send workflow

1 files changed, 12 insertions, 2 deletions

diff --git a/package.json b/package.json
index 72fe57f9b..8020985d4 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,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": "METAMASK_ENV=test mocha test/e2e/metamask.spec --recursive",
+    "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: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",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
     "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",
@@ -27,6 +30,7 @@
     "test:mascara:build:locales": "mkdirp dist/chrome && cp -R app/_locales dist/chrome/_locales",
     "test:mascara:build:background": "browserify mascara/src/background.js -o dist/mascara/background.js",
     "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
+    "ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'",
     "sentry": "export RELEASE=`cat app/manifest.json| jq -r .version` && npm run sentry:release && npm run sentry:upload",
     "sentry:release": "npm run sentry:release:new && npm run sentry:release:clean",
     "sentry:release:new": "sentry-cli releases --org 'metamask' --project 'metamask' new $RELEASE",
@@ -140,7 +144,6 @@
     "number-to-bn": "^1.7.0",
     "obj-multiplex": "^1.0.0",
     "obs-store": "^3.0.0",
-    "once": "^1.3.3",
     "percentile": "^1.2.0",
     "pify": "^3.0.0",
     "ping-pong-stream": "^1.0.0",
@@ -216,10 +219,13 @@
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-15": "^1.0.5",
     "eslint-plugin-chai": "0.0.1",
+    "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",
     "fs-promise": "^2.0.3",
+    "ganache-cli": "^6.1.0",
+    "gifencoder": "^1.1.0",
     "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
     "gulp-babel": "^7.0.0",
     "gulp-eslint": "^4.0.0",
@@ -234,6 +240,7 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^5.0.0",
     "gulp-zip": "^4.0.0",
+    "image-size": "^0.6.2",
     "isomorphic-fetch": "^2.2.1",
     "jsdom": "^11.2.0",
     "jsdom-global": "^3.0.2",
@@ -252,6 +259,7 @@
     "node-sass": "^4.7.2",
     "nyc": "^11.0.3",
     "open": "0.0.5",
+    "png-file-stream": "^1.0.0",
     "prompt": "^1.0.0",
     "qs": "^6.2.0",
     "qunitjs": "^2.4.1",
@@ -259,7 +267,9 @@
     "react-test-renderer": "^15.6.2",
     "react-testutils-additions": "^15.2.0",
     "redux-test-utils": "^0.2.2",
+    "rimraf": "^2.6.2",
     "selenium-webdriver": "^3.5.0",
+    "shell-parallel": "^1.0.3",
     "sinon": "^5.0.0",
     "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",