Skip to content

Commit ca17559

Browse files
committed
Merge branch 'develop' into DDW-1014-ui-fix-search-field-paddings
# Conflicts: # CHANGELOG.md
2 parents 8236790 + 201609b commit ca17559

28 files changed

+992
-773
lines changed

CHANGELOG.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
### Fixes
1414

1515
- Adjusted padding for search field in stake pools ([PR 2945](https://github.com/input-output-hk/daedalus/pull/2945))
16-
- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
16+
- Fixed margin for dialogs content and token table header ([PR 2944](https://github.com/input-output-hk/daedalus/pull/2944))
17+
- Fixed performance issue on stake pool list view ([PR 2924](https://github.com/input-output-hk/daedalus/pull/2924))
1718
- Fixed position of popup on syncing screen ([PR 2921](https://github.com/input-output-hk/daedalus/pull/2921))
1819
- Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
1920
- Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
@@ -25,13 +26,22 @@
2526

2627
### Chores
2728

28-
- Introduced new version of the `@cardano-foundation/ledgerjs-hw-app-cardano` package ([PR 2930](https://github.com/input-output-hk/daedalus/pull/2930))
2929
- Using new faker.js ([PR 2855](https://github.com/input-output-hk/daedalus/pull/2855))
30-
- Removed `dockutil` due compatibility issues with MacOs Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
3130
- Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
3231
- Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
3332
- Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))
3433

34+
## 4.9.1
35+
36+
### Fixes
37+
38+
- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
39+
- Fixed macOS installer on Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
40+
41+
### Chores
42+
43+
- Introduced new version of the `@cardano-foundation/ledgerjs-hw-app-cardano` package ([PR 2930](https://github.com/input-output-hk/daedalus/pull/2930))
44+
3545
## 4.9.0
3646

3747
### Features

installers/common/MacInstaller.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-x64-"*
153153
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/build/Release/addon.node"
154154
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-x64/node.napi.node"
155155
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
156+
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/build/Release/binding.node"
156157
sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
157158

158159
# Sign the whole component deeply

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "daedalus",
33
"productName": "Daedalus",
4-
"version": "4.9.0",
4+
"version": "4.9.1",
55
"description": "Cryptocurrency Wallet",
66
"main": "./dist/main/index.js",
77
"scripts": {
@@ -103,6 +103,7 @@
103103
"@types/qrcode.react": "^1.0.2",
104104
"@types/react": "^17.0.38",
105105
"@types/react-svg-inline": "^2.1.3",
106+
"@types/react-table": "^7.7.9",
106107
"@typescript-eslint/eslint-plugin": "^5.10.1",
107108
"@typescript-eslint/parser": "^5.10.1",
108109
"asar": "2.1.0",
@@ -260,6 +261,7 @@
260261
"react-router": "5.2.0",
261262
"react-router-dom": "5.2.0",
262263
"react-svg-inline": "2.1.1",
264+
"react-table": "7.7.0",
263265
"react-virtualized": "9.22.3",
264266
"recharts": "1.8.5",
265267
"rimraf": "3.0.2",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
.SimpleBubble_bubble {
2727
border-radius: 2px !important;
2828
}
29+
30+
.Dialog_contentWrapper::-webkit-scrollbar-track {
31+
margin-top: -8px;
32+
}
2933
}
3034

3135
.content {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,9 @@
8888
}
8989
}
9090
}
91+
92+
.Dialog_contentWrapper::-webkit-scrollbar-track {
93+
margin-top: -8px;
94+
}
9195
}
9296
}
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
import { defineMessages } from 'react-intl';
2+
3+
export const messages = defineMessages({
4+
tableHeaderRank: {
5+
id: 'staking.stakePools.tableHeader.rank',
6+
defaultMessage: '!!!Rank',
7+
description: 'Table header "Rank" label on stake pools list view page',
8+
},
9+
tableHeaderRankTooltip: {
10+
id: 'staking.stakePools.tooltip.rankingTooltip',
11+
defaultMessage:
12+
'!!!<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>',
13+
description: '"Rank" tooltip for the Stake Pools Table.',
14+
},
15+
tableHeaderTicker: {
16+
id: 'staking.stakePools.tableHeader.ticker',
17+
defaultMessage: '!!!Ticker',
18+
description: 'Table header "Ticker" label on stake pools list view page',
19+
},
20+
tableHeaderSaturation: {
21+
id: 'staking.stakePools.tableHeader.saturation',
22+
defaultMessage: '!!!Saturation',
23+
description:
24+
'Table header "Saturation" label on stake pools list view page',
25+
},
26+
tableHeaderSaturationTooltip: {
27+
id: 'staking.stakePools.tooltip.saturationTooltip',
28+
defaultMessage:
29+
'!!!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.',
30+
description: '"Saturation" tooltip for the Stake Pools Table.',
31+
},
32+
tableHeaderPerformance: {
33+
id: 'staking.stakePools.tableHeader.performance',
34+
defaultMessage: '!!!Performance',
35+
description:
36+
'Table header "Performance" label on stake pools list view page',
37+
},
38+
tableHeaderUptime: {
39+
id: 'staking.stakePools.tableHeader.uptime',
40+
defaultMessage: '!!!Uptime (days)',
41+
description: 'Table header "Uptime" label on stake pools list view page',
42+
},
43+
tableHeaderMargin: {
44+
id: 'staking.stakePools.tableHeader.margin',
45+
defaultMessage: '!!!Margin',
46+
description: 'Table header "Margin" label on stake pools list view page',
47+
},
48+
tableHeaderMarginTooltip: {
49+
id: 'staking.stakePools.tooltip.profitMarginTooltip',
50+
defaultMessage:
51+
"!!!The pool's profit, defined as the rewards percentage kept by the pool from the stake that was delegated to it.",
52+
description: '"Pool margin" tooltip for the Stake Pools Table.',
53+
},
54+
tableHeaderRoi: {
55+
id: 'staking.stakePools.tableHeader.roi',
56+
defaultMessage: '!!!Roi',
57+
description: 'Table header "Roi" label on stake pools list view page',
58+
},
59+
tableHeaderCost: {
60+
id: 'staking.stakePools.tableHeader.cost',
61+
defaultMessage: '!!!Cost (ADA)',
62+
description: 'Table header "Cost" label on stake pools list view page',
63+
},
64+
tableHeaderCostTooltip: {
65+
id: 'staking.stakePools.tooltip.costPerEpochTooltip',
66+
defaultMessage:
67+
'!!!Fixed operational costs that the stake pool retains from any rewards earned during each epoch.',
68+
description: '"Cost per epoch" tooltip for the Stake Pools Table.',
69+
},
70+
tableHeaderProducedBlocks: {
71+
id: 'staking.stakePools.tableHeader.producedBlocks',
72+
defaultMessage: '!!!Produced Blocks',
73+
description:
74+
'Table header "Produced Blocks" label on stake pools list view page',
75+
},
76+
tableHeaderProducedBlocksTooltip: {
77+
id: 'staking.stakePools.tooltip.producedBlocksTooltip',
78+
defaultMessage:
79+
'!!!The total number of blocks the stake pool has produced.',
80+
description: '"Blocks" tooltip for the Stake Pools Table.',
81+
},
82+
tableHeaderPotentialRewards: {
83+
id: 'staking.stakePools.tableHeader.potentialRewards',
84+
defaultMessage: '!!!Potential rewards',
85+
description:
86+
'Table header "Potential rewards" label on stake pools list view page',
87+
},
88+
tableHeaderPotentialRewardsTooltip: {
89+
id: 'staking.stakePools.tooltip.potentialRewardsTooltip',
90+
defaultMessage:
91+
"!!!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.",
92+
description: '"Rewards" tooltip for the Stake Pools Table.',
93+
},
94+
tableHeaderPledge: {
95+
id: 'staking.stakePools.tableHeader.pledge',
96+
defaultMessage: '!!!Pledge (ADA)',
97+
description: 'Table header "Pledge" label on stake pools list view page',
98+
},
99+
tableHeaderPledgeTooltip: {
100+
id: 'staking.stakePools.tooltip.pledgeTooltip',
101+
defaultMessage:
102+
'!!!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.',
103+
description: '"Pledge" tooltip for the Stake Pools Table.',
104+
},
105+
tableHeaderRetiring: {
106+
id: 'staking.stakePools.tableHeader.retiring',
107+
defaultMessage: '!!!Retiring in',
108+
description: 'Table header "Retiring" label on stake pools list view page',
109+
},
110+
});

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@
9292
}
9393
}
9494

95-
table {
95+
.table {
9696
border-style: hidden;
9797
user-select: text;
9898
width: 100%;
9999

100-
thead {
100+
.thead {
101101
background: var(--theme-bordered-box-background-color);
102102
border-radius: 4px 4px 0 0;
103103
box-shadow: 0 10px 10px -10px rgba(0, 0, 0, 0.2);
@@ -108,7 +108,7 @@
108108
top: 0;
109109
z-index: $sticky-header-z-index;
110110

111-
tr {
111+
.tr {
112112
border: 0;
113113
display: flex;
114114
justify-content: space-between;
@@ -131,8 +131,8 @@
131131
}
132132
}
133133

134-
tbody {
135-
tr {
134+
.tbody {
135+
.tr {
136136
display: flex;
137137
justify-content: space-between;
138138
width: 100%;
@@ -145,11 +145,11 @@
145145
}
146146
}
147147

148-
tr {
148+
.tr {
149149
border-bottom: 1px solid var(--theme-staking-table-border-color);
150150
}
151151

152-
th {
152+
.th {
153153
color: var(--theme-staking-font-color-regular);
154154
cursor: pointer;
155155
font-family: var(--font-semibold);
@@ -207,7 +207,7 @@
207207
}
208208
}
209209

210-
td {
210+
.td {
211211
color: var(--theme-staking-font-color-regular);
212212
font-family: var(--font-regular);
213213
font-size: 12px;
@@ -266,6 +266,7 @@
266266
display: flex;
267267
flex-direction: row;
268268
height: 100%;
269+
justify-content: center;
269270
}
270271

271272
%saturationContainer {
@@ -346,8 +347,8 @@
346347
}
347348
}
348349

349-
th,
350-
td {
350+
.th,
351+
.td {
351352
&:nth-child(1),
352353
&:nth-child(3),
353354
&:nth-child(4),

0 commit comments

Comments
 (0)