Merge branch 'develop' into LoginPerSite-ux

MetaMask · Jan 8, 2020 · 913db0c · 913db0c
2 parents ca559e9 + 9ba3774
commit 913db0c
Show file tree

Hide file tree

Showing 95 changed files with 732 additions and 896 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,6 +23,9 @@ workflows:
           requires:
             - prep-deps
       - test-lint-shellcheck
+      - test-lint-lockfile:
+          requires:
+            - prep-deps
       - test-e2e-chrome:
           requires:
             - prep-deps
@@ -51,6 +54,7 @@ workflows:
           requires:
             - test-lint
             - test-lint-shellcheck
+            - test-lint-lockfile
             - test-unit
             - test-unit-global
             - test-mozilla-lint
@@ -185,6 +189,17 @@ jobs:
           name: Shellcheck Lint
           command: yarn lint:shellcheck
 
+  test-lint-lockfile:
+    docker:
+      - image: circleci/node:10.17-browsers
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: lockfile-lint
+          command: yarn lint:lockfile
+
   test-deps:
     docker:
       - image: circleci/node:10.17-browsers

diff --git a/.eslintrc b/.eslintrc
@@ -27,6 +27,7 @@
   },
 
   "plugins": [
+    "babel",
     "mocha",
     "chai",
     "react",
@@ -180,6 +181,7 @@
       "prop": "parens-new-line"
     }],
     "semi": [2, "never"],
+    "babel/semi": [2, "never"],
     "semi-spacing": [2, { "before": false, "after": true }],
     "space-before-blocks": [2, "always"],
     "space-before-function-paren": [2, "always"],

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -5,16 +5,17 @@ about: Using MetaMask, but it's not working as you expect?
 ---
 
 <!--
-BEFORE SUBMITTING: 
+BEFORE SUBMITTING:
 1) Please search to make sure this issue has not been opened already
-2) If this is a implementation question or trouble with your personal project, please post on StackExchange. This will get your question answered more quickly and make it easier for other devs to find the answer in the future. 
+2) If this is a implementation question or trouble with your personal project, please post on StackExchange. This will get your question answered more quickly and make it easier for other devs to find the answer in the future.
 -->
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+**To Reproduce (REQUIRED)**
+Steps to reproduce the behavior, libraries used with version number, and/or any setup information to easily reproduce:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -28,8 +29,9 @@ If applicable, add screenshots to help explain your problem.
 
 **Browser details (please complete the following information):**
  - OS: [e.g. OS X, Windows]
- - Browser [e.g. chrome, safari]
+ - Hardware Wallet [e.g. Trezor Firmware version 1.8.3, Ledger Nano S Firmware version 1.6.0]
+ - Browser [e.g. Chrome Version 79.0.3945.79 (Official Build) (64-bit), Firefox Browser 71.0 (64-bit)]
  - MetaMask Version [e.g. 5.0.2]
 
-**Additional context**
+**Additional context (Error Messages, etc.)**
 Add any other context about the problem here.
diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
@@ -1157,7 +1157,7 @@
     "message": "ምልክት"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "ምልክቱ ከ0 እስከ 12 ቁምፊዎች መያዝ አለበት።"
+    "message": "ምልክቱ 11 ቁምፊዎች ወይም ከዚያ ያነሰ መሆን አለበት።"
   },
   "syncWithMobile": {
     "message": "ከሞባይል ጋር አሳምር"

diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
@@ -1153,7 +1153,7 @@
     "message": "رمز"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "يجب أن يتراوح الرمز ما بين 0 و 12 أحرف."
+    "message": "يجب أن يكون الرمز 11 حرفًا أو أقل."
   },
   "syncWithMobile": {
     "message": "مزامنة مع الهاتف المحمول"

diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
@@ -1156,7 +1156,7 @@
     "message": "Символ"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Символът трябва да е между 0 и 12 знака."
+    "message": "Символът трябва да е 11 символа или по-малко."
   },
   "syncWithMobile": {
     "message": "Синхронизиране с мобилни устройства"

diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
@@ -1160,7 +1160,7 @@
     "message": "প্রতীক"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "প্রতীক অবশ্যই 0 এবং 12 অক্ষরের মধ্যে হতে হবে।"
+    "message": "প্রতীকটি 11 টি অক্ষর বা তার চেয়ে কম হতে হবে।"
   },
   "syncWithMobile": {
     "message": "মোবাইল দিয়ে সিঙ্ক করুন"

diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
@@ -1138,7 +1138,7 @@
     "message": "Símbol"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "El símbol ha de tenir entre 0 i 12 caràcters."
+    "message": "El símbol ha de tenir com a mínim 11 caràcters."
   },
   "syncWithMobile": {
     "message": "Sincronitza amb el mòbil"

diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
@@ -456,7 +456,7 @@
     "message": "Navštivte naše centrum podpory"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Symbol musí být mezi 0 a 12 znaky."
+    "message": "Symbol musí mít 11 nebo méně znaků."
   },
   "terms": {
     "message": "Podmínky použití"

diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
@@ -1132,7 +1132,7 @@
     "message": "Besøg vores supportcenter"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Symbol skal være mellem 0 og 12 tegn."
+    "message": "Symbolet skal være mindst 11 tegn."
   },
   "syncWithMobile": {
     "message": "Synkronisér med mobil"

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
@@ -1123,7 +1123,7 @@
     "message": "Gehe zu unserem Support Center"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Das Symbol muss zwischen 0 und 12 Zeichen haben."
+    "message": "Das Symbol darf maximal 11 Zeichen lang sein."
   },
   "syncWithMobile": {
     "message": "Mit Mobilgerät synchronisieren"

diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
@@ -1157,7 +1157,7 @@
     "message": "Σύμβολο"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Το σύμβολο θα πρέπει να είναι μεταξύ 0 και 12 χαρακτήρες."
+    "message": "Το σύμβολο πρέπει να είναι τουλάχιστον 11 χαρακτήρες."
   },
   "syncWithMobile": {
     "message": "Συγχρονισμός με κινητό"

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -1342,7 +1342,7 @@
     "message": "Symbol"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Symbol must be between 0 and 12 characters."
+    "message": "Symbol must be 11 characters or fewer."
   },
   "syncWithThreeBox": {
     "message": "Sync data with 3Box (experimental)"

diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
@@ -937,7 +937,7 @@
     "message": "Visita nuestro centro de atención"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Símbolo debe ser entre 0 y 12 caracteres"
+    "message": "El símbolo debe tener 11 caracteres o menos."
   },
   "syncWithMobile": {
     "message": "Sincronizar con el móvil"

diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
@@ -1145,7 +1145,7 @@
     "message": "Símbolo"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "El símbolo debe tener entre 0 y 12 caracteres."
+    "message": "El símbolo debe tener 11 caracteres o menos."
   },
   "syncWithMobile": {
     "message": "Sincronizar con un dispositivo móvil"

diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
@@ -1150,7 +1150,7 @@
     "message": "Sümbol"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Sümbol peab olema 0 kuni 12 tähemärki."
+    "message": "Sümbol peab olema 11 tähemärki või vähem."
   },
   "syncWithMobile": {
     "message": "Mobiiliga sünkroonimine"

diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
@@ -1160,7 +1160,7 @@
     "message": "سمبول"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "سمبول باید بین 0 و 12 حرف باشد"
+    "message": "نماد باید 11 کاراکتر یا کمتر باشد."
   },
   "syncWithMobile": {
     "message": "همگام سازی با موبایل"

diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
@@ -1157,7 +1157,7 @@
     "message": "Symboli"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Symbolin on oltava 0-12 merkkiä pitkä."
+    "message": "Symbolin on oltava 11 merkkiä tai vähemmän."
   },
   "syncWithMobile": {
     "message": "Synkronoi mobiililaitteelle"

diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
@@ -1063,7 +1063,7 @@
     "message": "Simbolo"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Ang simbolo ay dapat na nasa pagitan ng 0 at 12 character."
+    "message": "Ang simbolo ay dapat na 11 character o mas kaunti."
   },
   "syncWithMobile": {
     "message": "I-sync sa mobile"

diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
@@ -1139,7 +1139,7 @@
     "message": "Symbole"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Le symbol doit avoir entre 0 et 12 caractères."
+    "message": "Le symbole doit comporter 11 caractères ou moins."
   },
   "syncWithMobile": {
     "message": "Synchroniser avec le mobile"

diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
@@ -1154,7 +1154,7 @@
     "message": "סמל"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "על הסמל להכיל בין 0 ל-12 תווים."
+    "message": "הסמל חייב להיות 11 תווים או פחות."
   },
   "syncWithMobile": {
     "message": "סנכרן עם הנייד"

diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
@@ -1154,7 +1154,7 @@
     "message": "सिम्बल"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "सिंबल को 0 से 12 अक्षरों के मध्य का होना चाहिए।"
+    "message": "प्रतीक 11 वर्ण या उससे कम का होना चाहिए।"
   },
   "syncWithMobile": {
     "message": "मोबाइल से सिंक करें"

diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
@@ -424,7 +424,7 @@
     "message": "हमारे सहायता केंद्र पर जाएं"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "प्रतीक 0 और 12 अक्षरों के बीच होना चाहिए"
+    "message": "प्रतीक 11 वर्ण या उससे कम का होना चाहिए।"
   },
   "terms": {
     "message": "उपयोग की शर्तें"

diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
@@ -1153,7 +1153,7 @@
     "message": "Simbol"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Simbol mora imati od 0 do 12 znakova."
+    "message": "Simbol mora biti 11 znakova ili manje."
   },
   "syncWithMobile": {
     "message": "Sinkroniziraj s mobilnim telefonom"

diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json
@@ -736,7 +736,7 @@
     "message": "Vizite Sant Sipò Nou"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Senbòl yo dwe ant 0 ak 12 karaktè."
+    "message": "Senbòl yo dwe 11 karaktè oswa mwens."
   },
   "terms": {
     "message": "Tèm pou itilize"

diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
@@ -1160,7 +1160,7 @@
     "message": "Simbolis"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Simbolis turi būti nuo 0 iki 12 ženklų."
+    "message": "Simbolis turi būti ne ilgesnis nei 11 simbolių."
   },
   "syncWithMobile": {
     "message": "Sinchronizuoti su mobiliuoju"

diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
@@ -1156,7 +1156,7 @@
     "message": "Simbols"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Simbolam jāietver no 0 līdz 12 rakstzīmēm."
+    "message": "Simbolā nedrīkst būt vairāk par 11 rakstzīmēm."
   },
   "syncWithMobile": {
     "message": "Sinhronizēt ar tālruni"

diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
@@ -1131,7 +1131,7 @@
     "message": "Simbol"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Simbol mestilah antara 0 hingga 12 aksara."
+    "message": "Simbol mestilah 11 aksara atau kurang."
   },
   "syncWithMobile": {
     "message": "Segerakkan dengan telefon mudah alih"

diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
@@ -414,7 +414,7 @@
     "message": "Bezoek ons ondersteuningscentrum"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Het symbool moet tussen 0 en 12 tekens lang zijn."
+    "message": "Symbool moet 11 tekens of minder zijn."
   },
   "terms": {
     "message": "Gebruiksvoorwaarden"

diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
@@ -1135,7 +1135,7 @@
     "message": "Besøk brukerstøtte"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Symboler må være på mellom 0 og 12 tegn. "
+    "message": "Symbolet må være 11 tegn eller færre."
   },
   "syncWithMobile": {
     "message": "Synkroniser med mobil "

diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
@@ -1148,7 +1148,7 @@
     "message": "Odwiedź nasze Centrum Pomocy"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Symbol musi mieć od 0 do 12 znaków."
+    "message": "Symbol musi mieć maksymalnie 11 znaków."
   },
   "syncWithMobile": {
     "message": "Synchronizuj z telefonem"

diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
@@ -424,7 +424,7 @@
     "message": "Visitar o nosso Centro de Suporte"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Símbolo deve conter entre 0 e 12 characters."
+    "message": "O símbolo deve ter 11 caracteres ou menos."
   },
   "terms": {
     "message": "Termos de Uso"

diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
@@ -1145,7 +1145,7 @@
     "message": "Símbolo"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "O símbolo deve ter entre 0 e 12 caracteres."
+    "message": "O símbolo deve ter 11 caracteres ou menos."
   },
   "syncWithMobile": {
     "message": "Sincronizar com o celular"

diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
@@ -1147,7 +1147,7 @@
     "message": "Simbol"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Simbolul trebuie să fie între 0 și 12 caractere."
+    "message": "Simbolul trebuie să fie de 11 caractere sau mai puțin."
   },
   "syncWithMobile": {
     "message": "Sincronizați cu dispozitivul mobil"

diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
@@ -472,7 +472,7 @@
     "message": "Перейти в наш Центр поддержки"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Символ должен быть от 0 до 12 символов."
+    "message": "Символ должен быть не более 11 символов."
   },
   "terms": {
     "message": "Условия пользования"

diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
@@ -1142,7 +1142,7 @@
     "message": "Simbol"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Simbol mora imeti med 0 in 12 znakov."
+    "message": "Simbol mora biti največ 11 znakov ali manj."
   },
   "syncWithMobile": {
     "message": "Sinhroniziraj z mobilnimi telefonom"

diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
@@ -1151,7 +1151,7 @@
     "message": "Simbol"
   },
   "symbolBetweenZeroTwelve": {
-    "message": "Simbol mora da bude između 0 i 12 karaktera."
+    "message": "Simbol mora biti 11 znakova ili manje."
   },
   "syncWithMobile": {
     "message": "Sinhronizacija sa mobilnim telefonom"