Merge branch 'develop' into DDW-1014-ui-fix-search-field-paddings

Author: shawnbusuttil

CHANGELOG.md

@@ -4,13 +4,15 @@
 
 ### Features
 
+- Improved UI regarding the Hardware Wallet public key export error ([PR 2922](https://github.com/input-output-hk/daedalus/pull/2922))
 - Added ASCII name to token header when metadata name is missing ([PR 2904](https://github.com/input-output-hk/daedalus/pull/2904))
 - Improved IPC by reducing the amount of messages from periodic events ([PR 2892](https://github.com/input-output-hk/daedalus/pull/2892))
 - Improved RTS flags splash screen message ([PR 2901](https://github.com/input-output-hk/daedalus/pull/2901))
 - Implemented error message when trying to leave wallet without enough ada to support tokens ([PR 2783](https://github.com/input-output-hk/daedalus/pull/2783))
 
 ### Fixes
 
+- Fixed position of popup on syncing screen ([PR 2921](https://github.com/input-output-hk/daedalus/pull/2921))
 - Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
 - Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
 - Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))

README.md

@@ -8,13 +8,15 @@
 
 Daedalus - Cryptocurrency Wallet
 
-## Installation
+## Setup development environment
 
-### Yarn
+### Linux/macOS
+
+#### Yarn
 
 [Yarn](https://yarnpkg.com/lang/en/docs/install) is required to install `npm` dependencies to build Daedalus.
 
-### Nix
+#### Nix
 
 [Nix](https://nixos.org/nix/) is needed to run Daedalus in `nix-shell`.
 
@@ -57,22 +59,19 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
    ```
 2. Download certificate from https://docs.certifytheweb.com/docs/kb/kb-202109-letsencrypt/ and import to your keychain.
 
-## Development
-
-### Running Daedalus with Cardano Node
+#### Running Daedalus with Cardano Node
 
-#### Selfnode
+##### Selfnode
 
 1. Run `yarn nix:selfnode` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell` (use `KEEP_LOCAL_CLUSTER_RUNNING` environment variable to keep the local cluster running after Daedalus exits: `KEEP_LOCAL_CLUSTER_RUNNING=true yarn dev`)
-    1. Alternatively: run `yarn nix:selfnode yarn dev` to achieve the same thing in a single command. Note: after `yarn dev` exits, you will still remain in the `nix-shell`.
 3. Once Daedalus has started and has gotten past the loading screen run the following commands from a new terminal window if you wish to import funded wallets:
-   - Byron wallets: `yarn byron:wallet:importer`
-   - Shelley wallets: `yarn shelley:wallet:importer`
-   - Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
-   - Yoroi Byron wallets: `yarn yoroi:wallet:importer`
-   - _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
-   - _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
+  - Byron wallets: `yarn byron:wallet:importer`
+  - Shelley wallets: `yarn shelley:wallet:importer`
+  - Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
+  - Yoroi Byron wallets: `yarn yoroi:wallet:importer`
+  - _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
+  - _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
 
    These scripts import 3 wallets by default. You can import up to 10 wallets by supplying `WALLET_COUNT` environment variable (e.g. `WALLET_COUNT=10 yarn mary:wallet:importer`).
 
@@ -91,43 +90,37 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
 | desiredPoolNumber | 3
 | minimumUtxoValue | 1 ADA
 
-#### Mainnet
+##### Mainnet
 
 1. Run `yarn nix:mainnet` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
-3. Or in one command: `yarn nix:mainnet yarn dev`
 
-#### Flight
+##### Flight
 
 1. Run `yarn nix:flight` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
-3. Or in one command: `yarn nix:flight yarn dev`
 
-#### Testnet
+##### Testnet
 
 1. Run `yarn nix:testnet` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
-3. Or in one command: `yarn nix:testnet yarn dev`
 
-#### Staging
+##### Staging
 
 1. Run `yarn nix:staging` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
-3. Or in one command: `yarn nix:staging yarn dev`
 
-#### Shelley QA
+##### Shelley QA
 
 1. Run `yarn nix:shelley_qa` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
-3. Or in one command: `yarn nix:shelley_qa yarn dev`
 
-#### Alonzo Purple
+##### Alonzo Purple
 
 1. Run `yarn nix:alonzo_purple` from `daedalus`.
 2. Run `yarn dev` from the subsequent `nix-shell`
-3. Or in one command: `yarn nix:alonzo_purple yarn dev`
 
-#### Native token metadata server
+##### Native token metadata server
 
 Daedalus, by default, uses the following metadata server for all networks except for the mainnet: `https://metadata.cardano-testnet.iohkdev.io/`.
 
@@ -158,7 +151,28 @@ http://localhost:65432/metadata/query
 ```
 ... and expect a "200 OK" response.
 
-### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix)
+### Windows
+
+This option is only for troubleshooting windows specific issues with hardware wallets. It is not recommended to use Windows as a developer environment.
+Most of the commands need `nix` and will run only on Linux or macOS.
+
+#### Requisites
+- Windows 10/11
+- Daedalus testnet installation (similar version used in branch) in `C:\Program Files\Daedalus Testnet`
+- NodeJS 16
+- Python2 *
+- `yarn global add windows-build-tools` * (if this does not work extract daedalus\nix\windows-usb-libs.zip under daedalus\build folder)
+- Microsoft Build Tools 2015 *
+- Microsoft Visual Studio 2017 (Include Desktop development with C++) *
+- `yarn config set msvsversion 2015 --global`
+
+*needed for compiling [email protected] on Windows
+
+#### Steps
+- `yarn install`
+- `yarn dev:windows`
+
+#### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix)
 
 `Niv` is used to manage the version of upstream dependencies. The versions of these dependencies can be seen in `nix/sources.json`.
 

package.json

@@ -11,6 +11,7 @@
     "start": "gulp start",
     "start:dev": "NODE_ENV=development gulp start",
     "dev": "IS_WATCH_MODE=true gulp dev",
+    "dev:windows": "cross-env DAEDALUS_INSTALL_DIRECTORY=\"C:\\Program Files\\Daedalus Testnet\" LAUNCHER_CONFIG=\"C:\\Program Files\\Daedalus Testnet\\launcher-config.yaml\" gulp dev",
     "test": "NODE_ENV=test yarn build && yarn test:unit && yarn test:e2e:fail-fast",
     "test:jest": "NODE_OPTIONS=--experimental-vm-modules jest",
     "test:generate:report": "ts-node tests/reporter.ts",

source/renderer/app/components/hardware-wallet/HardwareWalletStatus.scss

@@ -23,7 +23,7 @@
         font-size: 16px;
       }
     }
-    .passphraseLabel {
+    .secondaryMessage {
       color: var(--theme-hardware-wallet-status-passphrase-label-color);
       line-height: 1.38;
     }
@@ -75,11 +75,3 @@
     }
   }
 }
-
-.errorText {
-  color: var(--rp-theme-color-error);
-  font-family: var(--font-regular);
-  font-size: 16px;
-  margin-top: 20px;
-  text-align: center;
-}

source/renderer/app/components/hardware-wallet/HardwareWalletStatus.tsx

@@ -160,12 +160,53 @@ const messages = defineMessages({
     description: '"Address verified" device state',
   },
 });
+
+const hwDeviceLoadingStatuses = [
+  HwDeviceStatuses.CONNECTING,
+  HwDeviceStatuses.LAUNCHING_CARDANO_APP,
+  HwDeviceStatuses.EXPORTING_PUBLIC_KEY,
+  HwDeviceStatuses.VERIFYING_TRANSACTION,
+  HwDeviceStatuses.VERIFYING_ADDRESS,
+  HwDeviceStatuses.VERIFYING_ADDRESS_CONFIRMATION,
+];
+
+const hwDeviceReadyStatuses = [
+  HwDeviceStatuses.READY,
+  HwDeviceStatuses.VERIFYING_TRANSACTION_SUCCEEDED,
+  HwDeviceStatuses.VERIFYING_ADDRESS_SUCCEEDED,
+];
+
+const hwDeviceErrorStatuses = [
+  HwDeviceStatuses.EXPORTING_PUBLIC_KEY_FAILED,
+  HwDeviceStatuses.CONNECTING_FAILED,
+  HwDeviceStatuses.TREZOR_BRIDGE_FAILURE,
+  HwDeviceStatuses.WRONG_FIRMWARE,
+  HwDeviceStatuses.WRONG_CARDANO_APP_VERSION,
+  HwDeviceStatuses.UNSUPPORTED_DEVICE,
+  HwDeviceStatuses.VERIFYING_TRANSACTION_FAILED,
+  HwDeviceStatuses.VERIFYING_ADDRESS_FAILED,
+  HwDeviceStatuses.VERIFYING_ADDRESS_ABORTED,
+];
+
+const hwDevicePassphraseRelatedStatuses = [
+  HwDeviceStatuses.EXPORTING_PUBLIC_KEY,
+  HwDeviceStatuses.VERIFYING_TRANSACTION,
+  HwDeviceStatuses.VERIFYING_ADDRESS,
+];
+
+const hwDeviceInstructionsLinkRelatedStatuses = [
+  HwDeviceStatuses.TREZOR_BRIDGE_FAILURE,
+  HwDeviceStatuses.WRONG_CARDANO_APP_VERSION,
+  HwDeviceStatuses.WRONG_FIRMWARE,
+];
+
 type Props = {
   hwDeviceStatus: HwDeviceStatus;
   onExternalLinkClick?: (...args: Array<any>) => any;
   walletName?: string;
   isTrezor: boolean;
 };
+
 type State = {
   hwDeviceStatus: HwDeviceStatus;
 };
@@ -207,40 +248,29 @@ class HardwareWalletStatus extends Component<Props, State> {
     const { intl } = this.context;
     const { onExternalLinkClick, walletName, isTrezor } = this.props;
     const { hwDeviceStatus } = this.state;
-    const isLoading =
-      hwDeviceStatus === HwDeviceStatuses.CONNECTING ||
-      hwDeviceStatus === HwDeviceStatuses.LAUNCHING_CARDANO_APP ||
-      hwDeviceStatus === HwDeviceStatuses.EXPORTING_PUBLIC_KEY ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_TRANSACTION ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_ADDRESS ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_ADDRESS_CONFIRMATION;
-    const isReady =
-      hwDeviceStatus === HwDeviceStatuses.READY ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_TRANSACTION_SUCCEEDED ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_ADDRESS_SUCCEEDED;
-    const hasErrored =
-      hwDeviceStatus === HwDeviceStatuses.EXPORTING_PUBLIC_KEY_FAILED ||
-      hwDeviceStatus === HwDeviceStatuses.CONNECTING_FAILED ||
-      hwDeviceStatus === HwDeviceStatuses.TREZOR_BRIDGE_FAILURE ||
-      hwDeviceStatus === HwDeviceStatuses.WRONG_FIRMWARE ||
-      hwDeviceStatus === HwDeviceStatuses.WRONG_CARDANO_APP_VERSION ||
-      hwDeviceStatus === HwDeviceStatuses.UNSUPPORTED_DEVICE ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_TRANSACTION_FAILED ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_ADDRESS_FAILED ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_ADDRESS_ABORTED;
-    const hasPassphraseLabel =
-      hwDeviceStatus === HwDeviceStatuses.EXPORTING_PUBLIC_KEY ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_TRANSACTION ||
-      hwDeviceStatus === HwDeviceStatuses.VERIFYING_ADDRESS;
-    const componentClasses = classnames([
-      styles.component,
-      isReady ? styles.isReady : null,
-      hasErrored ? styles.isError : null,
-    ]);
-    const hasInstructionsLink =
-      hwDeviceStatus === HwDeviceStatuses.TREZOR_BRIDGE_FAILURE ||
-      hwDeviceStatus === HwDeviceStatuses.WRONG_CARDANO_APP_VERSION ||
-      hwDeviceStatus === HwDeviceStatuses.WRONG_FIRMWARE;
+    const isLoading = hwDeviceLoadingStatuses.includes(hwDeviceStatus);
+    const isReady = hwDeviceReadyStatuses.includes(hwDeviceStatus);
+    const isError = hwDeviceErrorStatuses.includes(hwDeviceStatus);
+    const hasInstructionsLink = hwDeviceInstructionsLinkRelatedStatuses.includes(
+      hwDeviceStatus
+    );
+
+    const passphraseLabelVisible =
+      isTrezor && hwDevicePassphraseRelatedStatuses.includes(hwDeviceStatus);
+    let secondaryMessage = null;
+    if (passphraseLabelVisible) {
+      secondaryMessage = messages.enterPassphrase;
+    } else if (
+      hwDeviceStatus === HwDeviceStatuses.EXPORTING_PUBLIC_KEY_FAILED
+    ) {
+      secondaryMessage = messages.exportingPublicKeyError;
+    }
+
+    const componentClasses = classnames(styles.component, {
+      [styles.isReady]: isReady,
+      [styles.isError]: isError,
+    });
+
     let instructionsLink;
     let label;
 
@@ -298,9 +328,9 @@ class HardwareWalletStatus extends Component<Props, State> {
                 label
               )}
             </div>
-            {hasPassphraseLabel && isTrezor && (
-              <div className={styles.passphraseLabel}>
-                {intl.formatMessage(messages.enterPassphrase)}
+            {secondaryMessage && (
+              <div className={styles.secondaryMessage}>
+                {intl.formatMessage(secondaryMessage)}
               </div>
             )}
           </div>
@@ -310,15 +340,10 @@ class HardwareWalletStatus extends Component<Props, State> {
           {isReady && (
             <SVGInline svg={checkIcon} className={styles.checkIcon} />
           )}
-          {hasErrored && (
+          {isError && (
             <SVGInline svg={clearIcon} className={styles.clearIcon} />
           )}
         </div>
-        {hwDeviceStatus === HwDeviceStatuses.EXPORTING_PUBLIC_KEY_FAILED && (
-          <div className={styles.errorText}>
-            {intl.formatMessage(messages.exportingPublicKeyError)}
-          </div>
-        )}
       </>
     );
   }

source/renderer/app/components/loading/syncing-connecting/SyncingProgress/SyncingProgress.tsx

@@ -58,16 +58,18 @@ const SyncingProgress: FC<Props> = (props, { intl }: Context) => (
           <span className={makeMainMessageStyles(props[type] === 100)}>
             {intl.formatMessage(getProgressNameByBlockSyncType(type))}
           </span>
-          <PopOver
-            content={intl.formatMessage(
-              getProgressDescriptionByBlockSyncType(type)
-            )}
-          >
-            <SVGInline
-              svg={questionMarkIcon}
-              className={questionMarkIconStyles}
-            />
-          </PopOver>
+          <span>
+            <PopOver
+              content={intl.formatMessage(
+                getProgressDescriptionByBlockSyncType(type)
+              )}
+            >
+              <SVGInline
+                svg={questionMarkIcon}
+                className={questionMarkIconStyles}
+              />
+            </PopOver>
+          </span>
         </div>
       ))}
     </div>

source/renderer/app/i18n/locales/ja-JP.json

@@ -1187,7 +1187,7 @@
   "wallet.summary.transactionsList.syncingTransactionsMessage": "ウォレットのトランザクション履歴は現在ブロックチェーンと同期中です。",
   "wallet.summary.transactionsList.todayLabel": "今日",
   "wallet.summary.transactionsList.yesterdayLabel": "昨日",
-  "wallet.token.picker.addButtonLabel": "キャンセル",
+  "wallet.token.picker.addButtonLabel": "追加する",
   "wallet.token.picker.allTokensLabel": "すべてのトークン",
   "wallet.token.picker.cancelButtonLabel": "キャンセル",
   "wallet.token.picker.checkAllLabel": "すべてを選択",

tls/client/ca.crt

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
 MIIDNjCCAh6gAwIBAgIBATANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhEYWVk
 YWx1czElMCMGA1UEAwwcRGFlZGFsdXMgU2VsZi1TaWduZWQgUm9vdCBDQTAeFw0y
-MTAzMzAxNzIwMTBaFw0zMTAzMjgxNzIxMTBaMDoxETAPBgNVBAoMCERhZWRhbHVz
+MjAzMzAyMDEzNDhaFw0zMjAzMjcyMDE0NDhaMDoxETAPBgNVBAoMCERhZWRhbHVz
 MSUwIwYDVQQDDBxEYWVkYWx1cyBTZWxmLVNpZ25lZCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuIGJJKwYvhby2ib829IE8UU8irHEZ082
-J8XLgADEiG6UCs+aqn9w++27nlzMRMofF49rjfSjDjhzpML8e5Vug9djEz9s2B0u
-uPtAzBBJyrA56IIDUO1r/X7AcQ+h86WXWzkmGjvRQLzN0L0rPU26S7RbasXc3FP0
-wCer3Uaw/3npkfZopNXzq16/9CuZB95gka4g/LJVSqvrrZFx4dcQ8mpHK9S/Uq2n
-j1tRW8xzgFUg5NWdqhyRxvX4jtPUWMXJfn5ltOSk29Xj0Cra25ZVORtaCsqTargn
-pinWLzlejHeGZR4NVPY+213ucyt6EWMf3HnlPxqES83m9rf/oPYHbwIDAQABo0cw
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnH93sgS9S02Wbf9n1bMMPuf7bsu95wh
+vQdNRi6lmadjMcqY4KIAwebGO0bEH5fLEuPmvD2PPfjaju7/FKv8QG0aPx0ElrBo
+cYbiuYPaFmJWvhThxKSyYEEILxzx9oKxwJk+lbIaSR5p+mQLLR+UYET4fzZ3E9fL
+mgMODQNc1JKgM4GBdH13Y+0CxYsj9vQAbXTsIUvGh6+1zh0whdV1/3szSfztftnT
+OGT8xdsYZ2kTGeBjp2hQzSagWc50eT9G/d32fAhCKD6uvEsAT6xS2S6/RpGVlA8H
++ZbdHiCVGHVAuCo8DL63fPCXHjCrmOjZnV2hajK95jug2b1XbhMbowIDAQABo0cw
 RTAPBgNVHQ8BAf8EBQMDBwYAMBIGA1UdEwEB/wQIMAYBAf8CAQAwDQYDVR0OBAYE
-BHBw0/IwDwYDVR0jBAgwBoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAUlYcsa/F
-xak3RO4YH4mdJOPDt7I16SoqH9EP8BTlOTgFU8Ql5MpG7VE+XWVc1D3NSp0y9iQk
-bJH9MGaPLFbkJfwGq+pfpaS/0xI+KwRkG5rQVbpP+jOqGaADOVjuC2J3dNFg71ww
-eozmKRjKU16DsFnQJ+N68kWoJ3t776/NzS7p7Oa7k4oijPhGtEAkrKOBzHXLILkZ
-kUXYszN4pQGPPuWG2EZpTyAnvrDOwST1VrpGDFMdUy9ML891sMtuf5YM8dSF/WOS
-pTmpP4xcb5HciFa+5Hv7242ATVrAirUB6pGA0A9ruxRQPWXwISBRtOIiqqOq2xIi
-FX/3TGmzZn7kqw==
+BHBw0/IwDwYDVR0jBAgwBoAEcHDT8jANBgkqhkiG9w0BAQsFAAOCAQEAUOIAbhAt
+9AniOsPJeHL/K9bnls8zcLark229FIYrglInd53ILSKyC2+g/sOVSue2w3WebLD8
+6UkyHxYUsjz1ONla8/HMvYkbWSqCkWczlFzW5WjsTbXhtUIPtfQObnrYg3jtm/Q7
+malzKPGseR1F6cHKOzjJ2jo2FHkLrrQIgnKRAMcW0zso2sAzrx1aJnzhEhsZhKXP
+kSUGLQoDStRRJHfE5FYMEstTXa2odkCpR19Eha6BhZBxwmfzXjktjIqeHngUy4U3
+8815LuzFag+wp3nUQlkSLuwfOiBtpcWB2uzKsY6/1jrf9jcZOd8kyzOphYNngN7u
+r0BWefYXe1rFEA==
 -----END CERTIFICATE-----