Merge branch 'develop' into chore/ddw-1034-refactor-error-handling-in-rewards-only-wallets

Author: shawnbusuttil

CHANGELOG.md

@@ -12,7 +12,11 @@
 
 ### Fixes
 
-- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
+- 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 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))
@@ -24,13 +28,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

@@ -153,6 +153,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",
@@ -103,6 +103,7 @@
     "@types/qrcode.react": "^1.0.2",
     "@types/react": "^17.0.38",
     "@types/react-svg-inline": "^2.1.3",
+    "@types/react-table": "^7.7.9",
     "@typescript-eslint/eslint-plugin": "^5.10.1",
     "@typescript-eslint/parser": "^5.10.1",
     "asar": "2.1.0",
@@ -138,7 +139,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",
@@ -155,7 +156,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",
@@ -167,7 +167,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",
@@ -256,10 +257,11 @@
     "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",
+    "react-table": "7.7.0",
     "react-virtualized": "9.22.3",
     "recharts": "1.8.5",
     "rimraf": "3.0.2",

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/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 {

source/renderer/app/components/staking/stake-pools/StakePoolsTable.messages.tsx

@@ -0,0 +1,110 @@
+import { defineMessages } from 'react-intl';
+
+export const messages = defineMessages({
+  tableHeaderRank: {
+    id: 'staking.stakePools.tableHeader.rank',
+    defaultMessage: '!!!Rank',
+    description: 'Table header "Rank" label on stake pools list view page',
+  },
+  tableHeaderRankTooltip: {
+    id: 'staking.stakePools.tooltip.rankingTooltip',
+    defaultMessage:
+      '!!!<p>A hierarchical ranking based on the potential rewards you will earn if you delegate the intended amount of stake to this pool, assuming that it reaches saturation.</p><p>*Stake pools with the potential rewards estimated at zero have the same ranking. Please set the stake slider to a higher value for more pools to get potential rewards estimated at more than zero.</p>',
+    description: '"Rank" tooltip for the Stake Pools Table.',
+  },
+  tableHeaderTicker: {
+    id: 'staking.stakePools.tableHeader.ticker',
+    defaultMessage: '!!!Ticker',
+    description: 'Table header "Ticker" label on stake pools list view page',
+  },
+  tableHeaderSaturation: {
+    id: 'staking.stakePools.tableHeader.saturation',
+    defaultMessage: '!!!Saturation',
+    description:
+      'Table header "Saturation" label on stake pools list view page',
+  },
+  tableHeaderSaturationTooltip: {
+    id: 'staking.stakePools.tooltip.saturationTooltip',
+    defaultMessage:
+      '!!!Saturation measures the stake in the pool and indicates the point at which rewards stop increasing with increases in stake. This capping mechanism encourages decentralization by discouraging users from delegating to oversaturated stake pools.',
+    description: '"Saturation" tooltip for the Stake Pools Table.',
+  },
+  tableHeaderPerformance: {
+    id: 'staking.stakePools.tableHeader.performance',
+    defaultMessage: '!!!Performance',
+    description:
+      'Table header "Performance" label on stake pools list view page',
+  },
+  tableHeaderUptime: {
+    id: 'staking.stakePools.tableHeader.uptime',
+    defaultMessage: '!!!Uptime (days)',
+    description: 'Table header "Uptime" label on stake pools list view page',
+  },
+  tableHeaderMargin: {
+    id: 'staking.stakePools.tableHeader.margin',
+    defaultMessage: '!!!Margin',
+    description: 'Table header "Margin" label on stake pools list view page',
+  },
+  tableHeaderMarginTooltip: {
+    id: 'staking.stakePools.tooltip.profitMarginTooltip',
+    defaultMessage:
+      "!!!The pool's profit, defined as the rewards percentage kept by the pool from the stake that was delegated to it.",
+    description: '"Pool margin" tooltip for the Stake Pools Table.',
+  },
+  tableHeaderRoi: {
+    id: 'staking.stakePools.tableHeader.roi',
+    defaultMessage: '!!!Roi',
+    description: 'Table header "Roi" label on stake pools list view page',
+  },
+  tableHeaderCost: {
+    id: 'staking.stakePools.tableHeader.cost',
+    defaultMessage: '!!!Cost (ADA)',
+    description: 'Table header "Cost" label on stake pools list view page',
+  },
+  tableHeaderCostTooltip: {
+    id: 'staking.stakePools.tooltip.costPerEpochTooltip',
+    defaultMessage:
+      '!!!Fixed operational costs that the stake pool retains from any rewards earned during each epoch.',
+    description: '"Cost per epoch" tooltip for the Stake Pools Table.',
+  },
+  tableHeaderProducedBlocks: {
+    id: 'staking.stakePools.tableHeader.producedBlocks',
+    defaultMessage: '!!!Produced Blocks',
+    description:
+      'Table header "Produced Blocks" label on stake pools list view page',
+  },
+  tableHeaderProducedBlocksTooltip: {
+    id: 'staking.stakePools.tooltip.producedBlocksTooltip',
+    defaultMessage:
+      '!!!The total number of blocks the stake pool has produced.',
+    description: '"Blocks" tooltip for the Stake Pools Table.',
+  },
+  tableHeaderPotentialRewards: {
+    id: 'staking.stakePools.tableHeader.potentialRewards',
+    defaultMessage: '!!!Potential rewards',
+    description:
+      'Table header "Potential rewards" label on stake pools list view page',
+  },
+  tableHeaderPotentialRewardsTooltip: {
+    id: 'staking.stakePools.tooltip.potentialRewardsTooltip',
+    defaultMessage:
+      "!!!An estimation of the potential rewards you will earn per epoch if you delegate the intended amount of stake. The system looks at the pool's parameters and historical performance data to calculate potential rewards, assuming that the pool reaches optimal saturation.",
+    description: '"Rewards" tooltip for the Stake Pools Table.',
+  },
+  tableHeaderPledge: {
+    id: 'staking.stakePools.tableHeader.pledge',
+    defaultMessage: '!!!Pledge (ADA)',
+    description: 'Table header "Pledge" label on stake pools list view page',
+  },
+  tableHeaderPledgeTooltip: {
+    id: 'staking.stakePools.tooltip.pledgeTooltip',
+    defaultMessage:
+      '!!!The amount of stake that a pool operator contributes to a pool. Pools with higher pledge amounts earn more rewards for themselves and their delegators. Pools that do not honor their pledge earn zero rewards and accrue low ranking.',
+    description: '"Pledge" tooltip for the Stake Pools Table.',
+  },
+  tableHeaderRetiring: {
+    id: 'staking.stakePools.tableHeader.retiring',
+    defaultMessage: '!!!Retiring in',
+    description: 'Table header "Retiring" label on stake pools list view page',
+  },
+});

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

@@ -92,12 +92,12 @@
     }
   }
 
-  table {
+  .table {
     border-style: hidden;
     user-select: text;
     width: 100%;
 
-    thead {
+    .thead {
       background: var(--theme-bordered-box-background-color);
       border-radius: 4px 4px 0 0;
       box-shadow: 0 10px 10px -10px rgba(0, 0, 0, 0.2);
@@ -108,7 +108,7 @@
       top: 0;
       z-index: $sticky-header-z-index;
 
-      tr {
+      .tr {
         border: 0;
         display: flex;
         justify-content: space-between;
@@ -131,8 +131,8 @@
       }
     }
 
-    tbody {
-      tr {
+    .tbody {
+      .tr {
         display: flex;
         justify-content: space-between;
         width: 100%;
@@ -145,11 +145,11 @@
       }
     }
 
-    tr {
+    .tr {
       border-bottom: 1px solid var(--theme-staking-table-border-color);
     }
 
-    th {
+    .th {
       color: var(--theme-staking-font-color-regular);
       cursor: pointer;
       font-family: var(--font-semibold);
@@ -207,7 +207,7 @@
       }
     }
 
-    td {
+    .td {
       color: var(--theme-staking-font-color-regular);
       font-family: var(--font-regular);
       font-size: 12px;
@@ -266,6 +266,7 @@
         display: flex;
         flex-direction: row;
         height: 100%;
+        justify-content: center;
       }
 
       %saturationContainer {
@@ -346,8 +347,8 @@
       }
     }
 
-    th,
-    td {
+    .th,
+    .td {
       &:nth-child(1),
       &:nth-child(3),
       &:nth-child(4),