Version 6.7.2 Release Candidate

.circleci/config.yml

@@ -80,7 +80,7 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - run:
@@ -94,7 +94,7 @@ jobs:
 
   prep-build:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -113,7 +113,7 @@ jobs:
 
   prep-docs:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -128,7 +128,7 @@ jobs:
 
   prep-scss:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -147,7 +147,7 @@ jobs:
 
   test-lint:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -158,7 +158,7 @@ jobs:
 
   test-deps:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -182,7 +182,7 @@ jobs:
   #         destination: test-artifacts
   test-e2e-chrome:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -197,7 +197,7 @@ jobs:
 
   test-e2e-firefox:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - run:
@@ -215,7 +215,7 @@ jobs:
 
   job-screens:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -230,7 +230,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -250,7 +250,7 @@ jobs:
 
   job-publish-release:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -267,7 +267,7 @@ jobs:
 
   test-unit:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -277,7 +277,7 @@ jobs:
           command: npm run test:coverage
   test-mozilla-lint:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -288,7 +288,7 @@ jobs:
 
   test-integration-flat-firefox:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -304,7 +304,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -315,7 +315,7 @@ jobs:
 
   all-tests-pass:
     docker:
-      - image: circleci/node:8.15.1-browsers
+      - image: circleci/node:10.16-browsers
     steps:
       - run:
           name: All Tests Passed

.github/CODEOWNERS

@@ -1,6 +1,7 @@
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 
+package*.json                        @whymarrh
 ui/                                  @danjm @whymarrh
 app/scripts/controllers/transactions @frankiebee
 

.nvmrc

@@ -1 +1 @@
-v8.15
+v10.16.0

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Current Develop Branch
 
+## 6.7.2 Mon Jul 01 2019
+
+- [#6713](https://github.com/MetaMask/metamask-extension/pull/6713): * Normalize and Validate txParams in TransactionStateManager.addTx too
+- [#6759](https://github.com/MetaMask/metamask-extension/pull/6759): Update to Node.js v10
+- [#Fixes #6694](https://github.com/MetaMask/metamask-extension/pull/Fixes #6694): Fixes #6694
+- [#6743](https://github.com/MetaMask/metamask-extension/pull/6743): * Add tests for ImportWithSeedPhrase#parseSeedPhrase
+- [#Fixes #6740](https://github.com/MetaMask/metamask-extension/pull/Fixes #6740): Fixes #6740
+- [#Fixes #6741](https://github.com/MetaMask/metamask-extension/pull/Fixes #6741): Fixes #6741
+- [#6761](https://github.com/MetaMask/metamask-extension/pull/6761): Fixes #6760, correct PropTypes for nextRoute
+- [#6754](https://github.com/MetaMask/metamask-extension/pull/6754): There is currently a bug in chrome that prevents reading source maps
+- [#6589](https://github.com/MetaMask/metamask-extension/pull/6589): Document hotfix protocol
+- [#6738](https://github.com/MetaMask/metamask-extension/pull/6738): Add codeowner for package-lock-old.json package-lock.json package.json packagelock-old.json files
+- [#6648](https://github.com/MetaMask/metamask-extension/pull/6648): Add loading view to notification.html
+- [#6731](https://github.com/MetaMask/metamask-extension/pull/6731): Add brave as a platform type for MetaMask
+
 ## 6.7.1 Fri Jun 28 2019
 - [#6764](https://github.com/MetaMask/metamask-extension/pull/6764): Fix display of token amount on confirm transaction screen
 

README.md

@@ -11,18 +11,16 @@ To learn how to contribute to the MetaMask project itself, visit our [Internal D
 
 ## Building locally
 
-- Install [Node.js](https://nodejs.org) version 8 and the latest available npm@6
+- Install [Node.js](https://nodejs.org) version 10 and the latest available npm@6
     - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you.
     - If you install Node.js manually, ensure you're using npm@6
         - Install npm@6 using `npm install -g npm@6`
-- Install dependencies: `npm install`
+- Install dependencies: `npm ci`
     - If you have issues with node-sass compilation, try `npm rebuild node-sass`
-- Install gulp globally with `npm install -g gulp-cli`.
-- Build the project to the `./dist/` folder with `gulp build`.
-- Optionally, to rebuild on file changes, run `gulp dev`.
-- To package .zip files for distribution, run `gulp zip`, or run the full build & zip with `gulp dist`.
+- Build the project to the `./dist/` folder with `npm run dist`.
+- Optionally, to start a development build (e.g. with logging and file watching) run `npm start` instead.
 
- Uncompressed builds can be found in `/dist`, compressed builds can be found in `/builds` once they're built.
+Uncompressed builds can be found in `/dist`, compressed builds can be found in `/builds` once they're built.
 
 ## Contributing
 
@@ -32,13 +30,11 @@ You can re-generate the docs locally by running `npm run doc`, and contributors
 
 ### Running Tests
 
-Requires `mocha` installed. Run `npm install -g mocha`.
-
-Then just run `npm test`.
+Run tests with `npm test`.
 
 You can also test with a continuously watching process, via `npm run watch`.
 
-You can run the linter by itself with `gulp lint`.
+You can run the linter by itself with `npm run lint`.
 
 ## Architecture
 

app/_locales/cs/messages.json

@@ -252,10 +252,6 @@
   "depositBTC": {
     "message": "Vložte BTC na níže uvedenou adresu:"
   },
-  "depositCoin": {
-    "message": "Vložte $1 na níže uvedenou adresu",
-    "description": "Tells the user what coin they have selected to deposit with shapeshift"
-  },
   "depositEth": {
     "message": "Vložit Eth"
   },

app/_locales/de/messages.json

@@ -249,10 +249,6 @@
   "depositBTC": {
     "message": "Zahle dein BTC in die unten stehende Adresse ein:"
   },
-  "depositCoin": {
-    "message": "Zahle deine $1 in die unten stehende Adresse ein",
-    "description": "Teilt dem Benutzer mit welchen Token er beim Einzahlen mit Shapeshift ausgewählt hat"
-  },
   "depositEth": {
     "message": "Eth kaufen"
   },

app/_locales/en/messages.json

@@ -466,10 +466,6 @@
   "depositBTC": {
     "message": "Deposit your BTC to the address below:"
   },
-  "depositCoin": {
-    "message": "Deposit your $1 to the address below",
-    "description": "Tells the user what coin they have selected to deposit with shapeshift"
-  },
   "depositEth": {
     "message": "Deposit Eth"
   },

app/_locales/es/messages.json

@@ -264,10 +264,6 @@
   "depositBTC": {
     "message": "Deposita tus BTC a la dirección de abajo:"
   },
-  "depositCoin": {
-    "message": "Deposita tu $1 a la dirección de abajo",
-    "description": "Informa al usuario que moneda ha elegido para depositar en shapeshift"
-  },
   "depositEth": {
     "message": "Depositar Ether"
   },

app/_locales/fr/messages.json

@@ -330,10 +330,6 @@
   "depositBTC": {
     "message": "Déposez vos BTC à l'adresse ci-dessous:"
   },
-  "depositCoin": {
-    "message": "Déposer votre $1 à l'adresse ci-dessous",
-    "description": "Indique à l'utilisateur quelle monnaie il a choisi de déposer avec Shapeshift"
-  },
   "depositEth": {
     "message": "Déposer Eth"
   },

app/_locales/hn/messages.json

@@ -240,10 +240,6 @@
   "depositBTC": {
     "message": "नीचे दिए गए पते पर अपना बीटीसी जमा करें:"
   },
-  "depositCoin": {
-    "message": "नीचे दिए गए पते पर अपना $1 जमा करें",
-    "description": "उपयोगकर्ता को बताता है कि उन्होंने सिक्का के साथ जमा करने के लिए किस सिक्का का चयन किया है"
-  },
   "depositEth": {
     "message": "Eth जमाआर्थ"
   },

app/_locales/ht/messages.json

@@ -336,10 +336,6 @@
   "depositBTC": {
     "message": "Depoze BTC ou nan adrès ki anba a:"
   },
-  "depositCoin": {
-    "message": "Depoze $1 ou nan adrès ki anba a",
-    "description": "Tells the user what coin they have selected to deposit with shapeshift"
-  },
   "depositEth": {
     "message": "Depo Eth"
   },

app/_locales/it/messages.json

@@ -463,10 +463,6 @@
   "depositBTC": {
     "message": "Deposita i tuoi BTC all'indirizzo sotto:"
   },
-  "depositCoin": {
-    "message": "Deposita $1 all'indirizzo sotto",
-    "description": "Dice all'utente quale moneta ha selezionato per depositare con Shapeshift"
-  },
   "depositEth": {
     "message": "Deposita Eth"
   },

app/_locales/ja/messages.json

@@ -228,10 +228,6 @@
   "depositBTC": {
     "message": "BTCを下記のアドレスへ振込んでください:"
   },
-  "depositCoin": {
-    "message": "$1を下記のアドレスへ振込んでください",
-    "description": "Tells the user what coin they have selected to deposit with shapeshift"
-  },
   "depositEth": {
     "message": "ETHを入金"
   },

app/_locales/ko/messages.json

@@ -402,10 +402,6 @@
   "depositBTC": {
     "message": "다음 주소로 BTC를 입금해주세요."
   },
-  "depositCoin": {
-    "message": "다음 주소로 $1 만큼 입금해주세요.",
-    "description": "사용자에게 shapeshift에서 어떤 코인을 선택해 입금했는지 알려줍니다"
-  },
   "depositEth": {
     "message": "이더 입금하기"
   },

app/_locales/nl/messages.json

@@ -240,10 +240,6 @@
   "depositBTC": {
     "message": "Stort uw BTC op het onderstaande adres:"
   },
-  "depositCoin": {
-    "message": "Stort uw $1 op het onderstaande adres",
-    "description": "Laat de gebruiker weten welk muntje ze hebben geselecteerd om te deponeren met shapeshift"
-  },
   "depositEth": {
     "message": "Aanbetaling Eth"
   },

app/_locales/ph/messages.json

@@ -201,10 +201,6 @@
   "depositBTC": {
     "message": "I-deposito ang iyong BTC sa address na ito:"
   },
-  "depositCoin": {
-    "message": "I-deposito ang iyong $1 sa address na ito",
-    "description": "Sinasabihan ang user kung ano ang coin na kanilang pinili para I-deposito gamit ang shapeshift"
-  },
   "depositEth": {
     "message": "I-deposito ang Eth"
   },

app/_locales/pl/messages.json

@@ -249,10 +249,6 @@
   "depositBTC": {
     "message": "Zdeponuj swoje BTC na poniższy adres:"
   },
-  "depositCoin": {
-    "message": "Zdeponuj $1 na poniższy adres",
-    "description": "Pokazuje użytkownikowi jakie waluty wybrał do zdeponowania w ShapeShift"
-  },
   "depositEth": {
     "message": "Zdeponuj Eth"
   },

app/_locales/pt/messages.json

@@ -240,10 +240,6 @@
   "depositBTC": {
     "message": "Deposite as suas BTC no endereço abaixo:"
   },
-  "depositCoin": {
-    "message": "Deposite $1 no endereço abaixo",
-    "description": "Diz ao usuário que moeda selecionou para depositar com shapeshift"
-  },
   "depositEth": {
     "message": "Depositar Eth"
   },

app/_locales/ru/messages.json

@@ -252,10 +252,6 @@
   "depositBTC": {
     "message": "Отправьте ваш BTC на адрес ниже:"
   },
-  "depositCoin": {
-    "message": "Отправьте ваш $1 на адрес ниже",
-    "description": "Tells the user what coin they have selected to deposit with shapeshift"
-  },
   "depositEth": {
     "message": "Пополнить Eth"
   },

app/_locales/sk/messages.json

@@ -243,10 +243,6 @@
   "depositBTC": {
     "message": "Vložte BTC na níže uvedenou adresu:"
   },
-  "depositCoin": {
-    "message": "Vložte $1 na níže uvedenou adresu",
-    "description": "Tells the user what coin they have selected to deposit with shapeshift"
-  },
   "depositEth": {
     "message": "Vložit Eth"
   },