Skip to content

Commit bb7dfd6

Browse files
committed
Merge branch 'develop' into remove-dockutil
2 parents 3688959 + e8ba793 commit bb7dfd6

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
### Fixes
1313

14+
- Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
1415
- Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
1516
- Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))
1617
- Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2907](https://github.com/input-output-hk/daedalus/pull/2907))
-280 KB
Binary file not shown.
112 KB
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module '*.ttf';

source/main/ipc/generateAddressPDFChannel.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,12 @@ import type {
99
GenerateAddressPDFRendererRequest,
1010
GenerateAddressPDFMainResponse,
1111
} from '../../common/ipc/api';
12-
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../common/assets/pdf/NotoSa... Remove this comment to see the full error message
1312
import fontRegularEn from '../../common/assets/pdf/NotoSans-Regular.ttf';
14-
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../common/assets/pdf/NotoSa... Remove this comment to see the full error message
1513
import fontMediumEn from '../../common/assets/pdf/NotoSans-Medium.ttf';
16-
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../common/assets/pdf/arial-... Remove this comment to see the full error message
1714
import fontUnicode from '../../common/assets/pdf/arial-unicode.ttf';
18-
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../common/assets/pdf/NotoSa... Remove this comment to see the full error message
19-
import fontMono from '../../common/assets/pdf/NotoSansMono-Regular.ttf';
15+
import fontMono from '../../common/assets/pdf/RobotoMono-Regular.ttf';
2016

21-
export const generateAddressPDFChannel: // IpcChannel<Incoming, Outgoing>
22-
MainIpcChannel<
17+
export const generateAddressPDFChannel: MainIpcChannel<
2318
GenerateAddressPDFRendererRequest,
2419
GenerateAddressPDFMainResponse
2520
> = new MainIpcChannel(GENERATE_ADDRESS_PDF_CHANNEL);

0 commit comments

Comments
 (0)