Skip to content

Commit b983b6f

Browse files
Merge remote-tracking branch 'origin/develop' into chore/ddw-1080-add-storybook-build-validation-on-pre-push
2 parents f79ad49 + adb3d86 commit b983b6f

File tree

12 files changed

+31
-14
lines changed

12 files changed

+31
-14
lines changed

CHANGELOG.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212

1313
### Fixes
1414

15+
- Fixed tooltip being hidden in several places ([PR-2934](https://github.com/input-output-hk/daedalus/pull/2934))
16+
- Adjusted padding for search field in stake pools ([PR 2945](https://github.com/input-output-hk/daedalus/pull/2945))
1517
- Fixed margin for dialogs content and token table header ([PR 2944](https://github.com/input-output-hk/daedalus/pull/2944))
1618
- Fixed performance issue on stake pool list view ([PR 2924](https://github.com/input-output-hk/daedalus/pull/2924))
17-
- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
1819
- Fixed position of popup on syncing screen ([PR 2921](https://github.com/input-output-hk/daedalus/pull/2921))
1920
- Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
2021
- Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
@@ -27,13 +28,22 @@
2728
### Chores
2829

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

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

3949
### 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: 1 addition & 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": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
top: 0;
1414
transition: margin-right 400ms ease;
1515
width: 460px;
16-
z-index: $dialog-z-index;
16+
z-index: $news-feed-z-index;
1717

1818
&.noTransition {
1919
transition: none;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
input {
4242
border-radius: 4px;
4343
height: 50px;
44-
padding: 0 68px 0 55px;
44+
padding: 0 68px 0 45px;
4545
}
4646

4747
&.inputExtrasSearch {
@@ -61,7 +61,7 @@
6161
height: 48px;
6262
line-height: 48px;
6363
position: absolute;
64-
right: 20px;
64+
right: 11px;
6565
}
6666

6767
.clearSearchButton {

source/renderer/app/components/wallet/WalletCreateDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { Input } from 'react-polymorph/lib/components/Input';
66
import { InputSkin } from 'react-polymorph/lib/skins/simple/InputSkin';
77
import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl';
88
import vjf from 'mobx-react-form/lib/validators/VJF';
9-
import { PopOver } from 'react-polymorph/lib/components/PopOver';
109
import SVGInline from 'react-svg-inline';
10+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
1111
import ReactToolboxMobxForm, {
1212
handleFormErrors,
1313
} from '../../utils/ReactToolboxMobxForm';

source/renderer/app/components/wallet/send-form/WalletSendAssetsConfirmationDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { Input } from 'react-polymorph/lib/components/Input';
44
import { InputSkin } from 'react-polymorph/lib/skins/simple/InputSkin';
55
import { Checkbox } from 'react-polymorph/lib/components/Checkbox';
66
import { CheckboxSkin } from 'react-polymorph/lib/skins/simple/CheckboxSkin';
7-
import { PopOver } from 'react-polymorph/lib/components/PopOver';
87
import { get } from 'lodash';
98
import BigNumber from 'bignumber.js';
109
import SVGInline from 'react-svg-inline';
1110
import { intlShape, FormattedHTMLMessage } from 'react-intl';
1211
import vjf from 'mobx-react-form/lib/validators/VJF';
12+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
1313
import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
1414
import Dialog from '../../widgets/Dialog';
1515
import DialogCloseButton from '../../widgets/DialogCloseButton';

source/renderer/app/components/wallet/settings/ChangeSpendingPasswordDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import classnames from 'classnames';
44
import { Input } from 'react-polymorph/lib/components/Input';
55
import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl';
66
import vjf from 'mobx-react-form/lib/validators/VJF';
7-
import { PopOver } from 'react-polymorph/lib/components/PopOver';
87
import SVGInline from 'react-svg-inline';
8+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
99
import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
1010
import DialogCloseButton from '../../widgets/DialogCloseButton';
1111
import Dialog from '../../widgets/Dialog';

source/renderer/app/components/wallet/wallet-import/WalletSelectImportDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import {
88
import { observer } from 'mobx-react';
99
import { ButtonSkin } from 'react-polymorph/lib/skins/simple/ButtonSkin';
1010
import { Button } from 'react-polymorph/lib/components/Button';
11-
import { PopOver } from 'react-polymorph/lib/components/PopOver';
1211
import { CheckboxSkin } from 'react-polymorph/lib/skins/simple/CheckboxSkin';
1312
import { Checkbox } from 'react-polymorph/lib/components/Checkbox';
1413
import { Link } from 'react-polymorph/lib/components/Link';
1514
import { LinkSkin } from 'react-polymorph/lib/skins/simple/LinkSkin';
1615
import classNames from 'classnames';
1716
import SVGInline from 'react-svg-inline';
17+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
1818
import styles from './WalletSelectImportDialog.scss';
1919
import DialogCloseButton from '../../widgets/DialogCloseButton';
2020
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../../assets/images/close-c... Remove this comment to see the full error message

source/renderer/app/components/widgets/forms/FormFieldSkinTooltip.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import type { Element } from 'react';
55
import { omit } from 'lodash';
66
import classnames from 'classnames';
77
import SVGInline from 'react-svg-inline';
8-
import { PopOver } from 'react-polymorph/lib/components/PopOver';
98
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../../assets/images/exclama... Remove this comment to see the full error message
109
import exclamationPointIcon from '../../../assets/images/exclamation-point.inline.svg';
1110
import styles from './FormFieldSkinTooltip.scss';
11+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
12+
1213
type Props = {
1314
className: string;
1415
disabled: boolean;

0 commit comments

Comments
 (0)