Merge branch 'NewUI-flat' into merge

1 files changed, 20 insertions, 1 deletions

diff --git a/package.json b/package.json
index 7b1578f7b..59b2836ce 100644
--- a/package.json
+++ b/package.json
@@ -45,17 +45,24 @@
           ]
         }
       ],
+      "reactify",
       "envify",
       "brfs"
     ]
   },
   "dependencies": {
+    "abi-decoder": "^1.0.8",
     "async": "^2.5.0",
     "await-semaphore": "^0.1.1",
     "babel-runtime": "^6.23.0",
+    "bignumber.js": "^4.0.4",
+    "bip39": "^2.2.0",
     "bluebird": "^3.5.0",
     "bn.js": "^4.11.7",
+    "boron": "^0.2.3",
+    "browser-passworder": "^2.0.3",
     "browserify-derequire": "^0.9.4",
+    "classnames": "^2.2.5",
     "client-sw-ready-event": "^3.3.0",
     "clone": "^2.1.1",
     "copy-to-clipboard": "^3.0.8",
@@ -68,19 +75,21 @@
     "ensnare": "^1.0.0",
     "eth-bin-to-ops": "^1.0.1",
     "eth-block-tracker": "^2.2.0",
-    "eth-contract-metadata": "^1.1.4",
     "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^1.2.2",
     "eth-keyring-controller": "^2.1.0",
+    "eth-contract-metadata": "^1.1.5",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.4.0",
     "eth-simple-keyring": "^1.2.0",
     "eth-token-tracker": "^1.1.4",
+    "ethereumjs-abi": "^0.6.4",
     "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "ethereumjs-wallet": "^0.6.0",
     "etherscan-link": "^1.0.2",
+    "ethjs": "^0.2.8",
     "ethjs-contract": "^0.1.9",
     "ethjs-ens": "^2.0.0",
     "ethjs-query": "^0.2.9",
@@ -89,8 +98,11 @@
     "extensionizer": "^1.0.0",
     "fast-json-patch": "^2.0.4",
     "fast-levenshtein": "^2.0.6",
+    "fuse.js": "^3.1.0",
     "gulp": "github:gulpjs/gulp#4.0",
+    "gulp-autoprefixer": "^4.0.0",
     "gulp-eslint": "^4.0.0",
+    "gulp-sass": "^3.1.0",
     "hat": "0.0.3",
     "human-standard-token-abi": "^1.0.2",
     "idb-global": "^2.1.0",
@@ -120,6 +132,7 @@
     "pump": "^1.0.2",
     "pumpify": "^1.3.4",
     "qrcode-npm": "0.0.3",
+    "ramda": "^0.24.1",
     "react": "^15.0.2",
     "react-addons-css-transition-group": "^15.6.0",
     "react-dom": "^15.5.4",
@@ -129,6 +142,8 @@
     "react-select": "^1.0.0-rc.2",
     "react-simple-file-input": "^2.0.0",
     "react-tooltip-component": "^0.3.0",
+    "react-transition-group": "^2.2.0",
+    "reactify": "^1.1.1",
     "readable-stream": "^2.3.3",
     "redux": "^3.0.5",
     "redux-logger": "^3.0.6",
@@ -136,6 +151,7 @@
     "request-promise": "^4.2.1",
     "sandwich-expando": "^1.0.5",
     "semaphore": "^1.0.5",
+    "shallow-copy": "0.0.1",
     "sw-stream": "^2.0.0",
     "textarea-caret": "^3.0.1",
     "through2": "^2.0.3",
@@ -174,6 +190,8 @@
     "gulp-livereload": "^3.8.1",
     "gulp-replace": "^0.6.1",
     "gulp-sourcemaps": "^2.6.0",
+    "gulp-stylefmt": "^1.1.0",
+    "gulp-stylelint": "^4.0.0",
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "gulp-zip": "^4.0.0",
@@ -201,6 +219,7 @@
     "react-test-renderer": "^15.5.4",
     "react-testutils-additions": "^15.2.0",
     "sinon": "^4.0.0",
+    "stylelint-config-standard": "^17.0.0",
     "tape": "^4.5.1",
     "testem": "^1.10.3",
     "uglifyify": "^4.0.2",