Skip to content

Commit c515b62

Browse files
mchappelldanielmainMarcin Mazurekrenanvalentinszymonmaslowski
authored
[DDW-827] Show helpful message when trying to empty wallet containing native tokens (#2783)
Co-authored-by: Daniel Main <[email protected]> Co-authored-by: Marcin Mazurek <[email protected]> Co-authored-by: Renan Ferreira <[email protected]> Co-authored-by: Szymon Masłowski <[email protected]>
1 parent 416eea7 commit c515b62

File tree

19 files changed

+361
-207
lines changed

19 files changed

+361
-207
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Features
66

7+
- Implemented error message when trying to leave wallet without enough ada to support tokens ([PR 2783](https://github.com/input-output-hk/daedalus/pull/2783))
78
- Added display of current/unspent rewards ([PR 2803](https://github.com/input-output-hk/daedalus/pull/2803))
89
- Improve the syncing screen by showing syncing progress split into three stages ([PR 2877](https://github.com/input-output-hk/daedalus/pull/2877))
910
- Improved stake pool searchbar ([PR 2847](https://github.com/input-output-hk/daedalus/pull/2847))
@@ -19,6 +20,7 @@
1920
- Fixed Daedalus menu in Storybook used for theme and language selection ([PR 2886](https://github.com/input-output-hk/daedalus/pull/2886))
2021

2122
### Chores
23+
2224
- Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
2325

2426
## 4.9.0-FC1
@@ -85,10 +87,12 @@
8587

8688
### Fixes
8789

90+
- Fixed immediate language updates of application top menu bar ([PR 2813](https://github.com/input-output-hk/daedalus/pull/2813))
8891
- Fixed receiver address validation by disallowing rewards addresses ([PR 2781](https://github.com/input-output-hk/daedalus/pull/2781))
8992

9093
### Chores
9194

95+
- Integrated Chromatic for visual regression testing ([PR 2776](https://github.com/input-output-hk/daedalus/pull/2776))
9296
- Updated `trezor-connect` dependency to version `8.2.4` ([PR 2726](https://github.com/input-output-hk/daedalus/pull/2726))
9397
- Updated vulnerable dependencies ([PR 2769](https://github.com/input-output-hk/daedalus/pull/2769))
9498
- Updated CWB and Cardano Node ([PR 2799](https://github.com/input-output-hk/daedalus/pull/2799))

source/common/types/logging.types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import type { AdaApiStakePool } from '../../renderer/app/api/staking/types';
1919

2020
export type LoggingLevel = 'debug' | 'info' | 'error' | 'warn';
2121
export type Logger = {
22-
debug: (arg0: string, arg1: Record<string, any> | null | undefined) => void;
23-
info: (arg0: string, arg1: Record<string, any> | null | undefined) => void;
24-
error: (arg0: string, arg1: Record<string, any> | null | undefined) => void;
25-
warn: (arg0: string, arg1: Record<string, any> | null | undefined) => void;
22+
debug: (arg0: string, arg1?: Record<string, any> | null | undefined) => void;
23+
info: (arg0: string, arg1?: Record<string, any> | null | undefined) => void;
24+
error: (arg0: string, arg1?: Record<string, any> | null | undefined) => void;
25+
warn: (arg0: string, arg1?: Record<string, any> | null | undefined) => void;
2626
};
2727
export type FormatMessageContextParams = {
2828
appName: string;

source/main/ipc/downloadManagerChannel.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,9 @@ const getDownloadLocalData = async ({
211211

212212
const getDownloadsLocalData = async (): Promise<
213213
DownloadsLocalDataMainResponse
214-
// @ts-ignore ts-migrate(2322) FIXME: Type 'unknown' is not assignable to type 'Download... Remove this comment to see the full error message
215-
> => localStorage.getAll();
214+
> => {
215+
return localStorage.getAll() as Promise<DownloadsLocalDataMainResponse>;
216+
};
216217

217218
const clearDownloadLocalData = async ({
218219
fileName,

source/renderer/app/actions/lib/Action.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default class Action<Params> {
3030
this.listeners.push(listener);
3131
}
3232

33-
trigger(params: Params) {
33+
trigger(params?: Params) {
3434
this.listeners.forEach((listener) => listener(params));
3535
}
3636

source/renderer/app/actions/wallets-actions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ export default class WalletsActions {
6060
passphrase: string;
6161
assets?: Array<AssetToken>;
6262
assetsAmounts?: Array<string>;
63+
hasAssetsRemainingAfterTransaction?: boolean;
6364
}> = new Action();
6465
chooseWalletExportType: Action<{
6566
walletExportType: WalletExportTypeChoices;

0 commit comments

Comments
 (0)