add further guidance when regenerating a border wallets grid

build.gradle

@@ -7,7 +7,7 @@ plugins {
     id 'org.beryx.jlink' version '2.26.0'
 }
 
-def sparrowVersion = '1.7.5'
+def sparrowVersion = '1.7.6'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {

docs/reproducible.md

@@ -82,7 +82,7 @@ sudo apt install -y rpm fakeroot binutils
 First, assign a temporary variable in your shell for the specific release you want to build. For the current one specify:
 
 ```shell
-GIT_TAG="1.7.4"
+GIT_TAG="1.7.5"
 ```
 
 The project can then be initially cloned as follows:

src/main/deploy/package/osx/Info.plist

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.7.5</string>
+  <string>1.7.6</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->

src/main/java/com/sparrowwallet/sparrow/SparrowWallet.java

@@ -18,7 +18,7 @@ import java.util.*;
 public class SparrowWallet {
     public static final String APP_ID = "com.sparrowwallet.sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.7.5";
+    public static final String APP_VERSION = "1.7.6";
     public static final String APP_VERSION_SUFFIX = "";
     public static final String APP_HOME_PROPERTY = "sparrow.home";
     public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";

src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java

@@ -10,6 +10,7 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import javafx.event.Event;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
@@ -48,7 +49,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
         setTitle("Border Wallets Grid");
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("grid.css").toExternalForm());
-        dialogPane.setHeaderText("Load a Border Wallets PDF, or generate a grid from a BIP39 seed.\nThen select 11 or 23 words in a pattern on the grid. Note the order of selection is important!");
+        dialogPane.setHeaderText("Load a Border Wallets PDF, or generate a grid from a BIP39 seed.\nThen select 11 or 23 words in a pattern on the grid, one at a time (do not drag).\nThe order of selection is important!");
         javafx.scene.image.Image image = new Image("/image/border-wallets.png");
         dialogPane.setGraphic(new ImageView(image));
 
@@ -104,7 +105,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
         final ButtonType loadCsvButtonType = new javafx.scene.control.ButtonType("Load PDF...", ButtonBar.ButtonData.LEFT);
         dialogPane.getButtonTypes().add(loadCsvButtonType);
 
-        final ButtonType generateButtonType = new javafx.scene.control.ButtonType("Generate Grid...", ButtonBar.ButtonData.HELP);
+        final ButtonType generateButtonType = new javafx.scene.control.ButtonType("Generate Grid...", ButtonBar.ButtonData.HELP_2);
         dialogPane.getButtonTypes().add(generateButtonType);
 
         final ButtonType clearButtonType = new javafx.scene.control.ButtonType("Clear Selection", ButtonBar.ButtonData.OTHER);
@@ -235,6 +236,8 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                         try(BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(file))) {
                             String[][] wordGrid = PdfUtils.getWordGrid(inputStream);
                             spreadsheetView.setGrid(getGrid(wordGrid));
+                            selectedCells.clear();
+                            spreadsheetView.getSelectionModel().clearSelection();
                             initializedProperty.set(true);
                         } catch(Exception e) {
                             AppServices.showErrorDialog("Cannot load PDF", e.getMessage());
@@ -243,18 +246,20 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                 });
 
                 button = loadButton;
-            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.HELP) {
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.HELP_2) {
                 Button generateButton = new Button(buttonType.getText());
                 final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
                 ButtonBar.setButtonData(generateButton, buttonData);
                 generateButton.setOnAction(event -> {
-                    SeedEntryDialog seedEntryDialog = new SeedEntryDialog(12);
+                    SeedEntryDialog seedEntryDialog = new SeedEntryDialog("Border Wallets Entropy Grid Recovery Seed", 12);
                     Optional<List<String>> optWords = seedEntryDialog.showAndWait();
                     if(optWords.isPresent()) {
                         List<String> mnemonicWords = optWords.get();
                         List<String> shuffledWordList = shuffle(mnemonicWords);
                         String[][] wordGrid = toGrid(shuffledWordList);
                         spreadsheetView.setGrid(getGrid(wordGrid));
+                        selectedCells.clear();
+                        spreadsheetView.getSelectionModel().clearSelection();
                         initializedProperty.set(true);
 
                         if(seedEntryDialog.isGenerated()) {
@@ -269,6 +274,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                 final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
                 ButtonBar.setButtonData(clearButton, buttonData);
                 clearButton.setOnAction(event -> {
+                    selectedCells.clear();
                     spreadsheetView.getSelectionModel().clearSelection();
                 });
 

src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreEntryPane.java

@@ -18,8 +18,8 @@ public class MnemonicKeystoreEntryPane extends MnemonicKeystorePane {
 
     private boolean generated;
 
-    public MnemonicKeystoreEntryPane(int numWords) {
-        super(DeterministicSeed.Type.BIP39.getName(), "Enter seed words", "", "image/" + WalletModel.SEED.getType() + ".png");
+    public MnemonicKeystoreEntryPane(String name, int numWords) {
+        super(name, "Enter seed words", "", "image/" + WalletModel.SEED.getType() + ".png");
         showHideLink.setVisible(false);
         buttonBox.getChildren().clear();
 

src/main/java/com/sparrowwallet/sparrow/control/SeedEntryDialog.java

@@ -12,7 +12,7 @@ import java.util.List;
 public class SeedEntryDialog extends Dialog<List<String>> {
     private final MnemonicKeystoreEntryPane keystorePane;
 
-    public SeedEntryDialog(int numWords) {
+    public SeedEntryDialog(String name, int numWords) {
         final DialogPane dialogPane = new MnemonicGridDialogPane();
         setDialogPane(dialogPane);
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
@@ -38,7 +38,7 @@ public class SeedEntryDialog extends Dialog<List<String>> {
         Accordion keystoreAccordion = new Accordion();
         scrollPane.setContent(keystoreAccordion);
 
-        keystorePane = new MnemonicKeystoreEntryPane(numWords);
+        keystorePane = new MnemonicKeystoreEntryPane(name, numWords);
         keystorePane.setAnimated(false);
         keystoreAccordion.getPanes().add(keystorePane);
 

src/main/java/com/sparrowwallet/sparrow/io/PdfUtils.java

@@ -210,6 +210,8 @@ public class PdfUtils {
                 log.error("Error creating word grid PDF", e);
                 AppServices.showErrorDialog("Error creating word grid PDF", e.getMessage());
             }
+        } else {
+            AppServices.showWarningDialog("Entropy Grid PDF not saved", "You have chosen to not save the entropy grid PDF.\n\nDo not store funds on a seed selected from this grid - you will not be able to regenerate it!");
         }
     }
 }