From 346c1f2622d03fad76d0b0f94a3ba5d4ad269c4c Mon Sep 17 00:00:00 2001 From: ricky Date: Tue, 19 Nov 2019 00:11:50 -0500 Subject: [PATCH] Add additional rpcUrl verification (#7436) * Add additional url verification * Add commas * Address PR feedback * Use URL over URI * Update key in other languages * Add stateKey check * Split validateUrl into two separate methods * Remove unused variable * Add isValidWhenAppended method --- app/_locales/am/messages.json | 2 +- app/_locales/ar/messages.json | 2 +- app/_locales/bg/messages.json | 2 +- app/_locales/bn/messages.json | 2 +- app/_locales/ca/messages.json | 2 +- app/_locales/cs/messages.json | 2 +- app/_locales/da/messages.json | 2 +- app/_locales/de/messages.json | 2 +- app/_locales/el/messages.json | 2 +- app/_locales/en/messages.json | 7 +++-- app/_locales/es/messages.json | 2 +- app/_locales/es_419/messages.json | 2 +- app/_locales/et/messages.json | 2 +- app/_locales/fa/messages.json | 2 +- app/_locales/fi/messages.json | 2 +- app/_locales/fil/messages.json | 2 +- app/_locales/fr/messages.json | 2 +- app/_locales/he/messages.json | 2 +- app/_locales/hi/messages.json | 2 +- app/_locales/hn/messages.json | 2 +- app/_locales/hr/messages.json | 2 +- app/_locales/ht/messages.json | 2 +- app/_locales/hu/messages.json | 2 +- app/_locales/id/messages.json | 2 +- app/_locales/it/messages.json | 2 +- app/_locales/kn/messages.json | 2 +- app/_locales/ko/messages.json | 2 +- app/_locales/lt/messages.json | 2 +- app/_locales/lv/messages.json | 2 +- app/_locales/ms/messages.json | 2 +- app/_locales/nl/messages.json | 2 +- app/_locales/no/messages.json | 2 +- app/_locales/pl/messages.json | 2 +- app/_locales/pt/messages.json | 2 +- app/_locales/pt_BR/messages.json | 2 +- app/_locales/ro/messages.json | 2 +- app/_locales/ru/messages.json | 2 +- app/_locales/sk/messages.json | 2 +- app/_locales/sl/messages.json | 2 +- app/_locales/sr/messages.json | 2 +- app/_locales/sv/messages.json | 2 +- app/_locales/sw/messages.json | 2 +- app/_locales/ta/messages.json | 2 +- app/_locales/th/messages.json | 2 +- app/_locales/tr/messages.json | 2 +- app/_locales/uk/messages.json | 2 +- app/_locales/zh_TW/messages.json | 2 +- .../network-form/network-form.component.js | 31 +++++++++++++------ .../networks-tab/networks-tab.component.js | 4 ++- 49 files changed, 76 insertions(+), 58 deletions(-) diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index b122b754c..08b237aa0 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -1344,7 +1344,7 @@ "updatedWithDate": { "message": "የዘመነ $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URIs አግባብነት ያለው የ HTTP/HTTPS ቅድመ ቅጥያ ይፈልጋል።" }, "usedByClients": { diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index 5d21df192..18b9eafa2 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -1340,7 +1340,7 @@ "updatedWithDate": { "message": "تم تحديث $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "تتطلب الروابط بادئة HTTP/HTTPS مناسبة." }, "usedByClients": { diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index d5ca6f5cb..799214110 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -1343,7 +1343,7 @@ "updatedWithDate": { "message": "Актуализирано $1 " }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI изискват съответния HTTP / HTTPS префикс." }, "usedByClients": { diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index 3e7e44e2f..de1c0b6da 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -1347,7 +1347,7 @@ "updatedWithDate": { "message": "আপডেট করা $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI গুলির যথাযথ HTTP/HTTPS প্রেফিক্সের প্রয়োজন।" }, "usedByClients": { diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index a31e42357..599cb84ad 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -1316,7 +1316,7 @@ "updatedWithDate": { "message": "Actualitzat $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Els URIs requereixen el prefix HTTP/HTTPS apropiat." }, "usedByClients": { diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index e3c67c300..cd768d4d8 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -529,7 +529,7 @@ "unknownNetwork": { "message": "Neznámá soukromá síť" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI vyžadují korektní HTTP/HTTPS prefix." }, "usedByClients": { diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index 1c05509c8..5a2c3c100 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -1313,7 +1313,7 @@ "updatedWithDate": { "message": "Opdaterede $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Links kræver det rette HTTP/HTTPS-præfix." }, "usedByClients": { diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 79683988b..5f241ab05 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -1304,7 +1304,7 @@ "updatedWithDate": { "message": "$1 aktualisiert" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URIs benötigen die korrekten HTTP/HTTPS Präfixe." }, "usedByClients": { diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 860c5a563..126b9133f 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -1341,7 +1341,7 @@ "updatedWithDate": { "message": "Ενημερώθηκε το $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Τα URI απαιτούν το κατάλληλο πρόθεμα HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 470652fc8..18821dfe1 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1474,8 +1474,11 @@ "updatedWithDate": { "message": "Updated $1" }, - "uriErrorMsg": { - "message": "URIs require the appropriate HTTP/HTTPS prefix." + "urlErrorMsg": { + "message": "URLs require the appropriate HTTP/HTTPS prefix." + }, + "urlExistsErrorMsg": { + "message": "URL is already present in existing list of networks" }, "usedByClients": { "message": "Used by a variety of different clients" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 1462909d3..e503cd977 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -1091,7 +1091,7 @@ "updatedWithDate": { "message": "Actualizado $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI necesita el prefijo HTTP/HTTPS apropiado" }, "usedByClients": { diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 244eff885..c861be81b 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -1326,7 +1326,7 @@ "updatedWithDate": { "message": "Actualización: $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Los URI deben tener el prefijo HTTP/HTTPS apropiado." }, "usedByClients": { diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index 79bc3ebd4..c779dff85 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -1337,7 +1337,7 @@ "updatedWithDate": { "message": "Värskendatud $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI-d nõuavad sobivat HTTP/HTTPS-i prefiksit." }, "usedByClients": { diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index 848341941..5e00dde11 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -1347,7 +1347,7 @@ "updatedWithDate": { "message": "بروزرسانی شد 1$1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URl ها نیازمند پیشوند مناسب HTTP/HTTPS اند." }, "usedByClients": { diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index a0a0ebfe2..df4f62a19 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -1344,7 +1344,7 @@ "updatedWithDate": { "message": "$1 päivitetty" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI:t vaativat asianmukaisen HTTP/HTTPS-etuliitteen." }, "usedByClients": { diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index b62df2909..d00726811 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -1235,7 +1235,7 @@ "updatedWithDate": { "message": "Na-update ang $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Kinakailangan ng mga URI ang naaangkop na HTTP/HTTPS prefix." }, "usedByClients": { diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index b39e6b361..98ae1576b 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -1308,7 +1308,7 @@ "updatedWithDate": { "message": "Mis à jour $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Les URLs requièrent un préfixe HTTP/HTTPS approprié." }, "usedByClients": { diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 64bf6a0a5..41813baf2 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -1341,7 +1341,7 @@ "updatedWithDate": { "message": "עודכן $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "כתובות URI דורשות את קידומת HTTP/HTTPS המתאימה." }, "usedByClients": { diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index f434c93b1..19834411e 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -1341,7 +1341,7 @@ "updatedWithDate": { "message": "$1 अपडेट किया गया" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI को उपयुक्त HTTP/HTTPS प्रीफ़िक्स की आवश्यकता होती है।" }, "usedByClients": { diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index 471776b02..91d9bde7e 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -491,7 +491,7 @@ "unknownNetwork": { "message": "अज्ञात निजी नेटवर्क" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI-यूआरआई को उपयुक्त HTTP / HTTPS उपसर्ग की आवश्यकता होती है।" }, "usedByClients": { diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index f022f2f80..ba64748c2 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -1337,7 +1337,7 @@ "updatedWithDate": { "message": "Ažurirano $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI-jevima se zahtijeva prikladan prefiks HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index 3150cb14c..d973aeef5 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -851,7 +851,7 @@ "updatedWithDate": { "message": "Mete ajou $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URIs mande pou apwopriye prefiks HTTP / HTTPS a." }, "usedByClients": { diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index 15a03716a..542534f32 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -1337,7 +1337,7 @@ "updatedWithDate": { "message": "$1 frissítve" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Az URI-hez szükség van a megfelelő HTTP/HTTPS előtagra." }, "usedByClients": { diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index f0d55ea8a..252b7ec9f 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -1316,7 +1316,7 @@ "updatedWithDate": { "message": "Diperbarui $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI memerlukan awalan HTTP/HTTPS yang sesuai." }, "usedByClients": { diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 57d0c6958..1d0725183 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -1307,7 +1307,7 @@ "updatedWithDate": { "message": "Aggiornata $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Gli URI richiedono un prefisso HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index b99bf69d7..7fc114988 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -1347,7 +1347,7 @@ "updatedWithDate": { "message": "$1 ನವೀಕರಿಸಲಾಗಿದೆ" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI ಗಳಿಗೆ ಸೂಕ್ತವಾದ HTTP/HTTPS ಪೂರ್ವಪ್ರತ್ಯಯದ ಅಗತ್ಯವಿದೆ." }, "usedByClients": { diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 17b327bab..c71e3c267 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -1338,7 +1338,7 @@ "updatedWithDate": { "message": "$1에 업데이트 됨" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI는 HTTP/HTTPS로 시작해야 합니다." }, "usedByClients": { diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index 36e8f52dd..7e029494f 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -1347,7 +1347,7 @@ "updatedWithDate": { "message": "Atnaujinta $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI reikia atitinkamo HTTP/HTTPS priešdėlio." }, "usedByClients": { diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index 6261816be..ace47600f 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -1343,7 +1343,7 @@ "updatedWithDate": { "message": "Atjaunināts $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI jāsākas ar atbilstošo HTTP/HTTPS priedēkli." }, "usedByClients": { diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index e6227f619..03f9ac0b2 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -1315,7 +1315,7 @@ "updatedWithDate": { "message": "Dikemaskini $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI memerlukan awalan HTTP/HTTPS yang sesuai." }, "usedByClients": { diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index 9e5aed56a..ba83e37a1 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -478,7 +478,7 @@ "unknownNetwork": { "message": "Onbekend privénetwerk" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Voor URI's is het juiste HTTP / HTTPS-voorvoegsel vereist." }, "usedByClients": { diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index 51f21abee..83a6f09d3 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -1319,7 +1319,7 @@ "updatedWithDate": { "message": "Oppdatert $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI-er krever det aktuelle HTTP/HTTPS-prefikset." }, "usedByClients": { diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index 47923983d..5ffd5585a 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -1332,7 +1332,7 @@ "updatedWithDate": { "message": "Zaktualizowano $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI wymaga prawidłowego prefiksu HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 5f1d914d5..70c2e52ae 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -488,7 +488,7 @@ "unknownNetwork": { "message": "Rede Privada Desconhecida" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Links requerem o prefixo HTTP/HTTPS apropriado." }, "usedByClients": { diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 0b6963d02..ecb223dcb 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -1326,7 +1326,7 @@ "updatedWithDate": { "message": "$1 atualizado" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URIs exigem o devido prefixo HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index 5d81811e9..5fed700da 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -1328,7 +1328,7 @@ "updatedWithDate": { "message": "Actualizat $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URL necesită prefixul potrivit HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 328127903..082e450da 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -542,7 +542,7 @@ "unknownNetwork": { "message": "Неизвестная частная сеть" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "Для URI требуется соответствующий префикс HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index a525b522e..697c58936 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -1301,7 +1301,7 @@ "updatedWithDate": { "message": "Aktualizované $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI vyžadují korektní HTTP/HTTPS prefix." }, "usedByClients": { diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index e617d7997..643e62c23 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -1329,7 +1329,7 @@ "updatedWithDate": { "message": "Posodobljeno $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI zahtevajo ustrezno HTTP/HTTPS predpono." }, "usedByClients": { diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index 01056d9e3..1cd653ed7 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -1332,7 +1332,7 @@ "updatedWithDate": { "message": "Ažuriran $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI-ovi zahtevaju odgovarajući prefiks HTTP / HTTPS." }, "usedByClients": { diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index 67a9fb94b..6d89b6e5c 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -1322,7 +1322,7 @@ "updatedWithDate": { "message": "Uppdaterat $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI:er kräver lämpligt HTTP/HTTPS-prefix." }, "usedByClients": { diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index 40aec5547..76d1897ac 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -1325,7 +1325,7 @@ "updatedWithDate": { "message": "Imesasishwa $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI huhitaji kiambishi sahihi cha HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json index b577fe695..b5be67520 100644 --- a/app/_locales/ta/messages.json +++ b/app/_locales/ta/messages.json @@ -554,7 +554,7 @@ "unknownNetwork": { "message": "அறியப்படாத தனியார் நெட்வொர்க்" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI கள் சரியான HTTP / HTTPS முன்னொட்டு தேவை." }, "usedByClients": { diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 5f852a932..f5fcf3edf 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -656,7 +656,7 @@ "updatedWithDate": { "message": "อัปเดต $1 แล้ว" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URI ต้องมีคำนำหน้าเป็น HTTP หรือ HTTPS" }, "usedByClients": { diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index dc7ca718f..fe2332f2f 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -547,7 +547,7 @@ "unknownNetwork": { "message": "Bilinmeyen özel ağ" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URIler için HTTP/HTTPS öneki gerekmektedir." }, "usedByClients": { diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 61be52fbe..d269044b3 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -1347,7 +1347,7 @@ "updatedWithDate": { "message": "Оновлено $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URIs вимагають відповідного префікса HTTP/HTTPS." }, "usedByClients": { diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index c606396a1..501272799 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -1320,7 +1320,7 @@ "updatedWithDate": { "message": "更新時間 $1" }, - "uriErrorMsg": { + "urlErrorMsg": { "message": "URIs 需要加入適當的 HTTP/HTTPS 前綴字" }, "usedByClients": { 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 07919f0fb..dcdd00a90 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 @@ -24,6 +24,7 @@ export default class NetworkForm extends PureComponent { isCurrentRpcTarget: PropTypes.bool, blockExplorerUrl: PropTypes.string, rpcPrefs: PropTypes.object, + rpcUrls: PropTypes.array, } state = { @@ -211,16 +212,28 @@ export default class NetworkForm extends PureComponent { ) } - validateUrl = (url, stateKey) => { - const invalidUrlErrorMsg = stateKey === 'rpcUrl' ? 'invalidRPC' : 'invalidBlockExplorerURL' + isValidWhenAppended = url => { + const appendedRpc = `http://${url}` + return validUrl.isWebUri(appendedRpc) && !url.match(/^https?:\/\/$/) + } - if (validUrl.isWebUri(url) || (stateKey === 'blockExplorerUrl' && url === '')) { - this.setErrorTo(stateKey, '') + validateBlockExplorerURL = (url, stateKey) => { + if (!validUrl.isWebUri(url) && url !== '') { + this.setErrorTo(stateKey, this.context.t(this.isValidWhenAppended(url) ? 'urlErrorMsg' : 'invalidBlockExplorerURL')) } else { - const appendedRpc = `http://${url}` - const validWhenAppended = validUrl.isWebUri(appendedRpc) && !url.match(/^https?:\/\/$/) + this.setErrorTo(stateKey, '') + } + } - this.setErrorTo(stateKey, this.context.t(validWhenAppended ? 'uriErrorMsg' : invalidUrlErrorMsg)) + validateUrlRpcUrl = (url, stateKey) => { + const { rpcUrls } = this.props + + if (!validUrl.isWebUri(url) && url !== '') { + this.setErrorTo(stateKey, this.context.t(this.isValidWhenAppended(url) ? 'urlErrorMsg' : 'invalidRPC')) + } else if (rpcUrls.includes(url)) { + this.setErrorTo(stateKey, this.context.t('urlExistsErrorMsg')) + } else { + this.setErrorTo(stateKey, '') } } @@ -254,7 +267,7 @@ export default class NetworkForm extends PureComponent { {this.renderFormTextField( 'rpcUrl', 'rpc-url', - this.setStateWithValue('rpcUrl', this.validateUrl), + this.setStateWithValue('rpcUrl', this.validateUrlRpcUrl), rpcUrl, )} {this.renderFormTextField( @@ -274,7 +287,7 @@ export default class NetworkForm extends PureComponent { {this.renderFormTextField( 'blockExplorerUrl', 'block-explorer-url', - this.setStateWithValue('blockExplorerUrl', this.validateUrl), + this.setStateWithValue('blockExplorerUrl', this.validateBlockExplorerURL), blockExplorerUrl, 'optionalBlockExplorerUrl', )} diff --git a/ui/app/pages/settings/networks-tab/networks-tab.component.js b/ui/app/pages/settings/networks-tab/networks-tab.component.js index 40e1a902f..4ee871a58 100644 --- a/ui/app/pages/settings/networks-tab/networks-tab.component.js +++ b/ui/app/pages/settings/networks-tab/networks-tab.component.js @@ -20,7 +20,7 @@ export default class NetworksTab extends PureComponent { location: PropTypes.object.isRequired, networkIsSelected: PropTypes.bool, networksTabIsInAddMode: PropTypes.bool, - networksToRender: PropTypes.array.isRequired, + networksToRender: PropTypes.arrayOf(PropTypes.object).isRequired, selectedNetwork: PropTypes.object, setNetworksTabAddMode: PropTypes.func.isRequired, setRpcTarget: PropTypes.func.isRequired, @@ -177,6 +177,7 @@ export default class NetworksTab extends PureComponent { editRpc, networkDefaultedToProvider, providerUrl, + networksToRender, } = this.props const envIsPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP @@ -189,6 +190,7 @@ export default class NetworksTab extends PureComponent { shouldRenderNetworkForm ? ( network.rpcUrl)} setRpcTarget={setRpcTarget} editRpc={editRpc} networkName={label || labelKey && t(labelKey) || ''}