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

followup

Browse source
This commit is contained in:
Craig Raw 2023-10-06 13:50:44 +02:00
parent cff731dec7
commit 2b8fc3900a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/io/Krux.java
View file

@ -10,7 +10,7 @@ public class Krux extends SpecterDIY {
@Override @Override
public String getKeystoreImportDescription(int account) { public String getKeystoreImportDescription(int account) {
return "Import QR created on your Krux by selecting Extended Public Key from the main menu once you have loaded your mnemonic."; return "Import file or QR created on your Krux by selecting Extended Public Key from the main menu once you have loaded your mnemonic.";
} }
@Override @Override

8
src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java
View file

@ -99,7 +99,7 @@ public class SettingsController extends WalletFormController implements Initiali
private boolean initialising = true; private boolean initialising = true;
private boolean reverting; private boolean reverting;
private boolean ignoreScriptTypeChange; private boolean replacing;
@Override @Override
public void initialize(URL location, ResourceBundle resources) { public void initialize(URL location, ResourceBundle resources) {
@ -146,7 +146,7 @@ public class SettingsController extends WalletFormController implements Initiali
scriptType.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> { scriptType.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
if(newValue != null) { if(newValue != null) {
if(oldValue != null && !ignoreScriptTypeChange && !reverting && walletForm.getWallet().getKeystores().stream().anyMatch(keystore -> keystore.getExtendedPublicKey() != null)) { if(oldValue != null && !replacing && !reverting && walletForm.getWallet().getKeystores().stream().anyMatch(keystore -> keystore.getExtendedPublicKey() != null)) {
Optional<ButtonType> optType = showWarningDialog("Clear keystores?", Optional<ButtonType> optType = showWarningDialog("Clear keystores?",
"You are changing the script type on a wallet with existing key information. Usually this means the keys need to be re-imported using a different derivation path.\n\n" + "You are changing the script type on a wallet with existing key information. Usually this means the keys need to be re-imported using a different derivation path.\n\n" +
"Do you want to clear the current key information?", ButtonType.YES, ButtonType.NO, ButtonType.CANCEL); "Do you want to clear the current key information?", ButtonType.YES, ButtonType.NO, ButtonType.CANCEL);
@ -472,9 +472,9 @@ public class SettingsController extends WalletFormController implements Initiali
totalKeystores.setValue(0); totalKeystores.setValue(0);
walletForm.setWallet(editedWallet); walletForm.setWallet(editedWallet);
initialising = true; initialising = true;
ignoreScriptTypeChange = true; replacing = true;
setFieldsFromWallet(editedWallet); setFieldsFromWallet(editedWallet);
ignoreScriptTypeChange = false; replacing = false;
initialising = false; initialising = false;
EventManager.get().post(new SettingsChangedEvent(editedWallet, SettingsChangedEvent.Type.POLICY)); EventManager.get().post(new SettingsChangedEvent(editedWallet, SettingsChangedEvent.Type.POLICY));