m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Refactor validation function (#7187)

Browse Source 
* Update invalidBlockExplorerURL message

* Refactor validation function
This commit is contained in:
Sunghee Lee 2019-09-18 22:57:18 +09:00 committed by Mark Stacey
parent 638149d861
commit 87ac07bb35
49 changed files with 149 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/_locales/am/messages.json
View File

@ -876,6 +876,9 @@
"invalidRPC": {
"message": "ልክ ያልሆነ RPC ዩአርኤል"
},
"invalidBlockExplorerURL": {
"message": "ልክ ያልሆነ Block Explorer ዩአርኤል"
},
"invalidSeedPhrase": {
"message": "የተሳሳተ የዘር ሐረግ"
},

3
app/_locales/ar/messages.json
View File

@ -878,6 +878,9 @@
"invalidRPC": {
"message": "رابط آر بي سي غير صحيح"
},
"invalidBlockExplorerURL": {
"message": "غير صحيح Block Explorer رابط"
},
"invalidSeedPhrase": {
"message": "عبارة أمان غير صحيحة"
},

3
app/_locales/bg/messages.json
View File

@ -875,6 +875,9 @@
"invalidRPC": {
"message": "Невалиден RPC URL адрес"
},
"invalidBlockExplorerURL": {
"message": "Невалиден Block Explorer URL адрес"
},
"invalidSeedPhrase": {
"message": "Невалидна фраза зародиш"
},

3
app/_locales/bn/messages.json
View File

@ -879,6 +879,9 @@
"invalidRPC": {
"message": "অবৈধ RPC URL"
},
"invalidBlockExplorerURL": {
"message": "অবৈধ Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "অবৈধ সীড ফ্রেজ"
},

3
app/_locales/ca/messages.json
View File

@ -855,6 +855,9 @@
"invalidRPC": {
"message": "URL de RPC"
},
"invalidBlockExplorerURL": {
"message": "URL de Block Explorer"
},
"invalidSeedPhrase": {
"message": "Frase de recuperació no vàlida"
},

3
app/_locales/cs/messages.json
View File

@ -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."
},

3
app/_locales/da/messages.json
View File

@ -866,6 +866,9 @@
"invalidRPC": {
"message": "Ugyldig RPC-webadresse"
},
"invalidBlockExplorerURL": {
"message": "Ugyldig Block Explorer-webadresse"
},
"invalidSeedPhrase": {
"message": "Ugyldig backupsætning"
},

3
app/_locales/de/messages.json
View File

@ -854,6 +854,9 @@
"invalidRPC": {
"message": "Ungültige RPC URI"
},
"invalidBlockExplorerURL": {
"message": "Ungültige Block Explorer URI"
},
"invalidSeedPhrase": {
"message": "Ungültiger Seedschlüssel"
},

3
app/_locales/el/messages.json
View File

@ -873,6 +873,9 @@
"invalidRPC": {
"message": "Μη έγκυρο RPC URL"
},
"invalidBlockExplorerURL": {
"message": "Μη έγκυρο Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Μη έγκυρη φράση φύτρου"
},

3
app/_locales/en/messages.json
View File

@ -915,6 +915,9 @@
"invalidRPC": {
"message": "Invalid RPC URL"
},
"invalidBlockExplorerURL": {
"message": "Invalid Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Invalid seed phrase"
},

3
app/_locales/es/messages.json
View File

@ -756,6 +756,9 @@
"invalidRPC": {
"message": "Invalida URL del RPC"
},
"invalidBlockExplorerURL": {
"message": "Invalida URL del Block Explorer"
},
"invalidSeedPhrase": {
"message": "Frase semilla no válida."
},

3
app/_locales/es_419/messages.json
View File

@ -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"
},

3
app/_locales/et/messages.json
View File

@ -875,6 +875,9 @@
"invalidRPC": {
"message": "Vale RPC URL"
},
"invalidBlockExplorerURL": {
"message": "Vale Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Vigane seemnefraas"
},

3
app/_locales/fa/messages.json
View File

@ -876,6 +876,9 @@
"invalidRPC": {
"message": "RPC URL نا معتبر"
},
"invalidBlockExplorerURL": {
"message": "Block Explorer URL نا معتبر"
},
"invalidSeedPhrase": {
"message": "عبارت بازیابی نا معتبر"
},

3
app/_locales/fi/messages.json
View File

@ -873,6 +873,9 @@
"invalidRPC": {
"message": "Virheellinen RPC:n URL-osoite"
},
"invalidBlockExplorerURL": {
"message": "Virheellinen Block Explorer URL-osoite"
},
"invalidSeedPhrase": {
"message": "Virheellinen salausteksti"
},

3
app/_locales/fil/messages.json
View File

@ -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"
},

3
app/_locales/fr/messages.json
View File

@ -844,6 +844,9 @@
"invalidRPC": {
"message": "URL RPC invalide"
},
"invalidBlockExplorerURL": {
"message": "URL Block Explorer invalide"
},
"invalidSeedPhrase": {
"message": "Phrase Seed invalide"
},

3
app/_locales/he/messages.json
View File

@ -879,6 +879,9 @@
"invalidRPC": {
"message": "כתובת URL לא חוקית של RPC"
},
"invalidBlockExplorerURL": {
"message": "כתובת URL לא חוקית של Block Explorer"
},
"invalidSeedPhrase": {
"message": "seed phrase לא חוקי"
},

3
app/_locales/hi/messages.json
View File

@ -882,6 +882,9 @@
"invalidRPC": {
"message": "अमान्य RPC URL"
},
"invalidBlockExplorerURL": {
"message": "अमान्य Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "अमान्य बीज वाक्यांश"
},

3
app/_locales/hn/messages.json
View File

@ -419,6 +419,9 @@
"invalidRPC": {
"message": "अमान्य RPC कै URI"
},
"invalidBlockExplorerURL": {
"message": "अमान्य Block Explorer कै URI"
},
"jsonFail": {
"message": "कुछ गलत हो गया। कृपया सुनिश्चित करें कि आपकी JSON फ़ाइल ठीक से फ़ॉर्मेट की गई है।"
},

3
app/_locales/hr/messages.json
View File

@ -872,6 +872,9 @@
"invalidRPC": {
"message": "Nevaljani URL RPC-a"
},
"invalidBlockExplorerURL": {
"message": "Nevaljani URL Block Explorer-a"
},
"invalidSeedPhrase": {
"message": "Nevaljana početna rečenica"
},

3
app/_locales/ht/messages.json
View File

@ -568,6 +568,9 @@
"invalidRPC": {
"message": "RPC URI pa valab"
},
"invalidBlockExplorerURL": {
"message": "Block Explorer URI pa valab"
},
"invalidSeedPhrase": {
"message": "Seed fraz pa valab"
},

3
app/_locales/hu/messages.json
View File

@ -872,6 +872,9 @@
"invalidRPC": {
"message": "Helytelen RPC URL"
},
"invalidBlockExplorerURL": {
"message": "Helytelen Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Érvénytelen seed mondat"
},

3
app/_locales/id/messages.json
View File

@ -853,6 +853,9 @@
"invalidRPC": {
"message": "URL RPC Tidak Sah"
},
"invalidBlockExplorerURL": {
"message": "URL Block Explorer Tidak Sah"
},
"invalidSeedPhrase": {
"message": "Frasa benih tidak valid"
},

3
app/_locales/it/messages.json
View File

@ -844,6 +844,9 @@
"invalidRPC": {
"message": "URI RPC invalido"
},
"invalidBlockExplorerURL": {
"message": "URI Block Explorer invalido"
},
"invalidSeedPhrase": {
"message": "Frase seed non valida"
},

3
app/_locales/kn/messages.json
View File

@ -879,6 +879,9 @@
"invalidRPC": {
"message": "ಅಮಾನ್ಯವಾದ RPC URL"
},
"invalidBlockExplorerURL": {
"message": "ಅಮಾನ್ಯವಾದ Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "ಅಮಾನ್ಯವಾದ ಸೀಡ್ ಫ್ರೇಸ್"
},

3
app/_locales/ko/messages.json
View File

@ -864,6 +864,9 @@
"invalidRPC": {
"message": "올바르지 않은 RPC URI"
},
"invalidBlockExplorerURL": {
"message": "올바르지 않은 Block Explorer URI"
},
"invalidSeedPhrase": {
"message": "잘못된 시드 구문"
},

3
app/_locales/lt/messages.json
View File

@ -879,6 +879,9 @@
"invalidRPC": {
"message": "Netinkamas RPC URL"
},
"invalidBlockExplorerURL": {
"message": "Netinkamas Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Netinkama atkūrimo frazė"
},

3
app/_locales/lv/messages.json
View File

@ -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"
},

3
app/_locales/ms/messages.json
View File

@ -849,6 +849,9 @@
"invalidRPC": {
"message": "URL RPC tidak sah"
},
"invalidBlockExplorerURL": {
"message": "URL Block Explorer tidak sah"
},
"invalidSeedPhrase": {
"message": "Ungkapan benih tidak sah"
},

3
app/_locales/nl/messages.json
View File

@ -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."
},

3
app/_locales/no/messages.json
View File

@ -866,6 +866,9 @@
"invalidRPC": {
"message": "Ugyldig RPC URL"
},
"invalidBlockExplorerURL": {
"message": "Ugyldig Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Ugyldig mnemonisk gjenopprettingsfrase"
},

3
app/_locales/pl/messages.json
View File

@ -870,6 +870,9 @@
"invalidRPC": {
"message": "Nieprawidłowe RPC URI"
},
"invalidBlockExplorerURL": {
"message": "Nieprawidłowe Block Explorer URI"
},
"invalidSeedPhrase": {
"message": "Nieprawidłowa fraza seed"
},

3
app/_locales/pt/messages.json
View File

@ -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."
},

3
app/_locales/pt_BR/messages.json
View File

@ -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"
},

3
app/_locales/ro/messages.json
View File

@ -859,6 +859,9 @@
"invalidRPC": {
"message": "URL RPC nevalid"
},
"invalidBlockExplorerURL": {
"message": "URL Block Explorer nevalid"
},
"invalidSeedPhrase": {
"message": "Expresie sursă nevalidă"
},

3
app/_locales/ru/messages.json
View File

@ -449,6 +449,9 @@
"invalidRPC": {
"message": "Неверный RPC URI"
},
"invalidBlockExplorerURL": {
"message": "Неверный Block Explorer URI"
},
"jsonFail": {
"message": "Что-то пошло не так. Убедитесь, что ваш JSON файл правильно отформатирован."
},

3
app/_locales/sk/messages.json
View File

@ -860,6 +860,9 @@
"invalidRPC": {
"message": "Neplatné RPC URI"
},
"invalidBlockExplorerURL": {
"message": "Neplatné Block Explorer URI"
},
"invalidSeedPhrase": {
"message": "Neplatná seed fráza"
},

3
app/_locales/sl/messages.json
View File

@ -854,6 +854,9 @@
"invalidRPC": {
"message": "Neveljaven RPC URL"
},
"invalidBlockExplorerURL": {
"message": "Neveljaven Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Neveljavna seed phrase"
},

3
app/_locales/sr/messages.json
View File

@ -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"
},

3
app/_locales/sv/messages.json
View File

@ -863,6 +863,9 @@
"invalidRPC": {
"message": "Ogiltig RPC-URL"
},
"invalidBlockExplorerURL": {
"message": "Ogiltig Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Ogiltig"
},

3
app/_locales/sw/messages.json
View File

@ -863,6 +863,9 @@
"invalidRPC": {
"message": "RPC URL batili"
},
"invalidBlockExplorerURL": {
"message": "Block Explorer URL batili"
},
"invalidSeedPhrase": {
"message": "Kirai kianzio batili"
},

3
app/_locales/ta/messages.json
View File

@ -449,6 +449,9 @@
"invalidRPC": {
"message": "தவறான RPC URI"
},
"invalidBlockExplorerURL": {
"message": "தவறான Block Explorer URI"
},
"jsonFail": {
"message": "ஏதோ தவறு நடந்துவிட்டது. உங்கள் JSON கோப்பு ஒழுங்காக வடிவமைக்கப்பட்டுள்ளது என்பதை உறுதிப்படுத்தவும்"
},

3
app/_locales/th/messages.json
View File

@ -518,6 +518,9 @@
"invalidRPC": {
"message": "RPC URI ไม่ถูกต้อง"
},
"invalidBlockExplorerURL": {
"message": "Block Explorer URI ไม่ถูกต้อง"
},
"jsonFail": {
"message": "เกิดบางอย่างผิดพลาด โปรดตรวจสอบว่าไฟล์ JSON ของคุณมีรูปแบบที่ถูกต้อง."
},

3
app/_locales/tr/messages.json
View File

@ -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."
},

3
app/_locales/uk/messages.json
View File

@ -879,6 +879,9 @@
"invalidRPC": {
"message": "Недійсний RPC URL"
},
"invalidBlockExplorerURL": {
"message": "Недійсний Block Explorer URL"
},
"invalidSeedPhrase": {
"message": "Недійсна seed-фраза"
},

3
app/_locales/zh_CN/messages.json
View File

@ -857,6 +857,9 @@
"invalidRPC": {
"message": "无效 RPC URI"
},
"invalidBlockExplorerURL": {
"message": "无效 Block Explorer URI"
},
"invalidSeedPhrase": {
"message": "无效种子密语"
},

3
app/_locales/zh_TW/messages.json
View File

@ -866,6 +866,9 @@
"invalidRPC": {
"message": "無效的 RPC URI"
},
"invalidBlockExplorerURL": {
"message": "無效的 Block Explorer URI"
},
"invalidSeedPhrase": {
"message": "無效的助憶詞"
},

19
ui/app/pages/settings/networks-tab/network-form/network-form.component.js
View File

@ -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',
)}