From 826162ba9f79f832d9d2c27c256e3f50ba0da9fc Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Mon, 11 Jan 2021 18:26:45 +0200
Subject: [PATCH] various bwt related tweaks

---
 .../sparrow/AboutController.java              |   4 ++++
 .../sparrow/control/WelcomeDialog.java        |   1 +
 .../com/sparrowwallet/sparrow/net/Bwt.java    |   3 +--
 .../ServerPreferencesController.java          |   5 ++++-
 .../com/sparrowwallet/sparrow/about.fxml      |   7 ++++---
 .../com/sparrowwallet/sparrow/app.css         |   5 +++++
 .../com/sparrowwallet/sparrow/general.css     |   5 -----
 .../resources/native/osx/x64/libbwt_jni.dylib | Bin 5540376 -> 5540376 bytes
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/AboutController.java b/src/main/java/com/sparrowwallet/sparrow/AboutController.java
index 07472f54..4ae2d8d3 100644
--- a/src/main/java/com/sparrowwallet/sparrow/AboutController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/AboutController.java
@@ -22,4 +22,8 @@ public class AboutController {
     public void close(ActionEvent event) {
         stage.close();
     }
+
+    public void openDonate(ActionEvent event) {
+        AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/donate");
+    }
 }
diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java
index 78056030..ce7cec4b 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java
@@ -25,6 +25,7 @@ public class WelcomeDialog extends Dialog<Mode> {
 
         setTitle("Welcome to Sparrow");
         dialogPane.setHeaderText("Welcome to Sparrow!");
+        dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
         dialogPane.setPrefWidth(600);
diff --git a/src/main/java/com/sparrowwallet/sparrow/net/Bwt.java b/src/main/java/com/sparrowwallet/sparrow/net/Bwt.java
index 33d52704..c88e1670 100644
--- a/src/main/java/com/sparrowwallet/sparrow/net/Bwt.java
+++ b/src/main/java/com/sparrowwallet/sparrow/net/Bwt.java
@@ -86,8 +86,7 @@ public class Bwt {
             bwtConfig.descriptors = outputDescriptors;
             bwtConfig.rescanSince = (rescanSince == null || rescanSince < 0 ? "now" : rescanSince);
             bwtConfig.forceRescan = forceRescan;
-            //bwtConfig.initialImportSize = IMPORT_BATCH_SIZE;
-            bwtConfig.gapLimit = IMPORT_BATCH_SIZE;
+            bwtConfig.gapLimit = gapLimit;
         } else {
             bwtConfig.requireAddresses = false;
         }
diff --git a/src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java b/src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
index efbed275..fa13661f 100644
--- a/src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
@@ -135,12 +135,15 @@ public class ServerPreferencesController extends PreferencesDetailController {
         coreForm.visibleProperty().bind(electrumForm.visibleProperty().not());
         serverTypeToggleGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
             if(serverTypeToggleGroup.getSelectedToggle() != null) {
+                ServerType existingType = config.getServerType();
                 ServerType serverType = (ServerType)newValue.getUserData();
                 electrumForm.setVisible(serverType == ServerType.ELECTRUM_SERVER);
                 config.setServerType(serverType);
                 testConnection.setGraphic(getGlyph(FontAwesome5.Glyph.QUESTION_CIRCLE, ""));
                 testResults.clear();
-                EventManager.get().post(new ServerTypeChangedEvent(serverType));
+                if(existingType != serverType) {
+                    EventManager.get().post(new ServerTypeChangedEvent(serverType));
+                }
             } else if(oldValue != null) {
                 oldValue.setSelected(true);
             }
diff --git a/src/main/resources/com/sparrowwallet/sparrow/about.fxml b/src/main/resources/com/sparrowwallet/sparrow/about.fxml
index 7ba67d3a..ab280520 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/about.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/about.fxml
@@ -8,7 +8,7 @@
 
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.image.Image?>
-<StackPane prefHeight="420.0" prefWidth="600.0" stylesheets="@about.css" fx:controller="com.sparrowwallet.sparrow.AboutController" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml">
+<StackPane prefHeight="420.0" prefWidth="600.0" stylesheets="@about.css, @general.css" fx:controller="com.sparrowwallet.sparrow.AboutController" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml">
     <VBox spacing="20">
         <HBox styleClass="title-area">
             <HBox alignment="CENTER_LEFT">
@@ -21,8 +21,9 @@
         </HBox>
         <VBox spacing="10" styleClass="content-area">
             <Label text="Sparrow is a Bitcoin wallet with the goal of providing greater transparency and usability on the path to full financial self sovereignty. It attempts to provide all of the detail about your wallet setup, transactions and UTXOs so that you can transact will a full understanding of your money." wrapText="true" />
-            <Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to your Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" />
-            <Label text="For privacy and security reasons it is not recommended to use a public Electrum server. Install an Electrum server that connects to your full node to index the blockchain and provide full privacy." wrapText="true" />
+            <Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to your Bitcoin Core node or Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" />
+            <Label text="Connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your own Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk. " wrapText="true" />
+            <HBox><Label text="If you find Sparrow useful, consider donating at "/><Hyperlink text="https://sparrowwallet.com/donate" onAction="#openDonate"/></HBox>
         </VBox>
         <HBox styleClass="button-area" alignment="BOTTOM_RIGHT" VBox.vgrow="SOMETIMES">
             <Button text="Done" onAction="#close" />
diff --git a/src/main/resources/com/sparrowwallet/sparrow/app.css b/src/main/resources/com/sparrowwallet/sparrow/app.css
index 99e937c6..3142fcef 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/app.css
+++ b/src/main/resources/com/sparrowwallet/sparrow/app.css
@@ -29,3 +29,8 @@
     -fx-padding: 0 0 0 8;
     -fx-spacing: 10;
 }
+
+.core-server.toggle-switch:selected .thumb-area {
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
+    -fx-background-insets: 0, 1;
+}
diff --git a/src/main/resources/com/sparrowwallet/sparrow/general.css b/src/main/resources/com/sparrowwallet/sparrow/general.css
index 9aab5b42..8a10fdfa 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/general.css
+++ b/src/main/resources/com/sparrowwallet/sparrow/general.css
@@ -159,8 +159,3 @@
 .root .header-panel {
     -fx-background-color: -fx-box-border, derive(-fx-background, 10%);
 }
-
-.core-server.toggle-switch:selected .thumb-area {
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
-    -fx-background-insets: 0, 1;
-}
\ No newline at end of file
diff --git a/src/main/resources/native/osx/x64/libbwt_jni.dylib b/src/main/resources/native/osx/x64/libbwt_jni.dylib
index 87354d380cb478c511919883e18e954ef5405a5f..52c7bea177aa8f92bb6efa575e2748b14f7a4070 100755
GIT binary patch
delta 410
zcmWm3IZgsm0D$2<6lVrRQBYh_QQS9hL!U6Xpflnwckl#2WkD?F0wzO3VrgO}RueBk
zLSkj1iJh?{+HnAXi?901cW<sTstLva@O58!52o}=<LC1!_Z_)46w6QqTxdZn+-Sr9
zsnFno7wwLr_-=kh#;P@a=s+j@=t4IF2%-nQ2%!)C7{DNgFpMxpFp4omFpddCF^MTm
zV+OOB!#ozSh$So|hB#KRiZ!fb0|{(8wdPhMAoBLJDnp`f*Hw8fUhSABi^A(XYVt!D
tFILHv*hUg5=tyG+yV%1%GC05?4461V7RNZjDb8??3tZyLDVaGt{RaaHz`Ote

delta 410
zcmWm3xlY1h0KoBlc(he3RaCqWyl**F^iwHVq4mDr!ABqr4n&j2T~l7cO{Olo5*$p7
zivvD^i5r`Xe}~`nE8TwtN_a{t#>21mrB~zfHglJIt{Jr(TXAhgAb<umq6y9TKNT8U
z(26$SR`ly1VY!vMj&=lLpaY!<p$pyUK^VR0Lq7&Eh#?GP1fv*31ml>%B&INp8O&l1
z^H{(lmavQ!L=i(A39Mob>quh5uhcicL!#i7RT&m<-m5CF#Jd;OWL^aQM@@dF#EV;W
pB(|`P9i(6)jSO~SVGmj4V8g*a4seJg9ODG1IKw$E{GxN|nST?Izl8t*