Revert "Merge pull request #7599 from MetaMask/Version-v7.7.0"

.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

@@ -44,19 +44,18 @@
   },
 
   "rules": {
-    "default-case": 2,
     "import/no-unresolved": ["error", { "commonjs": true }],
     "no-restricted-globals": ["error", "event"],
     "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"],
@@ -143,38 +142,17 @@
     "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,
     "react/no-deprecated": 0,
     "react/default-props-match-prop-types": 2,
-    "react/jsx-closing-tag-location": 2,
-    "react/jsx-no-duplicate-props": 2,
-    "react/jsx-closing-bracket-location": 2,
-    "react/jsx-first-prop-new-line": 2,
-    "react/jsx-max-props-per-line": [2, { "maximum": 1, "when": "multiline"} ],
-    "react/jsx-tag-spacing": [2, {
-      "closingSlash": "never",
-      "beforeSelfClosing": "always",
-      "afterOpening": "never"
-    }],
-    "react/jsx-wrap-multilines": [2, {
-      "declaration": "parens-new-line",
-      "assignment": "parens-new-line",
-      "return": "parens-new-line",
-      "arrow": "parens-new-line",
-      "condition": "parens-new-line",
-      "logical": "parens-new-line",
-      "prop": "parens-new-line"
-    }],
     "semi": [2, "never"],
     "semi-spacing": [2, { "before": false, "after": true }],
     "space-before-blocks": [2, "always"],

.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

@@ -73,6 +73,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/am/messages.json

@@ -1,16 +1,28 @@
 {
+  "privacyModeDefault": {
+    "message": "የግላዊነት ኩነት አሁን በንቡር ነቅቷል"
+  },
   "chartOnlyAvailableEth": {
     "message": "ቻርት የሚገኘው በ Ethereum አውታረ መረቦች ላይ ብቻ ነው።"
   },
+  "confirmClear": {
+    "message": "የተፈቀዱ ድረ ገጾችን ለማጥራት እንደሚፈልጉ እርግጠኛ ነዎት?"
+  },
   "contractInteraction": {
     "message": "የግንኙነት ተግባቦት"
   },
+  "clearApprovalData": {
+    "message": "የግላዊነት ውሂብን አጥራ"
+  },
   "reject": {
     "message": "አይቀበሉ"
   },
-  "likeToConnect": {
+  "providerRequest": {
     "message": "$1ከመለያዎ ጋር ለመገናኘት ይፈልጋል"
   },
+  "providerRequestInfo": {
+    "message": "ይህ ድረ ገጽ የእርስዎን መለያ ወቅታዊ አድራሻ ለማየት እየጠየቀ ነው። ምንጊዜም ግንኙነት የሚያደርጉባቸውን ድረ ገጾች የሚያምኗቸው መሆኑን ያረጋግጡ።"
+  },
   "about": {
     "message": "ስለ"
   },
@@ -145,6 +157,10 @@
   "basic": {
     "message": "መሠረታዊ"
   },
+  "betweenMinAndMax": {
+    "message": "ከ$1መብለጥ ወይም እኩል እና ከ$2በታች ወይም እኩል መሆን አለበት።",
+    "description": "helper for inputting hex as decimal input"
+  },
   "blockExplorerUrl": {
     "message": "ኤክስፕሎረር አግድ"
   },
@@ -236,6 +252,9 @@
   "connect": {
     "message": "ይገናኙ"
   },
+  "connectRequest": {
+    "message": "የግንኙነት ጥያቄ"
+  },
   "connectingTo": {
     "message": "ከ $1ጋር መገናኘት"
   },
@@ -275,6 +294,9 @@
   "copiedExclamation": {
     "message": "ተቀድቷል"
   },
+  "copy": {
+    "message": "ቅዳ"
+  },
   "copyAddress": {
     "message": "አድራሻን ወደ ቅንጥብ ሰሌዳ ቅዳ"
   },
@@ -353,6 +375,9 @@
   "directDepositEtherExplainer": {
     "message": "ቀደም ሲል የተወሰነ Ether ካለዎት፣ በአዲሱ ቋትዎ Ether ለማግኘት ፈጣኑ መንገድ ቀጥተኛ ተቀማጭ ነው።"
   },
+  "dismiss": {
+    "message": "አሰናብት"
+  },
   "done": {
     "message": "ተጠናቅቋል"
   },
@@ -518,6 +543,10 @@
   "getStarted": {
     "message": "አስጀማሪ መመሪያ"
   },
+  "greaterThanMin": {
+    "message": "ከ $1ጋር እኩል መሆን ወይም መብለጥ አለበት።",
+    "description": "helper for inputting hex as decimal input"
+  },
   "happyToSeeYou": {
     "message": "እርስዎን በማየታችን ደስተኛ ነን።"
   },
@@ -636,6 +665,10 @@
   "ledgerAccountRestriction": {
     "message": "አዲስ መለያ ከማከልዎ በፊት የመጨረሻውን መለያዎን መጠቀም አለብዎት።"
   },
+  "lessThanMax": {
+    "message": "ከ $1ያነሰ ወይም እኩል መሆን አለበት።",
+    "description": "helper for inputting hex as decimal input"
+  },
   "letsGoSetUp": {
     "message": "አዎ፣ እናደራጅ!"
   },
@@ -834,6 +867,9 @@
     "message": "የግል ቁልፍዎን ሕብረ ቁምፊ እዚህ ለጥፍ፡",
     "description": "For importing an account from a private key"
   },
+  "pasteSeed": {
+    "message": "የዘር ሐረግዎን እዚህ ይለጥፉ!"
+  },
   "pending": {
     "message": "በእንጥልጥል ላይ ያለ"
   },
@@ -1147,6 +1183,9 @@
   "storePhrase": {
     "message": "ይህን ሐረግ እንደ 1Password ባለ የይለፍ ቃል አስተዳዳሪ ውስጥ ያስቀምጡ።"
   },
+  "submit": {
+    "message": "አስገባ"
+  },
   "submitted": {
     "message": "የቀረበ"
   },
@@ -1314,6 +1353,9 @@
   "userName": {
     "message": "የተጣቃሚ ስም"
   },
+  "validFileImport": {
+    "message": "የሚያስመጡትን ትክክለኛ ፋይል መምረጥ አለብዎ፡"
+  },
   "viewAccount": {
     "message": "መለያን ይመልከቱ"
   },

app/_locales/ar/messages.json

@@ -1,16 +1,28 @@
 {
+  "privacyModeDefault": {
+    "message": "يتم تمكين وضع الخصوصية الآن بشكل افتراضي"
+  },
   "chartOnlyAvailableEth": {
     "message": "الرسم البياني متاح فقط على شبكات إيثيريوم."
   },
+  "confirmClear": {
+    "message": "هل أنت متأكد من أنك تريد مسح المواقع المعتمدة؟"
+  },
   "contractInteraction": {
     "message": "التفاعل على العقد"
   },
+  "clearApprovalData": {
+    "message": "مسح بيانات الخصوصية"
+  },
   "reject": {
     "message": "رفض"
   },
-  "likeToConnect": {
+  "providerRequest": {
     "message": "يرغب $1 في الاتصال بحسابك"
   },
+  "providerRequestInfo": {
+    "message": "يطلب هذا الموقع حق الوصول لعرض عنوان حسابك الحالي. تأكد دائماً من ثقتك في المواقع التي تتفاعل معها."
+  },
   "about": {
     "message": "حول"
   },
@@ -145,6 +157,10 @@
   "basic": {
     "message": "الأساسية"
   },
+  "betweenMinAndMax": {
+    "message": "يجب أن تكون أكبر من أو تساوي $1 وأقل من أو تساوي $2.",
+    "description": "helper for inputting hex as decimal input"
+  },
   "blockExplorerUrl": {
     "message": "متصفح Block Explorer"
   },
@@ -236,6 +252,9 @@
   "connect": {
     "message": "اتصال"
   },
+  "connectRequest": {
+    "message": "طلب اتصال"
+  },
   "connectingTo": {
     "message": "جارِ الاتصال بـ $1"
   },
@@ -275,6 +294,9 @@
   "copiedExclamation": {
     "message": "تم النسخ."
   },
+  "copy": {
+    "message": "نسخ"
+  },
   "copyAddress": {
     "message": "نسخ العنوان إلى الحافظة"
   },
@@ -353,6 +375,9 @@
   "directDepositEtherExplainer": {
     "message": "إذا كان لديك بالفعل بعض الأثير، فإن أسرع طريقة للحصول على الأثير في محفظتك الجديدة عن طريق الإيداع المباشر."
   },
+  "dismiss": {
+    "message": "رفض"
+  },
   "done": {
     "message": "تم"
   },
@@ -514,6 +539,10 @@
   "getStarted": {
     "message": "البدء"
   },
+  "greaterThanMin": {
+    "message": "يجب أن يكون أكبر من أو يساوي $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
   "happyToSeeYou": {
     "message": "نحن سعداء برؤيتك."
   },
@@ -629,6 +658,10 @@
   "ledgerAccountRestriction": {
     "message": "أنت بحاجة إلى استخدام حسابك الأخير قبل أن تتمكن من إضافة حساب جديد."
   },
+  "lessThanMax": {
+    "message": "يجب أن يكون أقل من أو يساوي $1.",
+    "description": "helper for inputting hex as decimal input"
+  },
   "letsGoSetUp": {
     "message": "نعم، دعنا نبدأ التثبيت!"
   },
@@ -830,6 +863,9 @@
     "message": "الصق مقطع مفتاحك الخاص هنا:",
     "description": "For importing an account from a private key"
   },
+  "pasteSeed": {
+    "message": "قم بلصق عبارة الأمان الخاصة بك هنا!"
+  },
   "pending": {
     "message": "قيد الانتظار"
   },
@@ -1143,6 +1179,9 @@
   "storePhrase": {
     "message": "احتفظ بهذه الجملة في مدير كلمات مرور مثل 1Password."
   },
+  "submit": {
+    "message": "إرسال"
+  },
   "submitted": {
     "message": "المقدمة"
   },
@@ -1310,6 +1349,9 @@
   "userName": {
     "message": "اسم المستخدم"
   },
+  "validFileImport": {
+    "message": "يجب عليك تحديد ملف صالح للاستيراد."
+  },
   "viewAccount": {
     "message": "عرض حساب"
   },