1. correct name display in network dropdown 2. enable 373 derived path

25 files changed, 76 insertions, 5 deletions

diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
index a28c4cb4a..fd8be5672 100644
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Režim súkromia"
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index b76f87772..ba6e1b13b 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Datenschutzmodus"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 774ae4c85..d106008da 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Privacy Mode"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 3bdbfa852..c6fb354ab 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Modo privado"
   },
@@ -1239,7 +1242,7 @@
   },
   "pending": {
     "message": "pendiente"
-  },  
+  },
   "popularTokens": {
     "message": "Tokens Corrientes"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index d2ba10009..eeb041d16 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Les sites Web doivent demander un accès pour afficher les informations de votre compte."
   },
diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
index 6c27ee1bc..acdb5b77e 100644
--- a/app/_locales/hn/messages.json
+++ b/app/_locales/hn/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "गोपनीयता मोड"
   },
diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json
index 4a4c92f3a..be9d555e9 100644
--- a/app/_locales/ht/messages.json
+++ b/app/_locales/ht/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Mòd Privacy"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 09ba045b9..796df2e0d 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Modalità privacy"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index fcac67894..9ed8ab583 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "プライバシーモード"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index bf11640e2..c592c5a76 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "개인 정보 보호 모드"
   },
diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
index 12bde6585..8a7a45e14 100644
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Privacy-modus"
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index da3cf266d..4be0a680f 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Mode ng Privacy"
   },
@@ -322,7 +325,7 @@
     "message": "i-click ito",
     "description": "tulad ng -i-click dito- para sa mas maraming impormasyon (kasama ng troubleTokenBalances)"
   },
-  "hide": { 
+  "hide": {
     "message": "Itago"
   },
   "hideToken": {
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index 026f4b3ec..35de7eb90 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "accept": {
     "message": "Akceptacja"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index e51b1f72e..02767fcbc 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Modo de privacidade"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index f80efcc56..5ada36c64 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Режим конфиденциальности"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index febcc9141..33c0ae195 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Režim súkromia"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index 2f3616dee..503d48272 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Zasebnostni način"
   },
@@ -1149,7 +1152,7 @@
   },
   "seedPhraseAlert": {
     "message": "Opozorilo o seed phrase"
-  },  
+  },
   "select": {
     "message": "Izberi"
   },
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index d851d325f..6d474b170 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "โหมดความเป็นส่วนตัว"
   },
diff --git a/app/_locales/tml/messages.json b/app/_locales/tml/messages.json
index e1ef45138..1d8f1d631 100644
--- a/app/_locales/tml/messages.json
+++ b/app/_locales/tml/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "தனியுரிமை முறை"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index bcf96dece..3e0cfecba 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Gizlilik modu"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 857f78597..2dca138c9 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "Chế độ riêng tư"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 0d3727703..8735e80e4 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "隐私模式"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 4df95f72f..d45794f3e 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -1,4 +1,7 @@
 {
+  "tangerine_testnet": {
+    "message": "Tangerine Testnet"
+  },
   "privacyMode": {
     "message": "隱私模式"
   },
diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js
index 3b5afb800..c97f1e9ce 100644
--- a/app/scripts/lib/seed-phrase-verifier.js
+++ b/app/scripts/lib/seed-phrase-verifier.js
@@ -1,4 +1,4 @@
-const KeyringController = require('eth-keyring-controller')
+const KeyringController = require('@byzantine-lab/keyring-controller')
 const log = require('loglevel')
 
 const seedPhraseVerifier = {
@@ -29,6 +29,7 @@ const seedPhraseVerifier = {
       const opts = {
         mnemonic: seedWords,
         numberOfAccounts: createdAccounts.length,
+        hdPath: `m/44'/373'/0'/0`,
       }
 
       const keyring = new Keyring(opts)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 0b6f5fcb5..28c990b54 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -22,7 +22,7 @@ const createOriginMiddleware = require('./lib/createOriginMiddleware')
 const createLoggerMiddleware = require('./lib/createLoggerMiddleware')
 const providerAsMiddleware = require('eth-json-rpc-middleware/providerAsMiddleware')
 const {setupMultiplex} = require('./lib/stream-utils.js')
-const KeyringController = require('eth-keyring-controller')
+const KeyringController = require('@byzantine-lab/keyring-controller')
 const NetworkController = require('./controllers/network')
 const PreferencesController = require('./controllers/preferences')
 const AppStateController = require('./controllers/app-state')
@@ -170,6 +170,7 @@ module.exports = class MetamaskController extends EventEmitter {
       initState: initState.KeyringController,
       getNetwork: this.networkController.getNetworkState.bind(this.networkController),
       encryptor: opts.encryptor || undefined,
+      hdPath: `m/44'/373'/0'/0`,
     })
 
     this.keyringController.memStore.subscribe((s) => this._onKeyringControllerUpdate(s))