Skip to content

Commit 5dfe3f6

Browse files
authored
Merge pull request #2906 from input-output-hk/feature/ddw-970
[DDW-970] Prevent creation of new wallet during address verification
2 parents 150a0b9 + 9b4de1e commit 5dfe3f6

File tree

4 files changed

+550
-343
lines changed

4 files changed

+550
-343
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
{
114114
"files": "hardware-wallet-tests/**/*.ts",
115115
"rules": {
116-
"jest/no-standalone-expect": "off",
116+
"jest/no-standalone-expect": "off"
117117
}
118118
}
119119
]

CHANGELOG.md

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

55
### Fixes
66

7+
- Fixed incorrect behaviour of creating new wallet when paired incorrect hardware wallet during address verification ([PR 2906](https://github.com/input-output-hk/daedalus/pull/2906))
78
- Fixed phrasing of insufficient funds for tokens message ([PR 2966](https://github.com/input-output-hk/daedalus/pull/2966))
89

910
### Features

source/renderer/app/domains/Wallet.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export type HwDeviceStatus =
5757
| 'verifying_address_aborted'
5858
| 'verifying_address_succeeded'
5959
| 'unrecognized_wallet';
60+
6061
export const HwDeviceStatuses: {
6162
CONNECTING: HwDeviceStatus;
6263
CONNECTING_FAILED: HwDeviceStatus;

0 commit comments

Comments
 (0)