Support 24 word seed phrases

24 files changed, 39 insertions, 35 deletions

diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
index 13f5d0ff..47a53064 100644
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@@ -685,13 +685,13 @@
     "message": "Hledat"
   },
   "secretPhrase": {
-    "message": "Zadejte svých 12 slov tajné fráze k obnovení trezoru."
+    "message": "Zadejte svých 12 / 24 slov tajné fráze k obnovení trezoru."
   },
   "newPassword8Chars": {
     "message": "Nové heslo (min 8 znaků)"
   },
   "seedPhraseReq": {
-    "message": "klíčové fráze mají 12 slov"
+    "message": "klíčové fráze mají 12 / 24 slov"
   },
   "select": {
     "message": "Vybrat"
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 61650d76..1f058107 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -685,13 +685,13 @@
     "message": "Suche"
   },
   "secretPhrase": {
-    "message": "Gib die 12 Wörter deiner geheimem Wörterfolge ein um deinen Vault wiederherzustellen."
+    "message": "Gib die 12 oder 24 Wörter deiner geheimem Wörterfolge ein um deinen Vault wiederherzustellen."
   },
   "newPassword8Chars": {
     "message": "Neues Passwort (min. 8 Zeichen)"
   },
   "seedPhraseReq": {
-    "message": "Seed-Wörterfolgen bestehen aus 12 Wörtern"
+    "message": "Seed-Wörterfolgen bestehen aus 12 oder 24 Wörtern"
   },
   "select": {
     "message": "Auswählen"
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index d2755039..b80b9926 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -685,13 +685,13 @@
     "message": "Search"
   },
   "secretPhrase": {
-    "message": "Enter your secret twelve word phrase here to restore your vault."
+    "message": "Enter your secret 12 or 24 word phrase here to restore your vault."
   },
   "newPassword8Chars": {
     "message": "New Password (min 8 chars)"
   },
   "seedPhraseReq": {
-    "message": "Seed phrases are 12 words long"
+    "message": "Seed phrases are 12 or 24 words long"
   },
   "select": {
     "message": "Select"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 0a6bb1f1..d9bf2046 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -691,7 +691,7 @@
     "message": "Nueva contraseña (mínimo [8] caracteres)"
   },
   "seedPhraseReq": {
-    "message": "las frases semilla tienen doce (12) palabras de largo"
+    "message": ""
   },
   "select": {
     "message": "Seleccionar"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 6ac1d81f..e3f0ed02 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -685,13 +685,13 @@
     "message": "Rechercher"
   },
   "secretPhrase": {
-    "message": "Entrez vos 12 mots secrets de votre phrase Seed pour restaurer votre coffre."
+    "message": "Entrez vos 12 / 24 mots secrets de votre phrase Seed pour restaurer votre coffre."
   },
   "newPassword8Chars": {
     "message": "Nouveau mot de passe (min 8 caractères)"
   },
   "seedPhraseReq": {
-    "message": "Les phrases Seed sont composées de 12 mots"
+    "message": "Les phrases Seed sont composées de 12 / 24 mots"
   },
   "select": {
     "message": "Selectionner"
diff --git a/app/_locales/hi_IN/messages.json b/app/_locales/hi_IN/messages.json
index 89e5abf6..dc8cec86 100644
--- a/app/_locales/hi_IN/messages.json
+++ b/app/_locales/hi_IN/messages.json
@@ -691,7 +691,7 @@
     "message": ""
   },
   "seedPhraseReq": {
-    "message": "बीज वाक्यांश 12 शब्द लंबा हैं"
+    "message": "बीज वाक्यांश 12 / 24 शब्द लंबा हैं"
   },
   "select": {
     "message": "चुनें"
diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
index da951290..67ec8f3e 100644
--- a/app/_locales/hn/messages.json
+++ b/app/_locales/hn/messages.json
@@ -667,7 +667,7 @@
     "message": "अपनी गुप्त बारह शब्द वाक्यांश यहाँ अपनी तिजोरी को पुनर्स्थापित करने के लिए दर्ज करें।"
   },
   "seedPhraseReq": {
-    "message": "बीज वाक्यांश 12 शब्द लंबा हैं"
+    "message": "बीज वाक्यांश 12 / 24 शब्द लंबा हैं"
   },
   "select": {
     "message": "चुनें"
diff --git a/app/_locales/ht_HT/messages.json b/app/_locales/ht_HT/messages.json
index 4257ef26..6f3d724f 100644
--- a/app/_locales/ht_HT/messages.json
+++ b/app/_locales/ht_HT/messages.json
@@ -691,7 +691,7 @@
     "message": "Nouvo modpas (pou pi pit 8)"
   },
   "seedPhraseReq": {
-    "message": "Seed fraz yo se 12 long mo"
+    "message": "Seed fraz yo se 12 / 24 long mo"
   },
   "select": {
     "message": "Chwazi"
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 806b274c..15117ca5 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -691,7 +691,7 @@
     "message": "Nuova Password (minimo 8 caratteri)"
   },
   "seedPhraseReq": {
-    "message": "le frasi seed sono lunghe 12 parole"
+    "message": "le frasi seed sono lunghe 12 / 24 parole"
   },
   "select": {
     "message": "Seleziona"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index e5c88f49..cf5e97cc 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -691,7 +691,7 @@
     "message": "새 비밀번호 (최소 8문자)"
   },
   "seedPhraseReq": {
-    "message": "시드 구문은 12개의 단어입니다"
+    "message": "시드 구문은 12/24개의 단어입니다"
   },
   "select": {
     "message": "선택"
diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
index c924b82f..69dc3f9d 100644
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@@ -691,7 +691,7 @@
     "message": ""
   },
   "seedPhraseReq": {
-    "message": "Back-up woorden zijn 12 woorden lang"
+    "message": "Back-up woorden zijn 12 / 24 woorden lang"
   },
   "select": {
     "message": "kiezen"
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index 7a00a6ba..23e6292b 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -691,7 +691,7 @@
     "message": "Nowe hasło (min. 8 znaków)"
   },
   "seedPhraseReq": {
-    "message": "Frazy seed mają 12 słów"
+    "message": "Frazy seed mają 12 / 24 słów"
   },
   "select": {
     "message": "Wybierz"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 8dc786a5..febd338e 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -685,13 +685,13 @@
     "message": "Procurar"
   },
   "secretPhrase": {
-    "message": "Introduza a sua frase secreta de 12 palavras para recuperar o seu ."
+    "message": "Introduza a sua frase secreta de 12 / 24 palavras para recuperar o seu ."
   },
   "newPassword8Chars": {
     "message": ""
   },
   "seedPhraseReq": {
-    "message": "seed phrases are 12 words long"
+    "message": "seed phrases are 12 or 24 words long"
   },
   "select": {
     "message": "Selecionar"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index e98f87ca..7e05d7f3 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -685,13 +685,13 @@
     "message": "Поиск"
   },
   "secretPhrase": {
-    "message": "Введите вашу ключевую фразу из 12 слов, чтобы восстановить кошелек."
+    "message": "Введите вашу ключевую фразу из 12 / 24 слов, чтобы восстановить кошелек."
   },
   "newPassword8Chars": {
     "message": "Новый пароль (мин. 8 символов)"
   },
   "seedPhraseReq": {
-    "message": "ключевые фразы имеют длину 12 слов"
+    "message": "ключевые фразы имеют длину 12 / 24 слов"
   },
   "select": {
     "message": "Выбрать"
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index fde447a7..fe7ab39f 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -733,13 +733,13 @@
     "message": "Hledat"
   },
   "secretPhrase": {
-    "message": "Zadejte svých 12 slov tajné fráze k obnovení trezoru."
+    "message": "Zadejte svých 12 / 24 slov tajné fráze k obnovení trezoru."
   },
   "newPassword8Chars": {
     "message": "Nové heslo (min 8 znaků)"
   },
   "seedPhraseReq": {
-    "message": "klíčové fráze mají 12 slov"
+    "message": "klíčové fráze mají 12 / 24 slov"
   },
   "select": {
     "message": "Vybrat"
diff --git a/app/_locales/sl_SI/messages.json b/app/_locales/sl_SI/messages.json
index 1ba05ca3..212b032b 100644
--- a/app/_locales/sl_SI/messages.json
+++ b/app/_locales/sl_SI/messages.json
@@ -691,7 +691,7 @@
     "message": ""
   },
   "seedPhraseReq": {
-    "message": "seed phrases so dolgi 12 besed"
+    "message": "seed phrases so dolgi 12 / 24 besed"
   },
   "select": {
     "message": "Izberi"
diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json
index 7dbb822f..e79313ef 100644
--- a/app/_locales/ta/messages.json
+++ b/app/_locales/ta/messages.json
@@ -691,7 +691,7 @@
     "message": "புதிய கடவுச்சொல் (குறைந்தபட்சம் 8 எழுத்துகள்)"
   },
   "seedPhraseReq": {
-    "message": "விதை வாக்கியங்கள் 12 வார்த்தைகள் நீண்டவை"
+    "message": "விதை வாக்கியங்கள் 12 / 24 வார்த்தைகள் நீண்டவை"
   },
   "select": {
     "message": "தேர்வு"
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index e2eae7e8..7ce2e683 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -691,7 +691,7 @@
     "message": ""
   },
   "seedPhraseReq": {
-    "message": "กลุ่มคำชีดมีความยาว 12 คำ"
+    "message": "กลุ่มคำชีดมีความยาว 12 / 24 คำ"
   },
   "select": {
     "message": "เลือก"
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 7465a4d0..fcbded28 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -685,13 +685,13 @@
     "message": "Ara"
   },
   "secretPhrase": {
-    "message": "Kasanızı geri getirmek için gizli 12 kelimelik ifadenizi giriniz."
+    "message": "Kasanızı geri getirmek için gizli 12 / 24 kelimelik ifadenizi giriniz."
   },
   "newPassword8Chars": {
     "message": "Yeni Parola (minumum 8 karakter)"
   },
   "seedPhraseReq": {
-    "message": "Kaynak ifadeleri 12 kelimedir."
+    "message": "Kaynak ifadeleri 12 / 24 kelimedir."
   },
   "select": {
     "message": "Seç"
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 3c481337..a74223ef 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -685,13 +685,13 @@
     "message": "搜索"
   },
   "secretPhrase": {
-    "message": "输入12位助记词以恢复金库."
+    "message": "输入 12 或 24 位助记词以恢复金库."
   },
   "newPassword8Chars": {
     "message": "新密码（至少8位)"
   },
   "seedPhraseReq": {
-    "message": "助记词为12个单词"
+    "message": "助记词为 12 或 24 个单词"
   },
   "select": {
     "message": "选择"
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index e97f2425..646a2a87 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -685,13 +685,13 @@
     "message": "搜尋"
   },
   "secretPhrase": {
-    "message": "在此輸入你的12個祕密助憶詞以回復金庫."
+    "message": "在此輸入你的 12 或 24 個祕密助憶詞以回復金庫."
   },
   "newPassword8Chars": {
     "message": "新密碼 (至少 8 個字元)"
   },
   "seedPhraseReq": {
-    "message": "助憶詞為 12 個詞語"
+    "message": "助憶詞為 12 或 24 個詞語"
   },
   "select": {
     "message": "選擇"
diff --git a/mascara/src/app/first-time/import-seed-phrase-screen.js b/mascara/src/app/first-time/import-seed-phrase-screen.js
index 764e9ed4..68615fdb 100644
--- a/mascara/src/app/first-time/import-seed-phrase-screen.js
+++ b/mascara/src/app/first-time/import-seed-phrase-screen.js
@@ -43,7 +43,8 @@ class ImportSeedPhraseScreen extends Component {
 
     if (seedPhrase) {
       const parsedSeedPhrase = this.parseSeedPhrase(seedPhrase)
-      if (parsedSeedPhrase.split(' ').length !== 12) {
+      const numberOfWords = parsedSeedPhrase.split(' ').length
+      if (numberOfWords !== 12 && numberOfWords !== 24) {
         seedPhraseError = this.context.t('seedPhraseReq')
       } else if (!validateMnemonic(parsedSeedPhrase)) {
         seedPhraseError = this.context.t('invalidSeedPhrase')
diff --git a/ui/app/components/pages/keychains/restore-vault.js b/ui/app/components/pages/keychains/restore-vault.js
index d90a33e4..7b2f82ce 100644
--- a/ui/app/components/pages/keychains/restore-vault.js
+++ b/ui/app/components/pages/keychains/restore-vault.js
@@ -39,8 +39,11 @@ class RestoreVaultPage extends Component {
   handleSeedPhraseChange (seedPhrase) {
     let seedPhraseError = null
 
-    if (seedPhrase && this.parseSeedPhrase(seedPhrase).split(' ').length !== 12) {
-      seedPhraseError = this.context.t('seedPhraseReq')
+    if (seedPhrase) {
+      const numberOfWords = this.parseSeedPhrase(seedPhrase).split(' ').length
+      if (numberOfWords !== 12 && numberOfWords !== 24) {
+        seedPhraseError = this.context.t('seedPhraseReq')
+      }
     }
 
     this.setState({ seedPhrase, seedPhraseError })
diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js
index 913d2050..f5067c6b 100644
--- a/ui/app/keychains/hd/restore-vault.js
+++ b/ui/app/keychains/hd/restore-vault.js
@@ -168,7 +168,7 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
       this.props.dispatch(actions.displayWarning(this.warning))
     return
   }
-  if (seed.split(' ').length !== 12) {
+  if (seed.split(' ').length !== 12 && seed.split(' ').length !== 24) {
     this.warning = this.context.t('seedPhraseReq')
     this.props.dispatch(actions.displayWarning(this.warning))
     return