Merge remote-tracking branch 'origin/ui-2' into ui-2

js/.flowconfig

@@ -0,0 +1,10 @@
+[ignore]
+.*/node_modules/.*
+.*/bower_components/.*
+
+[include]
+.*/src/.*
+
+[libs]
+
+[options]

js/package.json

@@ -46,8 +46,6 @@
     "ci:build:npm": "NODE_ENV=production webpack --config webpack/npm",
     "ci:build:jsonrpc": "babel-node ./scripts/build-rpc-json.js --output .npmjs/jsonrpc",
     "ci:build:embed": "NODE_ENV=production EMBED=1 node webpack/embed",
-    "start": "npm run clean && npm install && npm run build:lib && npm run build:dll && npm run start:app",
-    "start:app": "node webpack/dev.server",
     "clean": "rm -rf ./.build ./.coverage ./.happypack ./.npmjs ./build ./node_modules/.cache ./node_modules/@parity",
     "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
     "lint": "npm run lint:css && npm run lint:js",
@@ -58,6 +56,8 @@
     "lint:js": "eslint --ignore-path .gitignore ./src/",
     "lint:js:cached": "eslint --cache --ignore-path .gitignore ./src/",
     "lint:js:fix": "eslint --fix --ignore-path .gitignore ./src/",
+    "start": "npm run clean && npm install && npm run build:lib && npm run build:dll && npm run start:app",
+    "start:app": "node webpack/dev.server",
     "test": "NODE_ENV=test mocha --compilers ejs:ejsify 'src/**/*.spec.js'",
     "test:coverage": "NODE_ENV=test istanbul cover _mocha -- --compilers ejs:ejsify 'src/**/*.spec.js'",
     "test:e2e": "NODE_ENV=test mocha 'src/**/*.e2e.js'",
@@ -113,6 +113,7 @@
     "extract-loader": "0.1.0",
     "extract-text-webpack-plugin": "2.0.0-beta.4",
     "file-loader": "0.10.0",
+    "flow-bin": "^0.46.0",
     "happypack": "3.0.3",
     "html-loader": "0.4.4",
     "html-webpack-plugin": "2.28.0",
@@ -170,6 +171,10 @@
     "@parity/wordlist": "1.0.1",
     "es6-promise": "4.0.5",
     "flat": "2.0.1",
+    "flow": "^0.2.3",
+    "format-json": "1.0.3",
+    "format-number": "2.0.1",
+    "geopattern": "1.2.3",
     "isomorphic-fetch": "2.2.1",
     "lodash": "4.17.2",
     "loglevel": "1.4.1",

js/yarn.lock

@@ -3240,6 +3240,14 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
+flow-bin@^0.46.0:
+  version "0.46.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.46.0.tgz#06ad7fe19dddb1042264438064a2a32fee12b872"
+
+flow@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/flow/-/flow-0.2.3.tgz#f8da65efa249127ec99376a28896572a9795d1af"
+
 for-in@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"