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

add additional check against existing child wallet names when suggesting new accounts to add

Browse source
This commit is contained in:
Craig Raw 2024-04-23 08:32:58 +02:00
parent f1cddc28e7
commit 21d91d3d10
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/sparrowwallet/sparrow/control/AddAccountDialog.java
View file

@ -14,8 +14,7 @@ import javafx.scene.layout.VBox;
import javafx.util.StringConverter; import javafx.util.StringConverter;
import org.controlsfx.glyphfont.Glyph; import org.controlsfx.glyphfont.Glyph;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import static com.sparrowwallet.drongo.wallet.StandardAccount.*; import static com.sparrowwallet.drongo.wallet.StandardAccount.*;
@ -46,12 +45,14 @@ public class AddAccountDialog extends Dialog<List<StandardAccount>> {
standardAccountCombo = new ComboBox<>(); standardAccountCombo = new ComboBox<>();
standardAccountCombo.setMaxWidth(Double.MAX_VALUE); standardAccountCombo.setMaxWidth(Double.MAX_VALUE);
List<Integer> existingIndexes = new ArrayList<>(); Set<Integer> existingIndexes = new LinkedHashSet<>();
Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet(); Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
existingIndexes.add(masterWallet.getAccountIndex()); existingIndexes.add(masterWallet.getAccountIndex());
for(Wallet childWallet : masterWallet.getChildWallets()) { for(Wallet childWallet : masterWallet.getChildWallets()) {
if(!childWallet.isNested()) { if(!childWallet.isNested()) {
existingIndexes.add(childWallet.getAccountIndex()); existingIndexes.add(childWallet.getAccountIndex());
Optional<StandardAccount> optStdAcc = Arrays.stream(StandardAccount.values()).filter(stdacc -> stdacc.getName().equals(childWallet.getName())).findFirst();
optStdAcc.ifPresent(standardAccount -> existingIndexes.add(standardAccount.getAccountNumber()));
} }
} }