Cherry picking in post v7.7.0 updates

.circleci/config.yml

@@ -22,7 +22,6 @@ workflows:
       - test-lint:
           requires:
             - prep-deps
-      - test-lint-shellcheck
       - test-e2e-chrome:
           requires:
             - prep-deps
@@ -50,7 +49,6 @@ workflows:
       - all-tests-pass:
           requires:
             - test-lint
-            - test-lint-shellcheck
             - test-unit
             - test-unit-global
             - test-mozilla-lint
@@ -175,16 +173,6 @@ jobs:
           name: Verify locales
           command: yarn verify-locales --quiet
 
-  test-lint-shellcheck:
-    docker:
-      - image: circleci/node:10.17-browsers
-    steps:
-      - checkout
-      - run: sudo apt-get install shellcheck
-      - run:
-          name: Shellcheck Lint
-          command: yarn lint:shellcheck
-
   test-deps:
     docker:
       - image: circleci/node:10.17-browsers

.eslintrc

@@ -51,13 +51,13 @@
     "accessor-pairs": 2,
     "arrow-spacing": [2, { "before": true, "after": true }],
     "block-spacing": [2, "always"],
-    "brace-style": 2,
+    "brace-style": [2, "1tbs", { "allowSingleLine": true }],
     "camelcase": [2, { "properties": "never" }],
     "comma-dangle": [2, "always-multiline"],
     "comma-spacing": [2, { "before": false, "after": true }],
     "comma-style": [2, "last"],
     "constructor-super": 2,
-    "curly": 2,
+    "curly": [2, "multi-line"],
     "dot-location": [2, "property"],
     "eol-last": 2,
     "eqeqeq": [2, "allow-null"],
@@ -144,14 +144,12 @@
     "no-useless-computed-key": 2,
     "no-useless-constructor": 2,
     "no-useless-escape": 2,
-    "no-var": 2,
     "no-whitespace-before-property": 2,
     "no-with": 2,
     "one-var": [2, { "initialized": "never" }],
     "operator-linebreak": [2, "after", { "overrides": { "?": "ignore", ":": "ignore" } }],
     "padded-blocks": "off",
     "quotes": [2, "single", {"avoidEscape": true, "allowTemplateLiterals": true}],
-    "react/no-unused-state": 2,
     "react/jsx-boolean-value": 2,
     "react/jsx-curly-brace-presence": [2, { "props": "never", "children": "never" }],
     "react/jsx-equals-spacing": 2,

.gitattributes

@@ -1,4 +1,3 @@
-* text=auto
 CHANGELOG.md merge=union
 
 # Reviewing the lockfile contents is an important step in verifying that

CHANGELOG.md

@@ -2,19 +2,6 @@
 
 ## Current Develop Branch
 
-## 7.7.0 Thu Nov 28 2019
-- [#7004](https://github.com/MetaMask/metamask-extension/pull/7004): Connect distinct accounts per site
-- [#7480](https://github.com/MetaMask/metamask-extension/pull/7480): Fixed link on root README.md
-- [#7482](https://github.com/MetaMask/metamask-extension/pull/7482): Update Wyre ETH purchase url
-- [#7484](https://github.com/MetaMask/metamask-extension/pull/7484): Ensure transactions are shown in the order they are received
-- [#7491](https://github.com/MetaMask/metamask-extension/pull/7491): Update gas when token is changed on the send screen
-- [#7501](https://github.com/MetaMask/metamask-extension/pull/7501): Fix accessibility of first-time-flow terms checkboxes
-- [#7502](https://github.com/MetaMask/metamask-extension/pull/7502): Fix chainId for non standard networks
-- [#7579](https://github.com/MetaMask/metamask-extension/pull/7579): Fix timing of DAI migration notifications after dismissal
-- [#7519](https://github.com/MetaMask/metamask-extension/pull/7519): Fixing hardware connect error display
-- [#7558](https://github.com/MetaMask/metamask-extension/pull/7558): Use localized messages for NotificationModal buttons
-- [#7488](https://github.com/MetaMask/metamask-extension/pull/7488): Fix text overlap when expanding transaction
-
 ## 7.6.1 Tue Nov 19 2019
 - [#7475](https://github.com/MetaMask/metamask-extension/pull/7475): Add 'Remind Me Later' to the Maker notification
 - [#7436](https://github.com/MetaMask/metamask-extension/pull/7436): Add additional rpcUrl verification

README.md

@@ -72,6 +72,6 @@ To write tests that will be run in the browser using QUnit, add your test files
 - [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](./development/gource-viz.sh)
+- [How to generate a visualization of this repository's development](./docs/development-visualization.md)
 
 [1]: http://www.nomnoml.com/#view/%5B%3Cactor%3Euser%5D%0A%0A%5Bmetamask-ui%7C%0A%20%20%20%5Btools%7C%0A%20%20%20%20%20react%0A%20%20%20%20%20redux%0A%20%20%20%20%20thunk%0A%20%20%20%20%20ethUtils%0A%20%20%20%20%20jazzicon%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20account-detail%0A%20%20%20%20%20accounts%0A%20%20%20%20%20locked-screen%0A%20%20%20%20%20restore-vault%0A%20%20%20%20%20identicon%0A%20%20%20%20%20config%0A%20%20%20%20%20info%0A%20%20%20%5D%0A%20%20%20%5Breducers%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20metamask%0A%20%20%20%20%20identities%0A%20%20%20%5D%0A%20%20%20%5Bactions%7C%0A%20%20%20%20%20%5BbackgroundConnection%5D%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%5D%3A-%3E%5Bactions%5D%0A%20%20%20%5Bactions%5D%3A-%3E%5Breducers%5D%0A%20%20%20%5Breducers%5D%3A-%3E%5Bcomponents%5D%0A%5D%0A%0A%5Bweb%20dapp%7C%0A%20%20%5Bui%20code%5D%0A%20%20%5Bweb3%5D%0A%20%20%5Bmetamask-inpage%5D%0A%20%20%0A%20%20%5B%3Cactor%3Eui%20developer%5D%0A%20%20%5Bui%20developer%5D-%3E%5Bui%20code%5D%0A%20%20%5Bui%20code%5D%3C-%3E%5Bweb3%5D%0A%20%20%5Bweb3%5D%3C-%3E%5Bmetamask-inpage%5D%0A%5D%0A%0A%5Bmetamask-background%7C%0A%20%20%5Bprovider-engine%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bid%20store%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%3E%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%3C-%3E%5Bid%20store%5D%0A%20%20%5Bconfig%20manager%7C%0A%20%20%20%20%5Brpc%20configuration%5D%0A%20%20%20%20%5Bencrypted%20keys%5D%0A%20%20%20%20%5Bwallet%20nicknames%5D%0A%20%20%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%5Bconfig%20manager%5D%0A%20%20%5Bid%20store%5D%3C-%3E%5Bconfig%20manager%5D%0A%5D%0A%0A%5Buser%5D%3C-%3E%5Bmetamask-ui%5D%0A%0A%5Buser%5D%3C%3A--%3A%3E%5Bweb%20dapp%5D%0A%0A%5Bmetamask-contentscript%7C%0A%20%20%5Bplugin%20restart%20detector%5D%0A%20%20%5Brpc%20passthrough%5D%0A%5D%0A%0A%5Brpc%20%7C%0A%20%20%5Bethereum%20blockchain%20%7C%0A%20%20%20%20%5Bcontracts%5D%0A%20%20%20%20%5Baccounts%5D%0A%20%20%5D%0A%5D%0A%0A%5Bweb%20dapp%5D%3C%3A--%3A%3E%5Bmetamask-contentscript%5D%0A%5Bmetamask-contentscript%5D%3C-%3E%5Bmetamask-background%5D%0A%5Bmetamask-background%5D%3C-%3E%5Bmetamask-ui%5D%0A%5Bmetamask-background%5D%3C-%3E%5Brpc%5D%0A

app/_locales/cs/messages.json

@@ -1,7 +1,16 @@
 {
+  "confirmClear": {
+    "message": "Naozaj chcete vymazať schválené webové stránky?"
+  },
+  "clearApprovalData": {
+    "message": "Jasné údaje o schválení"
+  },
   "reject": {
     "message": "Odmítnout"
   },
+  "providerRequestInfo": {
+    "message": "Níže uvedená doména se pokouší požádat o přístup k API Ethereum, aby mohla komunikovat s blokádou Ethereum. Před schválením přístupu Ethereum vždy zkontrolujte, zda jste na správném místě."
+  },
   "account": {
     "message": "Účet"
   },
@@ -49,6 +58,10 @@
   "balanceIsInsufficientGas": {
     "message": "Nedostatek prostředků pro aktuální množství paliva"
   },
+  "betweenMinAndMax": {
+    "message": "musí být větší nebo roven $1 a menší nebo roven $2.",
+    "description": "helper for inputting hex as decimal input"
+  },
   "blockiesIdenticon": {
     "message": "Použít Blockies Identicon"
   },
@@ -100,6 +113,9 @@
   "copiedExclamation": {
     "message": "Zkopírováno!"
   },
+  "copy": {
+    "message": "Kopírovat"
+  },
   "copyToClipboard": {
     "message": "Kopírovat do schránky"
   },
@@ -211,6 +227,10 @@
     "message": "Získejte Ether z faucetu za $1.",
     "description": "Displays network name for Ether faucet"
   },
+  "greaterThanMin": {
+    "message": "musí být větší nebo roven $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
   "here": {
     "message": "zde",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -265,6 +285,10 @@
   "learnMore": {
     "message": "Zjistěte více."
   },
+  "lessThanMax": {
+    "message": "musí být menší nebo roven $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
   "likeToAddTokens": {
     "message": "Chcete přidat tyto tokeny?"
   },
@@ -343,6 +367,9 @@
     "message": "Vložte zde svůj privátní klíč:",
     "description": "For importing an account from a private key"
   },
+  "pasteSeed": {
+    "message": "Svou klíčovou frázi vložte zde!"
+  },
   "personalAddressDetected": {
     "message": "Detekována osobní adresa. Zadejte adresu kontraktu tokenu."
   },
@@ -449,6 +476,9 @@
   "stateLogError": {
     "message": "Chyba během získávání stavových protokolů."
   },
+  "submit": {
+    "message": "Odeslat"
+  },
   "submitted": {
     "message": "Odesláno"
   },
@@ -505,6 +535,9 @@
   "usedByClients": {
     "message": "Používána různými klienty"
   },
+  "validFileImport": {
+    "message": "Musíte vybrat validní soubor k importu."
+  },
   "viewAccount": {
     "message": "Zobrazit účet"
   },

app/_locales/de/messages.json

@@ -50,9 +50,12 @@
   "reject": {
     "message": "Ablehnen"
   },
-  "likeToConnect": {
+  "providerRequest": {
     "message": "$1 möchte sich mit deinem Account verbinden"
   },
+  "providerRequestInfo": {
+    "message": "Diese Website fordert Zugriff auf Ihre aktuelle Kontoadresse. Stellen Sie immer sicher, dass Sie den Websites vertrauen, mit denen Sie interagieren."
+  },
   "about": {
     "message": "Über"
   },
@@ -217,6 +220,10 @@
   "basic": {
     "message": "Grundlegend"
   },
+  "betweenMinAndMax": {
+    "message": "Muss größer oder gleich $1 und kleiner oder gleich $2 sein.",
+    "description": "helper for inputting hex as decimal input"
+  },
   "blockExplorerUrl": {
     "message": "Block-Explorer"
   },
@@ -386,6 +393,9 @@
   "copiedExclamation": {
     "message": "Kopiert!"
   },
+  "copy": {
+    "message": "Kopieren"
+  },
   "copyAddress": {
     "message": "Adresse in die Zwischenablage kopieren"
   },
@@ -476,6 +486,9 @@
   "directDepositEtherExplainer": {
     "message": "Wenn du bereits Ether besitzt, ist die sofortige Einzahlung die schnellste Methode Ether in deine neue Wallet zu bekommen."
   },
+  "dismiss": {
+    "message": "Schließen"
+  },
   "done": {
     "message": "Fertig"
   },
@@ -675,6 +688,10 @@
   "getStarted": {
     "message": "Erste Schritte"
   },
+  "greaterThanMin": {
+    "message": "Muss größer oder gleich $1 sein.",
+    "description": "helper for inputting hex as decimal input"
+  },
   "happyToSeeYou": {
     "message": "Wir freuen uns, Sie zu sehen."
   },
@@ -1063,6 +1080,9 @@
     "message": "Füge deine Private Key Zeichenfolge hier ein:",
     "description": "For importing an account from a private key"
   },
+  "pasteSeed": {
+    "message": "Füge deine Seed-Wörterfolge hier ein!"
+  },
   "pending": {
     "message": "ausstehend"
   },
@@ -1622,6 +1642,9 @@
   "userName": {
     "message": "Nutzername"
   },
+  "validFileImport": {
+    "message": "Du musst eine gültige Datei für den Import auswählen."
+  },
   "viewAccount": {
     "message": " Account einsehen"
   },