diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index 4c4b6732c..aa341612d 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "አስርዮሽ ቢያንስ 0 ቢበዛ ደግሞ 36 መሆን አለባቸው።" }, - "defaultNetwork": { - "message": "የ Ether ግብይቶች ንቡር አውታረ መረብ Mainnet ነው።" - }, "delete": { "message": "ሰርዝ" }, diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index 4dbec586e..aa6a76276 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "يجب أن تكون الكسور العشرية صفراً على الأقل، وألا تزيد عن 36 كسراً." }, - "defaultNetwork": { - "message": "الشبكة الافتراضية لمعاملات الأثير هي الشبكة الرئيسية." - }, "delete": { "message": "حذف" }, diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index 4105c3729..f9cabde5d 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Десетичните знаци трябва да бъдат най-малко 0 и не повече от 36." }, - "defaultNetwork": { - "message": "Мрежата по подразбиране за Ether транзакции е Mainnet." - }, "delete": { "message": "Изтриване" }, diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index 1e3996595..5d36aabe9 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "দশমিকগুলি অবশ্যই অন্তত 0 হতে হবে, এবং 36 এর উপর হবে না।" }, - "defaultNetwork": { - "message": "ইথার লেনদেনগুলির জন্য ডিফল্ট নেটওয়ার্কটি হল মেন নেট।" - }, "delete": { "message": "মুছুন" }, diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index 0d910f560..b29188344 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -263,9 +263,6 @@ "decimalsMustZerotoTen": { "message": "Els decimals han de ser al menys 0, i no més de 36." }, - "defaultNetwork": { - "message": "La xarxa per defecte per a les transaccions Ether és Mainnet." - }, "delete": { "message": "Suprimeix" }, diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index 910a151e6..da4fba371 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -97,9 +97,6 @@ "decimalsMustZerotoTen": { "message": "Desetinných míst musí být od 0 do 36." }, - "defaultNetwork": { - "message": "Výchozí síť pro Etherové transakce je Mainnet." - }, "depositEther": { "message": "Vložit Ether" }, diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index c333d6692..8d288c33f 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Decimaler skal være mindst 0 og højst 36." }, - "defaultNetwork": { - "message": "Standardnetværket for Ether-transaktioner er Mainnet." - }, "delete": { "message": "Slet" }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index fdd26afb6..bca6b887a 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -257,9 +257,6 @@ "decimalsMustZerotoTen": { "message": "Die Dezimalangabe muss mindestens 0 und nicht höher als 36 sein." }, - "defaultNetwork": { - "message": "Das Standardnetzwerk für Ether Transaktionen ist das Mainnet." - }, "delete": { "message": "Löschen" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 02871aad7..1b880074b 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -263,9 +263,6 @@ "decimalsMustZerotoTen": { "message": "Τα δεκαδικά πρέπει να είναι τουλάχιστον 0 και όχι πάνω από 36." }, - "defaultNetwork": { - "message": "Το προεπιλεγμένο δίκτυο για συναλλαγές Ether είναι το Mainnet." - }, "delete": { "message": "Διαγραφή" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 144ddd140..542c0135a 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -594,7 +594,8 @@ "message": "Decrypt request" }, "defaultNetwork": { - "message": "The default network for Ether transactions is Mainnet." + "message": "The default network for Ether transactions is Mainnet. You can also $1 testnets $2.", + "description": "$1 is the 'enable' or 'disable' key, depending on whether the display of test networks is enabled or not. $2 is a clickable link with text defined by the 'here' key. The link will open to the advanced settings where users can enable the display of test networks in the network dropdown." }, "delete": { "message": "Delete" @@ -620,6 +621,9 @@ "directDepositEtherExplainer": { "message": "If you already have some Ether, the quickest way to get Ether in your new wallet by direct deposit." }, + "disable": { + "message": "disable" + }, "disconnect": { "message": "Disconnect" }, @@ -771,6 +775,9 @@ "editPermission": { "message": "Edit Permission" }, + "enable": { + "message": "enable" + }, "enableFromSettings": { "message": " Enable it from Settings." }, @@ -2210,7 +2217,7 @@ "message": "Show Secret Recovery Phrase" }, "showTestnetNetworks": { - "message": "Test networks" + "message": "Show test networks" }, "showTestnetNetworksDescription": { "message": "Select this to show test networks in network list" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 1b86785f9..8418ba8e6 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "Descifrar solicitud" }, - "defaultNetwork": { - "message": "La red predeterminada para las transacciones de ether es la red principal." - }, "delete": { "message": "Eliminar" }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 1b86785f9..8418ba8e6 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "Descifrar solicitud" }, - "defaultNetwork": { - "message": "La red predeterminada para las transacciones de ether es la red principal." - }, "delete": { "message": "Eliminar" }, diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index 9201b35d8..66ce15ec5 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Kümnendkohad peavad olema vähemalt 0 ja mitte üle 36." }, - "defaultNetwork": { - "message": "Etheri tehingute vaikevõrk on peavõrk." - }, "delete": { "message": "Kustuta" }, diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index 28563b100..f6fd7e476 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "اعشاریه ها باید حد اقل 0، و بیشتر از 36 نباشند." }, - "defaultNetwork": { - "message": "شبکه خودکار برای معاملات Ether عبارت است از Mainnet." - }, "delete": { "message": "حذف" }, diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index a702aa641..8260f9ad4 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Desimaalien on oltava vähintään 0 ja korkeintaan 36." }, - "defaultNetwork": { - "message": "Oletusverkko Ether-tapahtumille on Mainnet." - }, "delete": { "message": "Poista" }, diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index ed799f2c9..23001c136 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -245,9 +245,6 @@ "decimalsMustZerotoTen": { "message": "Ang mga decimal ay hindi dapat bumaba sa 0, at hindi lumampas sa 36." }, - "defaultNetwork": { - "message": "Ang default na network para sa mga transaksyon ng Ether ay Mainnet." - }, "delete": { "message": "I-delete" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 3e8cf75db..7ed3dbcdd 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -257,9 +257,6 @@ "decimalsMustZerotoTen": { "message": "Les décimales doivent être plus grandes que 0 et inférieures à 36." }, - "defaultNetwork": { - "message": "Le réseau par défaut pour les transactions Ether est le \"Réseau principal Ethereum\"." - }, "delete": { "message": "Supprimer" }, diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 97db0dcbc..905020755 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "מספרים עשרוניים חייבים להיות לפחות 0 ולא מעל 36." }, - "defaultNetwork": { - "message": "רשת ברירת המחדל לעסקאות Ether היא Mainnet." - }, "delete": { "message": "מחיקה" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index c6d1f5883..65f6640c1 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "अनुरोध डिक्रिप्ट करें" }, - "defaultNetwork": { - "message": "Ether के लेनदेन के लिए डिफ़ॉल्ट नेटवर्क Mainnet है।" - }, "delete": { "message": "हटाएँ" }, diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index 3a8f7c19b..e42222336 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -76,9 +76,6 @@ "decimalsMustZerotoTen": { "message": "दशमलव कम से कम 0 होनी चाहिए, और 36 से अधिक नहीं होनी चाहिए।" }, - "defaultNetwork": { - "message": "ईथर लेनदेन के लिए डिफ़ॉल्ट नेटवर्क मुख्य नेट है।" - }, "depositEther": { "message": "जमा - Ether" }, diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index ea8631342..7a3a94c8f 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Decimalni brojevni ne smiju biti 0 i ne smiju prekoračivati 36." }, - "defaultNetwork": { - "message": "Zadana je mreža za transakcije Ether glavna mreža." - }, "delete": { "message": "Izbriši" }, diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index db29eb579..8013372c1 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -145,9 +145,6 @@ "decimalsMustZerotoTen": { "message": "Desimal yo dwe omwen 0, epi pa dwe plis pase 36." }, - "defaultNetwork": { - "message": "Dfo rezo a pou tranzaksyon Ether se Mainnet." - }, "depositEther": { "message": "Depo Ether" }, diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index 9de326c18..18f2cf317 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "A tizedesjegyek száma 0 és 36 között legyen . " }, - "defaultNetwork": { - "message": "Az Ether tranzakciók alapértelmezett hálózata a Mainnet." - }, "delete": { "message": "Törlés" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index c5ab406b9..9f0744379 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "Dekrip permintaan" }, - "defaultNetwork": { - "message": "Jaringan default untuk transaksi Ether adalah Jaringan Utama." - }, "delete": { "message": "Hapus" }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 5e5015007..1e8c000de 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -436,9 +436,6 @@ "decryptRequest": { "message": "Decifra richiesta" }, - "defaultNetwork": { - "message": "La rete predefinita per transazioni in Ether è la Rete Ethereum Principale." - }, "delete": { "message": "Elimina" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 2135f0dc0..cea2eda8c 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "リクエストの復号" }, - "defaultNetwork": { - "message": "Ether 取引のためのデフォルトのネットワークはメインネットです。" - }, "delete": { "message": "削除" }, diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index 80c171ece..bf17d9ce0 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "ದಶಮಾಂಶಗಳು ಕನಿಷ್ಟ 0 ಆಗಿರಬೇಕು ಮತ್ತು 36 ಕ್ಕಿಂತ ಹೆಚ್ಚಿರಬಾರದು" }, - "defaultNetwork": { - "message": "ಎಥರ್ ವಹಿವಾಟುಗಳಿಗಾಗಿ ಡೀಫಾಲ್ಟ್ ನೆಟ್‌ವರ್ಕ್ ಪ್ರಮುಖವಾಗಿರುವ ನೆಟ್ ಆಗಿದೆ." - }, "delete": { "message": "ಅಳಿಸಿ" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 6228d5088..f4c30767d 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "요청 암호 해독" }, - "defaultNetwork": { - "message": "Ether 거래의 기본 네트워크는 메인 넷입니다." - }, "delete": { "message": "삭제" }, diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index 2e35d171a..80536f454 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Turi būti bent 0 skaitmenų po kablelio, bet ne daugiau kaip 36." }, - "defaultNetwork": { - "message": "Numatytasis „Ether“ operacijų tinklas yra pagrindinis tinklas." - }, "delete": { "message": "Ištrinti" }, diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index bbee7c62a..4531820a4 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Daļskaitļiem jābūt diapazonā no 0 līdz 36." }, - "defaultNetwork": { - "message": "Galvenais Ether darījumu tīkls ir Mainnet." - }, "delete": { "message": "Dzēst" }, diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index 196f3a16f..85d021235 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Perpuluhan mestilah sekurang-kurangnya 0, dan tidak melebihi 36." }, - "defaultNetwork": { - "message": "Rangkaian lalai untuk transaksi Ether ialah Net Utama." - }, "delete": { "message": "Padam" }, diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index c48b9c041..448eef171 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -73,9 +73,6 @@ "decimalsMustZerotoTen": { "message": "Decimalen moeten minimaal 0 en niet meer dan 36 zijn." }, - "defaultNetwork": { - "message": "Het standaardnetwerk voor Ether-transacties is Mainnet." - }, "depositEther": { "message": "Stort Ether" }, diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index 3c00c6fb3..249ea5d10 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -263,9 +263,6 @@ "decimalsMustZerotoTen": { "message": "Desimaler må være minst 0, og ikke flere enn 36." }, - "defaultNetwork": { - "message": "Standardnettverket for Ether-transaksjoner er Mainnet." - }, "delete": { "message": "Slett" }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index 767b6815c..571178bc1 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "I-decrypt ang request" }, - "defaultNetwork": { - "message": "Ang default na network para sa mga transaksyon ng Ether ay ang Mainnet." - }, "delete": { "message": "I-delete" }, diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index cd955c838..0d0f59571 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Liczb po przecinku musi być co najmniej 0 i nie więcej niż 36." }, - "defaultNetwork": { - "message": "Domyślna sieć dla Eteru to Mainnet." - }, "delete": { "message": "Usuń" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 5e52a844a..c04767a2d 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -76,9 +76,6 @@ "decimalsMustZerotoTen": { "message": "Decimais devem ser no mínimo 0 e não passar de 36." }, - "defaultNetwork": { - "message": "A rede pré definida para transações em Ether é a Mainnet." - }, "depositEther": { "message": "Depositar Ether" }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index be2683be2..bd2e54f12 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "Descriptografar solicitação" }, - "defaultNetwork": { - "message": "A rede padrão das transações em ether é a Mainnet." - }, "delete": { "message": "Excluir" }, diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index 06cafb9b3..167fb1c26 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Zecimalele trebuie să fie cel puțin 0, dar nu peste 36." }, - "defaultNetwork": { - "message": "Rețeaua implicită pentru tranzacțiile cu Ether este Mainnet." - }, "delete": { "message": "Șterge" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 4246ecf35..40ccc7d45 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "Расшифровать запрос" }, - "defaultNetwork": { - "message": "Сетью по умолчанию для транзакций Ether является Mainnet." - }, "delete": { "message": "Удалить" }, diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index 65026b424..47097b3d1 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -260,9 +260,6 @@ "decimalsMustZerotoTen": { "message": "Desetinných míst musí být od 0 do 36." }, - "defaultNetwork": { - "message": "Výchozí síť pro Etherové transakce je Mainnet." - }, "delete": { "message": "Odstrániť" }, diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index 7b0363c17..e5b7b9e44 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Decimalk mora biti med 0 in 36." }, - "defaultNetwork": { - "message": "Privzeto omrežje za transkacije je glavno omrežje." - }, "delete": { "message": "Izbriši" }, diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index f991c8580..08eed9bf0 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -263,9 +263,6 @@ "decimalsMustZerotoTen": { "message": "Decimalni broj mora biti najmanje 0, a ne veći od 36." }, - "defaultNetwork": { - "message": "Podrazumevana mreža za Ether transakcije je Mainnet." - }, "delete": { "message": "Избриши" }, diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index 5e7e0fe5c..1c07f7dfc 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -260,9 +260,6 @@ "decimalsMustZerotoTen": { "message": "Decimalerna måste vara minst 0 och inte över 36." }, - "defaultNetwork": { - "message": "Standardnätverket för Ether-transaktioner är Mainnet." - }, "delete": { "message": "Radera" }, diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index 84db61de5..05436654c 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -260,9 +260,6 @@ "decimalsMustZerotoTen": { "message": "Desimali zinapaswa kuwa angalau 0, na si zaidi ya 36." }, - "defaultNetwork": { - "message": "Mtandao chaguomsingi wa miamala ya Ether ni Mainnet." - }, "delete": { "message": "Futa" }, diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json index 6b94d6bd5..d39aa6d05 100644 --- a/app/_locales/ta/messages.json +++ b/app/_locales/ta/messages.json @@ -112,9 +112,6 @@ "decimalsMustZerotoTen": { "message": "தசமங்கள் குறைந்தபட்சம் 0, மற்றும் 36 க்கு மேல் இருக்க வேண்டும்." }, - "defaultNetwork": { - "message": "எதிர் பரிவர்த்தனைகளுக்கான முன்னிருப்பு வலையமைப்பு முதன்மை நிகரமாகும்." - }, "delete": { "message": "நீக்கு" }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 166b36fed..7f3e453c6 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -115,9 +115,6 @@ "decimalsMustZerotoTen": { "message": "จำนวนต้องมากกว่า 0 และไม่เกิน 36" }, - "defaultNetwork": { - "message": "ค่าเริ่มต้นของเครือข่ายสำหรับทำรายการธุรกรรมอีเธอร์คือ Mainnet" - }, "delete": { "message": "ลบ" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index ae5632d42..cbd9275ce 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -424,9 +424,6 @@ "decryptRequest": { "message": "I-decrypt ang request" }, - "defaultNetwork": { - "message": "Ang default na network para sa mga transaksyon ng Ether ay ang Mainnet." - }, "delete": { "message": "I-delete" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 5a4bb29be..85714e974 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -97,9 +97,6 @@ "decimalsMustZerotoTen": { "message": "Ondalıklar en azından 0 olmalı ve 36'dan büyük olmamalı." }, - "defaultNetwork": { - "message": "Ether işlemleri için varsayılan ağ Mainnet." - }, "depositEther": { "message": "Ether yatır" }, diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 3aaa3b09b..8968e2f2e 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -266,9 +266,6 @@ "decimalsMustZerotoTen": { "message": "Кількість розрядів після коми: від 0 до 36." }, - "defaultNetwork": { - "message": "Мережа для транзакцій з Ether за замовчуванням - Mainnet." - }, "delete": { "message": "Видалити" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 9eac3134e..584c892c3 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -502,9 +502,6 @@ "decryptRequest": { "message": "Yêu cầu của Decrypt" }, - "defaultNetwork": { - "message": "Mạng mặc định cho các giao dịch Ether là Mạng chính thức." - }, "delete": { "message": "Xóa" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 22b102426..3f054b244 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -433,9 +433,6 @@ "decryptRequest": { "message": "解密请求" }, - "defaultNetwork": { - "message": "默认以太坊（Ether）交易网络为主网。" - }, "delete": { "message": "删除" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index ef0f842b0..91a527f48 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -275,9 +275,6 @@ "decimalsMustZerotoTen": { "message": "小數點後位數至少為0, 最多為36." }, - "defaultNetwork": { - "message": "預設以太幣交易網路為主網路" - }, "delete": { "message": "刪除" }, diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js index 00c7869e6..4dd785874 100644 --- a/ui/components/app/dropdowns/network-dropdown.js +++ b/ui/components/app/dropdowns/network-dropdown.js @@ -3,6 +3,7 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; import { compose } from 'redux'; +import classnames from 'classnames'; import Button from '../../ui/button'; import * as actions from '../../../store/actions'; import { openAlert as displayInvalidCustomNetworkAlert } from '../../../ducks/alerts/invalid-custom-network'; @@ -14,7 +15,10 @@ import { COLORS, SIZES } from '../../../helpers/constants/design-system'; import { getShowTestNetworks } from '../../../selectors'; import { getEnvironmentType } from '../../../../app/scripts/lib/util'; import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app'; -import { ADD_NETWORK_ROUTE } from '../../../helpers/constants/routes'; +import { + ADD_NETWORK_ROUTE, + ADVANCED_ROUTE, +} from '../../../helpers/constants/routes'; import { Dropdown, DropdownMenuItem } from './dropdown'; // classes from nodes of the toggle element. @@ -39,6 +43,7 @@ function mapStateToProps(state) { shouldShowTestNetworks: getShowTestNetworks(state), frequentRpcListDetail: state.metamask.frequentRpcListDetail || [], networkDropdownOpen: state.appState.networkDropdownOpen, + showTestnetMessageInDropdown: state.appState.showTestnetMessageInDropdown, }; } @@ -63,6 +68,7 @@ function mapDispatchToProps(dispatch) { }), ); }, + hideTestNetMessage: () => dispatch(actions.hideTestNetMessage()), }; } @@ -87,6 +93,8 @@ class NetworkDropdown extends Component { networkDropdownOpen: PropTypes.bool.isRequired, displayInvalidCustomNetworkAlert: PropTypes.func.isRequired, showConfirmDeleteNetworkModal: PropTypes.func.isRequired, + showTestnetMessageInDropdown: PropTypes.bool.isRequired, + hideTestNetMessage: PropTypes.func.isRequired, history: PropTypes.object, }; @@ -262,9 +270,16 @@ class NetworkDropdown extends Component { } render() { - const { shouldShowTestNetworks } = this.props; + const { + history, + hideNetworkDropdown, + shouldShowTestNetworks, + showTestnetMessageInDropdown, + hideTestNetMessage, + } = this.props; const rpcListDetail = this.props.frequentRpcListDetail; const isOpen = this.props.networkDropdownOpen; + const { t } = this.context; return (
-
- {this.context.t('networks')} -
+
{t('networks')}
-
- {this.context.t('defaultNetwork')} -
+ {showTestnetMessageInDropdown ? ( +
+ {t('defaultNetwork', [ + + {shouldShowTestNetworks ? t('disable') : t('enable')} + , + { + e.preventDefault(); + hideNetworkDropdown(); + history.push(ADVANCED_ROUTE); + }} + > + {t('here')} + , + ])} +
+ ) : null}
{this.renderNetworkEntry('mainnet')} {this.renderCustomRpcList(rpcListDetail, this.props.provider)} - {shouldShowTestNetworks && ( - <> - {this.renderNetworkEntry('ropsten')} - {this.renderNetworkEntry('kovan')} - {this.renderNetworkEntry('rinkeby')} - {this.renderNetworkEntry('goerli')} - {this.renderNetworkEntry('localhost')} - - )} +
+ {this.renderNetworkEntry('ropsten')} + {this.renderNetworkEntry('kovan')} + {this.renderNetworkEntry('rinkeby')} + {this.renderNetworkEntry('goerli')} + {this.renderNetworkEntry('localhost')} +
{this.renderAddCustomButton()} diff --git a/ui/css/itcss/components/network.scss b/ui/css/itcss/components/network.scss index 8f0130956..f7355fc1b 100644 --- a/ui/css/itcss/components/network.scss +++ b/ui/css/itcss/components/network.scss @@ -135,6 +135,12 @@ background-color: $scorpion; } +.network-dropdown-testnets { + &--no-visibility { + visibility: hidden; + } +} + .network-dropdown-title { @include H4; @@ -150,6 +156,25 @@ min-height: 36px; width: 265px; color: $dusty-gray; + + &--link { + color: $white; + cursor: pointer; + font-weight: bold; + text-decoration: underline; + + &:hover { + color: $white; + } + } + + &--close { + color: $white; + background: inherit; + position: absolute; + top: 64px; + right: 10px; + } } .network-caret { diff --git a/ui/ducks/app/app.js b/ui/ducks/app/app.js index 2baa2f53d..e7b4c2c9f 100644 --- a/ui/ducks/app/app.js +++ b/ui/ducks/app/app.js @@ -55,6 +55,7 @@ export default function reduceApp(state = {}, action) { ledgerWebHidConnectedStatus: WEBHID_CONNECTED_STATUSES.UNKNOWN, ledgerTransportStatus: TRANSPORT_STATES.NONE, newNetworkAdded: '', + showTestnetMessageInDropdown: true, ...state, }; @@ -72,6 +73,12 @@ export default function reduceApp(state = {}, action) { networkDropdownOpen: false, }; + case actionConstants.HIDE_TESTNET_MESSAGE: + return { + ...appState, + showTestnetMessageInDropdown: false, + }; + // alert methods case actionConstants.ALERT_OPEN: return { diff --git a/ui/ducks/app/app.test.js b/ui/ducks/app/app.test.js index c71a539e0..2ad0222d5 100644 --- a/ui/ducks/app/app.test.js +++ b/ui/ducks/app/app.test.js @@ -38,6 +38,16 @@ describe('App State', () => { expect(newState.networkDropdownOpen).toStrictEqual(false); }); + it('sets showTestnetMessageInDropdown dropdown to false', () => { + const testnetMessage = { showTestnetMessageInDropdown: true }; + const state = { ...metamaskState, ...testnetMessage }; + const newState = reduceApp(state, { + type: actions.HIDE_TESTNET_MESSAGE, + }); + + expect(newState.showTestnetMessageInDropdown).toStrictEqual(false); + }); + it('opens alert', () => { const state = reduceApp(metamaskState, { type: actions.ALERT_OPEN, diff --git a/ui/store/actionConstants.js b/ui/store/actionConstants.js index 81683dcb4..57e40f4bd 100644 --- a/ui/store/actionConstants.js +++ b/ui/store/actionConstants.js @@ -9,6 +9,8 @@ export const QR_CODE_DETECTED = 'UI_QR_CODE_DETECTED'; // network dropdown open export const NETWORK_DROPDOWN_OPEN = 'UI_NETWORK_DROPDOWN_OPEN'; export const NETWORK_DROPDOWN_CLOSE = 'UI_NETWORK_DROPDOWN_CLOSE'; +// network dropdown +export const HIDE_TESTNET_MESSAGE = 'HIDE_TESTNET_MESSAGE'; // remote state export const UPDATE_METAMASK_STATE = 'UPDATE_METAMASK_STATE'; export const SELECTED_ADDRESS_CHANGED = 'SELECTED_ADDRESS_CHANGED'; diff --git a/ui/store/actions.js b/ui/store/actions.js index 7a1a06ed7..c12b0072f 100644 --- a/ui/store/actions.js +++ b/ui/store/actions.js @@ -1658,6 +1658,12 @@ export function hideNetworkDropdown() { }; } +export function hideTestNetMessage() { + return { + type: actionConstants.HIDE_TESTNET_MESSAGE, + }; +} + export function showModal(payload) { return { type: actionConstants.MODAL_OPEN,