Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DDW-970] Prevent creation of new wallet during address verification #2906

Merged
merged 24 commits into from
May 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a5d885c
[DDW-970] Prevent creating new trezor software wallet when provided i…
szymonmaslowski Mar 8, 2022
396022a
[DDW-970] Remove redundant console.logs
szymonmaslowski Mar 8, 2022
11bf1c3
[DDW-970] Add changelog entry
szymonmaslowski Mar 8, 2022
0507f32
Merge branch 'develop' into feature/ddw-970
szymonmaslowski Mar 8, 2022
ea732c3
[DDW-970] Small styling and code quality fixes
szymonmaslowski Mar 11, 2022
de43ddf
[DDW-970] Change few names in the HardwareWalletStore after the code …
szymonmaslowski Mar 11, 2022
e26a627
Merge branch 'develop' into feature/ddw-970
szymonmaslowski Mar 11, 2022
ca54de3
[DDW-970] Minor code quality improvements after self review
szymonmaslowski Mar 11, 2022
f2ca378
[DDW-970] Remove unnecessary ts ignore comments
szymonmaslowski Mar 11, 2022
ddb7411
[DDW-970] Revert dialog related css changes
szymonmaslowski Mar 11, 2022
719f4a6
[DDW-970] Rename one of refactored methods in HardwareWalletStore aft…
szymonmaslowski Mar 16, 2022
36327c2
Merge remote-tracking branch 'origin/develop' into feature/ddw-970
szymonmaslowski Mar 16, 2022
d94e837
Merge remote-tracking branch 'origin/develop' into feature/ddw-970
szymonmaslowski Apr 21, 2022
0b4a9b0
[DDW-970] Use a UNRECOGNIZED_WALLET status and new translations in pl…
szymonmaslowski Apr 22, 2022
ea8ad7e
Merge remote-tracking branch 'origin/develop' into feature/ddw-970
szymonmaslowski Apr 25, 2022
2961975
[DDW-970] Fix prettier issues
szymonmaslowski Apr 25, 2022
30b9207
[DDW-970] Fix JP translation for the unrecognized_wallet status
szymonmaslowski Apr 27, 2022
67ec172
Merge remote-tracking branch 'origin/develop' into feature/ddw-970
szymonmaslowski Apr 28, 2022
7a1fe76
[DDW-970] Fix HardwareWalletStore implementaion after meging master
szymonmaslowski Apr 28, 2022
42977de
[DDW-970] Remove unnecessary calls of the resetWalletPairing function
szymonmaslowski Apr 28, 2022
9a3e897
Merge remote-tracking branch 'origin/develop' into feature/ddw-970
szymonmaslowski May 18, 2022
8fb0968
Merge branch 'develop' into feature/ddw-970
szymonmaslowski May 18, 2022
87825dd
Merge branch 'develop' into feature/ddw-970
szymonmaslowski May 20, 2022
9b4de1e
[DDW-970] Move changelog entry to the appropiate section
szymonmaslowski May 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
{
"files": "hardware-wallet-tests/**/*.ts",
"rules": {
"jest/no-standalone-expect": "off",
"jest/no-standalone-expect": "off"
}
}
]
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Fixes

- 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))
- Fixed phrasing of insufficient funds for tokens message ([PR 2966](https://github.com/input-output-hk/daedalus/pull/2966))

### Features
Expand Down
1 change: 1 addition & 0 deletions source/renderer/app/domains/Wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export type HwDeviceStatus =
| 'verifying_address_aborted'
| 'verifying_address_succeeded'
| 'unrecognized_wallet';

export const HwDeviceStatuses: {
CONNECTING: HwDeviceStatus;
CONNECTING_FAILED: HwDeviceStatus;
Expand Down