From f852b57135c8029283eb0f4e739a5ad5363ab641 Mon Sep 17 00:00:00 2001 From: Leroy Jethro Gibbs Date: Fri, 10 May 2019 10:55:59 +0300 Subject: [PATCH 1/6] #2662 Update links to new routes and replace create advanced account by restore account by brain key --- app/assets/locales/locale-de.json | 5 +++-- app/assets/locales/locale-en.json | 5 +++-- app/assets/locales/locale-es.json | 5 +++-- app/assets/locales/locale-fr.json | 5 +++-- app/assets/locales/locale-it.json | 5 +++-- app/assets/locales/locale-ja.json | 5 +++-- app/assets/locales/locale-ko.json | 5 +++-- app/assets/locales/locale-ru.json | 3 ++- app/assets/locales/locale-tr.json | 5 +++-- app/assets/locales/locale-zh.json | 5 +++-- app/components/LoginSelector.jsx | 26 +++++++++++--------------- 11 files changed, 40 insertions(+), 34 deletions(-) diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json index a84fd364c3..d5c8ec8d82 100644 --- a/app/assets/locales/locale-de.json +++ b/app/assets/locales/locale-de.json @@ -106,9 +106,10 @@ "no_price": "--", "open_orders": "Offene Aufträge", "optional": { - "formatter": "Optional, {restore_link} oder erstellen Sie ein Konto mit {restore_form}.", + "formatter": "Optional, {restore_link} oder {restore_link_brain}.", "restore_form": "Formular", - "restore_link": "stellen Sie Ihr Konto wiederher" + "restore_link": "stellen Sie Ihr Konto wiederher", + "restore_link_brain": "stellen Sie Ihr Konto mit dem Brain-Key wieder her" }, "options": { "memo_key": "Notitz-Schlüssel", diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index 38dbeb02ef..9742a4d610 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -107,9 +107,10 @@ "no_price": "--", "open_orders": "Open Orders", "optional": { - "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.", + "formatter": "Optionally, {restore_link} or {restore_link_brain}.", "restore_form": "advanced form", - "restore_link": "restore your account" + "restore_link": "restore your account from backup", + "restore_link_brain": "restore your account using brain-key" }, "options": { "memo_key": "Memo Key", diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json index 3ff245f071..ea0438d3ac 100644 --- a/app/assets/locales/locale-es.json +++ b/app/assets/locales/locale-es.json @@ -106,9 +106,10 @@ "no_price": "--", "open_orders": "Ordenes abiertas", "optional": { - "formatter": "Opcionalmente, {restore_link} o crea una cuenta usando el {restore_form}.", + "formatter": "Opcionalmente, {restore_link} o {restore_link_brain}.", "restore_form": "forma avanzada", - "restore_link": "restaurar su cuenta" + "restore_link": "restaurar su cuenta", + "restore_link_brain": "restaura tu cuenta usando la tecla cerebral" }, "options": { "memo_key": "Llave Memo", diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json index c9ae81b70e..557c48f6e7 100644 --- a/app/assets/locales/locale-fr.json +++ b/app/assets/locales/locale-fr.json @@ -106,9 +106,10 @@ "no_price": "--", "open_orders": "Open Orders", "optional": { - "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.", + "formatter": "Optionally, {restore_link} or {restore_link_brain}.", "restore_form": "advanced form", - "restore_link": "restore your account" + "restore_link": "restore your account from backup", + "restore_link_brain": "restore your account using brain-key" }, "options": { "memo_key": "Memo Key", diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json index 6012ea1a6f..9bc74e9d6f 100644 --- a/app/assets/locales/locale-it.json +++ b/app/assets/locales/locale-it.json @@ -106,9 +106,10 @@ "no_price": "Valore sconosciuto", "open_orders": "Ordini aperti", "optional": { - "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.", + "formatter": "Optionally, {restore_link} or {restore_link_brain}.", "restore_form": "advanced form", - "restore_link": "restore your account" + "restore_link": "restore your account from backup", + "restore_link_brain": "restore your account using brain-key" }, "options": { "memo_key": "Chiave Memo", diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json index e61fcd6115..e4cdd81cc8 100644 --- a/app/assets/locales/locale-ja.json +++ b/app/assets/locales/locale-ja.json @@ -106,9 +106,10 @@ "no_price": "不明な値", "open_orders": "注文中", "optional": { - "formatter": "ここから{restore_link}、または{restore_form}を使ってアカウントを作成することができます。", + "formatter": "オプションで、{restore_link} または {restore_link_brain}", "restore_form": "高度設定フォーム", - "restore_link": "アカウントのリストア" + "restore_link": "アカウントのリストア", + "restore_link_brain": "ブレインキーを使ってアカウントを復元する" }, "options": { "memo_key": "メモキー", diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json index 9cb8bb474b..5078da8c37 100644 --- a/app/assets/locales/locale-ko.json +++ b/app/assets/locales/locale-ko.json @@ -106,9 +106,10 @@ "no_price": "--", "open_orders": "Open Orders", "optional": { - "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.", + "formatter": "Optionally, {restore_link} or {restore_link_brain}.", "restore_form": "advanced form", - "restore_link": "restore your account" + "restore_link": "restore your account from backup", + "restore_link_brain": "restore your account using brain-key" }, "options": { "memo_key": "메모 키", diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index b9d919668b..b705151fe6 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -108,7 +108,8 @@ "optional": { "formatter": "При необходимости {restore_link} или создайте аккаунт с помощью {restore_form}.", "restore_form": "расширенная форма", - "restore_link": "восстановить аккаунт" + "restore_link": "восстановить аккаунт из резервной копии", + "restore_link_brain": "восстановить аккаунт, используя ключ" }, "options": { "memo_key": "Мемо-ключ", diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json index fc7811003c..60cf7d097c 100644 --- a/app/assets/locales/locale-tr.json +++ b/app/assets/locales/locale-tr.json @@ -106,9 +106,10 @@ "no_price": "Fiyat mevcut değil", "open_orders": "Açık Emirler", "optional": { - "formatter": "Optionally, {restore_link} or create an account using the {restore_form}.", + "formatter": "Optionally, {restore_link} or {restore_link_brain}.", "restore_form": "advanced form", - "restore_link": "restore your account" + "restore_link": "restore your account from backup", + "restore_link_brain": "restore your account using brain-key" }, "options": { "memo_key": "Memo Anahtarı", diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json index c3a28c93ea..fec290cb70 100644 --- a/app/assets/locales/locale-zh.json +++ b/app/assets/locales/locale-zh.json @@ -106,9 +106,10 @@ "no_price": "--", "open_orders": "我的挂单", "optional": { - "formatter": "可选: {restore_link} 或使用 {restore_form} 注册一个账户.", + "formatter": "（可选）{restore_link} 要么 {restore_link_brain}", "restore_form": "钱包模式", - "restore_link": "恢复你的账户" + "restore_link": "从备份中恢复您的帐户", + "restore_link_brain": "使用大脑密钥恢复您的帐户" }, "options": { "memo_key": "备注公钥", diff --git a/app/components/LoginSelector.jsx b/app/components/LoginSelector.jsx index 726ffa2838..1437b10dcf 100644 --- a/app/components/LoginSelector.jsx +++ b/app/components/LoginSelector.jsx @@ -163,7 +163,7 @@ class LoginSelector extends React.Component {
- { - SettingsActions.changeSetting.defer({ - setting: "passwordLogin", - value: true - }); - WalletUnlockActions.unlock().catch( - () => {} - ); - }} + data-intro={translator.translate( + "walkthrough.create_cloud_wallet" + )} > - +
@@ -205,13 +201,13 @@ class LoginSelector extends React.Component { }, { type: "link", - value: "/create-account/wallet", + value: "/create-wallet-brainkey", translation: - "account.optional.restore_form", + "account.optional.restore_link_brain", dataIntro: translator.translate( "walkthrough.create_local_wallet" ), - arg: "restore_form" + arg: "restore_link_brain" } ]} /> From 69eb7491ceee1fbafdbcf35231bd0a5bc4fab47e Mon Sep 17 00:00:00 2001 From: Leroy Jethro Gibbs Date: Fri, 10 May 2019 10:58:38 +0300 Subject: [PATCH 2/6] #2662 Update default container to Cloud instead of Local --- app/components/Login/Login.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/Login/Login.jsx b/app/components/Login/Login.jsx index cca2b319e4..8770590de3 100644 --- a/app/components/Login/Login.jsx +++ b/app/components/Login/Login.jsx @@ -9,7 +9,7 @@ export default class Login extends React.Component { constructor() { super(); this.state = { - activeWalletModel: true + activeWalletModel: false }; } From 5fab3e391be0d1db543dcadf83284e1ed0e9ecec Mon Sep 17 00:00:00 2001 From: Leroy Jethro Gibbs Date: Fri, 10 May 2019 11:03:38 +0300 Subject: [PATCH 3/6] #2662 Update link from dropdown --- app/components/Layout/HeaderDropdown.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/Layout/HeaderDropdown.jsx b/app/components/Layout/HeaderDropdown.jsx index 814163b55b..3241cfba35 100644 --- a/app/components/Layout/HeaderDropdown.jsx +++ b/app/components/Layout/HeaderDropdown.jsx @@ -77,8 +77,8 @@ export default class DropDownMenu extends React.Component { })} onClick={this.props.onNavigate.bind( this, - `/create-account/${ - !passwordLogin ? "wallet" : "password" + `/registration/${ + !passwordLogin ? "local" : "cloud" }` )} > From 4fad7dc057a9a6bc6ef88386da12a7a1901a045c Mon Sep 17 00:00:00 2001 From: Leroy Jethro Gibbs Date: Fri, 10 May 2019 11:08:32 +0300 Subject: [PATCH 4/6] #2662 Update link to create account page --- app/components/Dashboard/DashboardList.jsx | 2 +- app/components/Layout/HeaderDropdown.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/Dashboard/DashboardList.jsx b/app/components/Dashboard/DashboardList.jsx index cb6ab55ebc..a8f9b8a1b9 100644 --- a/app/components/Dashboard/DashboardList.jsx +++ b/app/components/Dashboard/DashboardList.jsx @@ -92,7 +92,7 @@ class DashboardList extends React.Component { } _createAccount() { - this.props.history.push("/create-account/wallet"); + this.props.history.push("/registration"); } _onFilter(e) { diff --git a/app/components/Layout/HeaderDropdown.jsx b/app/components/Layout/HeaderDropdown.jsx index 3241cfba35..3b8cd30e82 100644 --- a/app/components/Layout/HeaderDropdown.jsx +++ b/app/components/Layout/HeaderDropdown.jsx @@ -70,8 +70,8 @@ export default class DropDownMenu extends React.Component { className={cnames({ active: active.indexOf( - `/create-account/${ - !passwordLogin ? "wallet" : "password" + `/registration/${ + !passwordLogin ? "local" : "cloud" }` ) !== -1 })} From 6a7d7a94e3a0de3ef8c84f3c812ea5399dfb8b75 Mon Sep 17 00:00:00 2001 From: Leroy Jethro Gibbs Date: Fri, 10 May 2019 11:11:00 +0300 Subject: [PATCH 5/6] #2662 Update link to create account page --- app/components/Wallet/WalletUnlockModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/Wallet/WalletUnlockModal.jsx b/app/components/Wallet/WalletUnlockModal.jsx index 36e3db89a5..2a3a4c6acb 100644 --- a/app/components/Wallet/WalletUnlockModal.jsx +++ b/app/components/Wallet/WalletUnlockModal.jsx @@ -308,7 +308,7 @@ class WalletUnlockModal extends React.Component { this.props.history.push(path); }; - handleCreateWallet = () => this.closeRedirect("/create-account/wallet"); + handleCreateWallet = () => this.closeRedirect("/registration/local"); handleRestoreOther = () => this.closeRedirect("/settings/restore"); From fcee7d09cd2be61ccf6f843a7b73c87e186a6673 Mon Sep 17 00:00:00 2001 From: Leroy Jethro Gibbs Date: Fri, 10 May 2019 11:11:23 +0300 Subject: [PATCH 6/6] #2662 Remove unused routes and methods --- app/App.jsx | 4 ---- app/components/LoginSelector.jsx | 15 --------------- 2 files changed, 19 deletions(-) diff --git a/app/App.jsx b/app/App.jsx index 3776b0aafa..e213a8b0ca 100644 --- a/app/App.jsx +++ b/app/App.jsx @@ -400,10 +400,6 @@ class App extends React.Component { exact component={AccountDepositWithdraw} /> -
- - -