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.

Sign up for GitHub

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

Jump to bottom

[DDW-1182] Fix routing issues when deleting wallets #1823

Merged
merged 1 commit into from
Jan 20, 2020
Merged

[DDW-1182] Fix routing issues when deleting wallets #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ Changelog
- Improved network screen with responsive main copy box ([PR 1797](https://github.com/input-output-hk/daedalus/pull/1797))

### Fixes

- Fixed a routing issue connected to deleting Yoroi Balance/Rewards wallets restored from the same recovery phrase ([PR 1823](https://github.com/input-output-hk/daedalus/pull/1823))
- Fixed a typo in the Staking Pools section ([PR 1785](https://github.com/input-output-hk/daedalus/pull/1785))
- Fixed Daedalus ITN Terms of Service typo ([PR 1809](https://github.com/input-output-hk/daedalus/pull/1809))
- Fixed handling of duplicated wallet IDs when restoring both legacy and new wallets from the same wallet recovery phrase ([PR 1805](https://github.com/input-output-hk/daedalus/pull/1805))

### Chores

- Updated `cardano-wallet` to revision `254575e4` which includes Jormungandr 0.8.6 ([PR 1821](https://github.com/input-output-hk/daedalus/pull/1821))
- Improved delete wallet text copy ([PR 1819](https://github.com/input-output-hk/daedalus/pull/1819))
- Updated checkboxes, radio buttons and switchers sizes and borders ([PR 1793](https://github.com/input-output-hk/daedalus/pull/1793))
Expand Down
5 changes: 4 additions & 1 deletion source/renderer/app/stores/WalletsStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,13 +501,16 @@ export default class WalletsStore extends Store {
if (this.hasAnyWallets) {
const nextIndexInList = Math.max(indexOfWalletToDelete - 1, 0);
const nextWalletInList = this.all[nextIndexInList];
this.actions.dialogs.closeActiveDialog.trigger();
this.goToWalletRoute(nextWalletInList.id);
} else {
this.active = null;
this.activeValue = null;
this.actions.router.goToRoute.trigger({
route: ROUTES.WALLETS.ADD,
});
}
});
this.actions.dialogs.closeActiveDialog.trigger();
this._unsetWalletLocalData(params.walletId);
this._resumePolling();
this.deleteWalletRequest.reset();
Expand Down