From 87ac07bb3504e60db476f8baa87388fef151ebb8 Mon Sep 17 00:00:00 2001 From: Sunghee Lee <630sunghee@gmail.com> Date: Wed, 18 Sep 2019 22:57:18 +0900 Subject: [PATCH] Refactor validation function (#7187) * Update invalidBlockExplorerURL message * Refactor validation function --- app/_locales/am/messages.json | 3 +++ app/_locales/ar/messages.json | 3 +++ app/_locales/bg/messages.json | 3 +++ app/_locales/bn/messages.json | 3 +++ app/_locales/ca/messages.json | 3 +++ app/_locales/cs/messages.json | 3 +++ app/_locales/da/messages.json | 3 +++ app/_locales/de/messages.json | 3 +++ app/_locales/el/messages.json | 3 +++ app/_locales/en/messages.json | 3 +++ app/_locales/es/messages.json | 3 +++ app/_locales/es_419/messages.json | 3 +++ app/_locales/et/messages.json | 3 +++ app/_locales/fa/messages.json | 3 +++ app/_locales/fi/messages.json | 3 +++ app/_locales/fil/messages.json | 3 +++ app/_locales/fr/messages.json | 3 +++ app/_locales/he/messages.json | 3 +++ app/_locales/hi/messages.json | 3 +++ app/_locales/hn/messages.json | 3 +++ app/_locales/hr/messages.json | 3 +++ app/_locales/ht/messages.json | 3 +++ app/_locales/hu/messages.json | 3 +++ app/_locales/id/messages.json | 3 +++ app/_locales/it/messages.json | 3 +++ app/_locales/kn/messages.json | 3 +++ app/_locales/ko/messages.json | 3 +++ app/_locales/lt/messages.json | 3 +++ app/_locales/lv/messages.json | 3 +++ app/_locales/ms/messages.json | 3 +++ app/_locales/nl/messages.json | 3 +++ app/_locales/no/messages.json | 3 +++ app/_locales/pl/messages.json | 3 +++ app/_locales/pt/messages.json | 3 +++ app/_locales/pt_BR/messages.json | 3 +++ app/_locales/ro/messages.json | 3 +++ app/_locales/ru/messages.json | 3 +++ app/_locales/sk/messages.json | 3 +++ app/_locales/sl/messages.json | 3 +++ app/_locales/sr/messages.json | 3 +++ app/_locales/sv/messages.json | 3 +++ app/_locales/sw/messages.json | 3 +++ app/_locales/ta/messages.json | 3 +++ app/_locales/th/messages.json | 3 +++ app/_locales/tr/messages.json | 3 +++ app/_locales/uk/messages.json | 3 +++ app/_locales/zh_CN/messages.json | 3 +++ app/_locales/zh_TW/messages.json | 3 +++ .../network-form/network-form.component.js | 19 +++++-------------- 49 files changed, 149 insertions(+), 14 deletions(-) diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index e0867243c..21ddaeda6 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -876,6 +876,9 @@ "invalidRPC": { "message": "ልክ ያልሆነ RPC ዩአርኤል" }, + "invalidBlockExplorerURL": { + "message": "ልክ ያልሆነ Block Explorer ዩአርኤል" + }, "invalidSeedPhrase": { "message": "የተሳሳተ የዘር ሐረግ" }, diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index 69c3bb9e2..735220463 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -878,6 +878,9 @@ "invalidRPC": { "message": "رابط آر بي سي غير صحيح" }, + "invalidBlockExplorerURL": { + "message": "غير صحيح Block Explorer رابط" + }, "invalidSeedPhrase": { "message": "عبارة أمان غير صحيحة" }, diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index 44c17f366..aa75dcab7 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -875,6 +875,9 @@ "invalidRPC": { "message": "Невалиден RPC URL адрес" }, + "invalidBlockExplorerURL": { + "message": "Невалиден Block Explorer URL адрес" + }, "invalidSeedPhrase": { "message": "Невалидна фраза зародиш" }, diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index a1480dea6..83ae89c52 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -879,6 +879,9 @@ "invalidRPC": { "message": "অবৈধ RPC URL" }, + "invalidBlockExplorerURL": { + "message": "অবৈধ Block Explorer URL" + }, "invalidSeedPhrase": { "message": "অবৈধ সীড ফ্রেজ" }, diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index 6e5b4e0bf..4f9c7b4c6 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -855,6 +855,9 @@ "invalidRPC": { "message": "URL de RPC" }, + "invalidBlockExplorerURL": { + "message": "URL de Block Explorer" + }, "invalidSeedPhrase": { "message": "Frase de recuperació no vàlida" }, diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index 936d89890..45310773f 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -445,6 +445,9 @@ "invalidRPC": { "message": "Neplatné RPC URI" }, + "invalidBlockExplorerURL": { + "message": "Neplatné Block Explorer URI" + }, "jsonFail": { "message": "Něco se pokazilo. Prosím, ujistěte se, že váš JSON soubor má správný formát." }, diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index c34ba78ed..d6801e0f6 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -866,6 +866,9 @@ "invalidRPC": { "message": "Ugyldig RPC-webadresse" }, + "invalidBlockExplorerURL": { + "message": "Ugyldig Block Explorer-webadresse" + }, "invalidSeedPhrase": { "message": "Ugyldig backupsætning" }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index dd2d09e8d..560e039f6 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -854,6 +854,9 @@ "invalidRPC": { "message": "Ungültige RPC URI" }, + "invalidBlockExplorerURL": { + "message": "Ungültige Block Explorer URI" + }, "invalidSeedPhrase": { "message": "Ungültiger Seedschlüssel" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 9a66f7cff..b1b2acab1 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -873,6 +873,9 @@ "invalidRPC": { "message": "Μη έγκυρο RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Μη έγκυρο Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Μη έγκυρη φράση φύτρου" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 112a0f989..623696c87 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -915,6 +915,9 @@ "invalidRPC": { "message": "Invalid RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Invalid Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Invalid seed phrase" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 7f81ad13f..19174afb8 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -756,6 +756,9 @@ "invalidRPC": { "message": "Invalida URL del RPC" }, + "invalidBlockExplorerURL": { + "message": "Invalida URL del Block Explorer" + }, "invalidSeedPhrase": { "message": "Frase semilla no válida." }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 3496418d3..24b90fd38 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -863,6 +863,9 @@ "invalidRPC": { "message": "RPC de URL no válido" }, + "invalidBlockExplorerURL": { + "message": "Block Explorer de URL no válido" + }, "invalidSeedPhrase": { "message": "Frase de inicialización no válida" }, diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index 88e892dca..b724c884e 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -875,6 +875,9 @@ "invalidRPC": { "message": "Vale RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Vale Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Vigane seemnefraas" }, diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index 8e9cadf74..3bb38bb9d 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -876,6 +876,9 @@ "invalidRPC": { "message": "RPC URL نا معتبر" }, + "invalidBlockExplorerURL": { + "message": "Block Explorer URL نا معتبر" + }, "invalidSeedPhrase": { "message": "عبارت بازیابی نا معتبر" }, diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index 3dbf3793d..34fc0aa18 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -873,6 +873,9 @@ "invalidRPC": { "message": "Virheellinen RPC:n URL-osoite" }, + "invalidBlockExplorerURL": { + "message": "Virheellinen Block Explorer URL-osoite" + }, "invalidSeedPhrase": { "message": "Virheellinen salausteksti" }, diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index d8bcef5c7..08e7fd512 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -807,6 +807,9 @@ "invalidRPC": { "message": "Hindi valid ang RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Hindi valid ang Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Hindi valid ang seed phrase" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index e45c6a662..28255ad7f 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -844,6 +844,9 @@ "invalidRPC": { "message": "URL RPC invalide" }, + "invalidBlockExplorerURL": { + "message": "URL Block Explorer invalide" + }, "invalidSeedPhrase": { "message": "Phrase Seed invalide" }, diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 090e9a637..bc6f6268f 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -879,6 +879,9 @@ "invalidRPC": { "message": "כתובת URL לא חוקית של RPC" }, + "invalidBlockExplorerURL": { + "message": "כתובת URL לא חוקית של Block Explorer" + }, "invalidSeedPhrase": { "message": "seed phrase לא חוקי" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 2a0bb999a..3ded4a4e5 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -882,6 +882,9 @@ "invalidRPC": { "message": "अमान्य RPC URL" }, + "invalidBlockExplorerURL": { + "message": "अमान्य Block Explorer URL" + }, "invalidSeedPhrase": { "message": "अमान्य बीज वाक्यांश" }, diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index ad87c65a4..05a0acf49 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -419,6 +419,9 @@ "invalidRPC": { "message": "अमान्य RPC कै URI" }, + "invalidBlockExplorerURL": { + "message": "अमान्य Block Explorer कै URI" + }, "jsonFail": { "message": "कुछ गलत हो गया। कृपया सुनिश्चित करें कि आपकी JSON फ़ाइल ठीक से फ़ॉर्मेट की गई है।" }, diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index 4cda80a5d..d05e1f95e 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -872,6 +872,9 @@ "invalidRPC": { "message": "Nevaljani URL RPC-a" }, + "invalidBlockExplorerURL": { + "message": "Nevaljani URL Block Explorer-a" + }, "invalidSeedPhrase": { "message": "Nevaljana početna rečenica" }, diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index 8d9111391..b1a3da3b1 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -568,6 +568,9 @@ "invalidRPC": { "message": "RPC URI pa valab" }, + "invalidBlockExplorerURL": { + "message": "Block Explorer URI pa valab" + }, "invalidSeedPhrase": { "message": "Seed fraz pa valab" }, diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index d2f4e40f7..644202958 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -872,6 +872,9 @@ "invalidRPC": { "message": "Helytelen RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Helytelen Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Érvénytelen seed mondat" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 93954929f..b97c5f33b 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -853,6 +853,9 @@ "invalidRPC": { "message": "URL RPC Tidak Sah" }, + "invalidBlockExplorerURL": { + "message": "URL Block Explorer Tidak Sah" + }, "invalidSeedPhrase": { "message": "Frasa benih tidak valid" }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 685a1c2dc..08a209c66 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -844,6 +844,9 @@ "invalidRPC": { "message": "URI RPC invalido" }, + "invalidBlockExplorerURL": { + "message": "URI Block Explorer invalido" + }, "invalidSeedPhrase": { "message": "Frase seed non valida" }, diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index fee5f7aec..96266a9f6 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -879,6 +879,9 @@ "invalidRPC": { "message": "ಅಮಾನ್ಯವಾದ RPC URL" }, + "invalidBlockExplorerURL": { + "message": "ಅಮಾನ್ಯವಾದ Block Explorer URL" + }, "invalidSeedPhrase": { "message": "ಅಮಾನ್ಯವಾದ ಸೀಡ್ ಫ್ರೇಸ್" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 69144bbfb..f18b2cd7d 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -864,6 +864,9 @@ "invalidRPC": { "message": "올바르지 않은 RPC URI" }, + "invalidBlockExplorerURL": { + "message": "올바르지 않은 Block Explorer URI" + }, "invalidSeedPhrase": { "message": "잘못된 시드 구문" }, diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index 364a50b6e..1aad40922 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -879,6 +879,9 @@ "invalidRPC": { "message": "Netinkamas RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Netinkamas Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Netinkama atkūrimo frazė" }, diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index c041c0bbc..5bd828b5f 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -868,6 +868,9 @@ "invalidRPC": { "message": "Nederīgs RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Nederīgs Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Nederīga atkopšanas frāze" }, diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index fb447ab81..a7043261e 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -849,6 +849,9 @@ "invalidRPC": { "message": "URL RPC tidak sah" }, + "invalidBlockExplorerURL": { + "message": "URL Block Explorer tidak sah" + }, "invalidSeedPhrase": { "message": "Ungkapan benih tidak sah" }, diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index c9cc8a766..b37de58ae 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -403,6 +403,9 @@ "invalidRPC": { "message": "Ongeldige RPC-URI" }, + "invalidBlockExplorerURL": { + "message": "Ongeldige Block Explorer URI" + }, "jsonFail": { "message": "Er is iets fout gegaan. Zorg ervoor dat uw JSON-bestand correct is opgemaakt." }, diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index 36507e549..45f46ffbd 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -866,6 +866,9 @@ "invalidRPC": { "message": "Ugyldig RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Ugyldig Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Ugyldig mnemonisk gjenopprettingsfrase" }, diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index 7a2dc0132..e1b42cae1 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -870,6 +870,9 @@ "invalidRPC": { "message": "Nieprawidłowe RPC URI" }, + "invalidBlockExplorerURL": { + "message": "Nieprawidłowe Block Explorer URI" + }, "invalidSeedPhrase": { "message": "Nieprawidłowa fraza seed" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index f6dd551d1..c98a2b29a 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -412,6 +412,9 @@ "invalidRPC": { "message": "RPC URI Inválido" }, + "invalidBlockExplorerURL": { + "message": "Block Explorer URI Inválido" + }, "jsonFail": { "message": "Ocorreu um erro. Por favor confirme que o seu ficheiro JSON está devidamente formatado." }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index ffee0bc54..e5a65dd75 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -870,6 +870,9 @@ "invalidRPC": { "message": "URL de RPC inválida" }, + "invalidBlockExplorerURL": { + "message": "URL de Block Explorer inválida" + }, "invalidSeedPhrase": { "message": "Frase semente inválida" }, diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index e2c10cceb..f49d131a2 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -859,6 +859,9 @@ "invalidRPC": { "message": "URL RPC nevalid" }, + "invalidBlockExplorerURL": { + "message": "URL Block Explorer nevalid" + }, "invalidSeedPhrase": { "message": "Expresie sursă nevalidă" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index dd459712f..99646bc92 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -449,6 +449,9 @@ "invalidRPC": { "message": "Неверный RPC URI" }, + "invalidBlockExplorerURL": { + "message": "Неверный Block Explorer URI" + }, "jsonFail": { "message": "Что-то пошло не так. Убедитесь, что ваш JSON файл правильно отформатирован." }, diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index bb1263033..a04bc5ddd 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -860,6 +860,9 @@ "invalidRPC": { "message": "Neplatné RPC URI" }, + "invalidBlockExplorerURL": { + "message": "Neplatné Block Explorer URI" + }, "invalidSeedPhrase": { "message": "Neplatná seed fráza" }, diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index c89689a18..7caff0f26 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -854,6 +854,9 @@ "invalidRPC": { "message": "Neveljaven RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Neveljaven Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Neveljavna seed phrase" }, diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index 68d416633..0b79e3bd6 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -869,6 +869,9 @@ "invalidRPC": { "message": "Nevažeći RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Nevažeći Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Nevažeća seed fraza" }, diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index 504b78006..94a47daa5 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -863,6 +863,9 @@ "invalidRPC": { "message": "Ogiltig RPC-URL" }, + "invalidBlockExplorerURL": { + "message": "Ogiltig Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Ogiltig" }, diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index 75547c897..15de8bb49 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -863,6 +863,9 @@ "invalidRPC": { "message": "RPC URL batili" }, + "invalidBlockExplorerURL": { + "message": "Block Explorer URL batili" + }, "invalidSeedPhrase": { "message": "Kirai kianzio batili" }, diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json index d88405c43..aa51a8d8f 100644 --- a/app/_locales/ta/messages.json +++ b/app/_locales/ta/messages.json @@ -449,6 +449,9 @@ "invalidRPC": { "message": "தவறான RPC URI" }, + "invalidBlockExplorerURL": { + "message": "தவறான Block Explorer URI" + }, "jsonFail": { "message": "ஏதோ தவறு நடந்துவிட்டது. உங்கள் JSON கோப்பு ஒழுங்காக வடிவமைக்கப்பட்டுள்ளது என்பதை உறுதிப்படுத்தவும்" }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 827d7bde0..84cf6023f 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -518,6 +518,9 @@ "invalidRPC": { "message": "RPC URI ไม่ถูกต้อง" }, + "invalidBlockExplorerURL": { + "message": "Block Explorer URI ไม่ถูกต้อง" + }, "jsonFail": { "message": "เกิดบางอย่างผิดพลาด โปรดตรวจสอบว่าไฟล์ JSON ของคุณมีรูปแบบที่ถูกต้อง." }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 20c6b1c74..c20204a76 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -444,6 +444,9 @@ "invalidRPC": { "message": "Geçersiz RPC URI" }, + "invalidBlockExplorerURL": { + "message": "Geçersiz Block Explorer URI" + }, "jsonFail": { "message": "Birşeyler yanlış gitti. JSON dosyanızın düzgün derlendiğinden emin olun." }, diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 7aef59de2..07cf26ada 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -879,6 +879,9 @@ "invalidRPC": { "message": "Недійсний RPC URL" }, + "invalidBlockExplorerURL": { + "message": "Недійсний Block Explorer URL" + }, "invalidSeedPhrase": { "message": "Недійсна seed-фраза" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 226561188..d28801bdd 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -857,6 +857,9 @@ "invalidRPC": { "message": "无效 RPC URI" }, + "invalidBlockExplorerURL": { + "message": "无效 Block Explorer URI" + }, "invalidSeedPhrase": { "message": "无效种子密语" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 40283e158..e18cb3fb9 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -866,6 +866,9 @@ "invalidRPC": { "message": "無效的 RPC URI" }, + "invalidBlockExplorerURL": { + "message": "無效的 Block Explorer URI" + }, "invalidSeedPhrase": { "message": "無效的助憶詞" }, diff --git a/ui/app/pages/settings/networks-tab/network-form/network-form.component.js b/ui/app/pages/settings/networks-tab/network-form/network-form.component.js index ad199a701..07919f0fb 100644 --- a/ui/app/pages/settings/networks-tab/network-form/network-form.component.js +++ b/ui/app/pages/settings/networks-tab/network-form/network-form.component.js @@ -212,24 +212,15 @@ export default class NetworkForm extends PureComponent { } validateUrl = (url, stateKey) => { - if (validUrl.isWebUri(url)) { + const invalidUrlErrorMsg = stateKey === 'rpcUrl' ? 'invalidRPC' : 'invalidBlockExplorerURL' + + if (validUrl.isWebUri(url) || (stateKey === 'blockExplorerUrl' && url === '')) { this.setErrorTo(stateKey, '') } else { const appendedRpc = `http://${url}` const validWhenAppended = validUrl.isWebUri(appendedRpc) && !url.match(/^https?:\/\/$/) - this.setErrorTo(stateKey, this.context.t(validWhenAppended ? 'uriErrorMsg' : 'invalidRPC')) - } - } - - validateBlockExplorerUrl = (url, stateKey) => { - if (url === '' || validUrl.isWebUri(url)) { - this.setErrorTo(stateKey, '') - } else { - const appendedRpc = `http://${url}` - const validWhenAppended = validUrl.isWebUri(appendedRpc) && !url.match(/^https?:\/\/$/) - - this.setErrorTo(stateKey, this.context.t(validWhenAppended ? 'uriErrorMsg' : 'invalidRPC')) + this.setErrorTo(stateKey, this.context.t(validWhenAppended ? 'uriErrorMsg' : invalidUrlErrorMsg)) } } @@ -283,7 +274,7 @@ export default class NetworkForm extends PureComponent { {this.renderFormTextField( 'blockExplorerUrl', 'block-explorer-url', - this.setStateWithValue('blockExplorerUrl', this.validateBlockExplorerUrl), + this.setStateWithValue('blockExplorerUrl', this.validateUrl), blockExplorerUrl, 'optionalBlockExplorerUrl', )}