diff --git a/.nvmrc b/.nvmrc index 9a2a0e219c9b..94cb37d604f2 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20 +v20.14 diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index a4a0dc58e868..cb193bc11c36 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -69,9 +69,6 @@ "asset": { "message": "ሐብት" }, - "attemptingConnect": { - "message": "ከ blockchain ጋር ለመገናኘት መሞከር።" - }, "attributions": { "message": "አይነታ" }, diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index bc33690c7945..e262cebf3537 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -79,9 +79,6 @@ "asset": { "message": "الأصل" }, - "attemptingConnect": { - "message": "محاولة الاتصال بسلسلة الكتل." - }, "attributions": { "message": "الصفات" }, diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index cfe0f8de68a3..2169f13ecf9d 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Актив" }, - "attemptingConnect": { - "message": "Опит за свързване с blockchain." - }, "attributions": { "message": "Функции" }, diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index 592a9a593f28..29e06173be17 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "সম্পদ" }, - "attemptingConnect": { - "message": "ব্লকচেনে সংযোগ করার চেষ্টা করছে।" - }, "attributions": { "message": "গুণাবলী" }, diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index 93555423be6d..4393ea21f108 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Actius" }, - "attemptingConnect": { - "message": "Intentant conectar a blockchain." - }, "attributions": { "message": "Atribucions" }, diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index fc050b199d2d..f67d21b5cb52 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -39,9 +39,6 @@ "approved": { "message": "Schváleno" }, - "attemptingConnect": { - "message": "Pokouším se připojit k blockchainu." - }, "attributions": { "message": "Zásluhy" }, diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index 9d89b573a536..f5d7c9c89c3e 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Aktiv" }, - "attemptingConnect": { - "message": "Forsøger at oprette forbindelse til blokkæden." - }, "attributions": { "message": "Tilskrivninger" }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 731a805b1f2a..2500ff05f254 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Versuch, den Swap kostenlos zu stornieren" }, - "attemptingConnect": { - "message": "Versuch einer Verbindung zur Blockchain." - }, "attributions": { "message": "Zuschreibungen" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index cfbe0bd874dd..bff686407193 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Προσπάθεια ακύρωσης των ανταλλαγών δωρεάν" }, - "attemptingConnect": { - "message": "Προσπάθεια σύνδεσης στο blockchain." - }, "attributions": { "message": "Αποδόσεις" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index a7573e179ef3..8a5b75b3524f 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -614,9 +614,6 @@ "attemptToCancelSwapForFree": { "message": "Attempt to cancel swap for free" }, - "attemptingConnect": { - "message": "Attempting to connect to blockchain." - }, "attributions": { "message": "Attributions" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index f49efdbc7218..6a70bf40e68f 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Intente cancelar el intercambio de forma gratuita" }, - "attemptingConnect": { - "message": "Intentando una conexión a la cadena de bloques." - }, "attributions": { "message": "Atribuciones" }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index b2f763ced384..662a7f3ede27 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -214,9 +214,6 @@ "assetOptions": { "message": "Opciones de activos" }, - "attemptingConnect": { - "message": "Intentando una conexión a la cadena de bloques." - }, "attributions": { "message": "Atribuciones" }, diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index cba62eb1d7d9..dbfe1f88fb55 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Vara" }, - "attemptingConnect": { - "message": "Plokiahelaga ühenduse loomise katse." - }, "attributions": { "message": "Omistamised" }, diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index 3f2e3a703f01..9f1d89793c1b 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "سرمایه" }, - "attemptingConnect": { - "message": "در حال تلاش برای اتصال با زنجیره بلوکی" - }, "attributions": { "message": "مواصفات" }, diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index a907aeedbd9e..4f193797912c 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Omaisuuserä" }, - "attemptingConnect": { - "message": "Yritetään yhdistää lohkoketjuun." - }, "attributions": { "message": "Attribuutiot" }, diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index 040a687f7633..ab098442e52e 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -66,9 +66,6 @@ "approved": { "message": "Inaprubahan" }, - "attemptingConnect": { - "message": "Sinusubukang kumonekta sa blockchain." - }, "attributions": { "message": "Mga Attribution" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index c44d687aeaf6..0cd50d4788f8 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Tentative d’annuler gratuitement le swap" }, - "attemptingConnect": { - "message": "Tentative de connexion au réseau" - }, "attributions": { "message": "Attributions" }, diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 22f5ac53511e..e29f44c9f834 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "נכס" }, - "attemptingConnect": { - "message": "מנסה להתחבר לבלוקצ'יין." - }, "attributions": { "message": "תכונות" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 7ebd3e958736..5f83ad80bfdf 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "स्वैप को मुफ्त में कैंसिल करने की कोशिश करें" }, - "attemptingConnect": { - "message": "ब्लॉकचेन से कनेक्ट करने की कोशिश कर रहे हैं।" - }, "attributions": { "message": "एट्रीब्यूशन्स" }, diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index 8dc338db6dc1..03c87498c87f 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -33,9 +33,6 @@ "approve": { "message": "मंजूर" }, - "attemptingConnect": { - "message": "ब्लॉकचैन से कनेक्ट करने का प्रयास करना होगा।सब्र करे।" - }, "attributions": { "message": "एट्रिब्यूशन" }, diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index 3d259868534a..d7e62da80ba4 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Imovina" }, - "attemptingConnect": { - "message": "Pokušaj povezivanja na podatkovni blok." - }, "attributions": { "message": "Svojstva" }, diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index 94bad1913fe6..02f06746a58a 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -60,9 +60,6 @@ "approved": { "message": "Apwouve" }, - "attemptingConnect": { - "message": "Eseye konekte nan blockchain." - }, "attributions": { "message": "Atribisyon" }, diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index 21d413aa64a3..456b63710dd6 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Eszköz" }, - "attemptingConnect": { - "message": "Próbálunk csatlakozni a blokklánchoz." - }, "attributions": { "message": "Attribúciók" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 45bc8912c676..45073d2af42b 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Mencoba membatalkan pertukaran secara gratis" }, - "attemptingConnect": { - "message": "Mencoba terhubung ke blockchain." - }, "attributions": { "message": "Atribusi" }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 6a43d90d1624..2ca832f39006 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -297,9 +297,6 @@ "attemptSendingAssets": { "message": "Se si tenta di inviare risorse direttamente da una rete all'altra, ciò potrebbe comportare una perdita permanente della risorca coinvolta. Assicurati di usare un bridge." }, - "attemptingConnect": { - "message": "Tentativo di connessione alla blockchain." - }, "attributions": { "message": "Attribuzioni" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 4ca1b2faaf7f..ad69880ffd8e 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "無料でスワップのキャンセルを試行" }, - "attemptingConnect": { - "message": "ブロックチェーンへの接続を試みています。" - }, "attributions": { "message": "属性" }, diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index 0e44c06e69ce..0b0479e3dddf 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "ಆಸ್ತಿ" }, - "attemptingConnect": { - "message": "ಬ್ಲಾಕ್‌ಚೈನ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ." - }, "attributions": { "message": "ಗುಣಲಕ್ಷಣಗಳು" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index af94a9026392..9121a9b84281 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "무료 스왑 취소 시도" }, - "attemptingConnect": { - "message": "블록체인에 연결 중입니다." - }, "attributions": { "message": "속성" }, diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index 893d0a345fd5..0600ea96f32b 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Turtas" }, - "attemptingConnect": { - "message": "Mėginama prisijungti prie „blockchain“." - }, "attributions": { "message": "Požymiai" }, diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index bf058e6bb2fe..c0dfc6d573b8 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Aktīvs" }, - "attemptingConnect": { - "message": "Mēģina izveidot savienojumu ar bloku ķēdi." - }, "attributions": { "message": "Atribūti" }, diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index 61e4c37cae7a..b8a0cb2ac507 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Aset" }, - "attemptingConnect": { - "message": "Sedang cuba menyambungkan kepada rantaian blok." - }, "attributions": { "message": "Atribusi" }, diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index fc847537e00b..f3ae82f80616 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -33,9 +33,6 @@ "approve": { "message": "Goedkeuren" }, - "attemptingConnect": { - "message": "Poging om verbinding te maken met blockchain." - }, "attributions": { "message": "Bevoegdheden" }, diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index c2825ea5bfe7..56c05ffd958c 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Ressurs" }, - "attemptingConnect": { - "message": "Prøver å opprette forbindelse med blokkjede" - }, "attributions": { "message": "Henvisninger" }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index 3d3b2428bac3..fbace0f2117f 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -134,9 +134,6 @@ "assetOptions": { "message": "Mga opsyon sa asset" }, - "attemptingConnect": { - "message": "Sinusubukang kumonekta sa blockchain." - }, "attributions": { "message": "Mga Attribution" }, diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index a49b7bd23b16..dbc986a194e4 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Składnik aktywów" }, - "attemptingConnect": { - "message": "Próba połączenia z blockchainem." - }, "attributions": { "message": "Atrybuty" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index fe80de66b981..e83e1b6d4eea 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Tentar cancelar a troca sem custo" }, - "attemptingConnect": { - "message": "Tentando conexão com a blockchain." - }, "attributions": { "message": "Atribuições" }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index cc4c97e70ff6..688f5758ac26 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -214,9 +214,6 @@ "assetOptions": { "message": "Opções do ativo" }, - "attemptingConnect": { - "message": "Tentando conexão com o blockchain." - }, "attributions": { "message": "Atribuições" }, diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index fa02911ca8f3..a7f916825e57 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Activ" }, - "attemptingConnect": { - "message": "Se încearcă conectarea la blockchain." - }, "attributions": { "message": "Atribuții" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 3106cf4540f4..cb41df257fe1 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Бесплатная попытка отменить своп" }, - "attemptingConnect": { - "message": "Попытка подключения к блокчейну..." - }, "attributions": { "message": "Атрибуции" }, diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index a136cc940f79..79a185cf896c 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -72,9 +72,6 @@ "approved": { "message": "Schváleno" }, - "attemptingConnect": { - "message": "Pokouším se připojit k blockchainu." - }, "attributions": { "message": "Zásluhy" }, diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index bfc2a7d8b1d1..64e7c5662c3c 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Sredstva" }, - "attemptingConnect": { - "message": "Povezovanje z verigo blokov ..." - }, "attributions": { "message": "Dodelitve" }, diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index eaf957f685d7..1741b7567833 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Sredstva" }, - "attemptingConnect": { - "message": "Pokušava da se poveže na lanac blokova" - }, "attributions": { "message": "Atribucije" }, diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index 2f130ff20383..df3766108437 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Tillgång" }, - "attemptingConnect": { - "message": "Försöker ansluta till blockkedja." - }, "attributions": { "message": "Tillskrivningar" }, diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index 652a45bdcf27..7eb535bee573 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Rasilimali" }, - "attemptingConnect": { - "message": "Inajaribu kuunganisha kwenye blockchain." - }, "attributions": { "message": "Sifa" }, diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json index d1277cdb0e52..f9c7274ac55c 100644 --- a/app/_locales/ta/messages.json +++ b/app/_locales/ta/messages.json @@ -45,9 +45,6 @@ "approved": { "message": "அங்கீகரிக்கப்பட்ட" }, - "attemptingConnect": { - "message": "இணைக்க முயற்சி செய்க ப்ளாக்சைன்" - }, "attributions": { "message": "பண்புகளும்" }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 05f4970d383a..0b2dbb8664aa 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -39,9 +39,6 @@ "approve": { "message": "อนุมัติ" }, - "attemptingConnect": { - "message": "กำลังเชื่อมต่อกับบล็อกเชน" - }, "attributions": { "message": "อ้างถึง" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 4a570071faa5..cbd81acfcbc6 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Subukang kanselahin ang swap nang libre" }, - "attemptingConnect": { - "message": "Sinusubukang kumonekta sa blockchain." - }, "attributions": { "message": "Mga Attribution" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 51aafd650946..13887164bfd1 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Swap işlemini ücretsiz iptal etme girişimi" }, - "attemptingConnect": { - "message": "Blockzincirine bağlanmaya çalışılıyor." - }, "attributions": { "message": "Özellikler" }, diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index cadac70b7102..59bb0b477008 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -75,9 +75,6 @@ "asset": { "message": "Актив" }, - "attemptingConnect": { - "message": "Спроба підключення до розподіленої бази даних." - }, "attributions": { "message": "Авторство" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 6f2cba66d83b..3afd6bf2403e 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "Cố gắng hủy hoán đổi miễn phí" }, - "attemptingConnect": { - "message": "Đang cố gắng kết nối với chuỗi khối." - }, "attributions": { "message": "Ghi nhận đóng góp" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index ca5b01c48545..6cdb6aaf1e3f 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -524,9 +524,6 @@ "attemptToCancelSwapForFree": { "message": "尝试免费取消兑换" }, - "attemptingConnect": { - "message": "正在尝试连接到区块链。" - }, "attributions": { "message": "参与者" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 26f086433a96..d91d749ccffa 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -130,9 +130,6 @@ "assetOptions": { "message": "資產選項" }, - "attemptingConnect": { - "message": "正在嘗試連結區塊鏈。" - }, "attributions": { "message": "來源" }, diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js index dd7350281085..1a511523778f 100644 --- a/app/scripts/controllers/app-state.js +++ b/app/scripts/controllers/app-state.js @@ -43,7 +43,7 @@ export default class AppStateController extends EventEmitter { fullScreenGasPollTokens: [], recoveryPhraseReminderHasBeenShown: false, recoveryPhraseReminderLastShown: new Date().getTime(), - outdatedBrowserWarningLastShown: new Date().getTime(), + outdatedBrowserWarningLastShown: null, nftsDetectionNoticeDismissed: false, showTestnetMessageInDropdown: true, showBetaHeader: isBeta(), diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json index 534d5e4d606a..84fef8e26a90 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json @@ -30,7 +30,7 @@ "fullScreenGasPollTokens": "object", "recoveryPhraseReminderHasBeenShown": true, "recoveryPhraseReminderLastShown": "number", - "outdatedBrowserWarningLastShown": "number", + "outdatedBrowserWarningLastShown": "object", "nftsDetectionNoticeDismissed": false, "showTestnetMessageInDropdown": true, "showBetaHeader": false, diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json index 7bcbd81bf539..1dd7775ec70f 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json @@ -66,7 +66,7 @@ "fullScreenGasPollTokens": "object", "recoveryPhraseReminderHasBeenShown": true, "recoveryPhraseReminderLastShown": "number", - "outdatedBrowserWarningLastShown": "number", + "outdatedBrowserWarningLastShown": "object", "nftsDetectionNoticeDismissed": false, "showTestnetMessageInDropdown": true, "showBetaHeader": false, diff --git a/test/manual-scenarios/settings/advanced/show-test-networks.md b/test/manual-scenarios/settings/advanced/show-test-networks.md new file mode 100644 index 000000000000..bd505aae9b07 --- /dev/null +++ b/test/manual-scenarios/settings/advanced/show-test-networks.md @@ -0,0 +1,51 @@ + +# Manual test scenario for the 'Show test networks' toggle + +Below is a summary of the validations included:- + +* Validate that the 'Show test networks' toggle is present in the Advanced settings and is off by default. +* Validate that the toggle can be turned on and off. +* Validate that when the toggle is turned on, the Networks dropdown also shows the 'Show test networks' as on, and the test networks are visible. + + +```markdown + +# Advanced Settings: Verify "Show test networks" Toggle Functionality + +# Feature: Toggle "Show test networks" in Advanced Settings + +In order to enhance user experience +As a user of the wallet extension +I want to toggle the "Show test networks" option in the Advanced Settings + +# Scenario: Default state of "Show test networks" toggle is OFF + +Given I am in settings +When I click on the "Advanced" tab +Then the "Show test networks" toggle is set to off by default +And I click on the Network selection drop down on the left top +Then the "Select a network" dialog box appears +And the "Show test networks" toggle is selected OFF +And the test networks are not visible in the dropdown + +# Scenario: "Show test networks" toggle icon functionality + +Given I am on the Advanced settings page +And the "Show test networks" toggle is initially set to OFF +When I click on the "Show test networks" toggle icon +Then the toggle switch should visually indicate to ON +When I click on the "Show test networks" toggle icon again +Then the toggle switch should visually indicate to OFF + +# Scenario: Turning ON "Show test networks" and validate the 'Show test networks' in network selection dialog is turned ON and the test networks are visible + +Given I am on the Advanced settings page +When I toggle the "Show test networks" switch ON +Then the toggle switch should visually indicate to ON +When I click on the Network selection drop down on the left top +Then the "Select a network" dialog box appears +And the "Show test networks" toggle is selected ON automatically +And the test networks are shown as expected + + +``` diff --git a/ui/components/app/network-display/index.scss b/ui/components/app/network-display/index.scss index 9d6fa922819e..1c4e3dd568cb 100644 --- a/ui/components/app/network-display/index.scss +++ b/ui/components/app/network-display/index.scss @@ -1,37 +1,5 @@ .network-display { - display: flex; - align-items: center; - justify-content: flex-start; - padding: 0 10px; - border-radius: 4px; - min-height: 25px; - user-select: none; - - &--disabled { - cursor: not-allowed; - } - - &.chip { - margin: 0; - max-width: 100%; - } - - & .chip__label { - padding-left: 2px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - - & .chip__left-icon { - padding-left: 8px; - } - - & .chip__right-icon { - margin-right: 4px; - } - - &--clickable { - cursor: pointer; + &:not([disabled]):active { + background-color: transparent; } } diff --git a/ui/components/app/network-display/network-display.js b/ui/components/app/network-display/network-display.js index d4b81ec38d0a..11c56a60fcb7 100644 --- a/ui/components/app/network-display/network-display.js +++ b/ui/components/app/network-display/network-display.js @@ -1,129 +1,27 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import classnames from 'classnames'; import { useSelector } from 'react-redux'; -import { - NETWORK_TYPES, - BUILT_IN_NETWORKS, -} from '../../../../shared/constants/network'; -import LoadingIndicator from '../../ui/loading-indicator'; -import ColorIndicator from '../../ui/color-indicator'; import { BorderColor, - IconColor, - Size, - TypographyVariant, + BackgroundColor, } from '../../../helpers/constants/design-system'; -import Chip from '../../ui/chip/chip'; -import { useI18nContext } from '../../../hooks/useI18nContext'; -import { isNetworkLoading } from '../../../selectors'; -import { Icon, IconName, IconSize } from '../../component-library'; -import { getProviderConfig } from '../../../ducks/metamask/metamask'; -import { getNetworkLabelKey } from '../../../helpers/utils/i18n-helper'; - -/** - * @deprecated The `` component has been deprecated in favor of the new `` component from the component-library. - * Please update your code to use the new `` component instead, which can be found at ui/components/component-library/picker-network/picker-network.tsx. - * You can find documentation for the new `PickerNetwork` component in the MetaMask Storybook: - * {@link https://metamask.github.io/metamask-storybook/?path=/docs/components-componentlibrary-pickernetwork--docs} - * If you would like to help with the replacement of the old `NetworkDisplay` component, please submit a pull request against this GitHub issue: - * {@link https://github.com/MetaMask/metamask-extension/issues/20485} - */ - -export default function NetworkDisplay({ - indicatorSize, - disabled, - labelProps, - targetNetwork, - onClick, -}) { - const networkIsLoading = useSelector(isNetworkLoading); - const providerConfig = useSelector(getProviderConfig); - const t = useI18nContext(); - - const { nickname, type: networkType } = targetNetwork ?? providerConfig; +import { getCurrentNetwork } from '../../../selectors'; +import { PickerNetwork, AvatarNetworkSize } from '../../component-library'; +export default function NetworkDisplay() { + const currentNetwork = useSelector(getCurrentNetwork); return ( - - - - } - rightIcon={ - onClick ? : null - } - label={ - networkType === NETWORK_TYPES.RPC - ? nickname ?? t('privateNetwork') - : t(getNetworkLabelKey(networkType)) - } - className={classnames('network-display', { - 'network-display--disabled': disabled, - 'network-display--clickable': typeof onClick === 'function', - })} - labelProps={{ - variant: TypographyVariant.H7, - ...labelProps, - }} + ); } -NetworkDisplay.propTypes = { - /** - * The size of the indicator - */ - indicatorSize: PropTypes.oneOf(Object.values(Size)), - /** - * The label props of the label can use most of the Typography props - */ - labelProps: Chip.propTypes.labelProps, - /** - * The target network - */ - targetNetwork: PropTypes.shape({ - type: PropTypes.oneOf([ - ...Object.keys(BUILT_IN_NETWORKS), - NETWORK_TYPES.RPC, - ]), - nickname: PropTypes.string, - }), - /** - * Whether the NetworkDisplay is disabled - */ - disabled: PropTypes.bool, - /** - * The onClick event handler of the NetworkDisplay - * if it is not passed it is assumed that the NetworkDisplay - * should not be interactive and removes the caret and changes the border color - * of the NetworkDisplay - */ - onClick: PropTypes.func, -}; - -NetworkDisplay.defaultProps = { - indicatorSize: Size.LG, -}; diff --git a/ui/components/app/network-display/network-display.stories.js b/ui/components/app/network-display/network-display.stories.js index 5a67dc676ae4..2392a107b6e9 100644 --- a/ui/components/app/network-display/network-display.stories.js +++ b/ui/components/app/network-display/network-display.stories.js @@ -1,107 +1,10 @@ import React from 'react'; - -import { - BUILT_IN_NETWORKS, - NETWORK_TYPES, -} from '../../../../shared/constants/network'; -import { Severity, Size } from '../../../helpers/constants/design-system'; - -import { BannerAlert } from '../../component-library/banner-alert'; import NetworkDisplay from '.'; export default { title: 'Components/App/NetworkDisplay', - - argTypes: { - indicatorSize: { - control: 'select', - options: Object.values(Size), - }, - labelProps: { - control: 'object', - }, - targetNetwork: { - control: 'select', - options: [...Object.keys(BUILT_IN_NETWORKS), NETWORK_TYPES.RPC], - }, - disabled: { - control: 'boolean', - }, - onClick: { - action: 'onClick', - description: - 'The onClick event handler of the NetworkDisplay. If it is not passed it is assumed that the NetworkDisplay SHOULD NOT be interactive and removes the caret and changes the border color of the NetworkDisplay to border-muted', - }, - }, - args: { - targetNetwork: 'goerli', - }, }; -export const DefaultStory = (args) => ( - <> - - - -); +export const DefaultStory = () => ; DefaultStory.storyName = 'Default'; - -export const TargetNetwork = (args) => { - const targetNetworkArr = [ - ...Object.keys(BUILT_IN_NETWORKS), - NETWORK_TYPES.RPC, - ]; - return ( - <> - {Object.values(targetNetworkArr).map((variant) => ( - - ))} - - ); -}; - -export const DisplayOnly = (args) => { - const targetNetworkArr = [ - ...Object.keys(BUILT_IN_NETWORKS), - NETWORK_TYPES.RPC, - ]; - return ( - <> - {Object.values(targetNetworkArr).map((variant) => ( - - ))} - - ); -}; diff --git a/ui/components/ui/unit-input/unit-input.stories.tsx b/ui/components/ui/unit-input/unit-input.stories.tsx new file mode 100644 index 000000000000..15e627b73326 --- /dev/null +++ b/ui/components/ui/unit-input/unit-input.stories.tsx @@ -0,0 +1,43 @@ +import React from 'react'; +import type { Meta, StoryObj } from '@storybook/react'; +import UnitInput from './unit-input.component'; + +const meta: Meta = { + title: 'Components/UI/UnitInput', + component: UnitInput, + argTypes: { + className: { control: 'text' }, + dataTestId: { control: 'text' }, + children: { control: 'text' }, + actionComponent: { control: 'text' }, + error: { control: 'boolean' }, + onChange: { action: 'changed' }, + onBlur: { action: 'blurred' }, + placeholder: { control: 'text' }, + suffix: { control: 'text' }, + hideSuffix: { control: 'boolean' }, + value: { control: 'text' }, + keyPressRegex: { control: 'text' }, + isDisabled: { control: 'boolean' }, + isFocusOnInput: { control: 'boolean' }, + }, + args: { + className: '', + dataTestId: 'unit-input', + children: '', + actionComponent: '', + error: false, + placeholder: '0', + suffix: 'ETH', + hideSuffix: false, + value: '', + keyPressRegex: /^\d*(\.|,)?\d*$/u, + isDisabled: false, + isFocusOnInput: false, + }, +}; + +export default meta; +type Story = StoryObj; + +export const Default: Story = {}; diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap index e18103e853e5..ba0839bfd123 100644 --- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap +++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap @@ -25,26 +25,21 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = `
-
- -
+ ?
- Private network - + class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default" + data-testid="network-display" + /> +
diff --git a/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap b/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap index b188b22166c8..eb3f057a76a7 100644 --- a/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap +++ b/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap @@ -71,26 +71,23 @@ exports[`SignatureRequestHeader renders correctly with fromAccount 1`] = ` class="signature-request-header--network" >
-
- -
+ C
- goerli + Chain 5 +
@@ -109,26 +106,23 @@ exports[`SignatureRequestHeader renders correctly without fromAccount 1`] = ` class="signature-request-header--network" >
-
- -
+ C
- goerli + Chain 5 +
diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap index 7b2ea95038b8..0e472aad11db 100644 --- a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap +++ b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap @@ -80,26 +80,23 @@ exports[`ConfirmSendEther should render correct information for for confirm send class="confirm-page-container-header__row" >
-
- -
+ C
- goerli + Chain 5 +
{templatedValues.networkDisplay ? ( - + ) : null} {useSnapHeader && ( diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap index 4891743b24de..8fd320c388cc 100644 --- a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap +++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap @@ -12,26 +12,21 @@ exports[`add-ethereum-chain confirmation should match snapshot 1`] = ` class="box box--margin-top-2 box--flex-direction-row box--justify-content-center box--display-flex" >
-
- -
+ ?
- Test initial state - + class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default" + data-testid="network-display" + /> +

-
- -
+ ?
- Test initial state - + class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default" + data-testid="network-display" + /> +

-
- -
+ ?
- Test initial state - + class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default" + data-testid="network-display" + /> +