sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix persistence of renaming and deleting newly created wallet accounts

Browse source
This commit is contained in:
Craig Raw 2023-01-09 09:57:35 +02:00
parent 63b7aef91e
commit d1a1bd5751
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/sparrowwallet/sparrow/AppController.java
View file

@ -1600,7 +1600,7 @@ public class AppController implements Initializable {
TabData tabData = new WalletTabData(TabData.TabType.WALLET, walletForm); TabData tabData = new WalletTabData(TabData.TabType.WALLET, walletForm);
subTab.setUserData(tabData); subTab.setUserData(tabData);
if(!wallet.isWhirlpoolChildWallet()) { if(!wallet.isWhirlpoolChildWallet()) {
subTab.setContextMenu(getSubTabContextMenu(wallet, subTabs, subTab)); subTab.setContextMenu(getSubTabContextMenu(storage, wallet, subTabs, subTab));
} }
subTabs.getTabs().add(subTab); subTabs.getTabs().add(subTab);
@ -1981,7 +1981,9 @@ public class AppController implements Initializable {
} }
} }
private ContextMenu getSubTabContextMenu(Wallet wallet, TabPane subTabs, Tab subTab) { private ContextMenu getSubTabContextMenu(Storage storage, Wallet wallet, TabPane subTabs, Tab subTab) {
String walletId = storage.getWalletId(wallet);
ContextMenu contextMenu = new ContextMenu(); ContextMenu contextMenu = new ContextMenu();
MenuItem rename = new MenuItem("Rename Account"); MenuItem rename = new MenuItem("Rename Account");
rename.setOnAction(event -> { rename.setOnAction(event -> {
@ -1992,8 +1994,9 @@ public class AppController implements Initializable {
String label = optLabel.get(); String label = optLabel.get();
subTabLabel.setText(label); subTabLabel.setText(label);
wallet.setLabel(label); Wallet renamedWallet = AppServices.get().getWallet(walletId);
EventManager.get().post(new WalletLabelChangedEvent(wallet)); renamedWallet.setLabel(label);
EventManager.get().post(new WalletLabelChangedEvent(renamedWallet));
} }
}); });
contextMenu.getItems().add(rename); contextMenu.getItems().add(rename);
@ -2003,11 +2006,12 @@ public class AppController implements Initializable {
delete.setOnAction(event -> { delete.setOnAction(event -> {
Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Delete Wallet Account?", "Labels applied in this wallet account will be lost. Are you sure?", ButtonType.CANCEL, ButtonType.OK); Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Delete Wallet Account?", "Labels applied in this wallet account will be lost. Are you sure?", ButtonType.CANCEL, ButtonType.OK);
if(optButtonType.isPresent() && optButtonType.get() == ButtonType.OK) { if(optButtonType.isPresent() && optButtonType.get() == ButtonType.OK) {
Wallet deletedWallet = AppServices.get().getWallet(walletId);
EventManager.get().post(new WalletDeletedEvent(deletedWallet));
subTabs.getTabs().remove(subTab); subTabs.getTabs().remove(subTab);
if(subTabs.getTabs().size() == 1) { if(subTabs.getTabs().size() == 1) {
setSubTabsVisible(subTabs, areSubTabsVisible()); setSubTabsVisible(subTabs, areSubTabsVisible());
} }
EventManager.get().post(new WalletDeletedEvent(wallet));
} }
}); });
contextMenu.getItems().add(delete); contextMenu.getItems().add(delete);