From 7441c25fd8b920a04ba191ef366ff45e24cd8936 Mon Sep 17 00:00:00 2001 From: Aleksandar Djordjevic Date: Wed, 4 Dec 2019 22:02:34 +0400 Subject: [PATCH 01/32] [DDW-1100] - Implement yoroi wallets restoration --- .../components/wallet/WalletRestoreDialog.js | 22 +++++++++++++++---- source/renderer/app/config/cryptoConfig.js | 1 + source/renderer/app/config/walletsConfig.js | 3 +++ source/renderer/app/i18n/locales/de-DE.json | 7 +++--- source/renderer/app/i18n/locales/en-US.json | 7 +++--- source/renderer/app/i18n/locales/hr-HR.json | 7 +++--- source/renderer/app/i18n/locales/ja-JP.json | 5 +++-- source/renderer/app/i18n/locales/ko-KR.json | 7 +++--- source/renderer/app/i18n/locales/zh-CN.json | 7 +++--- 9 files changed, 45 insertions(+), 21 deletions(-) diff --git a/source/renderer/app/components/wallet/WalletRestoreDialog.js b/source/renderer/app/components/wallet/WalletRestoreDialog.js index f8dedfdf44..73edec070d 100644 --- a/source/renderer/app/components/wallet/WalletRestoreDialog.js +++ b/source/renderer/app/components/wallet/WalletRestoreDialog.js @@ -132,15 +132,21 @@ const messages = defineMessages({ }, recoveryPhraseTabTitle: { id: 'wallet.restore.dialog.tab.title.recoveryPhrase', - defaultMessage: '!!!Wallet recovery phrase', + defaultMessage: '!!!Daedalus wallet', description: - 'Tab title "Wallet recovery phrasee" in the wallet restore dialog.', + 'Tab title "Daedalus wallet" in the wallet restore dialog.', }, certificateTabTitle: { id: 'wallet.restore.dialog.tab.title.certificate', - defaultMessage: '!!!Paper wallet recovery phrase', + defaultMessage: '!!!Daedalus paper wallet', + description: + 'Tab title "Daedalus paper wallet" in the wallet restore dialog.', + }, + yoroiTabTitle: { + id: 'wallet.restore.dialog.tab.title.yoroi', + defaultMessage: '!!!Yoroi wallet', description: - 'Tab title "Paper wallet recovery phrase" in the wallet restore dialog.', + 'Tab title "Yoroi wallet" in the wallet restore dialog.', }, shieldedRecoveryPhraseInputLabel: { id: 'wallet.restore.dialog.shielded.recovery.phrase.input.label', @@ -414,6 +420,14 @@ export default class WalletRestoreDialog extends Component { > {intl.formatMessage(messages.certificateTabTitle)} + Date: Thu, 5 Dec 2019 08:23:46 +0400 Subject: [PATCH 02/32] [DDW-1100] - Implement yoroi wallets restoration --- .../components/wallet/WalletRestoreDialog.js | 65 ++++++++++++++++++- .../wallet/WalletRestoreDialog.scss | 2 +- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/source/renderer/app/components/wallet/WalletRestoreDialog.js b/source/renderer/app/components/wallet/WalletRestoreDialog.js index 73edec070d..a499652bbf 100644 --- a/source/renderer/app/components/wallet/WalletRestoreDialog.js +++ b/source/renderer/app/components/wallet/WalletRestoreDialog.js @@ -386,7 +386,7 @@ export default class WalletRestoreDialog extends Component { const regularTabClasses = classnames([ 'regularTab', - !this.isCertificate() ? styles.activeButton : '', + !this.isCertificate() && !this.isYoroi() ? styles.activeButton : '', ]); const certificateTabClasses = classnames([ @@ -394,6 +394,11 @@ export default class WalletRestoreDialog extends Component { this.isCertificate() ? styles.activeButton : '', ]); + const yoroiTabClasses = classnames([ + 'yoroiTab', + this.isYoroi() ? styles.activeButton : '', + ]); + return ( { {intl.formatMessage(messages.certificateTabTitle)}