[DDW-123] Disable address generation for Yoroi wallets (#1961)

* [DDW-123] Disable address generation for Yoroi wallets

* [DDW-123] Removes hardcoded API data

* [DDW-123] Adjustment in progress

* [DDW-123] Typo

* [DDW-123] Code improvements, README update

* [DDW-123] Update README

* [DDD-123] Yoroi addresses rendering issues

* [DDW-123] Removes console logs

* [DDW-123] Update text copy

Co-authored-by: Nikola Glumac <[email protected]>

Author: thedanheller

CHANGELOG.md

@@ -18,6 +18,7 @@ Changelog
 
 ### Fixes
 
+- Disabled address generation for Yoroi wallets ([PR 1961](https://github.com/input-output-hk/daedalus/pull/1961))
 - Fixed "Restoration" dialog validation ([PR 1951](https://github.com/input-output-hk/daedalus/pull/1951))
 - Fixed the `EPERM` errors thrown in the console upon changing wallet name on the "Wallet Settings" screen ([PR 1944](https://github.com/input-output-hk/daedalus/pull/1944))
 

README.md

@@ -47,7 +47,7 @@ Daedalus - Cryptocurrency Wallet
 
 1. Run `yarn nix:selfnode` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
-3. Once Daedalus has started, and has gotten past the loading screen, run `yarn byron:wallet:importer` from a new terminal window. This is only required if you wish to import some funded wallets.
+3. Once Daedalus has started, and has gotten past the loading screen, run `yarn byron:wallet:importer` from a new terminal window. This is only required if you wish to import some funded wallets. It is also possible to import funded Yoroi wallets by running `yarn yoroi:wallet:importer` script.
 
 #### Mainnet
 

nix/sources.json

@@ -41,10 +41,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "7140ff0886908e884eb7d1944ebdd59cbe3b1511",
-        "sha256": "0fg9bvd3dlbnszip0l1gxvwg17j0ryjmm8f31yvb33gjk0x6h94g",
+        "rev": "b97553a2b734a0fa25e0ef27f9fe15e46175f406",
+        "sha256": "026as7bdmmamcyjn05al4mfqyhg9w7q09h9zv9vx917l36jy76pa",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/7140ff0886908e884eb7d1944ebdd59cbe3b1511.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/b97553a2b734a0fa25e0ef27f9fe15e46175f406.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "v2020-04-07"
     },

package.json

@@ -55,6 +55,7 @@
     "byron:wallet:importer": "node utils/api-importer/byron-wallet-importer.js",
     "itn:byron:wallet:importer": "node utils/api-importer/itn-byron-wallet-importer.js",
     "itn:shelley:wallet:importer": "node utils/api-importer/itn-shelley-wallet-importer.js",
+    "yoroi:wallet:importer": "node utils/api-importer/yoroi-wallet-importer.js",
     "js-launcher": "node utils/js-launcher/index.js",
     "create-news-verification-hashes": "node utils/create-news-verification-hashes/index.js",
     "lockfile:check": "node utils/lockfile-checker/index.js --check",

source/renderer/app/api/api.js

@@ -1896,6 +1896,7 @@ const _createWalletFromServerData = action(
       delegation,
       state: syncState,
       isLegacy = false,
+      discovery,
     } = wallet;
 
     const id = isLegacy ? getLegacyWalletId(rawWalletId) : rawWalletId;
@@ -1945,6 +1946,7 @@ const _createWalletFromServerData = action(
       delegationStakePoolStatus,
       lastDelegationStakePoolId,
       pendingDelegations: next,
+      discovery,
     });
   }
 );

source/renderer/app/api/wallets/types.js

@@ -48,6 +48,7 @@ export type AdaWallet = {
     last_updated_at: string,
   },
   state: WalletSyncState,
+  discovery: Discovery,
   isLegacy: boolean,
 };
 
@@ -63,6 +64,7 @@ export type LegacyAdaWallet = {
     last_updated_at: string,
   },
   state: WalletSyncState,
+  discovery: Discovery,
   tip: Block,
 };
 
@@ -78,6 +80,8 @@ export type SyncStateStatus =
   | 'syncing'
   | 'not_responding';
 
+export type Discovery = 'random' | 'sequential';
+
 export type DelegationStatus = 'delegating' | 'not_delegating';
 
 export type WalletSyncStateProgress = {

source/renderer/app/components/wallet/receive/Address.js

@@ -0,0 +1,107 @@
+// @flow
+import React, { Component } from 'react';
+import { observer } from 'mobx-react';
+import classnames from 'classnames';
+import CopyToClipboard from 'react-copy-to-clipboard';
+import { defineMessages, intlShape } from 'react-intl';
+import SVGInline from 'react-svg-inline';
+import styles from './AddressActions.scss';
+import iconQR from '../../../assets/images/qr-code.inline.svg';
+import iconCopy from '../../../assets/images/clipboard-ic.inline.svg';
+import WalletAddress from '../../../domains/WalletAddress';
+
+const messages = defineMessages({
+  instructionsTitle: {
+    id: 'wallet.receive.page.instructions.instructionsTitle',
+    defaultMessage: '!!!Your wallet addresses',
+    description: 'Instructions Title on the wallet "Receive page"',
+  },
+  instructionsDescription: {
+    id: 'wallet.receive.page.instructions.instructionsDescription',
+    defaultMessage:
+      '!!!Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.',
+    description: 'Instructions Description on the wallet "Receive page"',
+  },
+  addressesTitle: {
+    id: 'wallet.receive.page.addresses.addressesTitle',
+    defaultMessage: '!!!Addresses',
+    description: 'Addresses Title on the wallet "Receive page"',
+  },
+  showUsedLabel: {
+    id: 'wallet.receive.page.showUsedLabel',
+    defaultMessage: '!!!show used',
+    description:
+      'Label for "show used" wallet addresses link on the wallet "Receive page"',
+  },
+  shareAddressLabel: {
+    id: 'wallet.receive.page.shareAddressLabel',
+    defaultMessage: '!!!Share',
+    description: 'Label for "Share" link on the wallet "Receive page"',
+  },
+  copyAddressLabel: {
+    id: 'wallet.receive.page.copyAddressLabel',
+    defaultMessage: '!!!Copy address',
+    description: 'Label for "Copy address" link on the wallet "Receive page"',
+  },
+});
+
+type Props = {
+  address: WalletAddress,
+  onShareAddress: Function,
+  onCopyAddress: Function,
+  type?: 'share' | 'copy',
+};
+
+@observer
+export default class AddressActions extends Component<Props> {
+  static defaultProps = {
+    type: 'copy',
+  };
+  static contextTypes = {
+    intl: intlShape.isRequired,
+  };
+
+  addressElement: ?HTMLElement;
+  addressContainerElement: ?HTMLElement;
+
+  render() {
+    const { intl } = this.context;
+    const {
+      address,
+      onShareAddress,
+      onCopyAddress,
+      type = 'copy',
+    } = this.props;
+    const { id: addressId, used: isUsed } = address;
+    const componentClasses = classnames(styles[`${type}Actions`], {
+      [styles.isUsed]: isUsed,
+    });
+    return (
+      <div className={componentClasses}>
+        {type === 'copy' ? (
+          <CopyToClipboard
+            text={addressId}
+            onCopy={() => onCopyAddress(addressId)}
+          >
+            <span className={styles.copyAddress}>
+              <SVGInline svg={iconCopy} className={styles.copyIcon} />
+              <span className={styles.copyAddressLabel}>
+                {intl.formatMessage(messages.copyAddressLabel)}
+              </span>
+            </span>
+          </CopyToClipboard>
+        ) : (
+          <button
+            className={styles.shareAddressButton}
+            onClick={() => onShareAddress(address)}
+          >
+            <SVGInline svg={iconQR} className={styles.shareIcon} />
+            <span className={styles.shareAddressLabel}>
+              {intl.formatMessage(messages.shareAddressLabel)}
+            </span>
+          </button>
+        )}
+      </div>
+    );
+  }
+}

source/renderer/app/components/wallet/receive/Address.scss

@@ -0,0 +1,64 @@
+.shareActions {
+  display: flex;
+  flex-direction: row;
+  flex-shrink: 0;
+  height: 18px;
+  justify-content: flex-end;
+}
+.copyActions {
+}
+.isUsed {
+  .copyAddress .copyIcon {
+    opacity: 0.4;
+  }
+  .copyAddress .copyAddressLabel {
+    opacity: 0.2;
+  }
+}
+
+/* COPY */
+.copyAddress {
+  cursor: pointer;
+  display: flex;
+  white-space: nowrap;
+}
+.copyAddressLabel {
+  color: var(--theme-label-button-color);
+  font-size: 14px;
+  margin-left: 6px;
+  opacity: 0.5;
+}
+.copyIcon {
+  cursor: pointer;
+  margin-left: 4px;
+  object-fit: contain;
+  & > svg {
+    height: 12px;
+    width: 10px;
+    path {
+      fill: var(--theme-icon-copy-address-color);
+    }
+  }
+}
+
+/* SHARE */
+.shareAddressButton {
+  cursor: pointer;
+  line-height: 1.36;
+  white-space: nowrap;
+}
+.shareIcon {
+  & > svg {
+    height: 12px;
+    width: 12px;
+    path {
+      fill: var(--theme-icon-copy-address-color);
+    }
+  }
+}
+.shareAddressLabel {
+  color: var(--theme-label-button-color);
+  font-size: 14px;
+  margin-left: 6px;
+  opacity: 0.5;
+}