input-output-hk · darko-mijic · Dec 23, 2019 · Dec 4, 2019 · Dec 5, 2019 · Dec 5, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,13 @@ Changelog
 
 ### Features
 
+- Added Yoroi wallets restoration to the "Restore Wallet" dialog ([PR 1740](https://github.com/input-output-hk/daedalus/pull/1740))
 - Implemented new menu shortcuts ([PR 1780](https://github.com/input-output-hk/daedalus/pull/1780))
 - Implemented all notifications to be on the top of the app and in front of any other element ([PR 1748](https://github.com/input-output-hk/daedalus/pull/1748))
+- Improved network screen with responsive main copy box ([PR 1797](https://github.com/input-output-hk/daedalus/pull/1797))
 
 ### Chores
-- Fixed network screen responsiveness on all screens ([PR 1797](https://github.com/input-output-hk/daedalus/pull/1797))
+- Updated `cardano-wallet` to revision `132a5faf8c076eb8e873857a15e80db56be7e6ca` ([PR 1740](https://github.com/input-output-hk/daedalus/pull/1740))
 
 ## 2.0.0-ITN1
 

diff --git a/nix/sources.json b/nix/sources.json
@@ -29,10 +29,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "5c287a82e415207a55686f4b0bda2420549af1af",
-        "sha256": "0msgr6xdcz52jqczj8wj7w4n7sxqr28x889xfdk1j8a7ygg4davi",
+        "rev": "132a5faf8c076eb8e873857a15e80db56be7e6ca",
+        "sha256": "0w9lip4g3fba82kjz6qh2i9zxz7z4fc3yyl4ybwn9h226f7wg8wd",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/5c287a82e415207a55686f4b0bda2420549af1af.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/132a5faf8c076eb8e873857a15e80db56be7e6ca.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "v2019-12-16"
     },

diff --git a/source/renderer/app/components/wallet/WalletRestoreDialog.js b/source/renderer/app/components/wallet/WalletRestoreDialog.js
@@ -28,6 +28,12 @@ import {
   WALLET_RESTORE_TYPES,
   RECOVERY_PHRASE_WORD_COUNT_OPTIONS,
 } from '../../config/walletsConfig';
+import {
+  LEGACY_WALLET_RECOVERY_PHRASE_WORD_COUNT,
+  PAPER_WALLET_RECOVERY_PHRASE_WORD_COUNT,
+  WALLET_RECOVERY_PHRASE_WORD_COUNT,
+  YOROI_WALLET_RECOVERY_PHRASE_WORD_COUNT,
+} from '../../config/cryptoConfig';
 
 const messages = defineMessages({
   title: {
@@ -43,13 +49,13 @@ const messages = defineMessages({
   },
   walletNameInputHint: {
     id: 'wallet.restore.dialog.wallet.name.input.hint',
-    defaultMessage: '!!!Choose a name for the wallet you are about to restore',
+    defaultMessage: '!!!Name the wallet you are restoring',
     description:
       'Hint "Name the wallet you are restoring" for the wallet name input on the wallet restore dialog.',
   },
   recoveryPhraseTypeLabel: {
     id: 'wallet.restore.dialog.recovery.phrase.type.options.label',
-    defaultMessage: '!!!Number of words in your recovery phrase',
+    defaultMessage: '!!!Number of words in the recovery phrase',
     description:
       'Label for the recovery phrase type options on the wallet restore dialog.',
   },
@@ -73,16 +79,21 @@ const messages = defineMessages({
   },
   recoveryPhraseInputLabel: {
     id: 'wallet.restore.dialog.recovery.phrase.input.label',
-    defaultMessage: '!!!Wallet recovery phrase',
+    defaultMessage: '!!!Recovery phrase',
     description:
       'Label for the recovery phrase input on the wallet restore dialog.',
   },
   recoveryPhraseInputHint: {
     id: 'wallet.restore.dialog.recovery.phrase.input.hint',
-    defaultMessage: '!!!Enter your {numberOfWords}-word wallet recovery phrase',
+    defaultMessage: '!!!Enter recovery phrase',
     description:
       'Hint "Enter recovery phrase" for the recovery phrase input on the wallet restore dialog.',
   },
+  newLabel: {
+    id: 'wallet.restore.dialog.recovery.phrase.newLabel',
+    defaultMessage: '!!!New',
+    description: 'Label "new" on the wallet restore dialog.',
+  },
   recoveryPhraseNoResults: {
     id: 'wallet.restore.dialog.recovery.phrase.input.noResults',
     defaultMessage: '!!!No results',
@@ -132,15 +143,19 @@ const messages = defineMessages({
   },
   recoveryPhraseTabTitle: {
     id: 'wallet.restore.dialog.tab.title.recoveryPhrase',
-    defaultMessage: '!!!Wallet recovery phrase',
-    description:
-      'Tab title "Wallet recovery phrasee" in the wallet restore dialog.',
+    defaultMessage: '!!!Daedalus wallet',
+    description: '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 "Paper wallet recovery phrase" in the wallet restore dialog.',
+      'Tab title "Daedalus paper wallet" in the wallet restore dialog.',
+  },
+  yoroiTabTitle: {
+    id: 'wallet.restore.dialog.tab.title.yoroi',
+    defaultMessage: '!!!Yoroi wallet',
+    description: 'Tab title "Yoroi wallet" in the wallet restore dialog.',
   },
   shieldedRecoveryPhraseInputLabel: {
     id: 'wallet.restore.dialog.shielded.recovery.phrase.input.label',
@@ -190,7 +205,7 @@ export default class WalletRestoreDialog extends Component<Props, State> {
   };
 
   state = {
-    walletType: WALLET_RESTORE_TYPES.LEGACY, // regular | certificate | legacy
+    walletType: WALLET_RESTORE_TYPES.LEGACY, // regular | certificate | legacy | yoroi
   };
 
   recoveryPhraseAutocomplete: Autocomplete;
@@ -380,14 +395,19 @@ export default class WalletRestoreDialog extends Component<Props, State> {
 
     const regularTabClasses = classnames([
       'regularTab',
-      !this.isCertificate() ? styles.activeButton : '',
+      this.isRegular() || this.isLegacy() ? styles.activeButton : '',
     ]);
 
     const certificateTabClasses = classnames([
       'certificateTab',
       this.isCertificate() ? styles.activeButton : '',
     ]);
 
+    const yoroiTabClasses = classnames([
+      'yoroiTab',
+      this.isYoroi() ? styles.activeButton : '',
+    ]);
+
     return (
       <Dialog
         className={dialogClasses}
@@ -414,6 +434,14 @@ export default class WalletRestoreDialog extends Component<Props, State> {
           >
             {intl.formatMessage(messages.certificateTabTitle)}
           </button>
+          <button
+            className={yoroiTabClasses}
+            onClick={() =>
+              this.onSelectWalletType(WALLET_RESTORE_TYPES.YOROI_LEGACY, true)
+            }
+          >
+            {intl.formatMessage(messages.yoroiTabTitle)}
+          </button>
         </div>
 
         <Input
@@ -424,15 +452,15 @@ export default class WalletRestoreDialog extends Component<Props, State> {
           skin={InputSkin}
         />
 
-        {!this.isCertificate() && (
+        {(this.isRegular() || this.isLegacy()) && (
           <RadioSet
             label={intl.formatMessage(messages.recoveryPhraseTypeLabel)}
             items={[
               {
                 key: WALLET_RESTORE_TYPES.LEGACY,
                 label: (
                   <Fragment>
-                    12
+                    {LEGACY_WALLET_RECOVERY_PHRASE_WORD_COUNT}
                     {intl.formatMessage(
                       messages.recoveryPhraseTypeOptionWord
                     )}{' '}
@@ -453,7 +481,7 @@ export default class WalletRestoreDialog extends Component<Props, State> {
                 key: WALLET_RESTORE_TYPES.REGULAR,
                 label: (
                   <Fragment>
-                    15
+                    {WALLET_RECOVERY_PHRASE_WORD_COUNT}
                     {intl.formatMessage(
                       messages.recoveryPhraseTypeOptionWord
                     )}{' '}
@@ -464,6 +492,9 @@ export default class WalletRestoreDialog extends Component<Props, State> {
                       )}
                       )
                     </span>
+                    <span className={styles.newLabel}>
+                      {intl.formatMessage(messages.newLabel)}
+                    </span>
                   </Fragment>
                 ),
                 selected: !this.isLegacy(),
@@ -474,6 +505,59 @@ export default class WalletRestoreDialog extends Component<Props, State> {
           />
         )}
 
+        {this.isYoroi() && (
+          <RadioSet
+            label={intl.formatMessage(messages.recoveryPhraseTypeLabel)}
+            items={[
+              {
+                key: WALLET_RESTORE_TYPES.YOROI_LEGACY,
+                label: (
+                  <Fragment>
+                    {YOROI_WALLET_RECOVERY_PHRASE_WORD_COUNT}
+                    {intl.formatMessage(
+                      messages.recoveryPhraseTypeOptionWord
+                    )}{' '}
+                    <span>
+                      (
+                      {intl.formatMessage(
+                        messages.recoveryPhraseType12WordOption
+                      )}
+                      )
+                    </span>
+                  </Fragment>
+                ),
+                selected: this.isYoroiLegacy(),
+                onChange: () =>
+                  this.onSelectWalletType(WALLET_RESTORE_TYPES.YOROI_LEGACY),
+              },
+              {
+                key: WALLET_RESTORE_TYPES.YOROI_REGULAR,
+                label: (
+                  <Fragment>
+                    {YOROI_WALLET_RECOVERY_PHRASE_WORD_COUNT}
+                    {intl.formatMessage(
+                      messages.recoveryPhraseTypeOptionWord
+                    )}{' '}
+                    <span>
+                      (
+                      {intl.formatMessage(
+                        messages.recoveryPhraseType15WordOption
+                      )}
+                      )
+                    </span>
+                    <span className={styles.newLabel}>
+                      {intl.formatMessage(messages.newLabel)}
+                    </span>
+                  </Fragment>
+                ),
+                selected: this.isYoroiRegular(),
+                onChange: () =>
+                  this.onSelectWalletType(WALLET_RESTORE_TYPES.YOROI_REGULAR),
+              },
+            ]}
+          />
+        )}
+
         <Autocomplete
           {...recoveryPhraseField.bind()}
           ref={autocomplete => {
@@ -486,12 +570,9 @@ export default class WalletRestoreDialog extends Component<Props, State> {
           }
           placeholder={
             !this.isCertificate()
-              ? intl.formatMessage(messages.recoveryPhraseInputHint, {
-                  numberOfWords:
-                    walletType === WALLET_RESTORE_TYPES.LEGACY ? '12' : '15',
-                })
+              ? intl.formatMessage(messages.recoveryPhraseInputHint)
               : intl.formatMessage(messages.shieldedRecoveryPhraseInputHint, {
-                  numberOfWords: 27,
+                  numberOfWords: PAPER_WALLET_RECOVERY_PHRASE_WORD_COUNT,
                 })
           }
           options={suggestedMnemonics}
@@ -551,6 +632,18 @@ export default class WalletRestoreDialog extends Component<Props, State> {
     return this.state.walletType === WALLET_RESTORE_TYPES.LEGACY;
   }
 
+  isYoroiLegacy() {
+    return this.state.walletType === WALLET_RESTORE_TYPES.YOROI_LEGACY;
+  }
+
+  isYoroiRegular() {
+    return this.state.walletType === WALLET_RESTORE_TYPES.YOROI_REGULAR;
+  }
+
+  isYoroi() {
+    return this.isYoroiLegacy() || this.isYoroiRegular();
+  }
+
   onSelectWalletType = (walletType: string, shouldResetForm?: boolean) => {
     const { onChoiceChange, isSubmitting } = this.props;
     if (isSubmitting) return;

diff --git a/source/renderer/app/components/wallet/WalletRestoreDialog.scss b/source/renderer/app/components/wallet/WalletRestoreDialog.scss
@@ -15,6 +15,23 @@
     margin-bottom: 20px;
   }
 
+  .newLabel {
+    background-color: var(
+      --theme-wallet-restore-dialog-new-label-background-color
+    );
+    border-radius: 3px;
+    color: var(--theme-wallet-restore-dialog-new-label-color);
+    font-family: var(--font-bold);
+    font-size: 8px;
+    font-weight: bold;
+    margin-left: 6px;
+    opacity: 1 !important;
+    padding: 2px 8px 3px 8px;
+    position: relative;
+    text-transform: uppercase;
+    top: -2px;
+  }
+
   .spendingPasswordWrapper {
     border-top: 1px solid var(--theme-dialog-border-color);
     margin-top: 30px;
@@ -68,9 +85,9 @@
       cursor: pointer;
       flex: 1;
       font-family: var(--font-medium);
-      font-size: 16px;
+      font-size: 14px;
       opacity: 0.5;
-      padding: 20px;
+      padding: 20px 0;
       text-align: center;
     }
 

diff --git a/source/renderer/app/config/cryptoConfig.js b/source/renderer/app/config/cryptoConfig.js
@@ -6,3 +6,4 @@ export const ADA_CERTIFICATE_MNEMONIC_LENGTH = 18;
 export const PAPER_WALLET_RECOVERY_PHRASE_WORD_COUNT = 27;
 export const PAPER_WALLET_PRINTED_WORDS_COUNT = 18;
 export const PAPER_WALLET_WRITTEN_WORDS_COUNT = 9;
+export const YOROI_WALLET_RECOVERY_PHRASE_WORD_COUNT = 15;
diff --git a/source/renderer/app/config/walletsConfig.js b/source/renderer/app/config/walletsConfig.js
@@ -2,6 +2,7 @@ import {
   WALLET_RECOVERY_PHRASE_WORD_COUNT,
   PAPER_WALLET_RECOVERY_PHRASE_WORD_COUNT,
   LEGACY_WALLET_RECOVERY_PHRASE_WORD_COUNT,
+  YOROI_WALLET_RECOVERY_PHRASE_WORD_COUNT,
 } from './cryptoConfig';
 
 export const CREATE_WALLET_STEPS = [
@@ -21,10 +22,14 @@ export const WALLET_RESTORE_TYPES = {
   REGULAR: 'regular', // Shelley wallet
   CERTIFICATE: 'certificate', // Paper wallet
   LEGACY: 'legacy', // Byron wallet
+  YOROI_REGULAR: 'yoroi-regular', // Yoroi regular (rewards) wallet
+  YOROI_LEGACY: 'yoroi-legacy', // Yoroi legacy (balance) wallet
 };
 
 export const RECOVERY_PHRASE_WORD_COUNT_OPTIONS = {
   [WALLET_RESTORE_TYPES.REGULAR]: WALLET_RECOVERY_PHRASE_WORD_COUNT,
   [WALLET_RESTORE_TYPES.CERTIFICATE]: PAPER_WALLET_RECOVERY_PHRASE_WORD_COUNT,
   [WALLET_RESTORE_TYPES.LEGACY]: LEGACY_WALLET_RECOVERY_PHRASE_WORD_COUNT,
+  [WALLET_RESTORE_TYPES.YOROI_REGULAR]: YOROI_WALLET_RECOVERY_PHRASE_WORD_COUNT,
+  [WALLET_RESTORE_TYPES.YOROI_LEGACY]: YOROI_WALLET_RECOVERY_PHRASE_WORD_COUNT,
 };
diff --git a/source/renderer/app/i18n/global-messages.js b/source/renderer/app/i18n/global-messages.js
@@ -59,7 +59,7 @@ export default defineMessages({
   passwordInstructions: {
     id: 'global.passwordInstructions',
     defaultMessage:
-      '!!!Note that password needs to be at least 10 characters long, and have at least 1 uppercase, 1 lowercase letter and 1 number.',
+      '!!!Note that password needs to be at least 7 characters long, and have at least 1 uppercase, 1 lowercase letter and 1 number.',
     description: 'Password instructions note.',
   },
   cancel: {

diff --git a/source/renderer/app/i18n/locales/de-DE.json b/source/renderer/app/i18n/locales/de-DE.json
@@ -546,17 +546,19 @@
   "wallet.restore.dialog.recovery.phrase.input.hint": "!!!Enter recovery phrase",
   "wallet.restore.dialog.recovery.phrase.input.label": "!!!Recovery phrase",
   "wallet.restore.dialog.recovery.phrase.input.noResults": "!!!No results",
+  "wallet.restore.dialog.recovery.phrase.newLabel": "!!!New",
   "wallet.restore.dialog.recovery.phrase.type.12word.option": "!!!Daedalus legacy wallet",
   "wallet.restore.dialog.recovery.phrase.type.15word.option": "!!!Daedalus wallet",
-  "wallet.restore.dialog.recovery.phrase.type.options.label": "!!!Recovery phrase type",
+  "wallet.restore.dialog.recovery.phrase.type.options.label": "!!!Number of words in the recovery phrase",
   "wallet.restore.dialog.recovery.phrase.type.word": "!!!words",
   "wallet.restore.dialog.repeatPasswordLabel": "!!!Repeat password",
   "wallet.restore.dialog.restore.wallet.button.label": "!!!Restore wallet",
   "wallet.restore.dialog.shielded.recovery.phrase.input.hint": "!!!Enter the recovery phrase from your paper wallet certificate",
   "wallet.restore.dialog.shielded.recovery.phrase.input.label": "!!!Paper wallet recovery phrase",
   "wallet.restore.dialog.spendingPasswordLabel": "!!!Enter password",
-  "wallet.restore.dialog.tab.title.certificate": "!!!Paper wallet certificate",
-  "wallet.restore.dialog.tab.title.recoveryPhrase": "!!!Backup recovery phrase",
+  "wallet.restore.dialog.tab.title.certificate": "!!!Daedalus paper wallet",
+  "wallet.restore.dialog.tab.title.recoveryPhrase": "!!!Daedalus wallet",
+  "wallet.restore.dialog.tab.title.yoroi": "!!!Yoroi wallet",
   "wallet.restore.dialog.title.label": "!!!Restore a wallet",
   "wallet.restore.dialog.wallet.name.input.hint": "!!!Name the wallet you are restoring",
   "wallet.restore.dialog.wallet.name.input.label": "!!!Wallet name",