Merge branch 'master' of https://github.com/MetaMask/metamask-extension

* 'master' of https://github.com/MetaMask/metamask-extension: (84 commits) Version 6.3.1 Check token name constants against the lower case methodData name in conf tx switch container. Ensure correct confirm screen in case of smartcontract check fail About tab copy changes; Update route for Info & Help in account menu (MetaMask#6356) Revert to providing inline defaults in getHexGasTotal and increaseLastGasPrice (MetaMask#6361) Further e2e fixes in wake of MetaMask#6364 and MetaMask#6367 (MetaMask#6374) Split e2e run-all commands onto multiple lines Run from-import e2e tests with additional account, to avoid conflict with accounts in earlier test runs Use localhost instead of mainnent/infura for custom rpc tests in e2e tests. ci: Add build:test Gulp task for e2e build e2e: Update Contract Interaction wording e2e: Skip approving token test send-footer.utils.js - addressIsNew - improve readability test - unit - ui - actions - setCompletedOnboarding - fix stub to call callback lint fix actions - setCompletedOnboarding - make async with pify notice-controller - make markAllNoticesRead sync lib - nodeify - correctly wrap synchronous functions notices - markAllNoticesRead - use async/await buy-eth-url - lint fix ...
vittominacori · Apr 3, 2019 · 15ac46c · 15ac46c
2 parents b4bb6a8 + 87f393e
commit 15ac46c
Show file tree

Hide file tree

Showing 804 changed files with 5,184 additions and 3,899 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,23 @@
 {
-  "presets": [["env", { "targets": { "browsers": [">0.25%", "not ie 11", "not op_mini all"] } } ], "react", "stage-0"],
-  "plugins": ["transform-runtime", "transform-async-to-generator", "transform-class-properties"]
-}
+  "presets": [
+    [
+      "env",
+      {
+        "targets": {
+          "browsers": [
+            ">0.25%",
+            "not ie 11",
+            "not op_mini all"
+          ]
+        }
+      }
+    ],
+    "react",
+    "stage-0"
+  ],
+  "plugins": [
+    "transform-runtime",
+    "transform-async-to-generator",
+    "transform-class-properties"
+  ]
+}
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,11 +23,9 @@ workflows:
       - test-e2e-chrome:
           requires:
             - prep-deps-npm
-            - prep-build
       - test-e2e-firefox:
           requires:
             - prep-deps-npm
-            - prep-build
       # - test-e2e-beta-drizzle:
       #     requires:
       #       - prep-deps-npm
@@ -82,28 +80,21 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - v1.0-dependency-cache-{{ checksum "package-lock.json" }}
       - run:
-          name: Install npm 6 + deps via npm
+          name: Install deps via npm
           command: |
-           sudo npm install -g npm@6 && npm install --no-save --no-audit
+           npm ci
       - persist_to_workspace:
           root: .
           paths:
           - node_modules
-      - save_cache:
-          key: v1.0-dependency-cache-{{ checksum "package-lock.json" }}
-          paths:
-            - node_modules
 
   prep-build:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -122,7 +113,7 @@ jobs:
 
   prep-docs:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -137,7 +128,7 @@ jobs:
 
   prep-scss:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -156,7 +147,7 @@ jobs:
 
   test-lint:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -191,21 +182,22 @@ jobs:
   #         destination: test-artifacts
   test-e2e-chrome:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
           at: .
       - run:
           name: test:e2e:chrome
-          command: npm run test:e2e:chrome
+          command: npm run build:test && npm run test:e2e:chrome
+          no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
 
   test-e2e-firefox:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - run:
@@ -215,14 +207,15 @@ jobs:
           at: .
       - run:
           name: test:e2e:firefox
-          command: npm run test:e2e:firefox
+          command: npm run build:test && npm run test:e2e:chrome
+          no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
 
   job-screens:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -237,7 +230,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -257,7 +250,7 @@ jobs:
 
   job-publish-release:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -274,7 +267,7 @@ jobs:
 
   test-unit:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -284,7 +277,7 @@ jobs:
           command: npm run test:coverage
   test-mozilla-lint:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -295,7 +288,7 @@ jobs:
 
   test-integration-flat-firefox:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -311,7 +304,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -320,36 +313,9 @@ jobs:
           name: test:integration:flat
           command: npm run test:flat
 
-  test-integration-mascara-firefox:
-    docker:
-      - image: circleci/node:8.11.3-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Install Firefox
-          command: ./.circleci/scripts/firefox-install
-      - run:
-          name: test:integration:mascara
-          command: npm run test:mascara
-
-  test-integration-mascara-chrome:
-    environment:
-      browsers: '["Chrome"]'
-    docker:
-      - image: circleci/node:8.11.3-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: test:integration:mascara
-          command: npm run test:mascara
-
   all-tests-pass:
     docker:
-      - image: circleci/node:8.11.3-browsers
+      - image: circleci/node:8.15.1-browsers
     steps:
       - run:
           name: All Tests Passed

diff --git a/.eslintignore b/.eslintignore
@@ -14,9 +14,6 @@ app/vendor/**
 
 ui/lib/blockies.js
 
-mascara/src/app/first-time/spinner.js
-mascara/test/jquery-3.1.0.min.js
-
 test/integration/bundle.js
 test/integration/jquery-3.1.0.min.js
 test/integration/helpers.js
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v8.13
+v8.15
diff --git a/.stylelintignore b/.stylelintignore
@@ -4,7 +4,6 @@ dist/
 docs/
 fonts/
 images/
-mascara/
 node_modules/
 notices/
 test/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,36 @@
 
 ## Current Develop Branch
 
+## 6.3.1 Fri Mar 26 2019
+
+- [#6353](https://github.com/MetaMask/metamask-extension/pull/6353): Open restore vault in full screen when clicked from popup
+- [#6372](https://github.com/MetaMask/metamask-extension/pull/6372): Prevents duplicates of account addresses from showing in send screen "To" dropdown
+- [#6374](https://github.com/MetaMask/metamask-extension/pull/6374): Ensures users are placed on correct confirm screens even when registry service fails
+
+## 6.3.0 Mon Mar 25 2019
+
+- [#6300](https://github.com/MetaMask/metamask-extension/pull/6300): Gas chart hidden on custom networks
+- [#6301](https://github.com/MetaMask/metamask-extension/pull/6301): Fix gas fee in the submitted step of the transaction details activity log
+- [#6302](https://github.com/MetaMask/metamask-extension/pull/6302): Replaces the coinbase link in the deposit modal with one for wyre
+- [#6307](https://github.com/MetaMask/metamask-extension/pull/6307): Centre the notification in the current window
+- [#6312](https://github.com/MetaMask/metamask-extension/pull/6312): Fixes popups not showing when screen size is odd
+- [#6326](https://github.com/MetaMask/metamask-extension/pull/6326): Fix oversized loading overlay on gas customization modal. 
+- [#6330](https://github.com/MetaMask/metamask-extension/pull/6330): Stop reloading dapps on network change allowing dapps to decide if it should refresh or not
+- [#6332](https://github.com/MetaMask/metamask-extension/pull/6332): Enable mobile sync
+- [#6333](https://github.com/MetaMask/metamask-extension/pull/6333): Redesign of the settings screen
+- [#6340](https://github.com/MetaMask/metamask-extension/pull/6340): Cancel transactions and signature requests on the closing of notification windows
+- [#6341](https://github.com/MetaMask/metamask-extension/pull/6341): Disable transaction "Cancel" button when balance is insufficient
+- [#6347](https://github.com/MetaMask/metamask-extension/pull/6347): Enable privacy mode by default for first time users
+
+## 6.2.2 Tue Mar 12 2019
+
+- [#6271](https://github.com/MetaMask/metamask-extension/pull/6271): Centre all notification popups
+- [#6268](https://github.com/MetaMask/metamask-extension/pull/6268): Improve Korean translations
+- [#6279](https://github.com/MetaMask/metamask-extension/pull/6279): Nonmultiple notifications for batch txs
+- [#6280](https://github.com/MetaMask/metamask-extension/pull/6280): No longer check network when validating checksum addresses
+
+## 6.2.1 Wed Mar 06 2019
+
 ## 6.2.0 Tue Mar 05 2019
 - [#6192](https://github.com/MetaMask/metamask-extension/pull/6192): Improves design and UX of onboarding flow
 - [#6195](https://github.com/MetaMask/metamask-extension/pull/6195): Fixes gas estimation when sending to contracts
@@ -12,7 +42,7 @@
 
 - [#6182](https://github.com/MetaMask/metamask-extension/pull/6182): Change "Token Address" to "Token Contract Address"
 - [#6177](https://github.com/MetaMask/metamask-extension/pull/6177): Fixes #6176
-- [#6146](https://github.com/MetaMask/metamask-extension/pull/6146): * Add Copy Tx ID button to transaction-list-item-details
+- [#6146](https://github.com/MetaMask/metamask-extension/pull/6146): * Add Copy Tx ID button to transaction-list-item-details
 - [#6133](https://github.com/MetaMask/metamask-extension/pull/6133): Checksum address before slicing it for the confirm screen
 - [#6147](https://github.com/MetaMask/metamask-extension/pull/6147): Add button to force edit token symbol when adding custom token
 - [#6124](https://github.com/MetaMask/metamask-extension/pull/6124): recent-blocks - dont listen for block when on infura providers

diff --git a/Dockerfile b/Dockerfile
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
@@ -131,6 +131,12 @@
   "buyCoinbaseExplainer": {
     "message": "Coinbase je světově nejoblíbenější místo k nákupu a prodeji bitcoinu, etherea nebo litecoinu."
   },
+  "buyCoinSwitch": {
+    "message": "Nákup na CoinSwitch"
+  },
+  "buyCoinSwitchExplainer": {
+    "message": "CoinSwitch je jediným místem, kde můžete vyměňovat více než 300 kryptocurrencí za nejlepší cenu."
+  },
   "ok": {
     "message": "Ok"
   },
@@ -164,6 +170,9 @@
   "continueToCoinbase": {
     "message": "Přejít na Coinbase"
   },
+  "continueToCoinSwitch": {
+    "message": "Přejít na CoinSwitch"
+  },
   "contractDeployment": {
     "message": "Nasazení kontraktu"
   },

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
@@ -131,6 +131,12 @@
   "buyCoinbaseExplainer": {
     "message": "Coinbase ist die weltweit bekannteste Art und Weise um Bitcoin, Ethereum und Litecoin zu kaufen und verkaufen."
   },
+  "buyCoinSwitch": {
+    "message": "Auf CoinSwitch kaufen"
+  },
+  "buyCoinSwitchExplainer": {
+    "message": "CoinSwitch ist die One-Stop-Destination, um mehr als 300 Kryptowährungen zum besten Preis zu tauschen."
+  },
   "ok": {
     "message": "Ok"
   },
@@ -164,6 +170,9 @@
   "continueToCoinbase": {
     "message": "Zu Coinbase fortfahren"
   },
+  "continueToCoinSwitch": {
+    "message": "Zu CoinSwitch fortfahren"
+  },
   "contractDeployment": {
     "message": "Smart Contract Ausführung"
   },