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

.circleci/config.yml

@@ -52,6 +52,9 @@ workflows:
       - test-lint-lockfile:
           requires:
             - prep-deps
+      - test-lint-changelog:
+          requires:
+            - prep-deps
       - test-e2e-chrome:
           requires:
             - prep-build-test
@@ -83,6 +86,7 @@ workflows:
             - test-lint
             - test-lint-shellcheck
             - test-lint-lockfile
+            - test-lint-changelog
             - test-unit
             - test-unit-global
             - validate-source-maps
@@ -282,6 +286,33 @@ jobs:
           name: lockfile-lint
           command: yarn lint:lockfile
 
+  test-lint-changelog:
+    executor: node-browsers
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - when:
+          condition:
+            not:
+              matches:
+                pattern: /^Version-v(\d+)[.](\d+)[.](\d+)$/
+                value: << pipeline.git.branch >>
+          steps:
+            - run:
+                name: Validate changelog
+                command: yarn auto-changelog validate
+      - when:
+          condition:
+            matches:
+              pattern: /^Version-v(\d+)[.](\d+)[.](\d+)$/
+              value: << pipeline.git.branch >>
+          steps:
+            - run:
+                name: Validate release candidate changelog
+                command: yarn auto-changelog validate --rc
+
+
   test-deps:
     executor: node-browsers
     steps:
@@ -485,7 +516,7 @@ jobs:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "5e:a3:2d:35:b6:25:b5:87:b1:41:11:0d:77:50:96:73"
+            - "3d:49:29:f4:b2:e8:ea:af:d1:32:eb:2a:fc:15:85:d8"
       - checkout
       - attach_workspace:
           at: .

.circleci/scripts/release-bump-manifest-version.sh

@@ -19,9 +19,7 @@ fi
 printf '%s\n' 'Updating the manifest version if needed'
 
 version="${CIRCLE_BRANCH/Version-v/}"
-updated_manifest="$(jq ".version = \"$version\"" app/manifest/_base.json)"
+yarn version --no-git-tag-version --new-version "${version}"
-printf '%s\n' "$updated_manifest" > app/manifest/_base.json
-yarn prettier --write app/manifest/_base.json
 
 if [[ -z $(git status --porcelain) ]]
 then

.circleci/scripts/release-commit-version-bump.sh

@@ -16,9 +16,19 @@ then
     exit 1
 fi
 
+if [[ -z "${GITHUB_TOKEN:-}" ]]
+then
+    printf '%s\n' 'GITHUB_TOKEN environment variable must be set'
+    exit 1
+elif [[ -z "${GITHUB_TOKEN_USER:-}" ]]
+then
+    printf '%s\n' 'GITHUB_TOKEN_USER environment variable must be set'
+    exit 1
+fi
+
 printf '%s\n' 'Commit the manifest version and changelog if the manifest has changed'
 
-if git diff --quiet app/manifest/_base.json;
+if git diff --quiet package.json;
 then
     printf '%s\n' 'No manifest changes to commit'
     exit 0
@@ -28,7 +38,7 @@ git \
     -c user.name='MetaMask Bot' \
     -c user.email='metamaskbot@users.noreply.github.com' \
     commit --message "${CIRCLE_BRANCH/-/ }" \
-        CHANGELOG.md app/manifest/_base.json
+        CHANGELOG.md package.json
 
 repo_slug="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
 git push "https://$GITHUB_TOKEN_USER:$GITHUB_TOKEN@github.com/$repo_slug" "$CIRCLE_BRANCH"

.circleci/scripts/release-create-release-pr.sh

@@ -16,12 +16,6 @@ then
     exit 1
 fi
 
-if [[ -z "${GITHUB_TOKEN:-}" ]]
-then
-    printf '%s\n' 'GITHUB_TOKEN environment variable must be set'
-    exit 1
-fi
-
 function install_github_cli ()
 {
     printf '%s\n' 'Installing hub CLI'

.eslintrc.js

@@ -108,7 +108,7 @@ module.exports = {
     },
     {
       files: ['**/*.test.js'],
-      excludedFiles: ['ui/**/*.test.js', 'ui/app/__mocks__/*.js'],
+      excludedFiles: ['ui/**/*.test.js', 'ui/__mocks__/*.js'],
       extends: ['@metamask/eslint-config-mocha'],
       rules: {
         'mocha/no-setup-in-describe': 'off',
@@ -125,7 +125,7 @@ module.exports = {
       },
     },
     {
-      files: ['ui/**/*.test.js', 'ui/app/__mocks__/*.js'],
+      files: ['ui/**/*.test.js', 'ui/__mocks__/*.js'],
       extends: ['@metamask/eslint-config-jest'],
       rules: {
         'jest/no-restricted-matchers': 'off',

.gitignore

@@ -39,7 +39,7 @@ test-builds
 build-artifacts
 
 #ignore css output and sourcemaps
-ui/app/css/output/
+ui/css/output/
 
 notes.txt
 

.storybook/i18n.js

@@ -1,12 +1,12 @@
 import React, { Component, createContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
-import { getMessage } from '../ui/app/helpers/utils/i18n-helper';
+import { getMessage } from '../ui/helpers/utils/i18n-helper';
-import { I18nContext } from '../ui/app/contexts/i18n';
+import { I18nContext } from '../ui/contexts/i18n';
 
-export { I18nContext }
+export { I18nContext };
 
 export const I18nProvider = (props) => {
-  const { currentLocale, current, en } = props
+  const { currentLocale, current, en } = props;
 
   const t = useMemo(() => {
     return (key, ...args) =>

.storybook/main.js

@@ -1,9 +1,9 @@
-const path = require('path')
+const path = require('path');
 
-const CopyWebpackPlugin = require('copy-webpack-plugin')
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-  stories: ['../ui/app/**/*.stories.js'],
+  stories: ['../ui/**/*.stories.js'],
   addons: [
     '@storybook/addon-knobs',
     '@storybook/addon-actions',
@@ -12,7 +12,7 @@ module.exports = {
     './i18n-party-addon/register.js',
   ],
   webpackFinal: async (config) => {
-    config.module.strictExportPresence = true
+    config.module.strictExportPresence = true;
     config.module.rules.push({
       test: /\.scss$/,
       loaders: [
@@ -31,12 +31,12 @@ module.exports = {
             sourceMap: true,
             implementation: require('sass'),
             sassOptions: {
-              includePaths: ['ui/app/css/'],
+              includePaths: ['ui/css/'],
             },
           },
         },
       ],
-    })
+    });
     config.plugins.push(
       new CopyWebpackPlugin({
         patterns: [
@@ -51,7 +51,7 @@ module.exports = {
           },
         ],
       }),
-    )
+    );
-    return config
+    return config;
   },
-}
+};

.storybook/preview.js

@@ -3,12 +3,12 @@ import { addDecorator, addParameters } from '@storybook/react';
 import { useGlobals } from '@storybook/api';
 import { withKnobs } from '@storybook/addon-knobs';
 import { Provider } from 'react-redux';
-import configureStore from '../ui/app/store/store';
+import configureStore from '../ui/store/store';
-import '../ui/app/css/index.scss';
+import '../ui/css/index.scss';
 import localeList from '../app/_locales/index.json';
 import * as allLocales from './locales';
 import { I18nProvider, LegacyI18nProvider } from './i18n';
-import testData from './test-data.js'
+import testData from './test-data.js';
 
 addParameters({
   backgrounds: {
@@ -41,7 +41,7 @@ const styles = {
   alignItems: 'center',
 };
 
-const store = configureStore(testData)
+const store = configureStore(testData);
 
 const metamaskDecorator = (story, context) => {
   const currentLocale = context.globals.locale;

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#10932](https://github.com/MetaMask/metamask-extension/pull/10932): Add view account details menu item to token page menu
 - [#10895](https://github.com/MetaMask/metamask-extension/pull/10895): Adding new links to contact MetaMask support
 - [#10595](https://github.com/MetaMask/metamask-extension/pull/10595): Adding option to set Custom Nonce to Confirm Approve Page
+- [#10717](https://github.com/MetaMask/metamask-extension/pull/10717): Adding recovery phrase video to onboarding process
 - [#10616](https://github.com/MetaMask/metamask-extension/pull/10616): add trezor HD path for ledger wallets
 
 ### Changed
@@ -2228,6 +2229,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.1...HEAD
 [9.5.1]: https://github.com/MetaMask/metamask-extension/compare/v9.5.0...v9.5.1
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.0...HEAD
 [9.5.0]: https://github.com/MetaMask/metamask-extension/compare/v9.4.0...v9.5.0
 [9.4.0]: https://github.com/MetaMask/metamask-extension/compare/v9.3.0...v9.4.0
 [9.3.0]: https://github.com/MetaMask/metamask-extension/compare/v9.2.1...v9.3.0

app/_locales/am/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "ተጠናቅቋል"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "የሃርድዌር ቋት የለዎትም?"
-  },
   "downloadGoogleChrome": {
     "message": "Google Chrome አውርድ"
   },
@@ -443,9 +440,6 @@
     "message": "Ether ከቧንቧ በ$1ያግኙ",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "እገዛ ያግኙ።"
-  },
   "getStarted": {
     "message": "አስጀማሪ መመሪያ"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "ከ MetaMask ጋር ሊጠቀሙበት የሚፈልጉትን የሃርድዌር ቋት ይምረጡ"
   },
-  "havingTroubleConnecting": {
-    "message": "ግንኙነት መፍጠር ላይ ተቸግረዋል?"
-  },
   "here": {
     "message": "እዚህ",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -698,9 +689,6 @@
   "optionalCurrencySymbol": {
     "message": "ምልክት (አማራጭ)"
   },
-  "orderOneHere": {
-    "message": "ትሬዞር ወይም ሌጀር በማዘዝ ገንዘብዎን በቀዝቃዛ ማስቀመጫ ውስጥ ያቆዩ"
-  },
   "origin": {
     "message": "መነሻ"
   },
@@ -760,9 +748,6 @@
   "readdToken": {
     "message": "በመለያ አማራጮችዎ ምናሌ ውስጥ ወደ “ተለዋጭ ስም አክል” በመግባት ለወደፊቱ ይህን ተለዋጭ ስም መልሰው ማከል ይችላሉ።"
   },
-  "readyToConnect": {
-    "message": "ለመገናኘት ዝግጁ ነዎት?"
-  },
   "recents": {
     "message": "የቅርብ ጊዜያት"
   },
@@ -985,24 +970,6 @@
   "stateLogsDescription": {
     "message": "ስቴት መዛግብት ይፋዊ የመለያ አድራሻዎትንና የተላኩ ግብይቶችን ይይዛሉ።"
   },
-  "step1HardwareWallet": {
-    "message": "1. ከሃርድዌር ቋት ጋር ይገናኙ"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "የሃርድዌር ቋትዎን በቀጥታ ከኮምፒዩተርዎ ጋር ያገናኙ።"
-  },
-  "step2HardwareWallet": {
-    "message": "2. መለያ ምረጥ"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "ለማየት የሚፈልጉትን መለያ ይምረጡ። በአንድ ጊዜ መምረጥ የሚችሉት አንድ ብቻ ነው።"
-  },
-  "step3HardwareWallet": {
-    "message": "3. dApps እና ሌሎችን መጠቀም ይጀምሩ!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "የሐርድዌር መለያዎን ከየትኛውም የ Ethereum መለያ ጋር በሚጠቀሙት መንገድ ይጠቀሙ። ወደ dApps በመለያ ይግቡ፣ Eth ይላኩ፣ የ ERC20 ተለዋጭ ስሞችና እንደ CryptoKitties ያሉ የማይለወጡ ተለዋጭ ስሞችን ይግዙና ያከማቹ።"
-  },
   "storePhrase": {
     "message": "ይህን ሐረግ እንደ 1Password ባለ የይለፍ ቃል አስተዳዳሪ ውስጥ ያስቀምጡ።"
   },

app/_locales/ar/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "تم"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "أليس لديك محفظة أجهزة؟"
-  },
   "downloadGoogleChrome": {
     "message": "تنزيل جوجل كروم"
   },
@@ -439,9 +436,6 @@
     "message": "احصل على الأثير من صنبور مقابل $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "احصل على الدعم."
-  },
   "getStarted": {
     "message": "البدء"
   },
@@ -463,9 +457,6 @@
   "hardwareWalletsMsg": {
     "message": "حدد محفظة أجهزة ترغب في استخدامها مع MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "هل تواجه مشكلة في الاتصال؟"
-  },
   "here": {
     "message": "هنا",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -694,9 +685,6 @@
   "optionalCurrencySymbol": {
     "message": "الرمز (اختياري)"
   },
-  "orderOneHere": {
-    "message": "اطلب Trezor أو Ledger وحافظ على أموالك في مخزن حصين"
-  },
   "origin": {
     "message": "الأصل"
   },
@@ -756,9 +744,6 @@
   "readdToken": {
     "message": "يمكنك إضافة هذه العملة الرمزية مرة أخرى في المستقبل من خلال الانتقال إلى \"إضافة عملة رمزية\" في قائمة خيارات الحسابات الخاصة بك."
   },
-  "readyToConnect": {
-    "message": "هل أنت جاهز للاتصال؟"
-  },
   "recents": {
     "message": "الحديث"
   },
@@ -981,24 +966,6 @@
   "stateLogsDescription": {
     "message": "تحتوي سجلات الحالة على عناوين حسابك العامة والمعاملات المرسلة."
   },
-  "step1HardwareWallet": {
-    "message": "1. قم بتوصيل محفظة Hardware Wallet"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "قم بتوصيل محفظة الأجهزة الخاصة بك مباشرة إلى جهاز الكمبيوتر الخاص بك."
-  },
-  "step2HardwareWallet": {
-    "message": "2. حدد حساباً"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "حدد الحساب الذي تريد عرضه. يمكنك اختيار حساب واحد فقط في المرة الواحدة."
-  },
-  "step3HardwareWallet": {
-    "message": "3. ابدأ في استخدام dApps وأكثر!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "استخدم حساب الجهاز الخاص بك كما تفعل مع أي حساب Ethereum. قم بتسجيل الدخول إلى dApps ، إرسال Eth ، قم بشراء وتخزين عملات ERC20 الرمزية والعملات الرمزية الغير قابلة للاستبدال مثل CryptoKitties."
-  },
   "storePhrase": {
     "message": "احتفظ بهذه الجملة في مدير كلمات مرور مثل 1Password."
   },

app/_locales/bg/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Готово"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Нямате хардуерен портфейл?"
-  },
   "downloadGoogleChrome": {
     "message": "Изтеглете Google Chrome"
   },
@@ -439,9 +436,6 @@
     "message": "Вземете Ether от фосет за $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Получете помощ."
-  },
   "getStarted": {
     "message": "Първи стъпки"
   },
@@ -463,9 +457,6 @@
   "hardwareWalletsMsg": {
     "message": "Изберете хардуерен портфейл, който искате да използвате с MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Имате проблеми със свързването?"
-  },
   "here": {
     "message": "тук",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -697,9 +688,6 @@
   "optionalCurrencySymbol": {
     "message": "Символ (по избор)"
   },
-  "orderOneHere": {
-    "message": "Поръчайте Trezor или Ledger и запазете средствата си "
-  },
   "origin": {
     "message": "Произход"
   },
@@ -759,9 +747,6 @@
   "readdToken": {
     "message": "Можете да добавите този жетон в бъдеще, като отидете на „Добавяне на жетон“ в менюто с опции на акаунти."
   },
-  "readyToConnect": {
-    "message": "Готови ли сте да се свържете? "
-  },
   "recents": {
     "message": "Скорошни"
   },
@@ -984,24 +969,6 @@
   "stateLogsDescription": {
     "message": "Държавните дневници съдържат адресите на публичните ви акаунти и изпратените транзакции."
   },
-  "step1HardwareWallet": {
-    "message": "1. Свържете хардуерния портфейл"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Свържете хардуерния си портфейл директно към компютъра."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Изберете акаунт"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Изберете акаунта, който искате да видите. В даден момент можете да изберете само един."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Започнете да използвате dApps и други!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Използвайте хардуерния си акаунт, както бихте правили с всеки акаунт в Ethereum. Влезте в dApps, изпратете Eth, купете и съхранявайте жетони ERC20 и незаменими жетони като CryptoKitties."
-  },
   "storePhrase": {
     "message": "Съхранявайте тази фраза в мениджър на пароли като 1Password."
   },

app/_locales/bn/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "সম্পন্ন "
   },
-  "dontHaveAHardwareWallet": {
-    "message": "একটি হার্ডওয়্যার ওয়ালেট নেই?"
-  },
   "downloadGoogleChrome": {
     "message": "Google Chrome ডাউনলোড করুন"
   },
@@ -443,9 +440,6 @@
     "message": "$1 এর জন্য একটি ফসেট থেকে ইথার পান",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "সহায়তা পান।"
-  },
   "getStarted": {
     "message": "শুরু করুন"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "আপনি MetaMask এর সাথে ব্যবহার করতে চান এমন একটি হার্ডওয়্যার ওয়ালেট নির্বাচন করুন"
   },
-  "havingTroubleConnecting": {
-    "message": "সংযোগ করতে সমস্যা হচ্ছে?"
-  },
   "here": {
     "message": "এখানে",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -701,9 +692,6 @@
   "optionalCurrencySymbol": {
     "message": "প্রতীক (ঐচ্ছিক)"
   },
-  "orderOneHere": {
-    "message": "একটি Trezor বা লেজার অর্ডার করুন এবং আপনার তহবিলগুলি হীম ঘরে রাখুন"
-  },
   "origin": {
     "message": "উৎস"
   },
@@ -763,9 +751,6 @@
   "readdToken": {
     "message": "আপনি আপনার অ্যাকাউন্টস বিকল্পের মেনুতে \"টোকেনগুলি যোগ করুন\" এ গিয়ে ভবিষ্যতে আবার এই টোকেনটি যোগ করতে পারবেন। "
   },
-  "readyToConnect": {
-    "message": "সংযোগ করার জন্য প্রস্তুত?"
-  },
   "recents": {
     "message": "সাম্প্রতিকগুলি"
   },
@@ -988,24 +973,6 @@
   "stateLogsDescription": {
     "message": "স্টেট লগগুলিতে আপনার পাবলিক অ্যাকাউন্টের ঠিকানা এবং প্রেরণ করার লেনদেনগুলি আছে।"
   },
-  "step1HardwareWallet": {
-    "message": "1. হার্ডওয়্যার ওয়ালেট সংযুক্ত করুন"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "আপনার হার্ডওয়্যার ওয়ালেট সরাসরি আপনার কম্পিউটারের সাথে সংযুক্ত করুন।"
-  },
-  "step2HardwareWallet": {
-    "message": "2. একটি অ্যাকাউন্ট নির্বাচন করুন"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "আপনি যে অ্যাকাউন্টটি দেখতে চান সেটি নির্বাচন করুন। আপনি একই সময়ে শুধুমাত্র একটিই বেছে নিতে পারবেন। "
-  },
-  "step3HardwareWallet": {
-    "message": "3. dApps এবং আরও ব্যবহার করে শুরু করুন!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "আপনি কোনো Ethereum অ্যাকাউন্ট যেমন ব্যবহার করেন সেইভাবে আপনার হার্ডওয়্যার অ্যাকাউন্ট ব্যবহার করুন। dApps এ লগইন করুন, Eth পাঠান, ERC20 টোকেন এবং CryptoKitties এর মতো পরস্পর বিনিময়যোগ্য নয় এমন টোকেনগুলি ক্রয় ও সংরক্ষণ করুন।  "
-  },
   "storePhrase": {
     "message": "এই বাক্যাংশটি 1Password এর মতো একটি পাসওয়ার্ড পরিচালকে সংরক্ষণ করুন। "
   },

app/_locales/ca/messages.json

@@ -305,9 +305,6 @@
   "done": {
     "message": "Fet"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "No tens una cartera de hardware?"
-  },
   "downloadGoogleChrome": {
     "message": "Descarrega Google Chrome"
   },
@@ -433,9 +430,6 @@
     "message": "Aconsegueix Ether d'una aixeta per $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Aconsegueix ajuda."
-  },
   "getStarted": {
     "message": "Comença"
   },
@@ -454,9 +448,6 @@
   "hardwareWalletsMsg": {
     "message": "Selecciona una cartera de hardware que t'agradaria utilizar amb MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Problemes per connectar?"
-  },
   "here": {
     "message": "aquí",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -685,9 +676,6 @@
   "optionalCurrencySymbol": {
     "message": "Símbol (opcional)"
   },
-  "orderOneHere": {
-    "message": "Demana un Trezor o un Ledger i congela les teves inversions"
-  },
   "origin": {
     "message": "Origen"
   },
@@ -744,9 +732,6 @@
   "readdToken": {
     "message": "Pots tornar a afegir aquesta fitxa en el futur anant a \"Afegir fitxa\" al menu d'opcions dels teus comptes."
   },
-  "readyToConnect": {
-    "message": "Estàs llest per a connectar?"
-  },
   "recipientAddress": {
     "message": "Adreça del destinatari"
   },
@@ -966,24 +951,6 @@
   "stateLogsDescription": {
     "message": "Els registres d'estat contenen les teves adreces de compte públiques i les transaccions enviades."
   },
-  "step1HardwareWallet": {
-    "message": "1. Connectar Moneder Hardware"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Connecta la teva cartera de hardware directament al teu ordinador."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Selecciona un Compte"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Selecciona el compte que vols veure. Només pots seleccionar 1 cada cop."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Comença a utilitzar dApps i altres!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Fes servir el teu compte de hardware com ho faries amb qualsevol compte Ethereum. Inicia sessió a DApps, envia Eth, compra i emmagatzema fitxes ERC20 i fitxes No Fungibles com CryptoKitties."
-  },
   "storePhrase": {
     "message": "Guarda aquesta frase a un gestor de contrasenyes com Contrasenya 1"
   },

app/_locales/da/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Færdig"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Har du ikke en hardware-pung?"
-  },
   "downloadGoogleChrome": {
     "message": "Hent Google Chrome"
   },
@@ -439,9 +436,6 @@
     "message": "Hent Ether fra en hane til $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Få hjælp"
-  },
   "getStarted": {
     "message": "Kom godt i gang"
   },
@@ -460,9 +454,6 @@
   "hardwareWalletsMsg": {
     "message": "Vælg en hardware-pung du vil bruge med MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Har du problemer med at oprette forbindelse?"
-  },
   "here": {
     "message": "her",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -685,9 +676,6 @@
   "optionalCurrencySymbol": {
     "message": "Symbol (valgfrit)"
   },
-  "orderOneHere": {
-    "message": "Bestil en Trezor eller Ledger og frys dine midler ned"
-  },
   "parameters": {
     "message": "Parametre"
   },
@@ -744,9 +732,6 @@
   "readdToken": {
     "message": "Du kan tilføje denne token i fremtiden, ved at gå til \"Tilføj token\" under dine valgmenuen for dine konti."
   },
-  "readyToConnect": {
-    "message": "Klar til at oprette forbindelse?"
-  },
   "recents": {
     "message": "Seneste"
   },
@@ -966,24 +951,6 @@
   "stateLogsDescription": {
     "message": "Status-logføringer indeholder dine offentlige kontoadresser og afsendte transaktioner."
   },
-  "step1HardwareWallet": {
-    "message": "1. Tilslut hardware-tegnebog"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Forbind din hardware-tegnebog direkte med din computer."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Vælg en konto"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Vælg den konto du ønsker at se. Du kan kun vælge én ad gangen."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Begynd at bruge dApps og mere!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Brug din hardwarekonto som du ville gøre med enhver Ethereum-konto. Log ind på dApps, send Eth, køb og opbevar ERC20-tokens og ikke-ombyttelige tokens som CryptoKitties."
-  },
   "storePhrase": {
     "message": "Gem denne sætning i en adgangskodeadministrator som 1Password."
   },

app/_locales/de/messages.json

@@ -296,9 +296,6 @@
   "done": {
     "message": "Fertig"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Sie haben kein Hardware-Wallet?"
-  },
   "downloadGoogleChrome": {
     "message": "Google Chrome herunterladen"
   },
@@ -431,9 +428,6 @@
     "message": "Ether für $1 vom Faucet holen",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Erhalten Sie Hilfe."
-  },
   "getStarted": {
     "message": "Erste Schritte"
   },
@@ -455,9 +449,6 @@
   "hardwareWalletsMsg": {
     "message": "Wählen Sie ein Hardware-Wallet aus, das Sie mit MetaMask verwenden möchten"
   },
-  "havingTroubleConnecting": {
-    "message": "Verbindungsprobleme?"
-  },
   "here": {
     "message": "hier",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -674,9 +665,6 @@
   "optionalBlockExplorerUrl": {
     "message": "Block-Explorer-URL (optional)"
   },
-  "orderOneHere": {
-    "message": "Bestellen Sie ein Trezor oder Ledger und legen Sie Ihr Geld auf Eis"
-  },
   "origin": {
     "message": "Ursprung"
   },
@@ -732,9 +720,6 @@
   "readdToken": {
     "message": "Du kannst diesen Token immer erneut hinzufügen, indem du in den Menüpunkt \"Token hinzufügen\" in den Einstellungen deines Accounts gehst."
   },
-  "readyToConnect": {
-    "message": "Bereit für die Verbindung?"
-  },
   "recents": {
     "message": "Letzte"
   },
@@ -957,24 +942,6 @@
   "stateLogsDescription": {
     "message": "Statelogs zeigen die Public Adresse und die gesendeten Transaktionen deines Accounts."
   },
-  "step1HardwareWallet": {
-    "message": "1. Hardware-Wallet verknüpfen"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Verknüpfen Sie Ihr Hardware-Wallet direkt mit Ihrem Computer."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Ein Konto auswählen"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Wählen Sie das Konto aus, das Sie anzeigen wollen. Sie können nur eines zur Zeit wählen."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Erste Schritte mit dApps und mehr!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Verwenden Sie Ihr Hardware-Konto so wie jedes Ethereum-Konto. Loggen Sie sich bei dApps ein, senden Sie Eth, kaufen und speichern Sie ERC20-Token und Nicht-Fungible-Token wie CryptoKitties."
-  },
   "storePhrase": {
     "message": "Speichern Sie diesen Schlüssel in einem Passwortmanager wie 1Password."
   },

app/_locales/el/messages.json

@@ -305,9 +305,6 @@
   "done": {
     "message": "Τέλος"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Δεν έχετε πορτοφόλι υλικού;"
-  },
   "downloadGoogleChrome": {
     "message": "Κατεβάστε το Google Chrome"
   },
@@ -440,9 +437,6 @@
     "message": "Πάρτε Ether από μια πηγή για το $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Πάρτε Βοήθεια."
-  },
   "getStarted": {
     "message": "Έναρξη"
   },
@@ -464,9 +458,6 @@
   "hardwareWalletsMsg": {
     "message": "Επιλέξτε ένα πορτοφόλι εξοπλισμού το οποίο θέλετε να χρησιμοποιήσετε με το MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Δυσκολεύεστε να συνδεθείτε;"
-  },
   "here": {
     "message": "εδώ",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -698,9 +689,6 @@
   "optionalCurrencySymbol": {
     "message": "Σύμβολο (προαιρετικό)"
   },
-  "orderOneHere": {
-    "message": "Παραγγείλετε ένα Trezor ή Ledger και κρατήστε τα χρήματά σας σε παγωμένη αποθήκευση"
-  },
   "origin": {
     "message": "Προέλευση"
   },
@@ -760,9 +748,6 @@
   "readdToken": {
     "message": "Μπορείτε να προσθέσετε ξανά αυτό το διακριτικό στο μέλλον μεταβαίνοντας στο \"Πρόσθεση διακριτικού\" στο μενού επιλογών των λογαριασμών σας."
   },
-  "readyToConnect": {
-    "message": "Έτοιμοι να Συνδεθείτε;"
-  },
   "recents": {
     "message": "Πρόσφατα"
   },
@@ -985,24 +970,6 @@
   "stateLogsDescription": {
     "message": "Τα αρχεία καταγραφής κατάστασης περιέχουν τις διευθύνσεις του δημόσιου λογαριασμού σας και τις συναλλαγές οι οποίες έχουν αποσταλεί."
   },
-  "step1HardwareWallet": {
-    "message": "1. Συνδέστε το Πορτοφόλι Εξοπλισμού"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Συνδέστε το πορτοφόλι υλικού απευθείας στον υπολογιστή σας."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Επιλέξτε ένα Λογαριασμό"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Επιλέξτε τον λογαριασμό που θέλετε να δείτε. Μπορείτε να επιλέξετε έναν μόνο κάθε φορά."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Ξεκινήστε να χρησιμοποιείτε το dApps και άλλα!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Χρησιμοποιήστε τον λογαριασμό εξοπλισμού σας όπως θα κάνατε με οποιονδήποτε λογαριασμό του Ethereum. Συνδεθείτε στο dApps, στείλτε το Eth, αγοράστε και αποθηκεύστε ERC20 tokens και Non-Fungible tokens όπως το CryptoKitties."
-  },
   "storePhrase": {
     "message": "Αποθηκεύστε αυτήν τη φράση σε έναν διαχειριστή κωδικών πρόσβασης όπως το 1Password."
   },

app/_locales/en/messages.json

@@ -556,12 +556,15 @@
   "dismiss": {
     "message": "Dismiss"
   },
+  "dismissReminderDescriptionField": {
+    "message": "Turn this on to dismiss the recovery phrase backup reminder message. We highly recommend that you back up your Secret Recovery Phrase to avoid loss of funds"
+  },
+  "dismissReminderField": {
+    "message": "Dismiss recovery phrase backup reminder"
+  },
   "done": {
     "message": "Done"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Don’t have a hardware wallet?"
-  },
   "dontShowThisAgain": {
     "message": "Don't show this again"
   },
@@ -600,7 +603,7 @@
     "message": "Request encryption public key"
   },
   "endOfFlowMessage1": {
-    "message": "You passed the test - keep your seedphrase safe, it's your responsibility!"
+    "message": "You passed the test - keep your Secret Recovery Phrase safe, it's your responsibility!"
   },
   "endOfFlowMessage10": {
     "message": "All Done"
@@ -615,17 +618,17 @@
     "message": "Never share the phrase with anyone."
   },
   "endOfFlowMessage5": {
-    "message": "Be careful of phishing! MetaMask will never spontaneously ask for your seed phrase."
+    "message": "Be careful of phishing! MetaMask will never spontaneously ask for your Secret Recovery Phrase."
   },
   "endOfFlowMessage6": {
-    "message": "If you need to back up your seed phrase again, you can find it in Settings -> Security."
+    "message": "If you need to back up your Secret Recovery Phrase again, you can find it in Settings -> Security."
   },
   "endOfFlowMessage7": {
     "message": "If you ever have questions or see something fishy, contact our support $1.",
     "description": "$1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
   },
   "endOfFlowMessage8": {
-    "message": "MetaMask cannot recover your seedphrase."
+    "message": "MetaMask cannot recover your Secret Recovery Phrase."
   },
   "endOfFlowMessage9": {
     "message": "Learn more."
@@ -687,6 +690,9 @@
   "estimatedProcessingTimes": {
     "message": "Estimated Processing Times"
   },
+  "ethGasPriceFetchWarning": {
+    "message": "Backup gas price is provided as the main gas estimation service is unavailable right now."
+  },
   "eth_accounts": {
     "message": "View the addresses of your permitted accounts (required)",
     "description": "The description for the `eth_accounts` permission"
@@ -783,6 +789,9 @@
   "gasPriceExtremelyLow": {
     "message": "Gas Price Extremely Low"
   },
+  "gasPriceFetchFailed": {
+    "message": "Gas price estimation failed due to network error."
+  },
   "gasPriceInfoTooltipContent": {
     "message": "Gas price specifies the amount of Ether you are willing to pay for each unit of gas."
   },
@@ -810,9 +819,6 @@
     "message": "Get Ether from a faucet for the $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Get Help."
-  },
   "getStarted": {
     "message": "Get Started"
   },
@@ -832,14 +838,14 @@
     "message": "(legacy)",
     "description": "Text representing the MEW path"
   },
+  "hardwareWalletSupportLinkConversion": {
+    "message": "click here"
+  },
   "hardwareWallets": {
     "message": "Connect a hardware wallet"
   },
   "hardwareWalletsMsg": {
-    "message": "Select a hardware wallet you'd like to use with MetaMask"
+    "message": "Select a hardware wallet you'd like to use with MetaMask."
-  },
-  "havingTroubleConnecting": {
-    "message": "Having trouble connecting?"
   },
   "here": {
     "message": "here",
@@ -872,13 +878,13 @@
     "message": "Import Account"
   },
   "importAccountLinkText": {
-    "message": "import using seed phrase"
+    "message": "import using Secret Recovery Phrase"
   },
   "importAccountMsg": {
-    "message": " Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts "
+    "message": " Imported accounts will not be associated with your originally created MetaMask account Secret Recovery Phrase. Learn more about imported accounts "
   },
   "importAccountSeedPhrase": {
-    "message": "Import an account with seed phrase"
+    "message": "Import an account with Secret Recovery Phrase"
   },
   "importAccountText": {
     "message": "or $1",
@@ -888,7 +894,7 @@
     "message": "Import wallet"
   },
   "importYourExisting": {
-    "message": "Import your existing wallet using a seed phrase"
+    "message": "Import your existing wallet using a Secret Recovery Phrase"
   },
   "imported": {
     "message": "Imported",
@@ -958,7 +964,7 @@
     "message": "Invalid RPC URL"
   },
   "invalidSeedPhrase": {
-    "message": "Invalid seed phrase"
+    "message": "Invalid Secret Recovery Phrase"
   },
   "ipfsGateway": {
     "message": "IPFS Gateway"
@@ -988,6 +994,21 @@
   "ledgerAccountRestriction": {
     "message": "You need to make use your last account before you can add a new one."
   },
+  "ledgerLiveAdvancedSetting": {
+    "message": "Use Ledger Live"
+  },
+  "ledgerLiveAdvancedSettingDescription": {
+    "message": "The new Ledger Live bridge allows you to more easily use your Ledger.  Only available in Chrome."
+  },
+  "ledgerLiveApp": {
+    "message": "Ledger Live App"
+  },
+  "ledgerLocked": {
+    "message": "Cannot connect to Ledger device. Please make sure your device is unlocked and Ethereum app is opened."
+  },
+  "ledgerTimeout": {
+    "message": "Ledger Live is taking too long to respond or connection timeout. Make sure Ledger Live app is opened and your device is unlocked."
+  },
   "letsGoSetUp": {
     "message": "Yes, let’s get set up!"
   },
@@ -1194,7 +1215,7 @@
     "message": "No address has been set for this name."
   },
   "noAlreadyHaveSeed": {
-    "message": "No, I already have a seed phrase"
+    "message": "No, I already have a Secret Recovery Phrase"
   },
   "noConversionRateAvailable": {
     "message": "No Conversion Rate Available"
@@ -1295,9 +1316,6 @@
   "optionalCurrencySymbol": {
     "message": "Currency Symbol (optional)"
   },
-  "orderOneHere": {
-    "message": "Order a Trezor or Ledger and keep your funds in cold storage"
-  },
   "origin": {
     "message": "Origin"
   },
@@ -1379,9 +1397,6 @@
   "readdToken": {
     "message": "You can add this token back in the future by going to “Add token” in your accounts options menu."
   },
-  "readyToConnect": {
-    "message": "Ready to Connect?"
-  },
   "receive": {
     "message": "Receive"
   },
@@ -1419,7 +1434,7 @@
     "message": "Remove account"
   },
   "removeAccountDescription": {
-    "message": "This account will be removed from your wallet. Please make sure you have the original seed phrase or private key for this imported account before continuing. You can import or create accounts again from the account drop-down. "
+    "message": "This account will be removed from your wallet. Please make sure you have the original Secret Recovery Phrase or private key for this imported account before continuing. You can import or create accounts again from the account drop-down. "
   },
   "requestsAwaitingAcknowledgement": {
     "message": "requests waiting to be acknowledged"
@@ -1434,13 +1449,13 @@
     "message": "Reset Account"
   },
   "resetAccountDescription": {
-    "message": "Resetting your account will clear your transaction history. This will not change the balances in your accounts or require you to re-enter your seed phrase."
+    "message": "Resetting your account will clear your transaction history. This will not change the balances in your accounts or require you to re-enter your Secret Recovery Phrase."
   },
   "restore": {
     "message": "Restore"
   },
   "restoreAccountWithSeed": {
-    "message": "Restore your Account with Seed Phrase"
+    "message": "Restore your Account with Secret Recovery Phrase"
   },
   "restoreWalletPreferences": {
     "message": "A backup of your data from $1 has been found. Would you like to restore your wallet preferences?",
@@ -1453,13 +1468,13 @@
     "message": "A token here reuses a symbol from another token you watch, this can be confusing or deceptive."
   },
   "revealSeedWords": {
-    "message": "Reveal Seed Phrase"
+    "message": "Reveal Secret Recovery Phrase"
   },
   "revealSeedWordsDescription": {
-    "message": "If you ever change browsers or move computers, you will need this seed phrase to access your accounts. Save them somewhere safe and secret."
+    "message": "If you ever change browsers or move computers, you will need this Secret Recovery Phrase to access your accounts. Save them somewhere safe and secret."
   },
   "revealSeedWordsTitle": {
-    "message": "Seed Phrase"
+    "message": "Secret Recovery Phrase"
   },
   "revealSeedWordsWarning": {
     "message": "These words can be used to steal all your accounts."
@@ -1519,16 +1534,52 @@
     "message": "Security & Privacy"
   },
   "securitySettingsDescription": {
-    "message": "Privacy settings and wallet seed phrase"
+    "message": "Privacy settings and wallet Secret Recovery Phrase"
+  },
+  "seedPhraseIntroSidebarBulletFour": {
+    "message": "Write down and store in multiple secret places."
+  },
+  "seedPhraseIntroSidebarBulletOne": {
+    "message": "Save in a password manager"
+  },
+  "seedPhraseIntroSidebarBulletThree": {
+    "message": "Store in a safe-deposit box."
+  },
+  "seedPhraseIntroSidebarBulletTwo": {
+    "message": "Store in a bank vault."
+  },
+  "seedPhraseIntroSidebarCopyOne": {
+    "message": "Your recovery phrase is the “master key” to your wallet and funds."
+  },
+  "seedPhraseIntroSidebarCopyThree": {
+    "message": "If someone asks for your recovery phrase, they are most likely trying to scam you."
+  },
+  "seedPhraseIntroSidebarCopyTwo": {
+    "message": "Never, ever share your recovery phrase, even with MetaMask!"
+  },
+  "seedPhraseIntroSidebarTitleOne": {
+    "message": "What is a recovery phrase?"
+  },
+  "seedPhraseIntroSidebarTitleThree": {
+    "message": "Should I share my recovery phrase?"
+  },
+  "seedPhraseIntroSidebarTitleTwo": {
+    "message": "How do I save my recovery phrase?"
+  },
+  "seedPhraseIntroTitle": {
+    "message": "Secure your wallet"
+  },
+  "seedPhraseIntroTitleCopy": {
+    "message": "Before getting started, watch this short video to learn about your recovery phrase and how to keep your wallet safe."
   },
   "seedPhrasePlaceholder": {
     "message": "Separate each word with a single space"
   },
   "seedPhrasePlaceholderPaste": {
-    "message": "Paste seed phrase from clipboard"
+    "message": "Paste Secret Recovery Phrase from clipboard"
   },
   "seedPhraseReq": {
-    "message": "Seed phrases contain 12, 15, 18, 21, or 24 words"
+    "message": "Secret Recovery Phrases contain 12, 15, 18, 21, or 24 words"
   },
   "selectAHigherGasFee": {
     "message": "Select a higher gas fee to accelerate the processing of your transaction.*"
@@ -1546,7 +1597,11 @@
     "message": "This account has already been connected to MetaMask"
   },
   "selectAnAccountHelp": {
-    "message": "Select the account to view in MetaMask"
+    "message": "Select an account to view in MetaMask."
+  },
+  "selectAnAccountHelpDirections": {
+    "message": "Don't see your account? $1",
+    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
   "selectEachPhrase": {
     "message": "Please select each phrase in order to make sure it is correct."
@@ -1616,7 +1671,7 @@
     "message": "Show Private Keys"
   },
   "showSeedPhrase": {
-    "message": "Show seed phrase"
+    "message": "Show Secret Recovery Phrase"
   },
   "sigRequest": {
     "message": "Signature Request"
@@ -1688,23 +1743,26 @@
   "statusNotConnected": {
     "message": "Not connected"
   },
-  "step1HardwareWallet": {
+  "step1LedgerWallet": {
-    "message": "1. Connect Hardware Wallet"
+    "message": "Download Ledger app"
   },
-  "step1HardwareWalletMsg": {
+  "step1LedgerWalletMsg": {
-    "message": "Connect your hardware wallet directly to your computer."
+    "message": "Download, set up, and enter your password to unlock $1.",
+    "description": "$1 represents the `ledgerLiveApp` localization value"
   },
-  "step2HardwareWallet": {
+  "step1TrezorWallet": {
-    "message": "2. Select an Account"
+    "message": "Plug in Trezor wallet"
   },
-  "step2HardwareWalletMsg": {
+  "step1TrezorWalletMsg": {
-    "message": "Select the account you want to view. You can only choose one at a time."
+    "message": "Connect your wallet directly to your computer. For more on using your hardware wallet device, $1",
+    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "step3HardwareWallet": {
+  "step2LedgerWallet": {
-    "message": "3. Start using web3 sites and more!"
+    "message": "Plug in Ledger wallet"
   },
-  "step3HardwareWalletMsg": {
+  "step2LedgerWalletMsg": {
-    "message": "Use your hardware account like you would with any Ethereum account. Connect to web3 sites, send ETH, buy and store ERC20 tokens and non-fungible tokens like CryptoKitties."
+    "message": "Connect your wallet directly to your computer.  Unlock your Ledger and open the Ethereum app. For more on using your hardware wallet device, $1.",
+    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
   "storePhrase": {
     "message": "Store this phrase in a password manager like 1Password."
@@ -1730,6 +1788,10 @@
   "swapAggregator": {
     "message": "Aggregator"
   },
+  "swapAllowSwappingOf": {
+    "message": "Allow swapping of $1",
+    "description": "Shows a user that they need to allow a token for swapping on their hardware wallet"
+  },
   "swapAmountReceived": {
     "message": "Guaranteed amount"
   },
@@ -1755,6 +1817,9 @@
     "message": "Checking $1",
     "description": "Shown to the user during quote loading. $1 is the name of an aggregator. The message indicates that metamask is currently checking if that aggregator has a trade/quote for their requested swap."
   },
+  "swapConfirmWithHwWallet": {
+    "message": "Confirm with your hardware wallet"
+  },
   "swapCustom": {
     "message": "custom"
   },
@@ -1800,8 +1865,15 @@
   "swapFinalizing": {
     "message": "Finalizing..."
   },
+  "swapFromTo": {
+    "message": "The swap of $1 to $2",
+    "description": "Tells a user that they need to confirm on their hardware wallet a swap of 2 tokens. $1 is a source token and $2 is a destination token"
+  },
+  "swapGasFeesSplit": {
+    "message": "Gas fees on the previous screen are split between these two transactions."
+  },
   "swapHighSlippageWarning": {
-    "message": "Slippage amount is very high. Make sure you know what you are doing!"
+    "message": "Slippage amount is very high."
   },
   "swapLowSlippageError": {
     "message": "Transaction may fail, max slippage too low."
@@ -1920,8 +1992,8 @@
   "swapSelectQuotePopoverDescription": {
     "message": "Below are all the quotes gathered from multiple liquidity sources."
   },
-  "swapSlippageTooLow": {
+  "swapSlippageNegative": {
-    "message": "Slippage must be greater than zero"
+    "message": "Slippage must be greater or equal to zero"
   },
   "swapSource": {
     "message": "Liquidity source"
@@ -1941,6 +2013,9 @@
   "swapThisWillAllowApprove": {
     "message": "This will allow $1 to be swapped."
   },
+  "swapToConfirmWithHwWallet": {
+    "message": "to confirm with your hardware wallet"
+  },
   "swapTokenAvailable": {
     "message": "Your $1 has been added to your account.",
     "description": "This message is shown after a swap is successful and communicates the exact amount of tokens the user has received for a swap. The $1 is a decimal number of tokens followed by the token symbol."
@@ -1970,6 +2045,9 @@
   "swapTransactionComplete": {
     "message": "Transaction complete"
   },
+  "swapTwoTransactions": {
+    "message": "2 transactions"
+  },
   "swapUnknown": {
     "message": "Unknown"
   },
@@ -2012,6 +2090,12 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "Allow this site to switch the network?"
   },
+  "switchLedgerPaths": {
+    "message": "Switch Ledger paths"
+  },
+  "switchLedgerPathsText": {
+    "message": "Select the Ledger path to view other accounts"
+  },
   "switchNetwork": {
     "message": "Switch network"
   },
@@ -2070,7 +2154,7 @@
     "message": "Test Faucet"
   },
   "thisWillCreate": {
-    "message": "This will create a new wallet and seed phrase"
+    "message": "This will create a new wallet and Secret Recovery Phrase"
   },
   "tips": {
     "message": "Tips"
@@ -2254,10 +2338,10 @@
     "message": "our hardware wallet connection guide"
   },
   "walletSeed": {
-    "message": "Seed phrase"
+    "message": "Secret Recovery Phrase"
   },
   "walletSeedRestore": {
-    "message": "Wallet Seed"
+    "message": "Wallet Secret Recovery Phrase"
   },
   "web3ShimUsageNotification": {
     "message": "We noticed that the current website tried to use the removed window.web3 API. If the site appears to be broken, please click $1 for more information.",
@@ -2297,7 +2381,7 @@
     "message": "You are signing"
   },
   "yourPrivateSeedPhrase": {
-    "message": "Your private seed phrase"
+    "message": "Your private Secret Recovery Phrase"
   },
   "zeroGasPriceOnSpeedUpError": {
     "message": "Zero gas price on speed up"

app/_locales/es/messages.json

@@ -500,9 +500,6 @@
   "done": {
     "message": "Completo"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "¿No tienes un monedero físico?"
-  },
   "dontShowThisAgain": {
     "message": "No mostrar esto de nuevo"
   },
@@ -727,9 +724,6 @@
     "message": "Obtenga Ether de un faucet (grifo) por $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Pedir ayuda."
-  },
   "getStarted": {
     "message": "Empezar"
   },
@@ -751,9 +745,6 @@
   "hardwareWalletsMsg": {
     "message": "Seleccionar un monedero físico que quieres usar con MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "¿Tienes problemas de conexión?"
-  },
   "here": {
     "message": "Aquí",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1117,9 +1108,6 @@
   "optionalCurrencySymbol": {
     "message": "Símbolo (opcional)"
   },
-  "orderOneHere": {
-    "message": "Cómprate un Trezor o Ledger y guarda tus fondos en almacenamiento frío"
-  },
   "origin": {
     "message": "Origen"
   },
@@ -1201,9 +1189,6 @@
   "readdToken": {
     "message": "Puedes volver a agregar este token en el futuro pinchando sobre 'Agregar token' en el menú de opciones de tu cuenta"
   },
-  "readyToConnect": {
-    "message": "¿Listo/a para conectar?"
-  },
   "receive": {
     "message": "Recibir"
   },
@@ -1504,24 +1489,6 @@
   "statusNotConnected": {
     "message": "No conectado"
   },
-  "step1HardwareWallet": {
-    "message": "1. Conectar monedero físico."
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Conéctate el monedero físico directamente al ordenador."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Seleccionar una cuenta"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Seleccione la cuenta que quieres ver. Sólo se puede eligir una a la vez."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Empezar a usar dApps ¡y más!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Usa tu cuenta física igual que harías con cualquier cuenta de Ethereum. Regístrate con dApps, manda Eth, compra y almacena tokens de ERC20 y otros tokens no-fungibles, como CryptoKitties."
-  },
   "storePhrase": {
     "message": "Guarde esta frase en un administrador de contraseñas como 1Password."
   },
@@ -1609,9 +1576,6 @@
   "swapFinalizing": {
     "message": "Finalizando..."
   },
-  "swapHighSlippageWarning": {
-    "message": "La cantidad de deslizamiento es muy alta. ¡Asegúrate de saber lo que estás haciendo!"
-  },
   "swapLowSlippageError": {
     "message": "La transacción puede fallar, el deslizamiento máximo es demasiado bajo."
   },
@@ -1723,9 +1687,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "A continuación se muestran todas las cotizaciones recopiladas de múltiples fuentes de liquidez."
   },
-  "swapSlippageTooLow": {
-    "message": "El deslizamiento debe ser mayor que cero"
-  },
   "swapSource": {
     "message": "Fuente de liquidez"
   },

app/_locales/es_419/messages.json

@@ -500,9 +500,6 @@
   "done": {
     "message": "Listo"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "¿No tienes una billetera de hardware?"
-  },
   "dontShowThisAgain": {
     "message": "No mostrar esto de nuevo"
   },
@@ -727,9 +724,6 @@
     "message": "Obtener Ether a partir de un grifo para $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Obtén ayuda."
-  },
   "getStarted": {
     "message": "Comenzar"
   },
@@ -751,9 +745,6 @@
   "hardwareWalletsMsg": {
     "message": "Selecciona la billetera de hardware que te gustaría utilizar con MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "¿Problemas de conexión?"
-  },
   "here": {
     "message": "Aquí",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1117,9 +1108,6 @@
   "optionalCurrencySymbol": {
     "message": "Símbolo (opcional)"
   },
-  "orderOneHere": {
-    "message": "Pida una billetera Trezor o Ledger y mantenga sus fondos en un almacenamiento en frío"
-  },
   "origin": {
     "message": "Origen"
   },
@@ -1201,9 +1189,6 @@
   "readdToken": {
     "message": "Puedes volver a agregar este token a través de la opción \"Agregar token\" en el menú de opciones de tus cuentas."
   },
-  "readyToConnect": {
-    "message": "¿Listo/a para conectarte?"
-  },
   "receive": {
     "message": "Recibir"
   },
@@ -1504,24 +1489,6 @@
   "statusNotConnected": {
     "message": "No conectado"
   },
-  "step1HardwareWallet": {
-    "message": "1. Conecta la billetera de hardware"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Conecta tu billetera de hardware directamente a tu computadora."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Selecciona una cuenta"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Selecciona la cuenta que deseas ver. Solo puedes seleccionar una a la vez."
-  },
-  "step3HardwareWallet": {
-    "message": "3. ¡Comienza a utilizar dApps y más!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Utiliza tu cuenta de hardware como si fuera una cuenta de Ethereum. Inicia sesión en dApps, envía ETH, compra y almacena tokens ERC20 y tokens no fungibles como CryptoKitties."
-  },
   "storePhrase": {
     "message": "Almacena esta frase en un administrador de contraseñas como 1Password."
   },
@@ -1609,9 +1576,6 @@
   "swapFinalizing": {
     "message": "Finalizando..."
   },
-  "swapHighSlippageWarning": {
-    "message": "La cantidad de deslizamiento es muy alta. ¡Asegúrate de saber lo que estás haciendo!"
-  },
   "swapLowSlippageError": {
     "message": "La transacción puede fallar, el deslizamiento máximo es demasiado bajo."
   },
@@ -1723,9 +1687,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "A continuación se muestran todas las cotizaciones recopiladas de múltiples fuentes de liquidez."
   },
-  "swapSlippageTooLow": {
-    "message": "El deslizamiento debe ser mayor que cero"
-  },
   "swapSource": {
     "message": "Fuente de liquidez"
   },

app/_locales/et/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Valmis"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Teil ei ole riistvara rahakotti?"
-  },
   "downloadGoogleChrome": {
     "message": "Laadige alla Google Chrome"
   },
@@ -439,9 +436,6 @@
     "message": "Hankige kraanist eetrit $1eest",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Küsige abi."
-  },
   "getStarted": {
     "message": "Alustamine"
   },
@@ -463,9 +457,6 @@
   "hardwareWalletsMsg": {
     "message": "Valige riistvara rahakott, mida soovite MetaMaskis kasutada"
   },
-  "havingTroubleConnecting": {
-    "message": "Kas ühendamisel esineb probleeme?"
-  },
   "here": {
     "message": "siin",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -691,9 +682,6 @@
   "optionalCurrencySymbol": {
     "message": "Sümbol (valikuline)"
   },
-  "orderOneHere": {
-    "message": "Tellige Trezor või Ledger ja hoidke oma varasid külmruumis"
-  },
   "origin": {
     "message": "Päritolu"
   },
@@ -753,9 +741,6 @@
   "readdToken": {
     "message": "Saate selle loa tulevikus tagasi lisada, kui lähete oma kontovalikute menüüs vahelehele „Lisa luba“."
   },
-  "readyToConnect": {
-    "message": "Kas olete ühenduseks valmis?"
-  },
   "recents": {
     "message": "Hiljutised"
   },
@@ -978,24 +963,6 @@
   "stateLogsDescription": {
     "message": "Olekulogid sisaldavad teie avalikke konto aadresse ja saadetud tehinguid."
   },
-  "step1HardwareWallet": {
-    "message": "1. Ühendage riistvara rahakott"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Ühendage oma riistvara rahakott otse oma arvutiga."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Valige konto"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Valige konto, mida soovite vaadata. Korraga saab valida ühe."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Hakake kasutama dAppse ja muud!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Kasutage oma riistvarakontot nagu mis tahes teist Ethereumi kontot. Logige dAppsi, saatke Eth-d, ostke ja hoiustage ERC20 lube ning asendamatuid lube nagu CryptoKitties."
-  },
   "storePhrase": {
     "message": "Salvestage see fraas paroolihaldurisse, nagu 1Password."
   },

app/_locales/fa/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "تمام"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "آیا کیف سخت افزار ندارید؟"
-  },
   "downloadGoogleChrome": {
     "message": "دانلود گوگل کروم"
   },
@@ -443,9 +440,6 @@
     "message": "اخذ ایتر از یک فاست برای 1$1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "دریافت کمک"
-  },
   "getStarted": {
     "message": "شروع به کار"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "یک کیف سخت افزار را که میخواهید با MetaMast استفاده نمایید، انتخاب کنید"
   },
-  "havingTroubleConnecting": {
-    "message": "آیا در اتصال مشکلی دارید؟"
-  },
   "here": {
     "message": "اینجا",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -701,9 +692,6 @@
   "optionalCurrencySymbol": {
     "message": "سمبول (انتخابی)"
   },
-  "orderOneHere": {
-    "message": "یک Trezor یا Ledger را سفارش داده و پول های تان را در ذخیره سرد نگهدارید"
-  },
   "origin": {
     "message": "مبدأ"
   },
@@ -763,9 +751,6 @@
   "readdToken": {
     "message": "شما میتوانید این رمزیاب را دوباره برای آینده با رفتن به گزینه \"Add token\" در مینوی تنظیمات حساب ها، اضافه نمایید."
   },
-  "readyToConnect": {
-    "message": "آماده برای اتصال هستید؟"
-  },
   "recents": {
     "message": "واپسین"
   },
@@ -988,24 +973,6 @@
   "stateLogsDescription": {
     "message": "دفترچه وضعیت شامل آدرس های حساب عمومی و معاملات فرستاده شده تان میباشد."
   },
-  "step1HardwareWallet": {
-    "message": "1. اتصال کیف سخت افزار"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "کیف سخت افزار تان را مستقیمًا به کمپیوتر وصل نمایید."
-  },
-  "step2HardwareWallet": {
-    "message": "2. انتخاب یک حساب"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "حسابی را که میخواهید مشاهده نمایید انتخاب کنید. شما میتوانید یک حساب را در یک زمان انتخاب نمایید."
-  },
-  "step3HardwareWallet": {
-    "message": "3. آغاز استفاده از dApps و بیشتر!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "حساب سخت افزار تان را همچنانکه در حساب ایتریم استفاده میکنید، استفاده نمایید. وارد dApps شده، Eth را ارسال نموده، رمزیاب های ERC20 و غیر-قابل تبدیل به پول مانند CryptoKitties را خریداری و ذخیره نمایید."
-  },
   "storePhrase": {
     "message": "این عبارت را در یک نرم افزار مدیریت رمز عبور مانند 1Password ذخیره نمایید."
   },

app/_locales/fi/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Valmis"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Eikö sinulla ole laitteistokukkaroa?"
-  },
   "downloadGoogleChrome": {
     "message": "Lataa Google Chrome"
   },
@@ -443,9 +440,6 @@
     "message": "Hanki etheriä faucetista kohteelle $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Pyydä apua."
-  },
   "getStarted": {
     "message": "Aloitusopas"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "Valitse laitteistokukkaro, jota haluaisit käyttää MetaMaskilla"
   },
-  "havingTroubleConnecting": {
-    "message": "Onko sinulla yhdistämisvaikeuksia?"
-  },
   "here": {
     "message": "tässä",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -698,9 +689,6 @@
   "optionalCurrencySymbol": {
     "message": "Symboli (valinnainen)"
   },
-  "orderOneHere": {
-    "message": "Tilaa Trezor tai Ledger ja pidä varasi vakaassa tallennustilassa"
-  },
   "origin": {
     "message": "Alkuperä"
   },
@@ -760,9 +748,6 @@
   "readdToken": {
     "message": "Voit lisätä tämän tietueen myöhemmin takaisin siirtymällä tilisi vaihtoehtovalikon kohtaan ”Lisää tietue”."
   },
-  "readyToConnect": {
-    "message": "Valmiina yhdistämään?"
-  },
   "recents": {
     "message": "Viimeaikaiset"
   },
@@ -985,24 +970,6 @@
   "stateLogsDescription": {
     "message": "Tilalokeista löydät julkiset tiliosoitteesi sekä lähetetyt maksusiirtosi."
   },
-  "step1HardwareWallet": {
-    "message": "1. Yhdistä laitteistokukkaro"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Yhdistä hardware-lompakkosi suoraan tietokoneeseesi."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Valitse tili"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Valitse tarkasteltava tili. Voit valita vain yhden kerrallaan."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Ota käyttöön dApps ja paljon muuta!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Käytä laitteistosi tiliä minkä tahansa Ethereum-tilin tavoin. Kirjaudu dAppsiin, lähettää ethereumeja, ostaa ja tallentaa ERC20-tunnuksia sekä CryptoKittiesin kaltaisia ei-korvattavia tunnuksia."
-  },
   "storePhrase": {
     "message": "Tallenna tämä teksti johonkin salasanojen hallintaohjelmaan (esim. 1Password)."
   },

app/_locales/fil/messages.json

@@ -284,9 +284,6 @@
   "done": {
     "message": "Tapos na"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Wala ka bang hardware wallet?"
-  },
   "downloadGoogleChrome": {
     "message": "I-download ang Google Chrome"
   },
@@ -412,9 +409,6 @@
     "message": "Kumuha ng Ether mula sa isang faucet para sa $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Humingi ng Tulong."
-  },
   "getStarted": {
     "message": "Magsimula"
   },
@@ -430,9 +424,6 @@
   "hardwareWalletsMsg": {
     "message": "Pumili ng hardware wallet na gusto mong gamitin sa MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "May problema ka ba sa pagkonekta?"
-  },
   "here": {
     "message": "dito",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -632,9 +623,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbolo (opsyonal)"
   },
-  "orderOneHere": {
-    "message": "Mag-order ng Trezor o Ledger para itago sa cold storage ang iyong pondo"
-  },
   "origin": {
     "message": "Pinanggalingan"
   },
@@ -687,9 +675,6 @@
   "readdToken": {
     "message": "Puwede mong idagdag ulit ang token na ito sa hinaharap sa pamamagitan ng pagpunta sa “Magdagdag ng token” sa menu ng mga opsyon ng iyong mga accounts."
   },
-  "readyToConnect": {
-    "message": "Handa ka nang Kumonekta?"
-  },
   "recents": {
     "message": "Kamakailan"
   },
@@ -894,24 +879,6 @@
   "stateLogsDescription": {
     "message": "Ang mga state log ay naglalaman ng iyong mga pampublikong account address at mga ipinadalang transaksyon."
   },
-  "step1HardwareWallet": {
-    "message": "1. Magkonekta ng Hardware Wallet"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Ikonekta ang iyong hardware wallet nang direkta sa computer."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Pumili ng Account"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Piliin ang halagang gusto mong tingnan. Maaari ka lang pumili nang paisa-isa."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Magsimula gamit ang dApps at higit pa!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Gamitin ang iyong hardware account tulad ng anumang Ethereum account. Mag-log in sa dApps, magpadala ng Eth, bumili at mag-store ng mga ERC20 token at mga Non-Fungible token tulad ng CryptoKitties."
-  },
   "storePhrase": {
     "message": "I-store ang pariralang ito sa isang password manager tulad ng 1Password."
   },

app/_locales/fr/messages.json

@@ -299,9 +299,6 @@
   "done": {
     "message": "Terminé"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Vous n'avez pas de portefeuille hardware ?"
-  },
   "downloadGoogleChrome": {
     "message": "Télécharger Google Chrome"
   },
@@ -437,9 +434,6 @@
     "message": "Obtenir de l'Ether d'une faucet pour $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Obtenir de l'aide."
-  },
   "getStarted": {
     "message": "Démarrer"
   },
@@ -458,9 +452,6 @@
   "hardwareWalletsMsg": {
     "message": "Selectionnez le portefeuille hardware que vous voulez utiliser avec MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Un problème de connection ?"
-  },
   "here": {
     "message": "ici",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -683,9 +674,6 @@
   "optionalCurrencySymbol": {
     "message": "Symbole (facultatif)"
   },
-  "orderOneHere": {
-    "message": "Commander un Trezor ou un Ledger et conserver vos fonds en \"cold storage\""
-  },
   "origin": {
     "message": "Origine"
   },
@@ -745,9 +733,6 @@
   "readdToken": {
     "message": "Vous pourrez ajouter à nouveau ce jeton en allant sur “Ajouter un jeton” dans le menu des options de votre compte."
   },
-  "readyToConnect": {
-    "message": "Prêt à se connecter ?"
-  },
   "recents": {
     "message": "Récents"
   },
@@ -970,24 +955,6 @@
   "stateLogsDescription": {
     "message": "Les logs d'Etat contiennent les adresses publiques de vos comptes et vos transactions envoyées."
   },
-  "step1HardwareWallet": {
-    "message": "1. Connecter le portefeuille hardware"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Connectez votre portefeuille hardware directement à votre ordinateur."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Selectionnez un compte"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Selectionnez le compte que vous voulez afficher. Vous ne pouvez en afficher qu'un seul à la fois."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Vous pouvez maintenant utiliser des dApps et autres... !"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Utilisez ce compte de votre portefeuille hardware comme n'importe quel compte Ethereum. Connectez vous à des dApps, envoyez de l'Eth, achetez et conservez des jetons ERC20 et Non-Fungible comme CryptoKitties."
-  },
   "storePhrase": {
     "message": "Stockez cette phrase dans un gestionnaire de mots de passe comme 1Password."
   },

app/_locales/he/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "סיום"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "אין לך ארנק חומרה?"
-  },
   "downloadGoogleChrome": {
     "message": "הורד/י את גוגל כרום"
   },
@@ -443,9 +440,6 @@
     "message": "השג/י את'ר מברז (faucet) עבור ה-$1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "בקש/י עזרה."
-  },
   "getStarted": {
     "message": "תחילת העבודה"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "בחר/י ארנק חומרה שבו תרצה להשתמש עם MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "חווה קשיים בהתחברות?"
-  },
   "here": {
     "message": "כאן",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -698,9 +689,6 @@
   "optionalCurrencySymbol": {
     "message": "סמל (אופציונלי)"
   },
-  "orderOneHere": {
-    "message": "הזמנ/י Trezor או Ledger ושמר/י את הכספים שלך באחסון קר"
-  },
   "origin": {
     "message": "מקור"
   },
@@ -760,9 +748,6 @@
   "readdToken": {
     "message": "באפשרותך להוסיף טוקן זה בחזרה בעתיד על ידי מעבר אל \"הוסף טוקן\" בתפריט אפשרויות החשבונות שלך."
   },
-  "readyToConnect": {
-    "message": "מוכנ/ה להתחבר?"
-  },
   "recents": {
     "message": "אחרונים"
   },
@@ -982,24 +967,6 @@
   "stateLogsDescription": {
     "message": "יומני המצב מכילים את כתובות החשבון הציבוריות שלך ועסקאות שנשלחו."
   },
-  "step1HardwareWallet": {
-    "message": "1. חבר/י ארנק חומרה"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "חבר/י את ארנק החומרה שלך ישירות למחשב שלך."
-  },
-  "step2HardwareWallet": {
-    "message": "2. בחר/י חשבון"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "בחר/י את החשבון שברצונך להציג. באפשרותך לבחור רק אחד בכל פעם."
-  },
-  "step3HardwareWallet": {
-    "message": "3. התחל/י להשתמש ב- dApps ועוד!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "השתמש/י בחשבון החומרה שלך כי שהיית משתמש/ת בכל חשבון אתריום"
-  },
   "storePhrase": {
     "message": "אחסנ/י צירוף זה במנהל ססמאות כמו 1Password."
   },

app/_locales/hi/messages.json

@@ -491,9 +491,6 @@
   "done": {
     "message": "संपन्न"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "हार्डवेयर वॉलेट नहीं है?"
-  },
   "dontShowThisAgain": {
     "message": "इसे दोबारा न दिखाएँ"
   },
@@ -718,9 +715,6 @@
     "message": "$1 के लिए एक फ़ॉसेट से Ether प्राप्त करें",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "मदद प्राप्त करें।"
-  },
   "getStarted": {
     "message": "प्रारंभ करें"
   },
@@ -742,9 +736,6 @@
   "hardwareWalletsMsg": {
     "message": "किसी हार्डवेयर वॉलेट का चयन करें, जिसे आप MetaMask के साथ उपयोग करना चाहते हैं"
   },
-  "havingTroubleConnecting": {
-    "message": "कनेक्ट करने में समस्या हो रही है?"
-  },
   "here": {
     "message": "यहाँ",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1108,9 +1099,6 @@
   "optionalCurrencySymbol": {
     "message": "मुद्रा प्रतीक (वैकल्पिक)"
   },
-  "orderOneHere": {
-    "message": "Trezor या लेजर ऑर्डर करें और अपने धन को कोल्ड स्टोरेज में रखें"
-  },
   "origin": {
     "message": "उत्पत्ति"
   },
@@ -1192,9 +1180,6 @@
   "readdToken": {
     "message": "आप अपने खातों के विकल्प मेनू में \"टोकन जोड़ें\" पर जाकर भविष्य में इस टोकन को वापस जोड़ सकते हैं।"
   },
-  "readyToConnect": {
-    "message": "कनेक्ट करने के लिए तैयार हैं?"
-  },
   "receive": {
     "message": "प्राप्त करें"
   },
@@ -1495,24 +1480,6 @@
   "statusNotConnected": {
     "message": "कनेक्ट नहीं है"
   },
-  "step1HardwareWallet": {
-    "message": "1. हार्डवेयर वॉलेट कनेक्ट करें"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "अपने हार्डवेयर वॉलेट को सीधे अपने कंप्यूटर से कनेक्ट करें।"
-  },
-  "step2HardwareWallet": {
-    "message": "2. किसी खाते का चयन करें"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "उस खाते का चयन करें, जिसे आप देखना चाहते हैं। आप एक समय में केवल एक ही चुन सकते हैं।"
-  },
-  "step3HardwareWallet": {
-    "message": "3. web3 साइटों और अधिक का उपयोग करना प्रारंभ करें!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "अपने हार्डवेयर खाते का उसी तरह से उपयोग करें, जैसे आप किसी भी Ethereum खाते को करेंगे। web3 साइटों से कनेक्ट करें, ETH भेजें, ERC20 और CryptoKitties जैसे गैर-प्रतिमोचन वाले टोकन जैसे टोकन खरीदें और संग्रहीत करें।"
-  },
   "storePhrase": {
     "message": "इस वाक्यांश को 1Password जैसे किसी पासवर्ड मैनेजर में संग्रहीत करें।"
   },
@@ -1597,9 +1564,6 @@
   "swapFinalizing": {
     "message": "अंतिम रूप दिया जा रहा है..."
   },
-  "swapHighSlippageWarning": {
-    "message": "स्लिपेज राशि बहुत अधिक है। सुनिश्चित करें कि आप जानते हैं कि आप क्या कर रहे हैं!"
-  },
   "swapLowSlippageError": {
     "message": "लेनदेन विफल हो सकता है, अधिकतम स्लिपेज बहुत कम हो सकता है।"
   },
@@ -1693,9 +1657,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "नीचे दिए गए सभी उद्धरण कई चलनिधि स्रोतों से एकत्र किए गए हैं।"
   },
-  "swapSlippageTooLow": {
-    "message": "स्लिपेज शून्य से अधिक होना चाहिए"
-  },
   "swapSource": {
     "message": "चलनिधि का स्रोत"
   },

app/_locales/hr/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Gotovo"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nemate hardverski novčanik?"
-  },
   "downloadGoogleChrome": {
     "message": "Preuzmi preglednik Google Chrome"
   },
@@ -439,9 +436,6 @@
     "message": "Dohvati Ether iz svežnja za $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Potražite pomoć."
-  },
   "getStarted": {
     "message": "Početak upotrebe"
   },
@@ -463,9 +457,6 @@
   "hardwareWalletsMsg": {
     "message": "Odaberite hardverski novčanik koji biste željeli upotrebljavati s uslugom MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Imate poteškoća s povezivanjem?"
-  },
   "here": {
     "message": "ovdje",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -694,9 +685,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbol (neobavezno)"
   },
-  "orderOneHere": {
-    "message": "Naručite Trezor ili Ledger te čuvajte svoja sredstva u hladnoj pohrani"
-  },
   "origin": {
     "message": "Podrijetlo"
   },
@@ -756,9 +744,6 @@
   "readdToken": {
     "message": "Ovaj token možete dodati kasnije odlaskom pod stavku „Dodaj token” u izborniku mogućnosti računa. "
   },
-  "readyToConnect": {
-    "message": "Sve je spremno za povezivanje?"
-  },
   "recents": {
     "message": "Nedavno"
   },
@@ -981,24 +966,6 @@
   "stateLogsDescription": {
     "message": "U zapisnicima se stanja nalaze javne adrese računa i poslane transakcije."
   },
-  "step1HardwareWallet": {
-    "message": "1. Povežite se na svoj hardverski novčanik"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Povežite svoj hardverski novčanik izravno na svoje računalo."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Odaberite račun"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Odaberite račun koji želite pregledati. Istovremeno možete odabrati samo jedan račun za pregled."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Započnite upotrebljavati dApps i više!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Upotrebljavajte svoj hardverski račun kako biste upotrebljavali bilo koji drugi račun Ethereum. Prijavite se u dApps, šaljite Eth, kupujte i pohranjujte ERC20 tokene i nezamjenske tokene kao CryptoKitties."
-  },
   "storePhrase": {
     "message": "Spremite ovu rečenicu u upravitelj lozinkama poput aplikacije 1Password."
   },

app/_locales/ht/messages.json

@@ -172,9 +172,6 @@
   "done": {
     "message": "Fini"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Pa gen yon materyèl bous?"
-  },
   "downloadGoogleChrome": {
     "message": "Telechaje Google Chrome"
   },
@@ -241,9 +238,6 @@
     "message": "Jwenn Ether nan yon tiyo pou $1 la",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Jwenn èd."
-  },
   "hardware": {
     "message": "materyèl"
   },
@@ -256,9 +250,6 @@
   "hardwareWalletsMsg": {
     "message": "Chwazi yon Materyèl Wallet ou ta renmen itilize ak MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Èske w gen pwoblèm pou konekte?"
-  },
   "here": {
     "message": "isit la",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -409,9 +400,6 @@
   "ok": {
     "message": "Oke"
   },
-  "orderOneHere": {
-    "message": "Mete nan lòd on Trezor oswa Ledger epi kenbe lajan ou nan yon stòk frèt."
-  },
   "origin": {
     "message": "Orijin"
   },
@@ -462,9 +450,6 @@
   "readdToken": {
     "message": "Ou ka ajoute token sa aprè sa ankò ou prale nan  \"Ajoute token\" nan opsyon meni kont ou an."
   },
-  "readyToConnect": {
-    "message": "Pare pou konekte?"
-  },
   "recipientAddress": {
     "message": "Adrès pou resevwa"
   },
@@ -618,24 +603,6 @@
   "stateLogsDescription": {
     "message": "State logs gen adrès kont piblik ou yo epi tranzaksyon ou te voye yo."
   },
-  "step1HardwareWallet": {
-    "message": "1. Konekte Materyèl bous"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Konekte materyèl bous ou dirèkteman nan òdinatè ou."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Chwazi yon kont"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Chwazi kont ou vle wè a. Ou ka chwazi youn sèlman nan yon moman."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Kòmanse itilize dApps ak plis ankò!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Sèvi ak kont materyèl ou menm jan ou t ap fè pou kont Etherum. Ouvri sesyon an nan dApps, voye Eth, achte ak stòke ERC20 tokens ak e ki pake chanje tokens tankou CryptoKitties."
-  },
   "submitted": {
     "message": "Te Soumèt"
   },

app/_locales/hu/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Kész"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nincs hardveres tárcája? "
-  },
   "downloadGoogleChrome": {
     "message": "Google Chrome letöltése"
   },
@@ -439,9 +436,6 @@
     "message": "Szerezzen Ethert pénzcsapból a(z) $1-ért",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Segítség kérése"
-  },
   "getStarted": {
     "message": "Első lépések"
   },
@@ -463,9 +457,6 @@
   "hardwareWalletsMsg": {
     "message": "Válassza ki a MetaMask-kal használni kívánt hardveres pénztárcát"
   },
-  "havingTroubleConnecting": {
-    "message": "Gond van a csatlakozással?"
-  },
   "here": {
     "message": "itt",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -694,9 +685,6 @@
   "optionalCurrencySymbol": {
     "message": "Szimbólum (opcionális)"
   },
-  "orderOneHere": {
-    "message": "Rendeljen trezort vagy főkönyvet, és tárolja pénzeszközeit hideg tárcában"
-  },
   "origin": {
     "message": "Eredet"
   },
@@ -756,9 +744,6 @@
   "readdToken": {
     "message": "Ezt a tokent a jövőben is hozzáadhatja, ha a fiókbeállítások menü „Token hozzáadása” elemére lép."
   },
-  "readyToConnect": {
-    "message": "Készen áll a csatlakozásra?"
-  },
   "recents": {
     "message": "Legutóbbiak"
   },
@@ -981,24 +966,6 @@
   "stateLogsDescription": {
     "message": "Az állapotnaplóban megtalálhatók nyilvános fiókcímeid és elküldött tranzakcióid."
   },
-  "step1HardwareWallet": {
-    "message": "1. Csatlakoztassa a hardveres pénztárcát"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Csatlakoztassa hardveres tárcáját közvetlenül a számítógéphez."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Válassz egy fiókot"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Válassza ki a megtekinteni kívánt fiókot. Egyszerre csak egyet választhat."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Kezdje el használni a dApps-t és másokat!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Használja hardveres fiókját úgy, mint bármilyen Ethereum fiókot. Jelentkezzen be a dAppsba, küldjön Ethet, vásároljon és tároljon ERC20 tokeneket és nem helyettesíthető tokeneket, például CryptoKitties-t."
-  },
   "storePhrase": {
     "message": "Tárolja a mondatot jelszókezelőben, például az 1Passwordben."
   },

app/_locales/id/messages.json

@@ -491,9 +491,6 @@
   "done": {
     "message": "Selesai"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Tidak punya dompet perangkat keras?"
-  },
   "dontShowThisAgain": {
     "message": "Jangan tampilkan ini lagi"
   },
@@ -718,9 +715,6 @@
     "message": "Dapatkan Ether dari keran untuk $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Dapatkan Bantuan."
-  },
   "getStarted": {
     "message": "Persiapan."
   },
@@ -742,9 +736,6 @@
   "hardwareWalletsMsg": {
     "message": "Pilih dompet perangkat keras yang ingin Anda gunakan dengan MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Ada masalah saat menghubungkan?"
-  },
   "here": {
     "message": "di sini",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1108,9 +1099,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbol Mata Uang (opsional)"
   },
-  "orderOneHere": {
-    "message": "Pesan Trezor atau Ledger dan simpan dana Anda di penyimpanan dingin"
-  },
   "origin": {
     "message": "Asal"
   },
@@ -1192,9 +1180,6 @@
   "readdToken": {
     "message": "Anda dapat menambahkan token ini kembali di masa mendatang dengan membuka “Tambahkan token” di menu opsi akun Anda."
   },
-  "readyToConnect": {
-    "message": "Siap untuk Terhubung?"
-  },
   "receive": {
     "message": "Terima"
   },
@@ -1495,24 +1480,6 @@
   "statusNotConnected": {
     "message": "Tidak terhubung"
   },
-  "step1HardwareWallet": {
-    "message": "1. Hubungkan Dompet Perangkat Keras"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Hubungkan dompet perangkat keras Anda langsung ke komputer."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Pilih Akun"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Pilih akun yang ingin Anda lihat. Anda hanya dapat memilih satu pada satu waktu."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Mulai menggunakan situs web3 dan lainnya!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Gunakan akun perangkat keras Anda seperti yang akan Anda lakukan dengan akun Ethereum lainnya. Hubungkan ke situs web3, kirim ETH, beli dan simpan token ERC20 dan token yang tidak dapat dipertukarkan seperti CryptoKitties."
-  },
   "storePhrase": {
     "message": "Simpan frasa ini dalam pengelola kata sandi seperti 1Password."
   },
@@ -1597,9 +1564,6 @@
   "swapFinalizing": {
     "message": "Menyelesaikan..."
   },
-  "swapHighSlippageWarning": {
-    "message": "Jumlah slippage sangat tinggi. Pastikan Anda mengetahui yang Anda kerjakan!"
-  },
   "swapLowSlippageError": {
     "message": "Transaksi bisa gagal, slippage maks. terlalu rendah."
   },
@@ -1693,9 +1657,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "Di bawah ini adalah semua kuota yang dikumpulkan dari beberapa sumber likuiditas."
   },
-  "swapSlippageTooLow": {
-    "message": "Slippage harus lebih besar dari nol"
-  },
   "swapSource": {
     "message": "Sumber likuiditas"
   },

app/_locales/it/messages.json

@@ -503,9 +503,6 @@
   "done": {
     "message": "Finito"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Non hai un portafoglio hardware?"
-  },
   "dontShowThisAgain": {
     "message": "Non mostrare di nuovo"
   },
@@ -730,9 +727,6 @@
     "message": "Ottieni Get Ether da un faucet per $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Aiuto."
-  },
   "getStarted": {
     "message": "Inizia"
   },
@@ -754,9 +748,6 @@
   "hardwareWalletsMsg": {
     "message": "Selezione un portafoglio hardware che vuoi utilizzare con MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Problemi di connessione?"
-  },
   "here": {
     "message": "qui",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1123,9 +1114,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbolo (opzionale)"
   },
-  "orderOneHere": {
-    "message": "Compra un Trezor o un Ledger e tieni i tuoi soldi al sicuro"
-  },
   "origin": {
     "message": "Origine"
   },
@@ -1207,9 +1195,6 @@
   "readdToken": {
     "message": "Puoi aggiungere nuovamente questo token in futuro andando in “Aggiungi token” nel menu delle opzioni del tuo account."
   },
-  "readyToConnect": {
-    "message": "Pronto a Connetterti?"
-  },
   "receive": {
     "message": "Ricevi"
   },
@@ -1510,24 +1495,6 @@
   "statusNotConnected": {
     "message": "Non connesso"
   },
-  "step1HardwareWallet": {
-    "message": "1. Connetti Portafoglio Hardware"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Connetti il tuo portafoglio hardware al tuo computer."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Seleziona un Account"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Selezione l'account che vuoi vedere. Puoi selezionarne solo uno alla volta."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Inizia a usare dApps e molto altro ancora!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Usa il tuo account hardware come utilizzeresti qualsiasi account Ethereum. Accedi alle dApps, invia Eth, compra e conserva token ERC20 e token non fungibili come CryptoKitties"
-  },
   "storePhrase": {
     "message": "Conserva questa frase in un gestore di password come 1Password."
   },
@@ -1615,9 +1582,6 @@
   "swapFinalizing": {
     "message": "Finalizzando..."
   },
-  "swapHighSlippageWarning": {
-    "message": "L'importo di slippage è molto alto. Assicurati di sapere cosa stai facendo!"
-  },
   "swapLowSlippageError": {
     "message": "La transazione può fallire, il massimo slippage è troppo basso."
   },
@@ -1735,9 +1699,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "Sotto trovi tutte le quotazioni raccolte da multiple sorgenti di liquidità."
   },
-  "swapSlippageTooLow": {
-    "message": "Lo slippage deve essere maggiore di zero"
-  },
   "swapSource": {
     "message": "Sorgente di liquidità"
   },

app/_locales/ja/messages.json

@@ -500,9 +500,6 @@
   "done": {
     "message": "完了"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "ハードウェアウォレットをお持ちではありませんか?"
-  },
   "dontShowThisAgain": {
     "message": "再度表示しない"
   },
@@ -727,9 +724,6 @@
     "message": "$1 のFaucetでEtherを得ることができます。",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "サポートを受ける。"
-  },
   "getStarted": {
     "message": "はじめる"
   },
@@ -751,9 +745,6 @@
   "hardwareWalletsMsg": {
     "message": "MetaMaskに接続するハードウェアウォレットを選択してください"
   },
-  "havingTroubleConnecting": {
-    "message": "接続に問題がありますか?"
-  },
   "here": {
     "message": "こちら",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1117,9 +1108,6 @@
   "optionalCurrencySymbol": {
     "message": "通貨シンボル(オプション)"
   },
-  "orderOneHere": {
-    "message": "Trezor又はLedgerを注文して資金をコールドストレージに保管できます"
-  },
   "origin": {
     "message": "要求元"
   },
@@ -1201,9 +1189,6 @@
   "readdToken": {
     "message": "アカウントオプションのメニューで\"トークンの追加\"を選択すると、後でこのトークンを戻すことができます。"
   },
-  "readyToConnect": {
-    "message": "接続準備はよろしいですか?"
-  },
   "receive": {
     "message": "受け取る"
   },
@@ -1504,24 +1489,6 @@
   "statusNotConnected": {
     "message": "未接続"
   },
-  "step1HardwareWallet": {
-    "message": "1.ハードウェア ウォレットの接続"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "コンピューターに直接ハードウェアウォレットを接続してください。"
-  },
-  "step2HardwareWallet": {
-    "message": "2.アカウントを選択"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "読取るアカウントを１つ選択します。"
-  },
-  "step3HardwareWallet": {
-    "message": "3.web3を使用してサイトに接続しましょう!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Ethereumアカウントと同じように、ハードウェアアカウントを使用します。web3サイトに接続してETH を送金し、ERC20トークンやCryptoKittiesのようなトークンを購入して保管できます。"
-  },
   "storePhrase": {
     "message": "このフレーズを1Passwordのようなパスワードマネージャーに保管てください。"
   },
@@ -1609,9 +1576,6 @@
   "swapFinalizing": {
     "message": "終了中..."
   },
-  "swapHighSlippageWarning": {
-    "message": "非常に大きいスリッページ額です。本当に実行するか確認してください。"
-  },
   "swapLowSlippageError": {
     "message": "トランザクションが失敗する可能性があります。最大スリッページが少なすぎます。"
   },
@@ -1723,9 +1687,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "以下は複数の流動性ソースから収集したすべての見積です。"
   },
-  "swapSlippageTooLow": {
-    "message": "スリッページは 0 より多くする必要があります。"
-  },
   "swapSource": {
     "message": "流動性ソース"
   },

app/_locales/kn/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "ಮುಗಿದಿದೆ"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "ಹಾರ್ಡ್‌ವೇರ್ ವ್ಯಾಲೆಟ್‌ ಅನ್ನು ಹೊಂದಿಲ್ಲವೇ?"
-  },
   "downloadGoogleChrome": {
     "message": "Google Chrome ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ"
   },
@@ -443,9 +440,6 @@
     "message": "$1 ಗಾಗಿ ಫಾಸೆಟ್‌ನಿಂದ ಎಥರ್ ಅನ್ನು ಪಡೆಯಿರಿ",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "ಸಹಾಯವನ್ನು ಪಡೆಯಿರಿ."
-  },
   "getStarted": {
     "message": "ಪ್ರಾರಂಭಗೊಂಡಿದೆ"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "MetaMask ನೊಂದಿಗೆ ಬಳಸಲು ನೀವು ಇಷ್ಟಪಡುವ ಹಾರ್ಡ‌ವೇರ್ ವ್ಯಾಲೆಟ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"
   },
-  "havingTroubleConnecting": {
-    "message": "ಸಂಪರ್ಕಿಸುವಲ್ಲಿ ತೊಂದರೆ ಇದೆಯೇ?"
-  },
   "here": {
     "message": "ಇಲ್ಲಿ",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -701,9 +692,6 @@
   "optionalCurrencySymbol": {
     "message": "ಚಿಹ್ನೆ (ಐಚ್ಛಿಕ)"
   },
-  "orderOneHere": {
-    "message": "ಟ್ರೆಜರ್ ಅಥವಾ ಲೆಡ್ಜರ್ ಅನ್ನು ಆರ್ಡರ್ ಮಾಡಿ ಮತ್ತು ನಿಮ್ಮ ನಿಧಿಗಳನ್ನು ಕೋಲ್ಡ್ ಸ್ಟೋರೇಜ್‌ನಲ್ಲಿರಿಸಿ"
-  },
   "origin": {
     "message": "ಮೂಲ"
   },
@@ -763,9 +751,6 @@
   "readdToken": {
     "message": "ನಿಮ್ಮ ಖಾತೆಗಳ ಆಯ್ಕೆಗಳ ಮೆನುವಿನಲ್ಲಿ \"ಟೋಕನ್ ಸೇರಿಸು\" ಗೆ ಹೋಗುವ ಮೂಲಕ ನೀವು ಈ ಟೋಕನ್ ಅನ್ನು ಭವಿಷ್ಯದಲ್ಲಿ ಮರಳಿ ಸೇರಿಸಬಹುದು."
   },
-  "readyToConnect": {
-    "message": "ಸಂಪರ್ಕಿಸಲು ಸಿದ್ಧವೇ?"
-  },
   "recents": {
     "message": "ಇತ್ತೀಚಿನವುಗಳು"
   },
@@ -988,24 +973,6 @@
   "stateLogsDescription": {
     "message": "ರಾಜ್ಯದ ಲಾಗ್‌ಗಳು ನಿಮ್ಮ ಸಾರ್ವಜನಿಕ ಖಾತೆಯ ವಿಳಾಸಗಳು ಮತ್ತು ಕಳುಹಿಸಲಾದ ವಹಿವಾಟುಗಳನ್ನು ಹೊಂದಿರುತ್ತವೆ."
   },
-  "step1HardwareWallet": {
-    "message": "1. ಹಾರ್ಡ್‌ವೆರ್ ವ್ಯಾಲೆಟ್ ಸಂಪರ್ಕಪಡಿಸಿ"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "ನಿಮ್ಮ ಹಾರ್ಡ್‌ವೇರ್ ವ್ಯಾಲೆಟ್ ಅನ್ನು ನೇರವಾಗಿ ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ."
-  },
-  "step2HardwareWallet": {
-    "message": "2. ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "ನೀವು ವೀಕ್ಷಿಸಲು ಬಯಸುವ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ. ನೀವು ಒಮ್ಮೆಗೆ ಒಂದನ್ನು ಮಾತ್ರ ಆಯ್ಕೆಮಾಡಬಹುದು."
-  },
-  "step3HardwareWallet": {
-    "message": "3. dApps ಮತ್ತು ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಲು ಪ್ರಾರಂಭಿಸಿ!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "ಯಾವುದೇ ಎಥೆರಿಯಮ್ ಖಾತೆಯೊಂದಿಗೆ ನಿಮ್ಮ ಹಾರ್ಡ್‌ವೇರ್ ಖಾತೆಯನ್ನು ಬಳಸಿ. dApps ಗೆ ಲಾಗಿನ್ ಮಾಡಿ, Eth ಕಳುಹಿಸಿ, ERC20 ಟೋಕನ್‌ಗಳನ್ನು ಮತ್ತು ಕ್ರಿಪ್ಟೋಕಿಟ್ಟೀಸ್‌ನಂತಹ ಫಂಗಿಬಲ್ ಟೋಕನ್‌ಗಳನ್ನು ಖರೀದಿಸಿ ಮತ್ತು ಸಂಗ್ರಹಿಸಿ."
-  },
   "storePhrase": {
     "message": "ಈ ಫ್ರೇಸ್ ಅನ್ನು ಪಾಸ್‌ವರ್ಡ್ ನಿರ್ವಾಹಕದಲ್ಲಿ 1Password ರೂಪದಲ್ಲಿ ಸಂಗ್ರಹಿಸಿ."
   },

app/_locales/ko/messages.json

@@ -491,9 +491,6 @@
   "done": {
     "message": "완료"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "하드웨어 지갑이 없으신가요?"
-  },
   "dontShowThisAgain": {
     "message": "이 메시지를 다시 표시하지 않음"
   },
@@ -718,9 +715,6 @@
     "message": "$1용 포시트에서 Ether 얻기",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "도움을 받으세요."
-  },
   "getStarted": {
     "message": "시작하기"
   },
@@ -742,9 +736,6 @@
   "hardwareWalletsMsg": {
     "message": "MetaMask와 함께 사용할 하드웨어 지갑 선택"
   },
-  "havingTroubleConnecting": {
-    "message": "연결에 문제가 있으신가요?"
-  },
   "here": {
     "message": "여기",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1108,9 +1099,6 @@
   "optionalCurrencySymbol": {
     "message": "통화 기호(선택 사항)"
   },
-  "orderOneHere": {
-    "message": "Trezor나 Ledger를 주문하고 자금을 냉동 창고에 보관하세요."
-  },
   "origin": {
     "message": "원본"
   },
@@ -1192,9 +1180,6 @@
   "readdToken": {
     "message": "나중에 계정 옵션 메뉴의 “토큰 추가”로 이동하면 이 토큰을 다시 추가할 수 있습니다."
   },
-  "readyToConnect": {
-    "message": "연결할 준비가 되셨나요?"
-  },
   "receive": {
     "message": "받기"
   },
@@ -1495,24 +1480,6 @@
   "statusNotConnected": {
     "message": "연결되지 않음"
   },
-  "step1HardwareWallet": {
-    "message": "1. 하드웨어 지갑 연결"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "하드웨어 지갑을 컴퓨터에 바로 연결합니다."
-  },
-  "step2HardwareWallet": {
-    "message": "2. 계정 선택"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "확인할 계정을 선택하세요. 한 번에 하나만 선택할 수 있습니다."
-  },
-  "step3HardwareWallet": {
-    "message": "3. web3 사이트 등을 사용해 시작하세요!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "하드웨어 계정을 이더리움 계정에서처럼 사용하세요. web3 사이트에 연결하고, ETH를 보내고, ERC20 토큰 및 CryptoKitties 같은 대체 불가능 토큰을 구매하고 저장하세요."
-  },
   "storePhrase": {
     "message": "이 구문을 1Password 같은 암호 관리자에 저장하세요."
   },
@@ -1597,9 +1564,6 @@
   "swapFinalizing": {
     "message": "마무리 중..."
   },
-  "swapHighSlippageWarning": {
-    "message": "슬리패지 금액이 아주 큽니다. 현재 어떤 작업을 하고 있는지 확인하세요!"
-  },
   "swapLowSlippageError": {
     "message": "거래가 실패할 수도 있습니다. 최대 슬리패지가 너무 낮습니다."
   },
@@ -1693,9 +1657,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "다음은 여러 유동성 소스에서 수집한 전체 견적입니다."
   },
-  "swapSlippageTooLow": {
-    "message": "슬리패지는 0보다 커야 합니다."
-  },
   "swapSource": {
     "message": "유동성 소스"
   },

app/_locales/lt/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Atlikta"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nėra aparatinės įrangos slaptažodinės?"
-  },
   "downloadGoogleChrome": {
     "message": "Atsiunčiama „Google Chrome“"
   },
@@ -443,9 +440,6 @@
     "message": "Gaukite eterių iš čiaupo $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Gaukite pagalbos."
-  },
   "getStarted": {
     "message": "Darbo pradžia"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "Pasirinkite aparatinės įrangos slaptažodinę, kurią pageidaujate naudoti su „MetaTask“"
   },
-  "havingTroubleConnecting": {
-    "message": "Kyla problemų susiejant?"
-  },
   "here": {
     "message": "čia",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -701,9 +692,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbolis (nebūtinas)"
   },
-  "orderOneHere": {
-    "message": "Užsisakykite „Trezor“ arba „Ledger“ ir laikykite savo lėšas šaltojoje saugykloje"
-  },
   "origin": {
     "message": "Kilmė"
   },
@@ -763,9 +751,6 @@
   "readdToken": {
     "message": "Šį žetoną galite bet kada galite įtraukti ir vėl, tiesiog savo paskyros parinkčių meniu nueikite  į „Įtraukti žetoną“."
   },
-  "readyToConnect": {
-    "message": "Pasirengę prisijungti?"
-  },
   "recents": {
     "message": "Naujausi"
   },
@@ -988,24 +973,6 @@
   "stateLogsDescription": {
     "message": "Būsenos žurnaluose yra jūsų viešos paskyros adresų ir išsiųstų operacijų."
   },
-  "step1HardwareWallet": {
-    "message": "1. Prijunkite aparatinės įrangos slaptažodinę"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Prijunkite savo aparatinės įrangos slaptažodinę tiesiogiai prie savo kompiuterio."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Pasirinkite paskyrą"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Pasirinkite norimą peržiūrėti sąskaitą. Vienu metu galima rinktis tik vieną."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Pradėkite naudoti decentralizuotas programas ir daugiau!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Naudokitės savo aparatinės įrangos paskyra kaip „Ethereum“ paskyra. Junkitės prie decentralizuotų programų, siųskite eterius, pirkite ir laikykite ERC20 žetonus ir nekeičiamus žetonus, tokius kaip „CryptoKitties“."
-  },
   "storePhrase": {
     "message": "Laikykite šią frazę slaptažodžių tvarkyklėje kaip 1 slaptažodį."
   },

app/_locales/lv/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Pabeigts"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nav aparatūras maka?"
-  },
   "downloadGoogleChrome": {
     "message": "Lejupielādēt ar Google Chrome"
   },
@@ -439,9 +436,6 @@
     "message": "Vai vēlaties $1 iegūt Ether no krāna?",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Saņemt palīdzību."
-  },
   "getStarted": {
     "message": "Sākt darbu"
   },
@@ -463,9 +457,6 @@
   "hardwareWalletsMsg": {
     "message": "Atlasiet aparatūras maku lietošanai ar MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Neizdodas pieslēgties?"
-  },
   "here": {
     "message": "šeit",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -697,9 +688,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbols (neobligāti)"
   },
-  "orderOneHere": {
-    "message": "Pasūtiet Trezor vai Ledger un glabājiet savus līdzekļus aukstajā krātuvē"
-  },
   "origin": {
     "message": "Avots"
   },
@@ -759,9 +747,6 @@
   "readdToken": {
     "message": "Jūs varat šo marķieri iestatīt atpakaļ nākotnē, konta opciju izvēlnē atverot \"Pievienot marķieri\"."
   },
-  "readyToConnect": {
-    "message": "Vai esat gatavi izveidot savienojumu?"
-  },
   "recents": {
     "message": "Nesenie"
   },
@@ -984,24 +969,6 @@
   "stateLogsDescription": {
     "message": "Statusa žurnāli ietver publisko kontu adreses un nosūtītos darījumus."
   },
-  "step1HardwareWallet": {
-    "message": "1. Pieslēgt aparatūras maku"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Savienojiet aparatūras maku tieši ar datoru."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Atlasiet kontu"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Atlasiet kontu, kuru vēlaties skatīt. Vienlaicīgi varat izvēlēties tikai vienu kontu."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Sāciet izmantot dApps un citas funkcijas!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Lietojiet aparatūras kontu līdzīgi citiem Ethereum kontiem. Pierakstieties dApps, sūtiet Eth, pērciet un glabājiet ERC20 žetonus un neatvietojamos žetonus, piemēram, CryptoKitties."
-  },
   "storePhrase": {
     "message": "Saglabājiet šo frāzi paroļu pārvaldniekā, piemēram, 1Password."
   },

app/_locales/ms/messages.json

@@ -305,9 +305,6 @@
   "done": {
     "message": "Selesai"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Tiada dompet perkakasan?"
-  },
   "downloadGoogleChrome": {
     "message": "Muat Turun Google Chrome"
   },
@@ -433,9 +430,6 @@
     "message": "Dapatkan Ether daripada pili untuk $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Dapatkan Bantuan."
-  },
   "getStarted": {
     "message": "Bermula"
   },
@@ -457,9 +451,6 @@
   "hardwareWalletsMsg": {
     "message": "Pilih dompet perkakasan yang anda ingin gunakan dengan MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Mengalami masalah untuk menyambungkan?"
-  },
   "here": {
     "message": "di sini",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -678,9 +669,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbol (pilihan)"
   },
-  "orderOneHere": {
-    "message": "Pesan Trezor atau Ledger dan simpan dana anda di dalam storan sejuk"
-  },
   "origin": {
     "message": "Asal"
   },
@@ -740,9 +728,6 @@
   "readdToken": {
     "message": "Anda boleh tambah token ini kembali pada masa depan dengan pergi ke \"Tambah token\" di dalam menu pilihan akaun anda."
   },
-  "readyToConnect": {
-    "message": "Bersedia Menyambung?"
-  },
   "recents": {
     "message": "Baru-baru ini"
   },
@@ -965,24 +950,6 @@
   "stateLogsDescription": {
     "message": "Log keadaan mengandungi alamat akaun awam anda dan transaksi dihantar."
   },
-  "step1HardwareWallet": {
-    "message": "1. Sambungkan Dompet Perkakasan"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Sambungkan dompet perkakasan anda terus kepada komputer anda."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Pilih Akaun"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Pilih akaun yang anda mahu lihat. Anda hanya boleh memilih satu pada suatu masa."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Mula menggunakan dApps dan banyak lagi!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Gunakan akaun perkakasan anda sepertimana anda menggunakan akaun Ethereum. Log masuk ke dalam dApps, hantar Eth, beli dan simpan token ERC20 serta token Tidak Mudah Tukar seperti CryptoKitties."
-  },
   "storePhrase": {
     "message": "Simpan ungkapan ini di dalam pengurus kata laluan seperti 1Password."
   },

app/_locales/no/messages.json

@@ -305,9 +305,6 @@
   "done": {
     "message": "Ferdig"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Har du ikke en hardware-lommebok?"
-  },
   "downloadGoogleChrome": {
     "message": "Last ned Google Chrome "
   },
@@ -436,9 +433,6 @@
     "message": "Få Ether fra en kran for $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Få hjelp."
-  },
   "getStarted": {
     "message": "Kom i gang"
   },
@@ -457,9 +451,6 @@
   "hardwareWalletsMsg": {
     "message": "Velg maskinvarelommeboken som du vil bruke med MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Har du problemer med å koble til?"
-  },
   "here": {
     "message": "her",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -688,9 +679,6 @@
   "optionalCurrencySymbol": {
     "message": "Symbol (valgfritt)"
   },
-  "orderOneHere": {
-    "message": "Bestill en Trezor eller Ledger og oppbevar midlene dine i kjølerom"
-  },
   "origin": {
     "message": "Opprinnelse"
   },
@@ -750,9 +738,6 @@
   "readdToken": {
     "message": "Du kan legge til dette tokenet igjen i fremtiden ved å gå til \"Legg til token\" i menyen for kontoalternativer."
   },
-  "readyToConnect": {
-    "message": "Klar til å koble til?"
-  },
   "recents": {
     "message": "Nylige"
   },
@@ -969,24 +954,6 @@
   "stateLogsDescription": {
     "message": "Tilstandslogger inneholder de offentlige kontoadressene og sendte transaksjoner."
   },
-  "step1HardwareWallet": {
-    "message": "1. Koble til maskinvarelommebok"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Koble hardware-lommebok din direkte til datamaskinen din."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Velg en konto"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Velg den kontoen du ønsker å se. Du kan bare velge en av gangen."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Begynn å bruke dApps mer! "
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Bruk hardware-kontoen din slik du ville gjort med enhver Ethereumkonto. Logg på dApps, send Eth, kjøp og lagre ERC20-tokener og ikke-fungible tokener som CryptoKitties."
-  },
   "storePhrase": {
     "message": "Lagre denne frasen i en passordbehandler slik som 1Password."
   },

app/_locales/pl/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Gotowe"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nie masz portfela sprzętowego?"
-  },
   "downloadGoogleChrome": {
     "message": "Ściągnij Google Chrome"
   },
@@ -443,9 +440,6 @@
     "message": "Zdobądź Eter ze źródła za $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Po pomoc."
-  },
   "getStarted": {
     "message": "Rozpocznij"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "Wybierz portfel sprzętowy, którego chcesz użyć z MetaMaskiem"
   },
-  "havingTroubleConnecting": {
-    "message": "Problem z połączeniem?"
-  },
   "here": {
     "message": "tutaj",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -695,9 +686,6 @@
   "optionalCurrencySymbol": {
     "message": "Symbol (opcjonalnie)"
   },
-  "orderOneHere": {
-    "message": "Zamów Trezor lub Ledger i trzymaj swoje środki w portfelu sprzętowym."
-  },
   "origin": {
     "message": "Pochodzenie"
   },
@@ -757,9 +745,6 @@
   "readdToken": {
     "message": "Możesz później ponownie dodać ten token poprzez \"Dodaj token\" w opcjach menu swojego konta."
   },
-  "readyToConnect": {
-    "message": "Gotowy na połączenie?"
-  },
   "recents": {
     "message": "Ostatnie"
   },
@@ -982,24 +967,6 @@
   "stateLogsDescription": {
     "message": "Logi stanów zawierają Twoje publiczne adresy kont i wykonanych transakcji."
   },
-  "step1HardwareWallet": {
-    "message": "1. Podłącz portfel sprzętowy"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Połącz swój portfel sprzętowy z komputerem."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Wybierz konto"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Wybierz konto, które chcesz przeglądać. Możesz wybrać tylko jedno konto w danym momencie."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Zacznij używać dystrybuowanych aplikacji (dApps) i wiele więcej!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Używaj swojego konta sprzętowego tak, jak używasz jakiegokolwiek konta z Ethereum. Loguj się do dystrybuowanych aplikacji (dApps), wysyłaj Eth, kupuj i przechowaj tokeny ERC20 i niewymienne tokeny, jak np. CryptoKitties."
-  },
   "storePhrase": {
     "message": "Przechowuj tę frazę w menedżerze haseł, takim jak 1Password."
   },

app/_locales/pt_BR/messages.json

@@ -302,9 +302,6 @@
   "done": {
     "message": "Concluído"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Não tem uma carteira física?"
-  },
   "downloadGoogleChrome": {
     "message": "Baixar Google Chrome"
   },
@@ -437,9 +434,6 @@
     "message": "Obtenha Ether em uma torneira para $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Obtenha Ajuda."
-  },
   "getStarted": {
     "message": "Primeiros passos"
   },
@@ -461,9 +455,6 @@
   "hardwareWalletsMsg": {
     "message": "Selecione um hardware que gostaria de utilizar com o MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Está tendo dificuldade para se conectar?"
-  },
   "here": {
     "message": "aqui",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -689,9 +680,6 @@
   "optionalCurrencySymbol": {
     "message": "Símbolo (opcional)"
   },
-  "orderOneHere": {
-    "message": "Peça uma Trezor ou Ledger e guarde seus fundos off-line"
-  },
   "origin": {
     "message": "Origem"
   },
@@ -751,9 +739,6 @@
   "readdToken": {
     "message": "Você pode adicionar esse token novamente no futuro acessando \"Adicionar token\" no menu de opções da sua conta."
   },
-  "readyToConnect": {
-    "message": "Pronto para Conectar?"
-  },
   "recents": {
     "message": "Recentes"
   },
@@ -976,24 +961,6 @@
   "stateLogsDescription": {
     "message": "Os registros de estado contêm seus endereços de conta pública e transações enviadas."
   },
-  "step1HardwareWallet": {
-    "message": "1. Conectar Carteira Física"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Conecte sua carteira de hardware diretamente ao seu computador."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Selecione uma Conta"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Selecione a conta que você deseja ver. Você só pode escolher uma por vez."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Comece a usar dApps e muito mais!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Use sua conta física como faria com qualquer conta de Ethereum. Faça login em dApps, envie Eth, compre e guarde tokens ERC20 e Tokens Não Fungíveis, como CryptoKitties."
-  },
   "storePhrase": {
     "message": "Guarde esta frase em um gerenciador de senhas como o 1Password."
   },

app/_locales/ro/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Efectuat"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nu aveți portofel hardware?"
-  },
   "downloadGoogleChrome": {
     "message": "Descărcare Google Chrome"
   },
@@ -436,9 +433,6 @@
     "message": "Obțineți Ether de la un robinet pentru $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Obțineți ajutor."
-  },
   "getStarted": {
     "message": "Începe"
   },
@@ -457,9 +451,6 @@
   "hardwareWalletsMsg": {
     "message": "Selectați un portofel hardware pe care doriți să îl folosiți cu MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Aveți probleme cu conectarea?"
-  },
   "here": {
     "message": "aici",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -688,9 +679,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbol (opțional)"
   },
-  "orderOneHere": {
-    "message": "Comandați Trezor sau Ledger și țineți-vă fondurile la rece"
-  },
   "origin": {
     "message": "Origine"
   },
@@ -750,9 +738,6 @@
   "readdToken": {
     "message": "Puteți adăuga din nou acest indicativ în viitor accesând „Adăugați indicativ” din meniul de opțiuni al contului dvs."
   },
-  "readyToConnect": {
-    "message": "Gata de conectare?"
-  },
   "recents": {
     "message": "Recente"
   },
@@ -975,24 +960,6 @@
   "stateLogsDescription": {
     "message": "Jurnalele de stare conțin adresele contului dvs. public și tranzacțiile trimise."
   },
-  "step1HardwareWallet": {
-    "message": "1. Conectați portofel hardware"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Conectați portofelul hardware direct la computer."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Selectați un cont"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Selectați contul pe care vreți să îl vizualizați. Puteți alege doar câte unul odată."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Începeți să folosiți dApps și altele!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Folosiți-vă contul hardware la fel ca pe orice cont Ethereum. Conectați-vă la dApps, trimiteți Eth, cumpărați și stocați tokenuri ERC20 și tokenuri non-fungibile precum CryptoKitties."
-  },
   "storePhrase": {
     "message": "Păstrați această expresie într-un program de gestionare a parolelor cum ar fi 1Password."
   },

app/_locales/ru/messages.json

@@ -491,9 +491,6 @@
   "done": {
     "message": "Выполнено"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "У вас нет аппаратного кошелька?"
-  },
   "dontShowThisAgain": {
     "message": "Больше не показывать это сообщение"
   },
@@ -718,9 +715,6 @@
     "message": "Получите Ether из крана для $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Получить справку."
-  },
   "getStarted": {
     "message": "Начать работу"
   },
@@ -742,9 +736,6 @@
   "hardwareWalletsMsg": {
     "message": "Выберите аппаратный кошелек, который вы хотите использовать с MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Проблемы с подключением?"
-  },
   "here": {
     "message": "здесь",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1108,9 +1099,6 @@
   "optionalCurrencySymbol": {
     "message": "Символ валюты (необязательно)"
   },
-  "orderOneHere": {
-    "message": "Закажите Trezor или Ledger и храните свои средства в холодном хранилище"
-  },
   "origin": {
     "message": "Источник"
   },
@@ -1192,9 +1180,6 @@
   "readdToken": {
     "message": "Вы можете снова добавить этот токен в будущем, выбрав «Добавить токен» в меню опций вашего счета."
   },
-  "readyToConnect": {
-    "message": "Готовы подключиться?"
-  },
   "receive": {
     "message": "Получить"
   },
@@ -1495,24 +1480,6 @@
   "statusNotConnected": {
     "message": "Не подключен"
   },
-  "step1HardwareWallet": {
-    "message": "1. Подключить аппаратный кошелек"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Подключите свой аппаратный кошелек напрямую к компьютеру."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Выберите счет"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Выберите желаемый счет для просмотра. Вы можете выбирать только по одному."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Начните использовать сайты web3 и другое!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Используйте свой аппаратный счет, как обычный счет Ethereum. Подключайтесь к сайтам web3, отправляйте ETH, покупайте и храните токены ERC20 и незаменяемые токены, такие как CryptoKitties."
-  },
   "storePhrase": {
     "message": "Сохраните эту фразу в диспетчере паролей, например в 1Password."
   },
@@ -1597,9 +1564,6 @@
   "swapFinalizing": {
     "message": "Завершение..."
   },
-  "swapHighSlippageWarning": {
-    "message": "Величина проскальзывания очень велика. Убедитесь, что вы знаете, что делаете!"
-  },
   "swapLowSlippageError": {
     "message": "Транзакции могут завершиться неудачей, максимальное проскальзывание слишком мало."
   },
@@ -1693,9 +1657,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "Ниже приведены все котировки, собранные из нескольких источников ликвидности."
   },
-  "swapSlippageTooLow": {
-    "message": "Проскальзывание должно быть больше нуля"
-  },
   "swapSource": {
     "message": "Источник ликвидности"
   },

app/_locales/sk/messages.json

@@ -302,9 +302,6 @@
   "done": {
     "message": "Hotovo"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nemáte hardvérovú peňaženku?"
-  },
   "downloadGoogleChrome": {
     "message": "Stiahnuť Google Chrome"
   },
@@ -437,9 +434,6 @@
     "message": "Získejte Ether z faucetu za $1.",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Získajte pomoc."
-  },
   "getStarted": {
     "message": "Začať"
   },
@@ -461,9 +455,6 @@
   "hardwareWalletsMsg": {
     "message": "Vyberte hardvérovú peňaženku, ktorú chcete používať s MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Máte problémy s pripojením?"
-  },
   "here": {
     "message": "zde",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -670,9 +661,6 @@
   "optionalCurrencySymbol": {
     "message": "Symbol (voliteľné)"
   },
-  "orderOneHere": {
-    "message": "Objednajte si Trezor alebo Hlavnú knihu a uschovajte svoje prostriedky v sklade"
-  },
   "origin": {
     "message": "Pôvod"
   },
@@ -732,9 +720,6 @@
   "readdToken": {
     "message": "Tento token můžete v budoucnu přidat zpět s „Přidat token“ v nastavení účtu."
   },
-  "readyToConnect": {
-    "message": "Pripravení na pripojenie?"
-  },
   "recents": {
     "message": "Posledné"
   },
@@ -951,24 +936,6 @@
   "stateLogsDescription": {
     "message": "Stavové protokoly obsahují vaše veřejné adresy účtů a odeslané transakce."
   },
-  "step1HardwareWallet": {
-    "message": "1. Pripojiť hardvérovú peňaženku"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Pripojte hardvérovú peňaženku priamo k počítaču."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Vybrať účet"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Vyberte účet, ktorý chcete zobraziť. Naraz si môžete vybrať iba jeden."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Začať používať dApps a ďalšie!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Použite svoj hardvérový účet, ako keby ste použili akýkoľvek účet Ethereum. Prihláste sa do Dapps, pošlite Eth, nakupujte a ukladajte tokeny ERC20 a nezameniteľné tokeny ako CryptoKitties."
-  },
   "storePhrase": {
     "message": "Túto frázu uložte do správcu hesiel ako 1Password."
   },

app/_locales/sl/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Končano"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nimate strojne denarnice?"
-  },
   "downloadGoogleChrome": {
     "message": "Prenesi Google Chrome"
   },
@@ -461,9 +458,6 @@
   "hardwareWalletsMsg": {
     "message": "Izberite vrsto strojne denarnice"
   },
-  "havingTroubleConnecting": {
-    "message": "Imate težave?"
-  },
   "here": {
     "message": "tukaj",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -686,9 +680,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbol (nezahtevano)"
   },
-  "orderOneHere": {
-    "message": "Naročite Trezor ali Ledger i n zavarujte svoje premoženje s strojno denarnico"
-  },
   "origin": {
     "message": "Izvor"
   },
@@ -748,9 +739,6 @@
   "readdToken": {
     "message": "Ta žeton lahko dodate tudi kasneje z uporabo gumba “Dodaj žeton” v možnostih vašega računa."
   },
-  "readyToConnect": {
-    "message": "Pripravljeni na povezovanje?"
-  },
   "recents": {
     "message": "Nedavno"
   },
@@ -970,24 +958,6 @@
   "stateLogsDescription": {
     "message": "State vsebujejo vaš javni nasklov in zgodovino transakcij."
   },
-  "step1HardwareWallet": {
-    "message": "1. Povežite strojno denarnico"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Z računalnikom povežite strojno denarnico."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Izberite račun"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Izberite račun, ki ga želute uporabiti. Trenutno lahko izberete le en račun na enkrat."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Začnite uporabljati dApps in več!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Uporabite strojno denarnico kot katerikoli drug Ethereum račun. Prijavite se v dApps, pošljite Ether in ERC20 žetone in žetone kot CryptoKitties."
-  },
   "storePhrase": {
     "message": "To geslo shranite v upravitelja gesel, kot je 1Password."
   },

app/_locales/sr/messages.json

@@ -305,9 +305,6 @@
   "done": {
     "message": "Gotovo"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Nemate hardverski novčanik?"
-  },
   "downloadGoogleChrome": {
     "message": "Preuzmi Google Chrome"
   },
@@ -440,9 +437,6 @@
     "message": "Preuzmite Ether sa slavine za $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Potražite pomoć."
-  },
   "getStarted": {
     "message": "Започнимо"
   },
@@ -464,9 +458,6 @@
   "hardwareWalletsMsg": {
     "message": "Izaberite hardverski novčanik koji biste voleli da koristite sa MetaMask-om"
   },
-  "havingTroubleConnecting": {
-    "message": "Da li imate problem sa povezivanjem?"
-  },
   "here": {
     "message": "ovde",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -692,9 +683,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbol (opciono)"
   },
-  "orderOneHere": {
-    "message": "Naručite Trezor ili Ledger i čuvajte svoja sredstva u hladnom skladištu"
-  },
   "origin": {
     "message": "Извор"
   },
@@ -754,9 +742,6 @@
   "readdToken": {
     "message": "U budućnosti možete vratiti ovaj token tako što ćete otvoriti „Dodaj token“ u meniju opcija vašeg naloga."
   },
-  "readyToConnect": {
-    "message": "Spremni za povezivanje?"
-  },
   "recents": {
     "message": "Skorašnje"
   },
@@ -979,24 +964,6 @@
   "stateLogsDescription": {
     "message": "Dnevnici stanja sadrže adrese vaših javnih naloga i poslatih transakcija."
   },
-  "step1HardwareWallet": {
-    "message": "1. Poveži hardverski novčanik"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Povežite svoj hardverski novčanik direktno sa kompjuterom."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Izaberite nalog"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Izaberite nalog koji želite da pogledatee. Možete izabrati samo po jedan nalog."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Počnite da koristite dApps i još mnogo toga!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Koristite nalog na vašem hardveru isto onako kako biste koristili bilo koji Ethereum nalog. Prijavite se na dApps, šaljite Eth, kupujte i skladištite ERC20 tokene i nezamenljive tokene poput CryptoKitties."
-  },
   "storePhrase": {
     "message": "Čuvajte ovaj izraz u menadžeru šifri kao što je 1Password."
   },

app/_locales/sv/messages.json

@@ -302,9 +302,6 @@
   "done": {
     "message": "Klart"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Har du inte en hårdvaruplånbok?"
-  },
   "downloadGoogleChrome": {
     "message": "Ladda ner Google Chrome"
   },
@@ -433,9 +430,6 @@
     "message": "Få Ether från en kran för $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Få hjälp."
-  },
   "getStarted": {
     "message": "Komma igång"
   },
@@ -457,9 +451,6 @@
   "hardwareWalletsMsg": {
     "message": "Välj en hårdvaruplånbok som du vill använda med MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Har du problem att ansluta?"
-  },
   "here": {
     "message": "här",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -685,9 +676,6 @@
   "optionalCurrencySymbol": {
     "message": "Symbol (frivillig)"
   },
-  "orderOneHere": {
-    "message": "Beställ en Trezor eller Ledger och håll dina medel på is"
-  },
   "origin": {
     "message": "Ursprung"
   },
@@ -747,9 +735,6 @@
   "readdToken": {
     "message": "Du kan lägga till denna token i framtiden genom att välja \"Lägg till token\" i kontots alternativmeny."
   },
-  "readyToConnect": {
-    "message": "Redo att ansluta?"
-  },
   "recents": {
     "message": "Senaste"
   },
@@ -972,24 +957,6 @@
   "stateLogsDescription": {
     "message": "Statusloggar innehåller dina publika kontoadresser och skickade transaktioner."
   },
-  "step1HardwareWallet": {
-    "message": "1. Anslut hårdvaruplånbok"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Koppla din hårdvaruplånbok direkt till din dator"
-  },
-  "step2HardwareWallet": {
-    "message": "2. Välj ett konto"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Välj det konto du vill visa. Du kan bara välja ett åt gången."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Börja använda dApps och mer!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Använd ditt hårdvarukonto som du skulle använda andra Ethereum-konton. Logga in i dAppar, skicka ETH, köp och förvara ERC20-tokens och Non-Fungible tokens som CryptoKitties."
-  },
   "storePhrase": {
     "message": "Lagra denna fras i en lösenordshanterare såsom 1Password."
   },

app/_locales/sw/messages.json

@@ -302,9 +302,6 @@
   "done": {
     "message": "Imekamilika"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Huna waleti ya programu maunzi?"
-  },
   "downloadGoogleChrome": {
     "message": "Pakua Google chrome"
   },
@@ -433,9 +430,6 @@
     "message": "Pata Ether kutoka kwenye mfereji $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Pata Msaada"
-  },
   "getStarted": {
     "message": "Anza"
   },
@@ -457,9 +451,6 @@
   "hardwareWalletsMsg": {
     "message": "Chagua waleti ya programu maunzi ambayo ungependa kutumia kwenye MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Je, unapata shida kuunganisha?"
-  },
   "here": {
     "message": "hapa",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -679,9 +670,6 @@
   "optionalCurrencySymbol": {
     "message": "Ishara (hiari)"
   },
-  "orderOneHere": {
-    "message": "Agiza Trezor au Leja na weka fedha zako kwenye ifadhi ya baridi"
-  },
   "origin": {
     "message": "Asili"
   },
@@ -741,9 +729,6 @@
   "readdToken": {
     "message": "Unaweza kuongeza tena kianzio hiki hapo baadaye kwa kwenda kwenye \"Ongeza kianzio\" kwenye machaguo yako ya menyu ya akaunti."
   },
-  "readyToConnect": {
-    "message": "Uko tayari Kuunganisha?"
-  },
   "recents": {
     "message": "Za hivi karibuni"
   },
@@ -966,24 +951,6 @@
   "stateLogsDescription": {
     "message": "Kumbukumbu za hali zinajumusiha anwani zako za akaunti za umma na miamala iliyotumwa."
   },
-  "step1HardwareWallet": {
-    "message": "1. Unganisha Programu Maunzi ya Waleti"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Unganisha programu maunzi yako ya waleti moja kwa moja kwenye kompyuta yako."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Chagua Akaunto"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Chagua akaunti unayotaka kutazama. Unaweza kuchagua moja tu kwa wakati mmoja."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Anza kutumia dApps na zaidi!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Tumia akaunti yako ya programu maunzi kama ambavyo ungetumia kwa akaunti ya Ethereum. Ingia kwenye dApps, tuma Eth, nunua na hifadhi vianzio vya ERC20 na Vianzio visivyobadilishika kama vile CryptoKitties."
-  },
   "storePhrase": {
     "message": "Hifadhi kirai hiki kwenye kidhibiti nenosiri kama vile 1Password."
   },

app/_locales/th/messages.json

@@ -148,9 +148,6 @@
   "done": {
     "message": "เสร็จสิ้น"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "ไม่มี Hardware Wallet ใช่ไหม"
-  },
   "downloadSecretBackup": {
     "message": "ดาวน์โหลด Phrase แบ็คอัพลับนี้และเก็บรักษาไว้ให้ปลอดภัยในฮาร์ดดิสก์หรืออุปกรณ์เก็บข้อมูลภายนอกที่มีการเข้ารหัส"
   },
@@ -465,15 +462,6 @@
   "stateLogsDescription": {
     "message": "บันทึกของสถานะประกอบด้วยแอดแดรสสาธารณะและธุรกรรมที่ส่ง"
   },
-  "step1HardwareWallet": {
-    "message": "1. เชื่อมต่อ Hardware Wallet"
-  },
-  "step2HardwareWallet": {
-    "message": "2. เลือกบัญชี"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "ใช้บัญชีฮาร์ดแวร์ของคุณเช่นเดียวกับการใช้กับบัญชี Ethereum ล็อกอินเข้าสู่ dApp ส่ง Eth ซื้อและเก็บโทเคน ERC20 และโทเคนแบบ Non-Fungible เช่น CryptoKitties"
-  },
   "storePhrase": {
     "message": "เก็บ Phrase นี้ในตัวจัดการรหัสผ่าน เช่น 1Password"
   },

app/_locales/tl/messages.json

@@ -491,9 +491,6 @@
   "done": {
     "message": "Tapos na"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Wala ka bang hardware wallet?"
-  },
   "dontShowThisAgain": {
     "message": "Huwag itong ipaklita ulit"
   },
@@ -718,9 +715,6 @@
     "message": "Kunin ang Ether mula sa isang faucet sa halagang $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Humingi ng Tulong."
-  },
   "getStarted": {
     "message": "Magsimula"
   },
@@ -742,9 +736,6 @@
   "hardwareWalletsMsg": {
     "message": "Pumili ng hardware wallet na gusto mong gamitin kasama ng MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Nagkakaproblema ka ba sa pagkonekta?"
-  },
   "here": {
     "message": "dito",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1105,9 +1096,6 @@
   "optionalCurrencySymbol": {
     "message": "Simbolo ng Currency (opsyonal)"
   },
-  "orderOneHere": {
-    "message": "Mag-order ng Trezor o Ledger at itabi ang mga pondo mo sa malamig na storage"
-  },
   "origin": {
     "message": "Pinagmulan"
   },
@@ -1189,9 +1177,6 @@
   "readdToken": {
     "message": "Puwede mong ibalik ang token na ito sa hinaharap sa pamamagitan ng pagpunta sa “Magdagdag ng token” sa menu ng mga opsyon sa iyong account."
   },
-  "readyToConnect": {
-    "message": "Handa ka na bang kumonekta?"
-  },
   "receive": {
     "message": "Tumanggap"
   },
@@ -1492,24 +1477,6 @@
   "statusNotConnected": {
     "message": "Hindi nakakonekta"
   },
-  "step1HardwareWallet": {
-    "message": "1. Ikonekta ang Hardware Wallet"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Direktang ikonekta ang wallet ng iyong hardware sa computer mo."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Pumili ng Account"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Piliin ang account na gusto mong tingnan. Puwede ka lang pumili ng isa sa isang pagkakataon."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Simulang gamitin ang mga web3 site at higit pa!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Gamitin ang account ng iyong hardware sa parehong paraan ng paggamit mo sa Ethereum account. Kumonekta sa mga web3 site, magpadala ng ETH, bumili at mag-store ng mga ERC20 token at non-fungible token gaya ng CryptoKitties."
-  },
   "storePhrase": {
     "message": "I-store ang phrase na ito sa isang password manager gaya ng 1Password."
   },
@@ -1594,9 +1561,6 @@
   "swapFinalizing": {
     "message": "Isinasapinal..."
   },
-  "swapHighSlippageWarning": {
-    "message": "Sobrang laki ng halaga ng slippage. Tiyaking alam mo ang ginagawa mo!"
-  },
   "swapLowSlippageError": {
     "message": "Maaaring hindi magtagumpay ang transaksyon, masyadong mababa ang max na slippage."
   },
@@ -1690,9 +1654,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "Makikita sa ibaba ang lahat ng quote na nakuha mula sa maraming pinagkukunan ng liquidity."
   },
-  "swapSlippageTooLow": {
-    "message": "Dapat ay mas malaki sa zero ang slippage"
-  },
   "swapSource": {
     "message": "Pinagkunan ng liquidity"
   },

app/_locales/uk/messages.json

@@ -308,9 +308,6 @@
   "done": {
     "message": "Готово"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Не маєте апаратного гаманця?"
-  },
   "downloadGoogleChrome": {
     "message": "Завантажити Гугл Хром"
   },
@@ -443,9 +440,6 @@
     "message": "Отримайте Ether з крану за $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Отримати допомогу."
-  },
   "getStarted": {
     "message": "Почати"
   },
@@ -467,9 +461,6 @@
   "hardwareWalletsMsg": {
     "message": "Оберіть апаратний гаманець, який ви хочете використовувати з MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Проблеми при підключенні?"
-  },
   "here": {
     "message": "тут",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -701,9 +692,6 @@
   "optionalCurrencySymbol": {
     "message": "Символ (не обов'язково)"
   },
-  "orderOneHere": {
-    "message": "Замовте Trezor або Ledger та зберігайте ваші кошти у холодному сховищі"
-  },
   "origin": {
     "message": "Походження"
   },
@@ -763,9 +751,6 @@
   "readdToken": {
     "message": "Ви можете знову додати цей токен у меню облікового запису у розділі “Додати токен”. "
   },
-  "readyToConnect": {
-    "message": "Готові підключитися?"
-  },
   "recents": {
     "message": "Останні"
   },
@@ -988,24 +973,6 @@
   "stateLogsDescription": {
     "message": "Логи стану містять ваші публічні адреси облікового запису та надіслані транзакції."
   },
-  "step1HardwareWallet": {
-    "message": "1. Приєднайте апаратний гаманець"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Під'єднайте ваш апаратний гаманець безпосередньо до вашого комп'ютера."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Оберіть обліковий запис"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Оберіть обліковий запис, який бажаєте переглянути. Ви можете вибрати лише один."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Почніть користуватись dApps та більше!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Використовуйте ваш апаратний обліковий запис, як би ви використовували будь-який обліковий запис Ethereum. Увійдіть в dApps, надсилайте Eth, купуйте та зберігайте токени ERC20 та токени, які не є взаємозамінними, такі як CryptoKitties."
-  },
   "storePhrase": {
     "message": "Зберігайте цю фразу у менеджері паролів, як 1Password."
   },

app/_locales/vi/messages.json

@@ -491,9 +491,6 @@
   "done": {
     "message": "Hoàn tất"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "Bạn không có ví cứng?"
-  },
   "dontShowThisAgain": {
     "message": "Không hiển thị lại"
   },
@@ -718,9 +715,6 @@
     "message": "Nhận Ether từ một vòi dành cho $1",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "Nhận trợ giúp."
-  },
   "getStarted": {
     "message": "Bắt đầu"
   },
@@ -742,9 +736,6 @@
   "hardwareWalletsMsg": {
     "message": "Chọn một ví cứng mà bạn muốn sử dụng với MetaMask"
   },
-  "havingTroubleConnecting": {
-    "message": "Bạn đang gặp sự cố với việc kết nối?"
-  },
   "here": {
     "message": "tại đây",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1108,9 +1099,6 @@
   "optionalCurrencySymbol": {
     "message": "Ký hiệu tiền tệ (không bắt buộc)"
   },
-  "orderOneHere": {
-    "message": "Đặt mua một ví Trezor hoặc Ledger và giữ tiền của bạn trong ví lưu trữ lạnh"
-  },
   "origin": {
     "message": "Nguồn gốc"
   },
@@ -1192,9 +1180,6 @@
   "readdToken": {
     "message": "Bạn có thể thêm lại token này trong tương lai bằng cách chuyển đến mục “Thêm token” trong trình đơn tùy chọn tài khoản."
   },
-  "readyToConnect": {
-    "message": "Bạn đã sẵn sàng kết nối chưa?"
-  },
   "receive": {
     "message": "Nhận"
   },
@@ -1495,24 +1480,6 @@
   "statusNotConnected": {
     "message": "Chưa kết nối"
   },
-  "step1HardwareWallet": {
-    "message": "1. Kết nối với ví cứng"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "Kết nối ví cứng của bạn trực tiếp với máy tính."
-  },
-  "step2HardwareWallet": {
-    "message": "2. Chọn một tài khoản"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "Chọn tài khoản bạn muốn xem. Bạn chỉ chọn được một tài khoản tại một thời điểm."
-  },
-  "step3HardwareWallet": {
-    "message": "3. Bắt đầu sử dụng các trang web trên web3 và nhiều hơn thế!"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "Sử dụng cùng một tài khoản ví cứng mà bạn sẽ dùng với mọi tài khoản Ethereum của mình. Kết nối với các trang web trên web3, gửi ETH, mua và lưu trữ token ERC20 cũng như token không thể thay thế, chẳng hạn như CryptoKitties."
-  },
   "storePhrase": {
     "message": "Lưu cụm mật khẩu này trong trình quản lý mật khẩu chẳng hạn như 1Password."
   },
@@ -1597,9 +1564,6 @@
   "swapFinalizing": {
     "message": "Đang hoàn tất..."
   },
-  "swapHighSlippageWarning": {
-    "message": "Số tiền trượt giá rất cao. Hãy chắc chắn rằng bạn hiểu những gì mình đang làm!"
-  },
   "swapLowSlippageError": {
     "message": "Giao dịch có thể không thành công, mức trượt giá tối đa quá thấp."
   },
@@ -1693,9 +1657,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "Dưới đây là tất cả các báo giá thu thập từ nhiều nguồn thanh khoản."
   },
-  "swapSlippageTooLow": {
-    "message": "Mức trượt giá phải lớn hơn 0"
-  },
   "swapSource": {
     "message": "Nguồn thanh khoản"
   },

app/_locales/zh_CN/messages.json

@@ -500,9 +500,6 @@
   "done": {
     "message": "完成"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "没有硬件钱包？"
-  },
   "dontShowThisAgain": {
     "message": "不再显示"
   },
@@ -727,9 +724,6 @@
     "message": "从水管获取 $1 网络的 Ether",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "获取帮助。"
-  },
   "getStarted": {
     "message": "开始使用"
   },
@@ -751,9 +745,6 @@
   "hardwareWalletsMsg": {
     "message": "选择希望用于 MetaMask 的硬件钱包"
   },
-  "havingTroubleConnecting": {
-    "message": "连接出现问题？"
-  },
   "here": {
     "message": "这里",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -1117,9 +1108,6 @@
   "optionalCurrencySymbol": {
     "message": "符号（选填）"
   },
-  "orderOneHere": {
-    "message": "订购 Trezor 或 Ledger ，将个人资金进行冷存储"
-  },
   "origin": {
     "message": "来源"
   },
@@ -1201,9 +1189,6 @@
   "readdToken": {
     "message": "之后您还可以通过帐户选项菜单中的“添加代币”来添加此代币。"
   },
-  "readyToConnect": {
-    "message": "是否准备连接？"
-  },
   "receive": {
     "message": "接收"
   },
@@ -1504,24 +1489,6 @@
   "statusNotConnected": {
     "message": "未连接"
   },
-  "step1HardwareWallet": {
-    "message": "1. 连接硬件钱包"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "将您的硬件钱包直接连接到电脑上。"
-  },
-  "step2HardwareWallet": {
-    "message": "2. 选择账户"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "请选择您想查看的账户。每次只能选择一个账户。"
-  },
-  "step3HardwareWallet": {
-    "message": "3. 开始使用 web3 站点和更多功能！"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "使用您的硬件钱包，操作与以太坊账户制作相同。登录 dApps，发送 ETH ，购买和保存 ERC20 代币和诸如 CryptoKitties 等不可替代代币。"
-  },
   "storePhrase": {
     "message": "通过如 1Password 等密码管理工具保存该账户助记词。"
   },
@@ -1609,9 +1576,6 @@
   "swapFinalizing": {
     "message": "确定中……"
   },
-  "swapHighSlippageWarning": {
-    "message": "滑点数量非常大。确保您知道您的操作！"
-  },
   "swapLowSlippageError": {
     "message": "交易可能失败，最大滑点过低。"
   },
@@ -1723,9 +1687,6 @@
   "swapSelectQuotePopoverDescription": {
     "message": "以下是从多个流动资金来源收集到的所有报价。"
   },
-  "swapSlippageTooLow": {
-    "message": "滑点必须大于零"
-  },
   "swapSource": {
     "message": "流动资金来源"
   },

app/_locales/zh_TW/messages.json

@@ -317,9 +317,6 @@
   "done": {
     "message": "完成"
   },
-  "dontHaveAHardwareWallet": {
-    "message": "還沒有硬體錢包？"
-  },
   "downloadGoogleChrome": {
     "message": "下載 Google Chrome 瀏覽器"
   },
@@ -452,9 +449,6 @@
     "message": "從水管取得 $1 以太幣。",
     "description": "Displays network name for Ether faucet"
   },
-  "getHelp": {
-    "message": "取得協助"
-  },
   "getStarted": {
     "message": "開始使用"
   },
@@ -476,9 +470,6 @@
   "hardwareWalletsMsg": {
     "message": "選擇要連線到 MetaMask 的硬體錢包"
   },
-  "havingTroubleConnecting": {
-    "message": "無法正確連線?"
-  },
   "here": {
     "message": "這裡",
     "description": "as in -click here- for more information (goes with troubleTokenBalances)"
@@ -701,9 +692,6 @@
   "optionalCurrencySymbol": {
     "message": "Symbol (可選)"
   },
-  "orderOneHere": {
-    "message": "訂購 Trezor 或 Ledger 讓資產保存於硬體裝置。"
-  },
   "origin": {
     "message": "來源"
   },
@@ -760,9 +748,6 @@
   "readdToken": {
     "message": "未來可以隨時重新加入此代幣"
   },
-  "readyToConnect": {
-    "message": "準備連線？"
-  },
   "recents": {
     "message": "最近"
   },
@@ -976,24 +961,6 @@
   "stateLogsDescription": {
     "message": "狀態紀錄包含您的公開帳戶位址和已傳送的交易資訊"
   },
-  "step1HardwareWallet": {
-    "message": "1. 連線硬體錢包"
-  },
-  "step1HardwareWalletMsg": {
-    "message": "將您的硬體錢包連接到電腦。"
-  },
-  "step2HardwareWallet": {
-    "message": "2. 選擇帳戶"
-  },
-  "step2HardwareWalletMsg": {
-    "message": "選擇想要檢視的帳戶。一次只能選擇一個帳戶。"
-  },
-  "step3HardwareWallet": {
-    "message": "3. 開始使用！"
-  },
-  "step3HardwareWalletMsg": {
-    "message": "使用您硬體錢包中的帳戶，與去中心化應用服務交易以太幣、ERC20代幣、或迷戀貓等數位資產。"
-  },
   "storePhrase": {
     "message": "您可以用密碼管理系統例如 1Password 等軟體儲存助憶詞。"
   },

app/images/hardware-wallet-step-2.svg

@@ -1,67 +0,0 @@
-<svg width="302" height="98" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <filter x="-2.4%" y="-15.6%" width="104.8%" height="143.8%" filterUnits="objectBoundingBox" id="a">
-            <feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"/>
-            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
-            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"/>
-            <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.123075181 0" in="shadowBlurOuter1"/>
-        </filter>
-        <path id="b" d="M0 0h294v32H0z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <g transform="translate(25 45)">
-            <path stroke="#AFDFFF" fill="#FFF" d="M.5.5h250v26H.5z"/>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="31" y="19">3</tspan>
-            </text>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="50" y="19">OXz3…T3A4</tspan>
-            </text>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="142" y="19">0.020000 ETH</tspan>
-            </text>
-            <circle stroke="#AFDFFF" stroke-width="2" cx="16.5" cy="14.5" r="6.5"/>
-        </g>
-        <g transform="translate(25)">
-            <path stroke="#AFDFFF" fill="#FFF" d="M.5.5h250v26H.5z"/>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="31" y="19">1</tspan>
-            </text>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="50" y="19">OXa4…s0a2</tspan>
-            </text>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="142" y="19">0.01500 ETH</tspan>
-            </text>
-            <circle stroke="#AFDFFF" stroke-width="2" cx="16.5" cy="14.5" r="6.5"/>
-        </g>
-        <g transform="translate(25 71)">
-            <path stroke="#AFDFFF" fill="#FFF" d="M.5.5h250v26H.5z"/>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="31" y="18">4</tspan>
-            </text>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="50" y="18">OXd2…D0V4</tspan>
-            </text>
-            <text font-family="Roboto-Regular, Roboto" font-size="12" fill="#ABB4BB">
-                <tspan x="142" y="18">0.030000 ETH</tspan>
-            </text>
-            <circle stroke="#AFDFFF" stroke-width="2" cx="16.5" cy="13.5" r="6.5"/>
-        </g>
-        <g transform="translate(4 21)">
-            <use fill="#000" filter="url(#a)" xlink:href="#b"/>
-            <path stroke="#3098DC" stroke-linejoin="square" fill="#D9F0FF" d="M.5.5h293v31H.5z"/>
-            <text font-family="Roboto-Regular, Roboto" font-size="16" fill="#4A4A4A">
-                <tspan x="36" y="22">2</tspan>
-            </text>
-            <text font-family="Roboto-Regular, Roboto" font-size="16" fill="#4A4A4A">
-                <tspan x="58" y="22">OXe7…B0a1</tspan>
-            </text>
-            <text font-family="Roboto-Regular, Roboto" font-size="16" fill="#4A4A4A">
-                <tspan x="166" y="22">0.041000 ETH</tspan>
-            </text>
-            <circle stroke="#3098DC" stroke-width="2" cx="19.5" cy="16.5" r="7.5"/>
-            <path stroke="#3098DC" stroke-width="2" d="M15 17l2.55 2.55L24 13.904"/>
-        </g>
-    </g>
-</svg>

app/images/hardware-wallet-step-3.svg

@@ -1,26 +0,0 @@
-<svg height="85" width="108" xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd">
-        <path d="M97.202 84H10.798A3.807 3.807 0 017 80.185V9.815C7 7.708 8.7 6 10.798 6h86.404A3.806 3.806 0 01101 9.815v70.37C101 82.292 99.3 84 97.202 84" fill="#fefefe"/>
-        <path d="M97.202 84H10.798A3.807 3.807 0 017 80.185V9.815C7 7.708 8.7 6 10.798 6h86.404A3.806 3.806 0 01101 9.815v70.37C101 82.292 99.3 84 97.202 84z" stroke="#3098dc"/>
-        <path d="M105.73 84H2.27C1.568 84 1 83.45 1 82.771V78.23C1 77.549 1.568 77 2.27 77h103.46c.7 0 1.27.55 1.27 1.229v4.542c0 .68-.57 1.229-1.27 1.229" fill="#d9f0ff"/>
-        <path d="M105.73 84H2.27C1.568 84 1 83.45 1 82.771V78.23C1 77.549 1.568 77 2.27 77h103.46c.7 0 1.27.55 1.27 1.229v4.542c0 .68-.57 1.229-1.27 1.229z" stroke="#3098dc"/>
-        <path d="M11 72h86V11H11z" fill="#fefefe"/>
-        <g stroke="#3098dc" transform="translate(1 1)">
-            <path d="M10 71h86V10H10z"/>
-            <rect fill="#fff" height="53" rx="2" width="77" x="14.5" y="14.5"/>
-            <path d="M14.5 21.5h77V16a1.5 1.5 0 00-1.5-1.5H16a1.5 1.5 0 00-1.5 1.5z" fill="#fff"/>
-            <g fill="#d9f0ff">
-                <circle cx="18" cy="18" r="1"/>
-                <circle cx="22.769" cy="18" r="1"/>
-                <circle cx="27.538" cy="18" r="1"/>
-            </g>
-        </g>
-        <path d="M93.299 30.058h-4.652a.401.401 0 01-.227-.07l-2.752-1.87-1.21-.973-6.718 1.814a.403.403 0 01-.49-.268l-1.947-6.568a.38.38 0 01.003-.228l2.07-6.327-1.243-1.43a.386.386 0 01.071-.572l.222-.157-.62-.555a.39.39 0 01-.13-.303.39.39 0 01.152-.293l.35-.27-.57-.426a.39.39 0 01-.157-.313.391.391 0 01.162-.312l.418-.305-.994-4.685a.379.379 0 01.013-.205l1.516-4.474c.034-.101.109-.185.206-.23a.406.406 0 01.31-.013l9.816 3.6h8.15l9.815-3.6a.405.405 0 01.31.013.392.392 0 01.207.23l1.516 4.476a.383.383 0 01.013.202l-.984 4.688.412.305a.386.386 0 01.002.622l-.57.427.349.27a.387.387 0 01.022.595l-.62.556.222.158a.387.387 0 01.07.57l-1.24 1.43 2.08 6.326a.382.382 0 01.004.23l-1.962 6.569a.403.403 0 01-.488.267l-6.718-1.814-1.247.998-2.716 1.845a.402.402 0 01-.226.07z" fill="#fff" stroke="#3098dc"/>
-        <g fill="#3098dc">
-            <path d="M92.024 25.677h-2.367l-.41.318-.157 1.914h3.5l-.156-1.914zM94.59 18.125l-.98 2.099c-.079.17.079.354.258.3l3.337-1.001a.217.217 0 00.028-.405l-2.358-1.098a.215.215 0 00-.286.105M87.07 18.02l-2.355 1.097a.218.218 0 00.03.406l3.336 1.001a.217.217 0 00.257-.3l-.982-2.1a.216.216 0 00-.286-.104"/>
-        </g>
-        <text fill="#3098dc" font-family="RobotoMono-Bold, Roboto Mono" font-size="10" font-weight="bold" transform="translate(1 1)">
-            <tspan x="24.495" y="43">LOGIN WITH </tspan><tspan x="30.496" y="56">METAMASK</tspan>
-        </text>
-    </g>
-</svg>

app/images/videos/recovery-onboarding/subtitles-en.vtt

@@ -0,0 +1,116 @@
+WEBVTT
+
+1
+00:00:00.780 --> 00:00:04.580
+MetaMask is a new way to connect
+to sites and applications.
+
+2
+00:00:04.580 --> 00:00:08.860
+On traditional websites, a central database
+or bank is responsible for controlling and
+
+3
+00:00:08.860 --> 00:00:10.179
+recovering your accounts.
+
+4
+00:00:10.179 --> 00:00:15.050
+But on MetaMask, all of the power belongs
+to the holder of a master key.
+
+5
+00:00:15.050 --> 00:00:18.460
+Whoever holds the key, controls the accounts.
+
+6
+00:00:18.460 --> 00:00:21.110
+Your secret recovery phrase
+is your "master key".
+
+7
+00:00:21.110 --> 00:00:26.070
+It's a series of 12 words that are generated
+when you first set up MetaMask, which allow
+
+8
+00:00:26.070 --> 00:00:30.120
+you to recover your wallet and funds if you
+ever lose access.
+
+9
+00:00:30.120 --> 00:00:33.451
+It's important that you secure
+your wallet by keeping your
+
+10
+00:00:33.451 --> 00:00:37.510
+secret recovery phrase
+very safe, and very secret.
+
+11
+00:00:37.510 --> 00:00:41.429
+If anyone gets access to it, they will have
+the "master key" to your wallet and can
+
+12
+00:00:41.429 --> 00:00:45.190
+freely access and take all of your funds.
+
+13
+00:00:45.190 --> 00:00:50.109
+To secure your MetaMask wallet you'll want
+to safely save your secret recovery phrase.
+
+14
+00:00:50.109 --> 00:00:54.930
+You can write it down, hide it somewhere,
+put it in a safe deposit box
+
+15
+00:00:54.930 --> 00:00:57.729
+or use a secure password manager.
+
+16
+00:00:57.729 --> 00:01:01.050
+Some users even engrave their
+phrase onto a metal plate!
+
+17
+00:01:01.050 --> 00:01:04.440
+Nobody, not even the team
+at MetaMask, can help you
+
+18
+00:01:04.440 --> 00:01:07.820
+recover your wallet if you lose
+your secret recovery phrase.
+
+19
+00:01:07.820 --> 00:01:12.072
+If you haven't written down your secret recovery
+phrase and stored it somewhere safe,
+
+20
+00:01:12.072 --> 00:01:15.492
+do it now. We'll wait.
+
+21
+00:01:15.500 --> 00:01:20.780
+And remember, never share your secret recovery
+phrase with anyone: not even us.
+
+22
+00:01:20.780 --> 00:01:24.910
+If anyone ever asks you for it,
+they're trying to scam you.
+
+23
+00:01:24.910 --> 00:01:26.250
+That's it!
+
+24
+00:01:26.250 --> 00:01:31.020
+Now you know what a secret recovery phrase
+is and how to keep your wallet safe and secure.
+

app/manifest/_base.json

@@ -71,6 +71,5 @@
     "notifications"
   ],
   "short_name": "__MSG_appName__",
-  "version": "9.5.1",
   "web_accessible_resources": ["inpage.js", "phishing.html"]
 }

app/scripts/account-import-strategies/account-import-strategies.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { stripHexPrefix } from 'ethereumjs-util';
 import accountImporter from '.';
 

app/scripts/contentscript.js

@@ -1,6 +1,6 @@
 import querystring from 'querystring';
 import pump from 'pump';
-import LocalMessageDuplexStream from 'post-message-stream';
+import { WindowPostMessageStream } from '@metamask/post-message-stream';
 import ObjectMultiplex from 'obj-multiplex';
 import extension from 'extensionizer';
 import PortStream from 'extension-port-stream';
@@ -57,7 +57,7 @@ function injectScript(content) {
  */
 async function setupStreams() {
   // the transport-specific streams for communication between inpage and background
-  const pageStream = new LocalMessageDuplexStream({
+  const pageStream = new WindowPostMessageStream({
     name: CONTENT_SCRIPT,
     target: INPAGE,
   });
@@ -89,7 +89,7 @@ async function setupStreams() {
 
   // TODO:LegacyProvider: Delete
   // handle legacy provider
-  const legacyPageStream = new LocalMessageDuplexStream({
+  const legacyPageStream = new WindowPostMessageStream({
     name: LEGACY_CONTENT_SCRIPT,
     target: LEGACY_INPAGE,
   });

app/scripts/controllers/app-state.js

@@ -23,6 +23,7 @@ export default class AppStateController extends EventEmitter {
       timeoutMinutes: 0,
       connectedStatusPopoverHasBeenShown: true,
       defaultHomeActiveTabName: null,
+      browserEnvironment: {},
       ...initState,
     });
     this.timer = null;
@@ -158,4 +159,12 @@ export default class AppStateController extends EventEmitter {
       timeoutMinutes * 60 * 1000,
     );
   }
+
+  /**
+   * Sets the current browser and OS environment
+   * @returns {void}
+   */
+  setBrowserEnvironment(os, browser) {
+    this.store.updateState({ browserEnvironment: { os, browser } });
+  }
 }

app/scripts/controllers/cached-balances.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import { KOVAN_CHAIN_ID } from '../../../shared/constants/network';
 import CachedBalancesController from './cached-balances';

app/scripts/controllers/detect-tokens.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import { ObservableStore } from '@metamask/obs-store';
 import contracts from '@metamask/contract-metadata';

app/scripts/controllers/ens/index.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import EnsController from '.';
 

app/scripts/controllers/incoming-transactions.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import proxyquire from 'proxyquire';
 import nock from 'nock';

app/scripts/controllers/network/network.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import EventEmitter from 'events';
 import { ComposedStore, ObservableStore } from '@metamask/obs-store';
 import { JsonRpcEngine } from 'json-rpc-engine';

app/scripts/controllers/network/pending-middleware.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { txMetaStub } from '../../../../test/stub/tx-meta-stub';
 import {
   createPendingNonceMiddleware,

app/scripts/controllers/preferences.js

@@ -43,6 +43,7 @@ export default class PreferencesController {
       useBlockie: false,
       useNonceField: false,
       usePhishDetect: true,
+      dismissSeedBackUpReminder: false,
 
       // WARNING: Do not use feature flags for security-sensitive things.
       // Feature flag toggling is available in the global namespace
@@ -67,6 +68,7 @@ export default class PreferencesController {
       // ENS decentralized website resolution
       ipfsGateway: 'dweb.link',
       infuraBlocked: null,
+      useLedgerLive: false,
       ...opts.initState,
     };
 
@@ -666,6 +668,35 @@ export default class PreferencesController {
     return Promise.resolve(domain);
   }
 
+  /**
+   * A setter for the `useLedgerLive` property
+   * @param {bool} useLedgerLive - Value for ledger live support
+   * @returns {Promise<string>} A promise of the update to useLedgerLive
+   */
+  async setLedgerLivePreference(useLedgerLive) {
+    this.store.updateState({ useLedgerLive });
+    return useLedgerLive;
+  }
+
+  /**
+   * A getter for the `useLedgerLive` property
+   * @returns {boolean} User preference of using Ledger Live
+   */
+  getLedgerLivePreference() {
+    return this.store.getState().useLedgerLive;
+  }
+
+  /**
+   * A setter for the user preference to dismiss the seed phrase backup reminder
+   * @param {bool} dismissBackupReminder- User preference for dismissing the back up reminder
+   * @returns {void}
+   */
+  async setDismissSeedBackUpReminder(dismissSeedBackUpReminder) {
+    await this.store.updateState({
+      dismissSeedBackUpReminder,
+    });
+  }
+
   //
   // PRIVATE METHODS
   //

app/scripts/controllers/preferences.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import {
   MAINNET_CHAIN_ID,

app/scripts/controllers/swaps.js

@@ -4,9 +4,9 @@ import BigNumber from 'bignumber.js';
 import { ObservableStore } from '@metamask/obs-store';
 import { mapValues, cloneDeep } from 'lodash';
 import abi from 'human-standard-token-abi';
-import { calcTokenAmount } from '../../../ui/app/helpers/utils/token-util';
+import { calcTokenAmount } from '../../../ui/helpers/utils/token-util';
-import { calcGasTotal } from '../../../ui/app/pages/send/send.utils';
+import { calcGasTotal } from '../../../ui/pages/send/send.utils';
-import { conversionUtil } from '../../../ui/app/helpers/utils/conversion-util';
+import { conversionUtil } from '../../../ui/helpers/utils/conversion-util';
 import {
   DEFAULT_ERC20_APPROVE_GAS,
   QUOTES_EXPIRED_ERROR,
@@ -20,7 +20,7 @@ import {
   fetchTradesInfo as defaultFetchTradesInfo,
   fetchSwapsFeatureLiveness as defaultFetchSwapsFeatureLiveness,
   fetchSwapsQuoteRefreshTime as defaultFetchSwapsQuoteRefreshTime,
-} from '../../../ui/app/pages/swaps/swaps.util';
+} from '../../../ui/pages/swaps/swaps.util';
 import { NETWORK_EVENTS } from './network';
 
 // The MAX_GAS_LIMIT is a number that is higher than the maximum gas costs we have observed on any aggregator

app/scripts/controllers/swaps.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 
 import { ethers } from 'ethers';
@@ -645,7 +645,7 @@ describe('SwapsController', function () {
           topAggId,
           resultQuotes,
         ] = await swapsController._findTopQuoteAndCalculateSavings(testInput);
-        assert.equal(topAggId, [TEST_AGG_ID_2]);
+        assert.equal(topAggId, TEST_AGG_ID_2);
         assert.deepStrictEqual(resultQuotes, expectedResultQuotes);
       });
     });

app/scripts/controllers/token-rates-controller.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import { ObservableStore } from '@metamask/obs-store';
 import TokenRatesController from './token-rates';

app/scripts/controllers/transactions/index.js

@@ -16,8 +16,8 @@ import {
   BnMultiplyByFraction,
   addHexPrefix,
 } from '../../lib/util';
-import { TRANSACTION_NO_CONTRACT_ERROR_KEY } from '../../../../ui/app/helpers/constants/error-keys';
+import { TRANSACTION_NO_CONTRACT_ERROR_KEY } from '../../../../ui/helpers/constants/error-keys';
-import { getSwapsTokensReceivedFromTxMeta } from '../../../../ui/app/pages/swaps/swaps.util';
+import { getSwapsTokensReceivedFromTxMeta } from '../../../../ui/pages/swaps/swaps.util';
 import {
   TRANSACTION_STATUSES,
   TRANSACTION_TYPES,

app/scripts/inpage.js

@@ -32,7 +32,7 @@ cleanContextForImports();
 
 /* eslint-disable import/first */
 import log from 'loglevel';
-import LocalMessageDuplexStream from 'post-message-stream';
+import { WindowPostMessageStream } from '@metamask/post-message-stream';
 import { initializeProvider } from '@metamask/inpage-provider';
 
 restoreContextAfterImports();
@@ -44,7 +44,7 @@ log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'warn');
 //
 
 // setup background connection
-const metamaskStream = new LocalMessageDuplexStream({
+const metamaskStream = new WindowPostMessageStream({
   name: 'metamask-inpage',
   target: 'metamask-contentscript',
 });

app/scripts/lib/ComposableObservableStore.js

@@ -13,8 +13,10 @@ export default class ComposableObservableStore extends ObservableStore {
    */
   constructor(initState, config) {
     super(initState);
+    if (config) {
       this.updateStructure(config);
     }
+  }
 
   /**
    * Composes a new internal store subscription structure
@@ -24,14 +26,12 @@ export default class ComposableObservableStore extends ObservableStore {
   updateStructure(config) {
     this.config = config;
     this.removeAllListeners();
-    for (const key in config) {
+    for (const key of Object.keys(this.config)) {
-      if (Object.prototype.hasOwnProperty.call(config, key)) {
       config[key].subscribe((state) => {
         this.updateState({ [key]: state });
       });
     }
   }
-  }
 
   /**
    * Merges all child store state into a single object rather than
@@ -40,16 +40,17 @@ export default class ComposableObservableStore extends ObservableStore {
    * @returns {Object} Object containing merged child store state
    */
   getFlatState() {
+    if (!this.config) {
+      return {};
+    }
     let flatState = {};
-    for (const key in this.config) {
+    for (const key of Object.keys(this.config)) {
-      if (Object.prototype.hasOwnProperty.call(this.config, key)) {
       const controller = this.config[key];
       const state = controller.getState
         ? controller.getState()
         : controller.state;
       flatState = { ...flatState, ...state };
     }
-    }
     return flatState;
   }
 }

app/scripts/lib/ComposableObservableStore.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { ObservableStore } from '@metamask/obs-store';
 import ComposableObservableStore from './ComposableObservableStore';
 
@@ -32,4 +32,9 @@ describe('ComposableObservableStore', function () {
     });
     assert.deepEqual(store.getFlatState(), { foo: 'foo', bar: 'bar' });
   });
+
+  it('should return empty flattened state when not configured', function () {
+    const store = new ComposableObservableStore();
+    assert.deepEqual(store.getFlatState(), {});
+  });
 });

app/scripts/lib/buy-eth-url.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import {
   KOVAN_CHAIN_ID,
   MAINNET_CHAIN_ID,

app/scripts/lib/cleanErrorStack.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import cleanErrorStack from './cleanErrorStack';
 
 describe('Clean Error Stack', function () {
@@ -14,7 +14,7 @@ describe('Clean Error Stack', function () {
   });
 
   it('tests error with message', function () {
-    assert.equal(cleanErrorStack(testError), 'Error: Test Message');
+    assert.equal(cleanErrorStack(testError).toString(), 'Error: Test Message');
   });
 
   it('tests error with undefined name', function () {
@@ -29,6 +29,6 @@ describe('Clean Error Stack', function () {
   });
 
   it('tests error with blank message', function () {
-    assert.equal(cleanErrorStack(blankMsgError), 'Error');
+    assert.equal(cleanErrorStack(blankMsgError).toString(), 'Error');
   });
 });

app/scripts/lib/createMetaRPCHandler.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { obj as createThoughStream } from 'through2';
 import createMetaRPCHandler from './createMetaRPCHandler';
 

app/scripts/lib/get-first-preferred-lang-code.js

@@ -40,9 +40,7 @@ export default async function getFirstPreferredLangCode() {
 
   const firstPreferredLangCode = userPreferredLocaleCodes
     .map((code) => code.toLowerCase().replace('_', '-'))
-    .find((code) =>
+    .find((code) => existingLocaleCodes[code] !== undefined);
-      Object.prototype.hasOwnProperty.call(existingLocaleCodes, code),
-    );
 
   return existingLocaleCodes[firstPreferredLangCode] || 'en';
 }

app/scripts/lib/message-manager.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
 import MessageManager from './message-manager';
 

app/scripts/lib/metaRPCClientFactory.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { obj as createThoughStream } from 'through2';
 import metaRPCClientFactory from './metaRPCClientFactory';
 

app/scripts/lib/migrator/index.test.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { cloneDeep } from 'lodash';
 import liveMigrations from '../../migrations';
 import data from '../../first-time-state';

app/scripts/lib/nodeify.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import nodeify from './nodeify';
 
 describe('nodeify', function () {

app/scripts/lib/personal-message-manager.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
 import PersonalMessageManager from './personal-message-manager';
 

app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js

@@ -1,4 +1,4 @@
-import { ethErrors } from 'eth-rpc-errors';
+import { ethErrors, errorCodes } from 'eth-rpc-errors';
 import validUrl from 'valid-url';
 import { omit } from 'lodash';
 import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
@@ -123,12 +123,16 @@ async function addEthereumChainHandler(
 
   const existingNetwork = findCustomRpcBy({ chainId: _chainId });
 
-  if (existingNetwork !== null) {
+  if (existingNetwork) {
+    // If the network already exists, the request is considered successful
+    res.result = null;
+
     const currentChainId = getCurrentChainId();
     if (currentChainId === _chainId) {
-      res.result = null;
       return end();
     }
+
+    // Ask the user to switch the network
     try {
       await updateRpcTarget(
         await requestUserApproval({
@@ -144,8 +148,13 @@ async function addEthereumChainHandler(
       );
       res.result = null;
     } catch (error) {
+      // For the purposes of this method, it does not matter if the user
+      // declines to switch the selected network. However, other errors indicate
+      // that something is wrong.
+      if (error.code !== errorCodes.provider.userRejectedRequest) {
         return end(error);
       }
+    }
     return end();
   }
 
@@ -251,6 +260,14 @@ async function addEthereumChainHandler(
       },
     });
 
+    // Once the network has been added, the requested is considered successful
+    res.result = null;
+  } catch (error) {
+    return end(error);
+  }
+
+  // Ask the user to switch the network
+  try {
     await updateRpcTarget(
       await requestUserApproval({
         origin,
@@ -263,10 +280,13 @@ async function addEthereumChainHandler(
         },
       }),
     );
-
-    res.result = null;
   } catch (error) {
+    // For the purposes of this method, it does not matter if the user
+    // declines to switch the selected network. However, other errors indicate
+    // that something is wrong.
+    if (error.code !== errorCodes.provider.userRejectedRequest) {
       return end(error);
     }
+  }
   return end();
 }

app/scripts/lib/rpc-method-middleware/handlers/index.js

@@ -1,10 +1,12 @@
 import addEthereumChain from './add-ethereum-chain';
+import switchEthereumChain from './switch-ethereum-chain';
 import getProviderState from './get-provider-state';
 import logWeb3ShimUsage from './log-web3-shim-usage';
 import watchAsset from './watch-asset';
 
 const handlers = [
   addEthereumChain,
+  switchEthereumChain,
   getProviderState,
   logWeb3ShimUsage,
   watchAsset,

app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js

@@ -0,0 +1,97 @@
+import { ethErrors } from 'eth-rpc-errors';
+import { omit } from 'lodash';
+import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
+import {
+  isPrefixedFormattedHexString,
+  isSafeChainId,
+} from '../../../../../shared/modules/network.utils';
+
+const switchEthereumChain = {
+  methodNames: [MESSAGE_TYPE.SWITCH_ETHEREUM_CHAIN],
+  implementation: switchEthereumChainHandler,
+};
+export default switchEthereumChain;
+
+async function switchEthereumChainHandler(
+  req,
+  res,
+  _next,
+  end,
+  { getCurrentChainId, findCustomRpcBy, updateRpcTarget, requestUserApproval },
+) {
+  if (!req.params?.[0] || typeof req.params[0] !== 'object') {
+    return end(
+      ethErrors.rpc.invalidParams({
+        message: `Expected single, object parameter. Received:\n${JSON.stringify(
+          req.params,
+        )}`,
+      }),
+    );
+  }
+
+  const { origin } = req;
+
+  const { chainId } = req.params[0];
+
+  const otherKeys = Object.keys(omit(req.params[0], ['chainId']));
+
+  if (otherKeys.length > 0) {
+    return end(
+      ethErrors.rpc.invalidParams({
+        message: `Received unexpected keys on object parameter. Unsupported keys:\n${otherKeys}`,
+      }),
+    );
+  }
+
+  const _chainId = typeof chainId === 'string' && chainId.toLowerCase();
+
+  if (!isPrefixedFormattedHexString(_chainId)) {
+    return end(
+      ethErrors.rpc.invalidParams({
+        message: `Expected 0x-prefixed, unpadded, non-zero hexadecimal string 'chainId'. Received:\n${chainId}`,
+      }),
+    );
+  }
+
+  if (!isSafeChainId(parseInt(_chainId, 16))) {
+    return end(
+      ethErrors.rpc.invalidParams({
+        message: `Invalid chain ID "${_chainId}": numerical value greater than max safe value. Received:\n${chainId}`,
+      }),
+    );
+  }
+
+  const existingNetwork = findCustomRpcBy({ chainId: _chainId });
+
+  if (existingNetwork) {
+    const currentChainId = getCurrentChainId();
+    if (currentChainId === _chainId) {
+      res.result = null;
+      return end();
+    }
+    try {
+      await updateRpcTarget(
+        await requestUserApproval({
+          origin,
+          type: MESSAGE_TYPE.SWITCH_ETHEREUM_CHAIN,
+          requestData: {
+            rpcUrl: existingNetwork.rpcUrl,
+            chainId: existingNetwork.chainId,
+            nickname: existingNetwork.nickname,
+            ticker: existingNetwork.ticker,
+          },
+        }),
+      );
+      res.result = null;
+    } catch (error) {
+      return end(error);
+    }
+    return end();
+  }
+  return end(
+    ethErrors.provider.custom({
+      code: 4902, // To-be-standardized "unrecognized chain ID" error
+      message: `Unrecognized chain ID "${chainId}". Try adding the chain using ${MESSAGE_TYPE.ADD_ETHEREUM_CHAIN} first.`,
+    }),
+  );
+}

app/scripts/lib/seed-phrase-verifier.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { cloneDeep } from 'lodash';
 import KeyringController from 'eth-keyring-controller';
 import firstTimeState from '../first-time-state';

app/scripts/lib/typed-message-manager.js

@@ -1,5 +1,5 @@
 import EventEmitter from 'events';
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { ObservableStore } from '@metamask/obs-store';
 import { ethErrors } from 'eth-rpc-errors';
 import { typedSignatureHash, TYPED_MESSAGE_SCHEMA } from 'eth-sig-util';

app/scripts/lib/typed-message-manager.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
 import TypedMessageManager from './typed-message-manager';

app/scripts/lib/util.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import extension from 'extensionizer';
 import { stripHexPrefix } from 'ethereumjs-util';
 import BN from 'bn.js';

app/scripts/metamask-controller.js

@@ -476,6 +476,17 @@ export default class MetamaskController extends EventEmitter {
       this.submitPassword(password);
     }
 
+    // Lazily update the store with the current extension environment
+    this.extension.runtime.getPlatformInfo(({ os }) => {
+      this.appStateController.setBrowserEnvironment(
+        os,
+        // This method is presently only supported by Firefox
+        this.extension.runtime.getBrowserInfo === undefined
+          ? 'chrome'
+          : 'firefox',
+      );
+    });
+
     // TODO:LegacyProvider: Delete
     this.publicConfigStore = this.createPublicConfigStore();
   }
@@ -666,6 +677,7 @@ export default class MetamaskController extends EventEmitter {
         this.unlockHardwareWalletAccount,
         this,
       ),
+      setLedgerLivePreference: nodeify(this.setLedgerLivePreference, this),
 
       // mobile
       fetchInfoToSync: nodeify(this.fetchInfoToSync, this),
@@ -721,6 +733,10 @@ export default class MetamaskController extends EventEmitter {
         preferencesController.addKnownMethodData,
         preferencesController,
       ),
+      setDismissSeedBackUpReminder: nodeify(
+        this.preferencesController.setDismissSeedBackUpReminder,
+        this.preferencesController,
+      ),
 
       // AddressController
       setAddressBook: nodeify(
@@ -1206,6 +1222,14 @@ export default class MetamaskController extends EventEmitter {
       log.error('Error while unlocking extension.', error);
     }
 
+    // This must be set as soon as possible to communicate to the
+    // keyring's iframe and have the setting initialized properly
+    // Optimistically called to not block Metamask login due to
+    // Ledger Keyring GitHub downtime
+    this.setLedgerLivePreference(
+      this.preferencesController.getLedgerLivePreference(),
+    );
+
     return this.keyringController.fullUpdate();
   }
 
@@ -2493,7 +2517,7 @@ export default class MetamaskController extends EventEmitter {
       };
       this.currencyRateController.update(currencyState);
       this.currencyRateController.configure(currencyState);
-      cb(null, this.currencyRateController.state);
+      cb(null);
       return;
     } catch (err) {
       cb(err);
@@ -2682,6 +2706,27 @@ export default class MetamaskController extends EventEmitter {
     }
   }
 
+  /**
+   * Sets the Ledger Live preference to use for Ledger hardware wallet support
+   * @param {bool} bool - the value representing if the users wants to use Ledger Live
+   */
+  async setLedgerLivePreference(bool) {
+    const currentValue = this.preferencesController.getLedgerLivePreference();
+    this.preferencesController.setLedgerLivePreference(bool);
+
+    const keyring = await this.getKeyringForDevice('ledger');
+    if (keyring?.updateTransportMethod) {
+      return keyring.updateTransportMethod(bool).catch((e) => {
+        // If there was an error updating the transport, we should
+        // fall back to the original value
+        this.preferencesController.setLedgerLivePreference(currentValue);
+        throw e;
+      });
+    }
+
+    return undefined;
+  }
+
   /**
    * Sets whether or not the user will have usage data tracked with MetaMetrics
    * @param {boolean} bool - True for users that wish to opt-in, false for users that wish to remain out.

app/scripts/metamask-controller.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import sinon from 'sinon';
 import { cloneDeep } from 'lodash';
 import nock from 'nock';
@@ -52,6 +52,7 @@ const ExtensionizerMock = {
     onInstalled: {
       addListener: () => undefined,
     },
+    getPlatformInfo: async () => 'mac',
   },
 };
 
@@ -492,8 +493,8 @@ describe('MetaMaskController', function () {
         );
       } catch (e) {
         assert.equal(
-          e,
+          e.message,
-          'Error: MetamaskController:getKeyringForDevice - Unknown device',
+          'MetamaskController:getKeyringForDevice - Unknown device',
         );
       }
     });
@@ -504,9 +505,9 @@ describe('MetaMaskController', function () {
       const keyrings = await metamaskController.keyringController.getKeyringsByType(
         'Trezor Hardware',
       );
-      assert.equal(
+      assert.deepEqual(
         metamaskController.keyringController.addNewKeyring.getCall(0).args,
-        'Trezor Hardware',
+        ['Trezor Hardware'],
       );
       assert.equal(keyrings.length, 1);
     });
@@ -517,9 +518,9 @@ describe('MetaMaskController', function () {
       const keyrings = await metamaskController.keyringController.getKeyringsByType(
         'Ledger Hardware',
       );
-      assert.equal(
+      assert.deepEqual(
         metamaskController.keyringController.addNewKeyring.getCall(0).args,
-        'Ledger Hardware',
+        ['Ledger Hardware'],
       );
       assert.equal(keyrings.length, 1);
     });
@@ -534,8 +535,8 @@ describe('MetaMaskController', function () {
         );
       } catch (e) {
         assert.equal(
-          e,
+          e.message,
-          'Error: MetamaskController:getKeyringForDevice - Unknown device',
+          'MetamaskController:getKeyringForDevice - Unknown device',
         );
       }
     });
@@ -553,8 +554,8 @@ describe('MetaMaskController', function () {
         await metamaskController.forgetDevice('Some random device name');
       } catch (e) {
         assert.equal(
-          e,
+          e.message,
-          'Error: MetamaskController:getKeyringForDevice - Unknown device',
+          'MetamaskController:getKeyringForDevice - Unknown device',
         );
       }
     });

app/scripts/migrations/021.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import wallet2 from '../../../test/lib/migrations/002.json';
 import migration21 from './021';
 

app/scripts/migrations/022.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
 import migration22 from './022';
 

app/scripts/migrations/023.test.js

@@ -1,4 +1,4 @@
-import assert from 'assert';
+import { strict as assert } from 'assert';
 import { TRANSACTION_STATUSES } from '../../../shared/constants/transaction';
 import migration23 from './023';