From 1ecf241a9fff8ee7170e2a79d3bc2956bd5556cf Mon Sep 17 00:00:00 2001 From: amerkadicE <97883527+amerkadicE@users.noreply.github.com> Date: Fri, 10 Feb 2023 22:50:12 +0100 Subject: [PATCH] Rename reset account settings (#17457) * Rename reset account settings Fix snapshot Update snapshots Fix e2e tests Fix e2e tests * Rename reset-account e2e test to clear-activity e2e test --- app/_locales/am/messages.json | 6 ----- app/_locales/ar/messages.json | 6 ----- app/_locales/bg/messages.json | 6 ----- app/_locales/bn/messages.json | 6 ----- app/_locales/ca/messages.json | 6 ----- app/_locales/cs/messages.json | 3 --- app/_locales/da/messages.json | 6 ----- app/_locales/de/messages.json | 6 ----- app/_locales/el/messages.json | 6 ----- app/_locales/en/messages.json | 18 ++++++++++----- app/_locales/es/messages.json | 6 ----- app/_locales/es_419/messages.json | 6 ----- app/_locales/et/messages.json | 6 ----- app/_locales/fa/messages.json | 6 ----- app/_locales/fi/messages.json | 6 ----- app/_locales/fil/messages.json | 6 ----- app/_locales/fr/messages.json | 6 ----- app/_locales/he/messages.json | 6 ----- app/_locales/hi/messages.json | 6 ----- app/_locales/hn/messages.json | 3 --- app/_locales/hr/messages.json | 6 ----- app/_locales/ht/messages.json | 6 ----- app/_locales/hu/messages.json | 6 ----- app/_locales/id/messages.json | 6 ----- app/_locales/it/messages.json | 6 ----- app/_locales/ja/messages.json | 6 ----- app/_locales/kn/messages.json | 6 ----- app/_locales/ko/messages.json | 6 ----- app/_locales/lt/messages.json | 6 ----- app/_locales/lv/messages.json | 6 ----- app/_locales/ms/messages.json | 6 ----- app/_locales/nl/messages.json | 3 --- app/_locales/no/messages.json | 6 ----- app/_locales/ph/messages.json | 6 ----- app/_locales/pl/messages.json | 6 ----- app/_locales/pt/messages.json | 6 ----- app/_locales/pt_BR/messages.json | 6 ----- app/_locales/ro/messages.json | 6 ----- app/_locales/ru/messages.json | 6 ----- app/_locales/sk/messages.json | 6 ----- app/_locales/sl/messages.json | 6 ----- app/_locales/sr/messages.json | 6 ----- app/_locales/sv/messages.json | 6 ----- app/_locales/sw/messages.json | 6 ----- app/_locales/ta/messages.json | 3 --- app/_locales/th/messages.json | 3 --- app/_locales/tl/messages.json | 6 ----- app/_locales/tr/messages.json | 6 ----- app/_locales/uk/messages.json | 6 ----- app/_locales/vi/messages.json | 6 ----- app/_locales/zh_CN/messages.json | 6 ----- app/_locales/zh_TW/messages.json | 6 ----- ...account.spec.js => clear-activity.spec.js} | 23 +++++++++++-------- .../confirm-reset-account.test.js.snap | 6 ++--- .../confirm-reset-account.component.js | 6 ++--- .../confirm-reset-account.test.js | 2 +- ui/helpers/constants/settings.js | 6 ++--- ui/helpers/utils/settings-search.test.js | 8 +++---- .../advanced-tab/advanced-tab.component.js | 6 ++--- 59 files changed, 42 insertions(+), 324 deletions(-) rename test/e2e/tests/{reset-account.spec.js => clear-activity.spec.js} (78%) diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index 8d86237b5..c56e8399f 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -624,12 +624,6 @@ "reset": { "message": "ዳግም አስጀምር" }, - "resetAccount": { - "message": "መለያን እንደገና ይሙሉ" - }, - "resetAccountDescription": { - "message": "መለያዎን እንደገና መሙላት የግብይት ታሪዎን ያጠራል።" - }, "restore": { "message": "እነበረበት መልስ" }, diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index b1462ad75..3d5a8863e 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -636,12 +636,6 @@ "reset": { "message": "إعادة" }, - "resetAccount": { - "message": "إعادة تعيين الحساب" - }, - "resetAccountDescription": { - "message": "ستؤدي إعادة تعيين حسابك إلى مسح سجل معاملتك." - }, "restore": { "message": "استعادة" }, diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index 5eb731605..65c702d8a 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -635,12 +635,6 @@ "reset": { "message": "Нулиране" }, - "resetAccount": { - "message": "Нулиране на акаунта" - }, - "resetAccountDescription": { - "message": "Нулирането на вашия акаунт ще изчисти историята на транзакциите ви." - }, "restore": { "message": "Възстановяване" }, diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index 832609aee..2e6fc183e 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -639,12 +639,6 @@ "reset": { "message": "রিসেট করুন" }, - "resetAccount": { - "message": "অ্যাকাউন্ট রিসেট করুন" - }, - "resetAccountDescription": { - "message": "আপনার অ্যাকাউন্ট রিসেট করা আপনার লেনদেনের ইতিহাসকে মুছে পরিস্কার করবে।" - }, "restore": { "message": "পুনরুদ্ধার করুন" }, diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index bae263733..3679a1caa 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -617,12 +617,6 @@ "reset": { "message": "Restableix" }, - "resetAccount": { - "message": "Reiniciar Compte" - }, - "resetAccountDescription": { - "message": "Reiniciar el teu compte esborrarà el teu historial de transaccions." - }, "restore": { "message": "Restaura" }, diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index 131e3e3d8..febaeaa31 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -289,9 +289,6 @@ "required": { "message": "Povinné" }, - "resetAccount": { - "message": "Resetovat účet" - }, "revealSeedWords": { "message": "Zobrazit slova klíčové fráze" }, diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index f0d400c0e..53e697c61 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -620,12 +620,6 @@ "reset": { "message": "Nulstil" }, - "resetAccount": { - "message": "Nulstil Konto" - }, - "resetAccountDescription": { - "message": "Nulstilling af din konto vil rydde din transaktionshistorik." - }, "restore": { "message": "Gendan" }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index c94068b24..d8d27051b 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Zurücksetzen" }, - "resetAccount": { - "message": "Konto zurücksetzen" - }, - "resetAccountDescription": { - "message": "Durch das Zurücksetzen Ihres Kontos wird Ihr Transaktionsverlauf gelöscht." - }, "resetWallet": { "message": "Wallet zurücksetzen" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 0aeeb1793..ba0b251b5 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Επαναφορά" }, - "resetAccount": { - "message": "Επαναφορά Λογαριασμού" - }, - "resetAccountDescription": { - "message": "Με την επαναφορά του λογαριασμού σας εκκαθαρίζεται το ιστορικό των συναλλαγών σας." - }, "resetWallet": { "message": "Επαναφορά Πορτοφολιού" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 7aa41fcd7..f619a25ec 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -636,6 +636,18 @@ "chromeRequiredForHardwareWallets": { "message": "You need to use MetaMask on Google Chrome in order to connect to your Hardware Wallet." }, + "clear": { + "message": "Clear" + }, + "clearActivity": { + "message": "Clear activity and nonce data" + }, + "clearActivityButton": { + "message": "Clear activity tab data" + }, + "clearActivityDescription": { + "message": "This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change." + }, "clickToConnectLedgerViaWebHID": { "message": "Click here to connect your Ledger via WebHID", "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid" @@ -2936,12 +2948,6 @@ "reset": { "message": "Reset" }, - "resetAccount": { - "message": "Reset account" - }, - "resetAccountDescription": { - "message": "Resetting your account will clear your transaction history. This will not change the balances in your accounts or require you to re-enter your Secret Recovery Phrase." - }, "resetWallet": { "message": "Reset wallet" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 230e339a8..9ec27033e 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Restablecer" }, - "resetAccount": { - "message": "Restablecer cuenta" - }, - "resetAccountDescription": { - "message": "Restablecer la cuenta borrará el historial de transacciones. Esto no cambiará los saldos de las cuentas ni se le pedirá que vuelva a escribir la frase secreta de recuperación." - }, "resetWallet": { "message": "Restablecer cartera" }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index ea936a978..ea9e19571 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -1978,12 +1978,6 @@ "reset": { "message": "Restablecer" }, - "resetAccount": { - "message": "Restablecer cuenta" - }, - "resetAccountDescription": { - "message": "Al restablecer la cuenta se borrará el historial de transacciones. Esto no cambiará los saldos de las cuentas ni se le pedirá que vuelva a escribir la frase secreta de recuperación." - }, "restore": { "message": "Restaurar" }, diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index e6879d2d6..b01eed00b 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -629,12 +629,6 @@ "reset": { "message": "Lähtesta" }, - "resetAccount": { - "message": "Lähtesta konto" - }, - "resetAccountDescription": { - "message": "Konto lähtestamine tühjendab tehingute ajaloo." - }, "restore": { "message": "Taasta" }, diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index 1b1a1ff53..610f8a550 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -639,12 +639,6 @@ "reset": { "message": "بازنشانی" }, - "resetAccount": { - "message": "تنظیم مجدد حساب" - }, - "resetAccountDescription": { - "message": "دوباره سازی حساب تاریخچه معامله تان را پاک میکند." - }, "restore": { "message": "بازیابی" }, diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index 2cff7d700..7a8c6f5e7 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -636,12 +636,6 @@ "reset": { "message": "Tyhjennä" }, - "resetAccount": { - "message": "Nollaa tili" - }, - "resetAccountDescription": { - "message": "Tilisi nollaaminen tyhjentää tapahtumahistoriasi." - }, "restore": { "message": "Palauta" }, diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index 8168dc729..d7ae5a6f9 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -566,12 +566,6 @@ "reset": { "message": "I-reset" }, - "resetAccount": { - "message": "I-reset ang Account" - }, - "resetAccountDescription": { - "message": "Kapag na-reset ang iyong account, maki-clear ang iyong kasaysayan ng transaksyon." - }, "restore": { "message": "Ipanumbalik" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index c2578992c..076f85e97 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Reinitialiser" }, - "resetAccount": { - "message": "Réinitialiser le compte" - }, - "resetAccountDescription": { - "message": "La réinitialisation de votre compte effacera l’historique de vos transactions. Les soldes de vos comptes ne seront pas modifiés. Vous ne serez pas obligé de saisir à nouveau votre phrase secrète de récupération." - }, "resetWallet": { "message": "Réinitialiser le portefeuille" }, diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 94543a14f..69a9dbd9b 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -636,12 +636,6 @@ "reset": { "message": "אפס" }, - "resetAccount": { - "message": "אפס חשבון" - }, - "resetAccountDescription": { - "message": "איפוס חשבונך ינקה את היסטוריית העסקאות שלך." - }, "restore": { "message": "שחזר" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 43b9f1691..35a644e1f 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "रीसेट करें" }, - "resetAccount": { - "message": "अकाउंट रीसेट करें" - }, - "resetAccountDescription": { - "message": "आपके खाते को रीसेट करने से आपका लेनदेन इतिहास साफ हो जाएगा। इससे आपके खातों में शेषराशि नहीं बदलेगी या आपको अपने गुप्त रिकवरी फ्रेज को फिर से दर्ज करने की आवश्यकता नहीं होगी।" - }, "resetWallet": { "message": "वॉलेट रीसेट करें" }, diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index b39c19fe9..d988c1fd6 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -266,9 +266,6 @@ "required": { "message": "आवश्यक" }, - "resetAccount": { - "message": "खाता रीसेट करें" - }, "revealSeedWords": { "message": "बीज शब्द प्रकट करें" }, diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index d959ef76c..8f49b4d41 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -632,12 +632,6 @@ "reset": { "message": "Ponovno postavi" }, - "resetAccount": { - "message": "Poništi račun" - }, - "resetAccountDescription": { - "message": "Poništavanjem se računa uklanja vaša povijest transakcija." - }, "restore": { "message": "Vrati" }, diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index 4d5575193..72f24cddf 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -452,12 +452,6 @@ "reset": { "message": "Repwograme" }, - "resetAccount": { - "message": "Repwograme Kont" - }, - "resetAccountDescription": { - "message": "Repwograme kont a netwaye tranzaksyon ou yo." - }, "restore": { "message": "Retabli" }, diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index 1c0a5c87f..681d20dbe 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -632,12 +632,6 @@ "reset": { "message": "Visszaállítás" }, - "resetAccount": { - "message": "Fiók visszaállítása" - }, - "resetAccountDescription": { - "message": "A fiók visszaállítása törli a tranzakciók előzményeit." - }, "restore": { "message": "Visszaállítás" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 375e077b3..459e76feb 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Atur ulang" }, - "resetAccount": { - "message": "Reset akun" - }, - "resetAccountDescription": { - "message": "Mengatur ulang akun akan mengosongkan riwayat transaksi Anda. Ini tidak akan mengubah saldo di akun atau mengharuskan Anda untuk memasukkan kembali Frasa Pemulihan Rahasia." - }, "resetWallet": { "message": "Reset dompet" }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index fbcbd7276..f66a15d38 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -1499,12 +1499,6 @@ "reset": { "message": "Ripristina" }, - "resetAccount": { - "message": "Ripristina account" - }, - "resetAccountDescription": { - "message": "Ripristinare il tuo account cancellerà lo storico delle transazioni." - }, "restore": { "message": "Ripristina" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 75c499329..bb6199a54 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "リセット" }, - "resetAccount": { - "message": "アカウントをリセット" - }, - "resetAccountDescription": { - "message": "アカウントをリセットすると、トランザクション履歴が消去されます。これによりアカウント内の残高が変更されることはありません。また、シークレットリカバリーフレーズの再入力が求められることもありません。" - }, "resetWallet": { "message": "ウォレットをリセット" }, diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index 2c58b461f..6eebd9094 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -639,12 +639,6 @@ "reset": { "message": "ಮರುಹೊಂದಿಸು" }, - "resetAccount": { - "message": "ಖಾತೆಯನ್ನು ಮರುಹೊಂದಿಸಿ" - }, - "resetAccountDescription": { - "message": "ನಿಮ್ಮ ಖಾತೆಯ ಮರುಹೊಂದಿಸುವಿಕೆಯು ನಿಮ್ಮ ವಹಿವಾಟು ಇತಿಹಾಸವನ್ನು ತೆರವುಗೊಳಿಸುತ್ತದೆ." - }, "restore": { "message": "ಮರುಸ್ಥಾಪನೆ" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 9e82cb1b9..73bd8d51d 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "재설정" }, - "resetAccount": { - "message": "계정 재설정" - }, - "resetAccountDescription": { - "message": "계정을 재설정하면 거래 내역이 지워집니다. 계정의 잔액은 변경되지 않으며 비밀 복구 구문을 다시 입력하지 않아도 됩니다." - }, "resetWallet": { "message": "지갑 초기화" }, diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json index 76765856f..25fd4e0da 100644 --- a/app/_locales/lt/messages.json +++ b/app/_locales/lt/messages.json @@ -639,12 +639,6 @@ "reset": { "message": "Nustatyti iš naujo" }, - "resetAccount": { - "message": "Atkurti paskyrą" - }, - "resetAccountDescription": { - "message": "Atkūrus paskyrą, jūsų operacijų istorija bus išvalyta." - }, "restore": { "message": "Atkurti" }, diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index 4a16847d0..9b22dec4f 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -635,12 +635,6 @@ "reset": { "message": "Atiestatīt" }, - "resetAccount": { - "message": "Atiestatīt kontu" - }, - "resetAccountDescription": { - "message": "Konta atiestatīšana izdzēsīs darījumu vēsturi." - }, "restore": { "message": "Atjaunot" }, diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index 95865e4c2..907c100c6 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -619,12 +619,6 @@ "reset": { "message": "Tetapkan semula" }, - "resetAccount": { - "message": "Tetapkan Semula Akaun" - }, - "resetAccountDescription": { - "message": "Menetapkan semula akaun anda akan mengosongkan sejarah transaksi anda." - }, "restore": { "message": "Pulihkan" }, diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index 53755e748..b5cc50044 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -256,9 +256,6 @@ "required": { "message": "Verplicht" }, - "resetAccount": { - "message": "Account opnieuw instellen" - }, "revealSeedWords": { "message": "Onthul back-up woorden" }, diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index 46788f1c2..13fbdcc21 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -626,12 +626,6 @@ "reset": { "message": "Tilbakestill" }, - "resetAccount": { - "message": "Tilbakestill konto" - }, - "resetAccountDescription": { - "message": "Hvis du tilbakestiller kontoen din vil transaksjonshistorien din slettes. " - }, "restore": { "message": "Gjenopprett" }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index c972807c7..60040ec01 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -1265,12 +1265,6 @@ "reset": { "message": "I-reset" }, - "resetAccount": { - "message": "I-reset ang Account" - }, - "resetAccountDescription": { - "message": "Kapag ni-reset ang iyong account, maki-clear ang history ng iyong transaksyon. Hindi nito babaguhin ang mga balanse sa iyong mga account o hindi mo kakailanganing ilagay ulit ang iyong Secret Recovery Phrase." - }, "restore": { "message": "I-restore" }, diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index a403f46de..bcac631b6 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -633,12 +633,6 @@ "reset": { "message": "Resetuj" }, - "resetAccount": { - "message": "Resetuj konto" - }, - "resetAccountDescription": { - "message": "Zresetowanie konta wyczyści Twoją historię transakcji." - }, "restore": { "message": "Przywróć" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 3aa0cab88..e3297770c 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Redefinir" }, - "resetAccount": { - "message": "Redefinir conta" - }, - "resetAccountDescription": { - "message": "A redefinição da sua conta limpará o histórico de transações. Isso não alterará os saldos nas suas contas nem exigirá a reintrodução da Frase de Recuperação Secreta." - }, "resetWallet": { "message": "Redefinir carteira" }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 8c08fb2bf..42484c3de 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -1978,12 +1978,6 @@ "reset": { "message": "Redefinir" }, - "resetAccount": { - "message": "Redefinir conta" - }, - "resetAccountDescription": { - "message": "A redefinição da sua conta limpará o histórico de transações. Isso não alterará os saldos nas suas contas nem exigirá a reintrodução da Frase de Recuperação Secreta." - }, "restore": { "message": "Restaurar" }, diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index 44efbb0cc..d51f9f281 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -626,12 +626,6 @@ "reset": { "message": "Resetează" }, - "resetAccount": { - "message": "Resetare cont" - }, - "resetAccountDescription": { - "message": "Resetarea contului va duce la ștergerea istoricului tranzacțiilor dvs." - }, "restore": { "message": "Restabilește" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 9e48fbba3..080511928 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Сбросить" }, - "resetAccount": { - "message": "Сбросить счет" - }, - "resetAccountDescription": { - "message": "Сброс вашего счета удалит историю транзакций. Это не изменит остатки на ваших счетах и не потребует повторного ввода секретной фразы для восстановления." - }, "resetWallet": { "message": "Сбросить кошелек" }, diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index b43ecd63f..d1050a994 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -611,12 +611,6 @@ "reset": { "message": "Resetovať" }, - "resetAccount": { - "message": "Resetovat účet" - }, - "resetAccountDescription": { - "message": "Pri obnovení účtu sa vymaže história transakcií." - }, "restore": { "message": "Obnoviť" }, diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index fca992011..fb530fc92 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -627,12 +627,6 @@ "reset": { "message": "Ponastavi" }, - "resetAccount": { - "message": "Ponastavi račun" - }, - "resetAccountDescription": { - "message": "Ponastavljanje računa bo izbrisalo zgodovino transakcij." - }, "restore": { "message": "Obnovi" }, diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index 72e8eb829..7ed8d8648 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -630,12 +630,6 @@ "reset": { "message": "Ресетуј" }, - "resetAccount": { - "message": "Ponovo postavi nalog" - }, - "resetAccountDescription": { - "message": "Resetovanje vašeg naloga će obrisati istoriju transakcija." - }, "restore": { "message": "Поново отвори" }, diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index b73e7c7f5..ede965a8a 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -623,12 +623,6 @@ "reset": { "message": "Återställ" }, - "resetAccount": { - "message": "Återställ konto" - }, - "resetAccountDescription": { - "message": "Återställning av ditt konto rensar din transaktionshistorik" - }, "restore": { "message": "Återställ" }, diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index 59e28b5c7..bbf274cd4 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -617,12 +617,6 @@ "reset": { "message": "Weka upya" }, - "resetAccount": { - "message": "Futa Akaunti" - }, - "resetAccountDescription": { - "message": "Kufuta Akaunti yako kutafuta histori ya akaunti yako." - }, "restore": { "message": "Rejesha" }, diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json index 08b911243..1c83f5f2d 100644 --- a/app/_locales/ta/messages.json +++ b/app/_locales/ta/messages.json @@ -359,9 +359,6 @@ "reset": { "message": "மீட்டமை" }, - "resetAccount": { - "message": "கணக்கை மீட்டமை" - }, "restore": { "message": "மீட்டமை" }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 5da22bc70..c3dffa9de 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -323,9 +323,6 @@ "required": { "message": "จำเป็น" }, - "resetAccount": { - "message": "รีเซ็ตบัญชี" - }, "revealSeedWords": { "message": "เปิดเผยกลุ่มคำชีด" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index de1c8d414..6ab34005d 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "I-reset" }, - "resetAccount": { - "message": "I-reset ang Account" - }, - "resetAccountDescription": { - "message": "Kapag ni-reset ang iyong account, maki-clear ang history ng iyong transaksyon. Hindi nito babaguhin ang mga balanse sa iyong mga account o hindi mo kakailanganing ilagay ulit ang iyong Secret Recovery Phrase." - }, "resetWallet": { "message": "I-reset ang Wallet" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index f238276ea..01a899e50 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Sıfırla" }, - "resetAccount": { - "message": "Hesabı sıfırla" - }, - "resetAccountDescription": { - "message": "Hesabınızı sıfırlamak işlem geçmişinizi temizler. Bu işlem, hesaplarınızdaki bakiyeyi değiştirmez veya Gizli Kurtarma İfadenizi yeniden girmenizi gerektirmez." - }, "resetWallet": { "message": "Cüzdanı sıfırla" }, diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index 69fa453ba..8c08e5d1e 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -639,12 +639,6 @@ "reset": { "message": "Скинути" }, - "resetAccount": { - "message": "Перезапустити обліковий запис" - }, - "resetAccountDescription": { - "message": "Перезапуск вашого облікового запису очистить історію ваших транзакцій." - }, "restore": { "message": "Відновити" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 0dfc612a9..d801066f4 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "Đặt lại" }, - "resetAccount": { - "message": "Đặt lại tài khoản" - }, - "resetAccountDescription": { - "message": "Nếu đặt lại tài khoản của bạn, toàn bộ lịch sử giao dịch sẽ bị xóa. Việc này sẽ không làm thay đổi số dư trong tài khoản của bạn hoặc yêu cầu bạn phải nhập lại Cụm mật khẩu khôi phục bí mật." - }, "resetWallet": { "message": "Đặt lại ví" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 85331da0f..dd1256263 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -2883,12 +2883,6 @@ "reset": { "message": "重置" }, - "resetAccount": { - "message": "重置账户" - }, - "resetAccountDescription": { - "message": "重置账户将清除您的交易历史记录。这不会改变您账户中的余额，也不会要求您重新输入账户助记词。" - }, "resetWallet": { "message": "重置钱包" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 16b1843a4..20e52af9b 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -1166,12 +1166,6 @@ "reset": { "message": "重置" }, - "resetAccount": { - "message": "重置帳戶" - }, - "resetAccountDescription": { - "message": "重置帳戶將清除您的交易紀錄。這將不會改變您的帳戶餘額或要求您重新輸入助憶詞。" - }, "restore": { "message": "還原" }, diff --git a/test/e2e/tests/reset-account.spec.js b/test/e2e/tests/clear-activity.spec.js similarity index 78% rename from test/e2e/tests/reset-account.spec.js rename to test/e2e/tests/clear-activity.spec.js index d51f05ee8..12903510c 100644 --- a/test/e2e/tests/reset-account.spec.js +++ b/test/e2e/tests/clear-activity.spec.js @@ -2,13 +2,13 @@ const { strict: assert } = require('assert'); const { convertToHexValue, withFixtures } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); -describe('Reset account', function () { - // //////////////////////////////////////////////////////////////////////////////////////////////////////////// - // When user get stuck with pending transactions, one can reset the account by clicking the 'Reset account' // - // button in settings, advanced tab. This functionality will clear all the send transactions history. // - // Note that the receive transactions history will be kept and it only only affects the current network. // - // /////////////////////////////////////////////////////////////////////////////////////////////////////////// - it('User can reset account via the advanced setting tab, ', async function () { +describe('Clear account activity', function () { + // ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // When user get stuck with pending transactions, one can reset the account by clicking the 'Clear activity tab data' // + // button in settings, advanced tab. This functionality will clear all the send transactions history. // + // Note that the receive transactions history will be kept and it only only affects the current network. // + // ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + it('User can clear account activity via the advanced setting tab, ', async function () { const ganacheOptions = { accounts: [ { @@ -43,15 +43,18 @@ describe('Reset account', function () { { timeout: 10000 }, ); - // Reset account + // Clear activity and nonce data await driver.clickElement('.account-menu__icon'); await driver.clickElement({ text: 'Settings', tag: 'div' }); await driver.clickElement({ css: '.tab-bar__tab__content__title', text: 'Advanced', }); - await driver.clickElement({ text: 'Reset account', tag: 'button' }); - await driver.clickElement({ text: 'Reset', tag: 'button' }); + await driver.clickElement({ + text: 'Clear activity tab data', + tag: 'button', + }); + await driver.clickElement({ text: 'Clear', tag: 'button' }); await driver.navigate(); // Check send transaction history is cleared and receive transaction history is kept diff --git a/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap b/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap index 12d0a8eb3..e1fd4e4cc 100644 --- a/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap +++ b/ui/components/app/modals/confirm-reset-account/__snapshots__/confirm-reset-account.test.js.snap @@ -14,12 +14,12 @@ exports[`Confirm Reset Account should match snapshot 1`] = `
- [resetAccount]? + [clearActivity]?
- [resetAccountDescription] + [clearActivityDescription]
@@ -38,7 +38,7 @@ exports[`Confirm Reset Account should match snapshot 1`] = ` role="button" tabindex="0" > - [reset] + [clear] diff --git a/ui/components/app/modals/confirm-reset-account/confirm-reset-account.component.js b/ui/components/app/modals/confirm-reset-account/confirm-reset-account.component.js index f9c4fe8fb..708d1bf81 100644 --- a/ui/components/app/modals/confirm-reset-account/confirm-reset-account.component.js +++ b/ui/components/app/modals/confirm-reset-account/confirm-reset-account.component.js @@ -23,13 +23,13 @@ export default class ConfirmResetAccount extends PureComponent { this.props.hideModal()} - submitText={t('reset')} + submitText={t('clear')} cancelText={t('nevermind')} submitType="danger-primary" > ); diff --git a/ui/components/app/modals/confirm-reset-account/confirm-reset-account.test.js b/ui/components/app/modals/confirm-reset-account/confirm-reset-account.test.js index eed420a45..84596a6f5 100644 --- a/ui/components/app/modals/confirm-reset-account/confirm-reset-account.test.js +++ b/ui/components/app/modals/confirm-reset-account/confirm-reset-account.test.js @@ -33,7 +33,7 @@ describe('Confirm Reset Account', () => { , ); - fireEvent.click(queryByText('[reset]')); + fireEvent.click(queryByText('[clear]')); expect(props.resetAccount).toHaveBeenCalled(); expect(props.hideModal).toHaveBeenCalled(); diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js index 282c6fc9a..a523e1e05 100644 --- a/ui/helpers/constants/settings.js +++ b/ui/helpers/constants/settings.js @@ -71,9 +71,9 @@ export const SETTINGS_CONSTANTS = [ }, { tabMessage: (t) => t('advanced'), - sectionMessage: (t) => t('resetAccount'), - descriptionMessage: (t) => t('resetAccountDescription'), - route: `${ADVANCED_ROUTE}#reset-account`, + sectionMessage: (t) => t('clearActivity'), + descriptionMessage: (t) => t('clearActivityDescription'), + route: `${ADVANCED_ROUTE}#clear-activity`, icon: 'fas fa-sliders-h', }, { diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js index 74c2c08b4..f6f040265 100644 --- a/ui/helpers/utils/settings-search.test.js +++ b/ui/helpers/utils/settings-search.test.js @@ -29,10 +29,10 @@ const t = (key) => { return 'State logs contain your public account addresses and sent transactions.'; case 'syncWithMobile': return 'Sync with mobile'; - case 'resetAccount': - return 'Reset account'; - case 'resetAccountDescription': - return 'Resetting your account will clear your transaction history. This will not change the balances in your accounts or require you to re-enter your Secret Recovery Phrase.'; + case 'clearActivity': + return 'Clear activity and nonce data'; + case 'clearActivityDescription': + return "This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change."; case 'showAdvancedGasInline': return 'Advanced gas controls'; case 'showAdvancedGasInlineDescription': diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js index 0072b0580..cf42eb77c 100644 --- a/ui/pages/settings/advanced-tab/advanced-tab.component.js +++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js @@ -230,9 +230,9 @@ export default class AdvancedTab extends PureComponent { data-testid="advanced-setting-reset-account" >
- {t('resetAccount')} + {t('clearActivity')} - {t('resetAccountDescription')} + {t('clearActivityDescription')}
@@ -251,7 +251,7 @@ export default class AdvancedTab extends PureComponent { showResetAccountConfirmationModal(); }} > - {t('resetAccount')} + {t('clearActivityButton')}