Merge remote-tracking branch 'origin/develop' into master-sync

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,97 @@
+name: Bug Report
+description: Using MetaMask, but it's not working as you expect?
+title: "[Bug]: "
+labels: ["bug"]
+body:
+ - type: markdown
+   attributes:
+     value: |
+       Thanks for taking the time to fill out this bug report!
+
+       ## **Before Submitting:**
+
+       * Please search to make sure this issue has not been opened already.
+       * If this is a question about how to integrate MetaMask with your project, please ask in our [Community forum](https://community.metamask.io/c/developer-questions/) instead. This will get your question answered more quickly and make it easier for other devs to find the answer in the future.
+ - type: textarea
+   id: what-happened
+   attributes:
+     label: Describe the bug
+     description: What happened? What did you expect to happen? Please include screenshots if applicable!
+     placeholder: Tell us what you see!
+   validations:
+     required: true
+ - type: textarea
+   id: reproduce
+   attributes:
+     label: Steps to reproduce
+     description: List all steps needed to reproduce the problem
+     value: |
+       1.
+   validations:
+     required: true
+ - type: textarea
+   id: error
+   attributes:
+     label: Error messages or log output
+     description: Please copy and paste any relevant error messages or log output. This will be automatically formatted, so there is no need for backticks.
+     render: shell
+ - type: input
+   id: version
+   attributes:
+     label: Version
+     description: What version of MetaMask are you running? You can find the version in "Settings" > "About"
+   validations:
+     required: true
+ - type: dropdown
+   id: build
+   attributes:
+     label: Build type
+     description: Are you using a testing or development build of MetaMask? If so, please select the type of build you are using.
+     options:
+       - Beta
+       - Flask
+       - Other (please specify exactly where you obtained this build in "Additional Context" section)
+ - type: dropdown
+   id: browsers
+   attributes:
+     label: Browser
+     description: Which browsers have you seen the problem on?
+     multiple: true
+     options:
+       - Chrome
+       - Firefox
+       - Microsoft Edge
+       - Brave
+       - Other (please elaborate in the "Additional Context" section)
+   validations:
+     required: true
+ - type: dropdown
+   id: os
+   attributes:
+     label: Operating system
+     description: Which operating systems have you seen the problem on?
+     multiple: true
+     options:
+       - Windows
+       - MacOS
+       - Linux
+       - Other (please elaborate in the "Additional Context" section)
+   validations:
+     required: true
+ - type: dropdown
+   id: hardware-wallet
+   attributes:
+     label: Hardware wallet
+     description: Are you using any of these hardware wallets? Please include the firmware version in the "Additional context" section below for any that you select here.
+     multiple: true
+     options:
+       - Ledger
+       - Trezor
+       - Keystone
+       - GridPlus Lattice1
+       - Other (please elaborate in the "Additional Context" section)
+ - type: textarea
+   id: additional
+   attributes:
+     label: Additional context
+     description: Add any other context about the problem here, e.g. related issues, additional error messages or logs, or any potentially relevant details about the environment or situation the bug occurred in.

.github/workflows/crowdin_action.yml

@@ -26,6 +26,6 @@ jobs:
         upload_translations: true
         download_translations: true
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.METAMASKBOT_CROWDIN_TOKEN }}
         CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
         CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.storybook/test-data.js

@@ -907,7 +907,7 @@ const state = {
       '0xaD6D458402F60fD3Bd25163575031ACDce07538D': './sai.svg',
     },
     hiddenTokens: [],
-    suggestedAssets: {},
+    suggestedAssets: [],
     useNonceField: false,
     usePhishDetect: true,
     lostIdentities: {},

CHANGELOG.md

@@ -418,7 +418,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#11093](https://github.com/MetaMask/metamask-extension/pull/11093): Update all uses of "Seed Phrase" to "Secret Recovery Phrase"
 
 ### Fixed
-- [#11025](https://github.com/MetaMask/metamask-extension/pull/11025): Fixed redirection to the build quotes page from the swaps page when failure has occured
+- [#11025](https://github.com/MetaMask/metamask-extension/pull/11025): Fixed redirection to the build quotes page from the swaps page when failure has occurred
 - [#11015](https://github.com/MetaMask/metamask-extension/pull/11015): Prevent an undefined gas price from breaking the transaction list
 - [#11013](https://github.com/MetaMask/metamask-extension/pull/11013): Prevent signature request component from canceling hardware wallet signing
 - [#10982](https://github.com/MetaMask/metamask-extension/pull/10982): Re-validating chain id when rpc url changes [custom network form]
@@ -472,7 +472,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [9.5.1]
 ### Fixed
 - Fixed icon on approval screen ([#11048](https://github.com/MetaMask/metamask-extension/pull/11048))
-- Fixed broken app state for some users with Chinese, Portugese or Spanish browser language settings. ([#11036](https://github.com/MetaMask/metamask-extension/pull/11036))
+- Fixed broken app state for some users with Chinese, Portuguese or Spanish browser language settings. ([#11036](https://github.com/MetaMask/metamask-extension/pull/11036))
 
 ## [9.5.0] - 2021-04-28
 ### Added
@@ -561,7 +561,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update Japanese translations. ([#10265](https://github.com/MetaMask/metamask-extension/pull/10265))
 - Update Chinese(Simplified) translations. ([#9388](https://github.com/MetaMask/metamask-extension/pull/9388))
 - Update Vietnamese translations. ([#10270](https://github.com/MetaMask/metamask-extension/pull/10270))
-- Update Spanish and Spanish(Latin American and Carribean) translations. ([#10258](https://github.com/MetaMask/metamask-extension/pull/10258))
+- Update Spanish and Spanish(Latin American and Caribbean) translations. ([#10258](https://github.com/MetaMask/metamask-extension/pull/10258))
 - Update Russian translations. ([#10268](https://github.com/MetaMask/metamask-extension/pull/10268))
 - Update Tagalog localized messages. ([#10269](https://github.com/MetaMask/metamask-extension/pull/10269))
 - Fix 'imported' translation use case for Dutch. ([#10448](https://github.com/MetaMask/metamask-extension/pull/10448))

LICENSE

@@ -1,4 +1,4 @@
-Copyright ConsenSys Software Inc. 2020. All rights reserved.
+Copyright ConsenSys Software Inc. 2022. All rights reserved.
 
 You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
 

app/_locales/am/messages.json

@@ -283,9 +283,6 @@
   "deleteNetworkDescription": {
     "message": "ይህን አውታረ መረብ ለመሰረዝ እንደሚፈልጉ እርግጠኛ ነዎት?"
   },
-  "depositEther": {
-    "message": "Ether አስቀምጥ"
-  },
   "details": {
     "message": "ዝርዝሮች"
   },
@@ -581,9 +578,6 @@
   "myAccounts": {
     "message": "የእኔ መለያዎች"
   },
-  "needEtherInWallet": {
-    "message": "MetaMask በመጠቀም ያልተማከሉ መተግበሪያዎች ጋር ግንኙነት ለማድረግ፣ በቋትዎ ውስጥ Ether ያስፈልግዎታል።"
-  },
   "needImportFile": {
     "message": "የሚያስመጡትን ፋይል መምረጥ አለብዎት።",
     "description": "User is important an account and needs to add a file to continue"

app/_locales/ar/messages.json

@@ -1,4 +1,10 @@
 {
+  "QRHardwareSignRequestCancel": {
+    "message": "رفض"
+  },
+  "QRHardwareWalletImporterTitle": {
+    "message": "مسح كود الاستجابة السريعة QR"
+  },
   "about": {
     "message": "حول"
   },
@@ -8,6 +14,14 @@
   "acceleratingATransaction": {
     "message": "* تسريع المعاملات باستخدام سعر عملة جاس أعلى يزيد من فرص معالجتها بواسطة الشبكة بشكلٍ أسرع، لكن ذلك غير مضمون دائماً."
   },
+  "acceptTermsOfUse": {
+    "message": "لقد قرأت دولار واحد وأوافق عليه",
+    "description": "$1 is the `terms` message"
+  },
+  "accessAndSpendNotice": {
+    "message": "$1 يمكن الوصول إلى هذا المبلغ الأقصى وإنفاقه حتى",
+    "description": "$1 is the url of the site requesting ability to spend"
+  },
   "accessingYourCamera": {
     "message": "جاري استخدام كاميرتك..."
   },
@@ -256,6 +270,9 @@
   "currentLanguage": {
     "message": "اللغة الحالية"
   },
+  "custom": {
+    "message": "إعدادات متقدمة"
+  },
   "customGas": {
     "message": "تخصيص الغاز"
   },
@@ -283,9 +300,6 @@
   "deleteNetworkDescription": {
     "message": "هل أنت متأكد أنك تريد حذف هذه الشبكة؟"
   },
-  "depositEther": {
-    "message": "إيداع عملة إيثير"
-  },
   "details": {
     "message": "التفاصيل"
   },
@@ -526,6 +540,9 @@
   "learnMore": {
     "message": "اكتشف المزيد"
   },
+  "learnMoreUpperCase": {
+    "message": "اكتشف المزيد"
+  },
   "ledgerAccountRestriction": {
     "message": "أنت بحاجة إلى استخدام حسابك الأخير قبل أن تتمكن من إضافة حساب جديد."
   },
@@ -577,9 +594,6 @@
   "myAccounts": {
     "message": "حساباتي"
   },
-  "needEtherInWallet": {
-    "message": "للتفاعل مع التطبيقات اللامركزية باستخدام MetaMask، ستحتاج إلى الإيثير في محفظتك."
-  },
   "needImportFile": {
     "message": "يلزم تحديد ملف للاستيراد.",
     "description": "User is important an account and needs to add a file to continue"

app/_locales/bg/messages.json

@@ -1,4 +1,10 @@
 {
+  "QRHardwareSignRequestCancel": {
+    "message": "Отхвърляне"
+  },
+  "QRHardwareWalletImporterTitle": {
+    "message": "Сканиране на QR код"
+  },
   "about": {
     "message": "Информация"
   },
@@ -256,6 +262,9 @@
   "currentLanguage": {
     "message": "Настоящ език"
   },
+  "custom": {
+    "message": "Разширени"
+  },
   "customGas": {
     "message": "Персонализирайте газ"
   },
@@ -283,9 +292,6 @@
   "deleteNetworkDescription": {
     "message": "Наистина ли искате да изтриете тази мрежа?"
   },
-  "depositEther": {
-    "message": "Депозирайте етер"
-  },
   "details": {
     "message": "Подробности"
   },
@@ -526,6 +532,9 @@
   "learnMore": {
     "message": "Научете повече"
   },
+  "learnMoreUpperCase": {
+    "message": "Научете повече"
+  },
   "ledgerAccountRestriction": {
     "message": "Трябва да използвате последния си акаунт, преди да можете да добавите нов."
   },
@@ -580,9 +589,6 @@
   "myAccounts": {
     "message": "Моите акаунти"
   },
-  "needEtherInWallet": {
-    "message": "За да взаимодействате с децентрализираните приложения, използвайки MetaMask, ще ви е необходим етер в портфейла ви."
-  },
   "needImportFile": {
     "message": "Трябва да изберете файл за импортиране.",
     "description": "User is important an account and needs to add a file to continue"

app/_locales/bn/messages.json

@@ -1,4 +1,10 @@
 {
+  "QRHardwareSignRequestCancel": {
+    "message": "প্রত্যাখ্যান"
+  },
+  "QRHardwareWalletImporterTitle": {
+    "message": "QR কোড স্ক্যান করুন"
+  },
   "about": {
     "message": "সম্পর্কে"
   },
@@ -256,6 +262,9 @@
   "currentLanguage": {
     "message": "বর্তমান ভাষা"
   },
+  "custom": {
+    "message": "উন্নত"
+  },
   "customGas": {
     "message": "গ্যাস কাস্টোমাইজ করুন"
   },
@@ -283,9 +292,6 @@
   "deleteNetworkDescription": {
     "message": "আপনি কি এই নেটওয়ার্কটি মোছার বিষয়ে নিশ্চিত?"
   },
-  "depositEther": {
-    "message": "ইথার জমা করুন"
-  },
   "details": {
     "message": "বিশদ বিবরণ"
   },
@@ -530,6 +536,9 @@
   "learnMore": {
     "message": "আরও জানুন"
   },
+  "learnMoreUpperCase": {
+    "message": "আরও জানুন"
+  },
   "ledgerAccountRestriction": {
     "message": "একটি নতুন অ্যা কাউন্ট যোগ করার আগে আপনাকে আপনার শেষ অ্যাকাউন্ট ব্যবহার করে ফেলতে হবে।"
   },
@@ -584,9 +593,6 @@
   "myAccounts": {
     "message": "আমার অ্যাকাউন্টগুলি"
   },
-  "needEtherInWallet": {
-    "message": "MetaMask ব্যবহার করে ছড়িয়ে ছিটিয়ে থাকা অ্যাপ্লিকেশনগুলির সাথে যোগাযোগ করতে, আপনার ওয়ালেটে ইথার লাগবে।"
-  },
   "needImportFile": {
     "message": "আমদানি করার জন্য আপনাকে অবশ্যই একটি ফাইল নির্বাচন করতে হবে।",
     "description": "User is important an account and needs to add a file to continue"