Merge pull request #43 from Conflux-Chain/Version-v0.0.7

Version v0.0.7 RC
Conflux-Chain · Feb 17, 2020 · 2b900e1 · 2b900e1
2 parents 7c6da65 + b3f9dbc
commit 2b900e1
Show file tree

Hide file tree

Showing 281 changed files with 6,324 additions and 9,572 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,6 +16,9 @@ workflows:
       - prep-build-test:
           requires:
             - prep-deps
+      - prep-build-storybook:
+          requires:
+            - prep-deps
       - prep-scss:
           requires:
             - prep-deps
@@ -79,20 +82,20 @@ workflows:
             - prep-deps
             - prep-build
             - all-tests-pass
-      # - job-publish-storybook:
-      #     filters:
-      #       branches:
-      #         only: develop
-      #     requires:
-      #       - prep-deps
+      - job-publish-storybook:
+          filters:
+            branches:
+              only: develop
+          requires:
+            - prep-build-storybook
       - coveralls-upload:
           requires:
             - test-unit
 
 jobs:
   create_release_pull_request:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - run:
@@ -104,7 +107,7 @@ jobs:
 
   prep-deps:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - run:
@@ -123,7 +126,7 @@ jobs:
 
   prep-build:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -142,7 +145,7 @@ jobs:
 
   prep-build-test:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -158,9 +161,24 @@ jobs:
           paths:
             - dist-test
 
+  prep-build-storybook:
+    docker:
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Build Storybook
+          command: yarn storybook:build
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .out
+
   prep-scss:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -179,7 +197,7 @@ jobs:
 
   test-lint:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -193,7 +211,7 @@ jobs:
 
   test-lint-shellcheck:
     docker:
-      - image: koalaman/shellcheck-alpine:stable
+      - image: koalaman/shellcheck-alpine@sha256:169a51b086af0ab181e32801c15deb78944bb433d4f2c0a21cc30d4e60547065
     steps:
       - checkout
       - run: apk add --no-cache bash jq yarn
@@ -203,7 +221,7 @@ jobs:
 
   test-lint-lockfile:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -214,7 +232,7 @@ jobs:
 
   test-deps:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -225,7 +243,7 @@ jobs:
 
   test-e2e-chrome:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -243,7 +261,7 @@ jobs:
 
   test-e2e-firefox:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - run:
@@ -264,7 +282,7 @@ jobs:
 
   benchmark:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -285,7 +303,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -315,7 +333,7 @@ jobs:
 
   job-publish-release:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -330,20 +348,26 @@ jobs:
       - run:
           name: Create GitHub Pull Request to sync master with develop
           command: .circleci/scripts/release-create-master-pr
-  # job-publish-storybook:
-  #   docker:
-  #     - image: circleci/node:10.18-browsers
-  #   steps:
-  #     - checkout
-  #     - attach_workspace:
-  #         at: .
-  #     - run:
-  #         name: storybook:deploy
-  #         command: yarn storybook:deploy
+
+  job-publish-storybook:
+    docker:
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - "5e:a3:2d:35:b6:25:b5:87:b1:41:11:0d:77:50:96:73"
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: storybook:deploy
+          command: |
+            git remote add storybook [email protected]:yqrashawn/conflux-portal-storybook.git
+            yarn storybook:deploy
 
   test-unit:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -358,7 +382,7 @@ jobs:
             - coverage
   test-unit-global:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -368,7 +392,7 @@ jobs:
           command: yarn test:unit:global
   test-mozilla-lint:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -379,7 +403,7 @@ jobs:
 
   test-integration-flat-firefox:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -395,7 +419,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:
@@ -406,15 +430,15 @@ jobs:
 
   all-tests-pass:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - run:
           name: All Tests Passed
           command: echo 'weew - everything passed!'
 
   coveralls-upload:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
     steps:
       - checkout
       - attach_workspace:

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,4 +1,5 @@
 module.exports = {
+  root: true,
   parser: 'babel-eslint',
   parserOptions: {
     'sourceType': 'module',
@@ -20,17 +21,16 @@ module.exports = {
   extends: [
     '@metamask/eslint-config',
     '@metamask/eslint-config/config/nodejs',
+    '@metamask/eslint-config/config/mocha',
     'plugin:react/recommended',
   ],
 
   env: {
     'browser': true,
-    'mocha': true,
   },
 
   plugins: [
     'babel',
-    'mocha',
     'chai',
     'react',
     'json',
@@ -90,6 +90,7 @@ module.exports = {
       'prop': 'parens-new-line',
     }],
     'babel/semi': ['error', 'never'],
-    'mocha/no-exclusive-tests': 'error',
+    'mocha/no-setup-in-describe': 'off',
+    'mocha/no-skipped-tests': 'off',
   },
 }
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ temp
 .DS_Store
 app/.DS_Store
 
+.out/
 coverage/
 dist
 builds/

diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -31,7 +31,7 @@ module.exports = {
   },
   resolve: {
     alias: {
-      './fonts/Font_Awesome': path.resolve(__dirname, '../fonts/Font_Awesome'),
+      './fonts/Font_Awesome': path.resolve(__dirname, '../app/fonts/Font_Awesome'),
     },
   },
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,8 @@
 # Changelog
 
-## Current Develop Branch
 
 ## 0.0.6 Tue Feb 11 2020
 
-## 0.0.5 Mon Feb 10 2020
-- [#7912](https://github.com/MetaMask/metamask-extension/pull/7912): Disable import button for empty string/file
-
 ## 0.0.5 Mon Feb 10 2020
 - [#7912](https://github.com/MetaMask/metamask-extension/pull/7912): Disable import button for empty string/file
 - Fix: release file blob

diff --git a/README.md b/README.md
@@ -56,18 +56,12 @@ yarn start
 yarn dist
 ```
 
-#### Writing Browser Tests
-
-To write tests that will be run in the browser using QUnit, add your test files to `test/integration/lib`.
-
 ## Other Docs
 
 - [How to add custom build to Chrome](./docs/add-to-chrome.md)
 - [How to add custom build to Firefox](./docs/add-to-firefox.md)
 - [How to add a new translation to MetaMask](./docs/translating-guide.md)
 - [Publishing Guide](./docs/publishing.md)
-- [How to live reload on local dependency changes](./docs/developing-on-deps.md)
-- [How to add new networks to the Provider Menu](./docs/adding-new-networks.md)
 - [How to port MetaMask to a new platform](./docs/porting_to_new_environment.md)
 - [How to use the TREZOR emulator](./docs/trezor-emulator.md)
 - [How to generate a visualization of this repository's development](./docs/development-visualization.md)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -746,6 +746,12 @@
   "knownAddressRecipient": {
     "message": "Known contract address."
   },
+  "knownTokenWarning": {
+    "message": "This action will edit tokens that are already listed in your wallet, which can be used to phish you. Only approve if you are certain that you mean to change what these tokens represent."
+  },
+  "reusedTokenNameWarning": {
+    "message": "A token here reuses a symbol from another token you watch, this can be confusing or deceptive."
+  },
   "invalidAddressRecipientNotEthNetwork": {
     "message": "Not CFX network, set to lowercase"
   },
@@ -1190,7 +1196,7 @@
     "message": "Separate each word with a single space"
   },
   "seedPhraseReq": {
-    "message": "Seed phrases are 12 words long"
+    "message": "Seed phrases contain 12, 15, 18, 21, or 24 words"
   },
   "selectCurrency": {
     "message": "Select Currency"

diff --git a/app/home.html b/app/home.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
-    <title>MetaMask</title>
+    <title>Conflux Portal</title>
     <link rel="stylesheet" type="text/css" href="./index.css" title="ltr">
     <link rel="stylesheet" type="text/css" href="./index-rtl.css" title="rtl" disabled>
   </head>

diff --git a/app/loading.html b/app/loading.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>MetaMask Loading</title>
+  <title>Conflux Portal Loading</title>
   <style>
     #div-logo {
       position: absolute;

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "manifest_version": 2,
   "author": "https://conflux-chain.org",
   "description": "__MSG_appDescription__",
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ temp @@
     .DS_Store
     app/.DS_Store
+    .out/
     coverage/
     dist
     builds/
@@ Expand Down @@