Merge branch 'develop' into fix/ddw-722-win-test

Author: danielmain

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Features
 
+- Implemented hover tooltips for menu ([PR 2938](https://github.com/input-output-hk/daedalus/pull/2938))
 - 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))
@@ -12,8 +13,13 @@
 
 ### Fixes
 
+- Fixes hardware wallet issues on Windows ([PR 2900](https://github.com/input-output-hk/daedalus/pull/2900))
+- Fixed stake pool list styling ([PR 2920](https://github.com/input-output-hk/daedalus/pull/2920))
+- Fixed PopOver overlap ([PR 2954](https://github.com/input-output-hk/daedalus/pull/2954))
+- Fixed tooltip being hidden in several places ([PR-2934](https://github.com/input-output-hk/daedalus/pull/2934))
+- Adjusted padding for search field in stake pools ([PR 2945](https://github.com/input-output-hk/daedalus/pull/2945))
+- Fixed margin for dialogs content and token table header ([PR 2944](https://github.com/input-output-hk/daedalus/pull/2944))
 - Fixed performance issue on stake pool list view ([PR 2924](https://github.com/input-output-hk/daedalus/pull/2924))
-- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
 - 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))
@@ -25,13 +31,23 @@
 
 ### Chores
 
-- Introduced new version of the `@cardano-foundation/ledgerjs-hw-app-cardano` package ([PR 2930](https://github.com/input-output-hk/daedalus/pull/2930))
+- Added `storybook:build` check to pre-push hook ([PR 2955](https://github.com/input-output-hk/daedalus/pull/2955))
 - Using new faker.js ([PR 2855](https://github.com/input-output-hk/daedalus/pull/2855))
-- Removed `dockutil` due compatibility issues with MacOs Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
 - Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
 - Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
 - Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))
 
+## 4.9.1
+
+### Fixes
+
+- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
+- Fixed macOS installer on Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
+
+### Chores
+
+- Introduced new version of the `@cardano-foundation/ledgerjs-hw-app-cardano` package ([PR 2930](https://github.com/input-output-hk/daedalus/pull/2930))
+
 ## 4.9.0
 
 ### Features

README.md

@@ -160,14 +160,12 @@ Most of the commands need `nix` and will run only on Linux or macOS.
 - 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++) *
+- 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`

installers/common/MacInstaller.hs

@@ -154,6 +154,7 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-x64-"*
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/build/Release/addon.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-x64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/build/Release/binding.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
 
 # Sign the whole component deeply

package.json

@@ -1,13 +1,13 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
     "build": "gulp build",
     "build:electron": "electron-rebuild -w usb --useCache -s --debug",
-    "check:all": "yarn prettier:check && yarn lint && yarn compile && yarn stylelint && yarn lockfile:check && yarn manage:translations",
+    "check:all": "yarn prettier:check && yarn lint && yarn compile && yarn stylelint && yarn lockfile:check && yarn manage:translations && yarn storybook:build",
     "start": "gulp start",
     "start:dev": "NODE_ENV=development gulp start",
     "dev": "IS_WATCH_MODE=true gulp dev",
@@ -141,7 +141,7 @@
     "eslint-plugin-react": "7.21.2",
     "eslint-plugin-react-hooks": "4.1.2",
     "esm": "3.2.25",
-    "fast-sass-loader": "1.5.0",
+    "fast-sass-loader": "2.0.1",
     "file-loader": "4.2.0",
     "gulp-shell": "0.8.0",
     "hash.js": "1.1.7",
@@ -158,7 +158,6 @@
     "mobx-react-devtools": "6.1.1",
     "node-forge": "1.0.0",
     "node-libs-browser": "2.2.1",
-    "node-sass": "4.14.1",
     "nodemon": "2.0.4",
     "npmlog": "4.1.2",
     "postcss": "8.2.13",
@@ -171,7 +170,8 @@
     "react-intl-translations-manager": "5.0.3",
     "react-syntax-highlighter": "13.5.3",
     "regenerator-runtime": "0.13.7",
-    "sass-loader": "7.1.0",
+    "sass": "1.32.13",
+    "sass-loader": "10.1.1",
     "seedrandom": "3.0.5",
     "sinon": "9.2.2",
     "spawn-sync": "2.0.0",
@@ -261,7 +261,7 @@
     "react-intl": "2.7.2",
     "react-lottie": "1.2.3",
     "react-markdown": "4.3.1",
-    "react-polymorph": "1.0.3",
+    "react-polymorph": "1.0.4",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-svg-inline": "2.1.1",

source/renderer/app/components/news/NewsFeed.scss

@@ -13,7 +13,7 @@
   top: 0;
   transition: margin-right 400ms ease;
   width: 460px;
-  z-index: $dialog-z-index;
+  z-index: $news-feed-z-index;
 
   &.noTransition {
     transition: none;

source/renderer/app/components/sidebar/SidebarCategory.messages.ts

@@ -0,0 +1,24 @@
+import { defineMessages } from 'react-intl';
+
+export const messages = defineMessages({
+  wallets: {
+    id: 'sidebar.categoryTooltip.wallets',
+    defaultMessage: '!!!Wallets',
+    description: 'Text for the tooltip of wallets category',
+  },
+  staking: {
+    id: 'sidebar.categoryTooltip.staking',
+    defaultMessage: '!!!Staking',
+    description: 'Text for the tooltip of staking category',
+  },
+  settings: {
+    id: 'sidebar.categoryTooltip.settings',
+    defaultMessage: '!!!Settings',
+    description: 'Text for the tooltip of settings category',
+  },
+  voting: {
+    id: 'sidebar.categoryTooltip.voting',
+    defaultMessage: '!!!Voting',
+    description: 'Text for the tooltip of voting category',
+  },
+});

source/renderer/app/components/sidebar/SidebarCategory.tsx

@@ -1,42 +1,53 @@
-import React, { Component } from 'react';
-// @ts-ignore ts-migrate(2305) FIXME: Module '"react"' has no exported member 'Node'.
-import type { Node } from 'react';
+import React from 'react';
 import SVGInline from 'react-svg-inline';
 import { observer } from 'mobx-react';
 import classNames from 'classnames';
 import { camelCase } from 'lodash';
+import { PopOver } from 'react-polymorph/lib/components/PopOver';
+import { injectIntl } from 'react-intl';
 import type { SidebarCategoryInfo } from '../../config/sidebarConfig';
 import styles from './SidebarCategory.scss';
+import { messages } from './SidebarCategory.messages';
+import type { Intl } from '../../types/i18nTypes';
+import { TOOLTIP_DELAY } from '../../config/timingConfig';
 
 type Props = {
   category: SidebarCategoryInfo;
+  intl: Intl;
   isActive: boolean;
   onClick: (...args: Array<any>) => any;
-  content?: Node;
+  content?: React.ReactNode;
 };
 
-@observer
-class SidebarCategory extends Component<Props> {
-  render() {
-    const { category, isActive, onClick, content } = this.props;
-    const { name, icon, route } = category;
-    const className = camelCase(name);
-    const componentStyles = classNames(
-      styles.component,
-      className,
-      styles[className],
-      {
-        [styles.active]: isActive,
-      }
-    );
-    const iconClassName = classNames(styles.icon, styles[`${className}Icon`]);
-    return (
+function SidebarCategory({
+  category,
+  intl,
+  isActive,
+  onClick,
+  content,
+}: Props) {
+  const { name, icon, route, tooltipTextId } = category;
+  const className = camelCase(name);
+  const componentStyles = classNames(
+    styles.component,
+    className,
+    styles[className],
+    isActive && styles.active
+  );
+  const iconClassName = classNames(styles.icon, styles[`${className}Icon`]);
+  return (
+    <PopOver
+      delay={TOOLTIP_DELAY}
+      offset={[0, -20]}
+      content={tooltipTextId && intl.formatMessage(messages[tooltipTextId])}
+      placement="bottom"
+    >
       <button className={componentStyles} onClick={() => onClick(route)}>
         <SVGInline svg={icon} className={iconClassName} />
         {content}
       </button>
-    );
-  }
+    </PopOver>
+  );
 }
 
-export default SidebarCategory;
+export default injectIntl(observer(SidebarCategory));

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsChooseWalletDialog.scss

@@ -26,6 +26,10 @@
     .SimpleBubble_bubble {
       border-radius: 2px !important;
     }
+
+    .Dialog_contentWrapper::-webkit-scrollbar-track {
+      margin-top: -8px;
+    }
   }
 
   .content {

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsConfirmationDialog.scss

@@ -88,5 +88,9 @@
         }
       }
     }
+
+    .Dialog_contentWrapper::-webkit-scrollbar-track {
+      margin-top: -8px;
+    }
   }
 }

source/renderer/app/components/staking/stake-pools/StakePoolsSearch.scss

@@ -41,7 +41,7 @@
   input {
     border-radius: 4px;
     height: 50px;
-    padding: 0 68px 0 55px;
+    padding: 0 68px 0 45px;
   }
 
   &.inputExtrasSearch {
@@ -61,7 +61,7 @@
   height: 48px;
   line-height: 48px;
   position: absolute;
-  right: 20px;
+  right: 11px;
 }
 
 .clearSearchButton {