From a6cb275557ef6770413269055f2c637bb2683bb4 Mon Sep 17 00:00:00 2001 From: okanishcheva Date: Wed, 19 May 2021 18:24:40 +0300 Subject: [PATCH 1/2] DEXW-4376: delete migration --- locale/en/app.migrate.json | 7 +- locale/en/app.signUp.json | 2 +- locale/en/app.ui.json | 7 +- locale/en/app.utils.json | 6 +- locale/ru/app.migrate.json | 5 +- locale/ru/app.ui.json | 7 +- .../mainHeader/templates/largeHeader.html | 294 ++++++------ .../mainHeader/templates/mobileHeader.html | 422 +++++++++--------- .../modals/exportAccounts/ExportAccounts.js | 13 +- .../modals/exportAccounts/exportAccounts.html | 31 +- .../components/dexwLocked/dexwLocked.html | 276 +----------- .../components/dexwLocked/dexwLocked.js | 108 +---- .../components/signInForm/signInForm.html | 2 +- 13 files changed, 421 insertions(+), 759 deletions(-) diff --git a/locale/en/app.migrate.json b/locale/en/app.migrate.json index bbffdc86c5..2a02fbd842 100644 --- a/locale/en/app.migrate.json +++ b/locale/en/app.migrate.json @@ -50,9 +50,10 @@ "desc": "To offer users a better experience and wider range of tools, the exchange has moved from Waves DEX to" }, "oldUser": { - "desc": "To continue working with your existing accounts, assets and the exchange, you should move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The migration process is fast, easy, and absolutely secure." + "desc": "If you want to continue working with your accounts, tokens, and exchange, please transfer your accounts to Waves.Exchange. To do this, you need to export your account and then import it into Waves.Exchange. This process is completely simple and safe." }, - "title": "We’re no longer operating this service. For additional information please contact [Waves.Exchange](https://waves.exchange/)" + "title": "We no longer support this service. For more information contact [Waves.Exchange](https://waves.exchange/)", + "export": "Export account" }, "faq": { "attention": { @@ -146,7 +147,7 @@ }, "modalTitle": { "moving": "We're moving!", - "plate": "Don’t worry! All of your tokens, seed phrases and passwords are safe.", + "plate": "Don’t worry! All of your tokens, seed phrases, and passwords are safe.", "redirected": "You have been redirected to" }, "signIn": "Sign in", diff --git a/locale/en/app.signUp.json b/locale/en/app.signUp.json index 8b56a88a33..4e3b8ee289 100644 --- a/locale/en/app.signUp.json +++ b/locale/en/app.signUp.json @@ -13,4 +13,4 @@ }, "termsAgreement": "I have read and agree with the [Terms and Conditions](https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf), [Privacy Policy](https://wavesplatform.com/files/docs/Privacy_Policy_SW.pdf)." } -} \ No newline at end of file +} diff --git a/locale/en/app.ui.json b/locale/en/app.ui.json index ecb7c058d2..b9f0e1f2af 100644 --- a/locale/en/app.ui.json +++ b/locale/en/app.ui.json @@ -156,7 +156,10 @@ "repeat": "Confirm password", "secure": "secure password", "title": "Protect Your Account with a New Password", - "warn": "easy, add a digit or symbol" + "warn": "easy, add a digit or symbol", + "createForSaveAcc": "Create Password for Saved Accounts", + "confirm": "Confirm Passwords", + "notMatch": "Password does not match" }, "qrCodeRead": { "closeRead": "Cancel" @@ -329,4 +332,4 @@ } }, "whitespace": " " -} \ No newline at end of file +} diff --git a/locale/en/app.utils.json b/locale/en/app.utils.json index d5b3ab8038..f318427ca8 100644 --- a/locale/en/app.utils.json +++ b/locale/en/app.utils.json @@ -668,8 +668,8 @@ "accounts": "Accounts", "export": "Export", "selectAll": "Select all", - "title": "Please select account", - "unselectAll": "Unselect all" + "title": "Please, select accounts", + "unselectAll": "Cancel all" }, "general": { "auto": "Auto", @@ -1028,4 +1028,4 @@ "sec": "s", "startMoving": "Safe moving" } -} \ No newline at end of file +} diff --git a/locale/ru/app.migrate.json b/locale/ru/app.migrate.json index 9c12502f76..248d0bf075 100644 --- a/locale/ru/app.migrate.json +++ b/locale/ru/app.migrate.json @@ -50,9 +50,10 @@ "desc": "Чтобы улучшить пользовательский опыт и предложить более широкий набор инструментов, биржа переехала с Waves DEX на" }, "oldUser": { - "desc": "Если Вы хотите продолжить работать со своими аккаунтами, токенами и биржей, перенесите свои аккаунты на Waves.Exchange. Настоятельно рекомендуем сделать это как можно скорее. Процесс миграции – быстрый, простой и абсолютно безопасный." + "desc": "Если Вы хотите продолжить работать со своими аккаунтами, токенами и биржей, перенесите свои аккаунты на Waves.Exchange. Для этого, вам необходимо экспортировать ваш аккаунт и, затем, импортировать его в Waves.Exchange. Данный процесс абсолютно простой и безопасный." }, - "title": "Мы больше не поддерживаем этот сервис. За дополнительной информацией обратитесь в [Waves.Exchange](https://waves.exchange/)" + "title": "Мы больше не поддерживаем этот сервис. За дополнительной информацией обратитесь в [Waves.Exchange](https://waves.exchange/)", + "export": "Экспортировать аккаунт" }, "faq": { "attention": { diff --git a/locale/ru/app.ui.json b/locale/ru/app.ui.json index f31dfb44cd..a306ab0bc4 100644 --- a/locale/ru/app.ui.json +++ b/locale/ru/app.ui.json @@ -156,7 +156,10 @@ "repeat": "Подтвердите пароль", "secure": "надёжный пароль", "title": "Защитите ваш кошелёк паролем", - "warn": "очень простой пароль, добавьте цифру или символ" + "warn": "очень простой пароль, добавьте цифру или символ", + "createForSaveAcc": "Создайте пароль для сохраняемых аккаунтов", + "confirm": "Подтвердите пароль", + "notMatch": "Пароли не совпадают" }, "qrCodeRead": { "closeRead": "Отмена" @@ -329,4 +332,4 @@ } }, "whitespace": " " -} \ No newline at end of file +} diff --git a/src/modules/ui/directives/mainHeader/templates/largeHeader.html b/src/modules/ui/directives/mainHeader/templates/largeHeader.html index 9a190a8887..223ec21e43 100644 --- a/src/modules/ui/directives/mainHeader/templates/largeHeader.html +++ b/src/modules/ui/directives/mainHeader/templates/largeHeader.html @@ -3,162 +3,162 @@ - -
+ + -
-
- - - + + + + + + + - -
- - -
-
- - -
-
- - -
- -
-
+ + + + + + + + + + + + + + + + -
-
-
-
- + + + + + - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + -
- + + + + + -
-
-
- -
-
-
{{user.name}}
- -
-
{{::user.address}}
-
-
-
-
- -
-
-
- -
-
{{user.name}}
-
{{::user.address}}
-
-
-
-
-
-
-
-
-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/ui/directives/mainHeader/templates/mobileHeader.html b/src/modules/ui/directives/mainHeader/templates/mobileHeader.html index c17bc1db19..216aac57be 100644 --- a/src/modules/ui/directives/mainHeader/templates/mobileHeader.html +++ b/src/modules/ui/directives/mainHeader/templates/mobileHeader.html @@ -3,227 +3,227 @@ -
- -
+ + + -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/utils/modals/exportAccounts/ExportAccounts.js b/src/modules/utils/modals/exportAccounts/ExportAccounts.js index 7957681706..fdcd905968 100644 --- a/src/modules/utils/modals/exportAccounts/ExportAccounts.js +++ b/src/modules/utils/modals/exportAccounts/ExportAccounts.js @@ -57,11 +57,6 @@ * @type {{}} */ checkedHash = {}; - /** - * @type {boolean} - */ - needPassword = false; - /** * @type {boolean} */ @@ -128,13 +123,11 @@ .filter(item => item[1]) .map(([address]) => this.userList.find(user => user.address === address)); const stringifyUsers = JSON.stringify(users); - const saveUsers = !this.needPassword ? - stringifyUsers : - encryptSeed(stringifyUsers, this.password, 10000); + const saveUsers = encryptSeed(stringifyUsers, this.password, 10000); const saveData = { - encrypted: this.needPassword, - encryptionRounds: this.needPassword ? 10000 : undefined, + encrypted: true, + encryptionRounds: 10000, saveUsers }; diff --git a/src/modules/utils/modals/exportAccounts/exportAccounts.html b/src/modules/utils/modals/exportAccounts/exportAccounts.html index 3519e59bd2..0c4c1a83eb 100644 --- a/src/modules/utils/modals/exportAccounts/exportAccounts.html +++ b/src/modules/utils/modals/exportAccounts/exportAccounts.html @@ -30,29 +30,10 @@ - -
-
- - - - -
-
- - - -
-
-
- +
- +
@@ -79,9 +60,9 @@ - +
- +
-