From 3c6adafc156a2401ce49b28e931ffb4ff6b8afed Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Tue, 6 Oct 2020 14:50:25 +0200
Subject: [PATCH] tweak help copy and ui

---
 .../com/sparrowwallet/sparrow/control/HelpLabel.java   |  2 +-
 .../resources/com/sparrowwallet/sparrow/darktheme.css  |  4 ++++
 .../com/sparrowwallet/sparrow/preferences/general.fxml | 10 +++++-----
 .../com/sparrowwallet/sparrow/wallet/advanced.fxml     |  2 +-
 .../com/sparrowwallet/sparrow/wallet/keystore.fxml     |  4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java b/src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java
index c579c2b4..7884a6a0 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java
@@ -36,7 +36,7 @@ public class HelpLabel extends Label {
     private StringProperty helpText;
 
     public final void setHelpText(String value) {
-        helpTextProperty().setValue(value);
+        helpTextProperty().setValue(value.replace("\\n", "\n"));
     }
 
     public final String getHelpText() {
diff --git a/src/main/resources/com/sparrowwallet/sparrow/darktheme.css b/src/main/resources/com/sparrowwallet/sparrow/darktheme.css
index 10a377b7..1bc82592 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/darktheme.css
+++ b/src/main/resources/com/sparrowwallet/sparrow/darktheme.css
@@ -81,6 +81,10 @@
     -fx-bar-fill: rgba(135, 138, 149, 0.5);
 }
 
+.root .titled-description-pane .status-error .text, .root .titled-description-pane .description-error .text {
+    -fx-fill: #e06c75;
+}
+
 #inputsPie .default-color0.chart-pie {
     -fx-pie-color: #e06c75;
 }
diff --git a/src/main/resources/com/sparrowwallet/sparrow/preferences/general.fxml b/src/main/resources/com/sparrowwallet/sparrow/preferences/general.fxml
index ff96af44..88dda0c2 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/preferences/general.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/preferences/general.fxml
@@ -39,7 +39,7 @@
                         </FXCollections>
                     </items>
                 </ComboBox>
-                <HelpLabel helpText="Display unit for bitcoin amounts. Auto displays amounts over 1 BTC in BTC, and amounts under in satoshis"/>
+                <HelpLabel helpText="Display unit for bitcoin amounts.\nAuto displays amounts over 1 BTC in BTC, and amounts under that in satoshis."/>
             </Field>
         </Fieldset>
         <Fieldset inputGrow="SOMETIMES" text="Fiat" styleClass="wideLabelFieldSet">
@@ -61,21 +61,21 @@
         <Fieldset inputGrow="SOMETIMES" text="Coin Selection" styleClass="wideLabelFieldSet">
             <Field text="Group by address:">
                 <UnlabeledToggleSwitch fx:id="groupByAddress" />
-                <HelpLabel helpText="Group UTXOs by address when sending to improve privacy by only sending from an address once"/>
+                <HelpLabel helpText="Group UTXOs by address when sending to improve privacy by only sending from an address once."/>
             </Field>
             <Field text="Use mempool change:">
                 <UnlabeledToggleSwitch fx:id="includeMempoolChange" />
-                <HelpLabel helpText="Allow a wallet to spend UTXOs that are still in the mempool where all their inputs are from that wallet"/>
+                <HelpLabel helpText="Allow a wallet to spend UTXOs that are still in the mempool where all their inputs are from that wallet."/>
             </Field>
         </Fieldset>
         <Fieldset inputGrow="SOMETIMES" text="Notifications" styleClass="wideLabelFieldSet">
             <Field text="New transactions:">
                 <UnlabeledToggleSwitch fx:id="notifyNewTransactions" />
-                <HelpLabel helpText="Show system notifications on new wallet transactions"/>
+                <HelpLabel helpText="Show system notifications on new wallet transactions?"/>
             </Field>
             <Field text="Software updates:">
                 <UnlabeledToggleSwitch fx:id="checkNewVersions" />
-                <HelpLabel helpText="Check for updates to Sparrow"/>
+                <HelpLabel helpText="Check for updates to Sparrow?"/>
             </Field>
         </Fieldset>
     </Form>
diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/advanced.fxml b/src/main/resources/com/sparrowwallet/sparrow/wallet/advanced.fxml
index b603944c..655ecd54 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/wallet/advanced.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/advanced.fxml
@@ -28,7 +28,7 @@
             <Fieldset inputGrow="SOMETIMES" text="Advanced Settings" styleClass="wideLabelFieldSet">
                 <Field text="Gap limit:">
                     <Spinner fx:id="gapLimit" editable="true" prefWidth="90" />
-                    <HelpLabel helpText="Change how far ahead to look for additional transactions beyond the highest derivation with previous transaction outputs"/>
+                    <HelpLabel helpText="Change how far ahead to look for additional transactions beyond the highest derivation with previous transaction outputs."/>
                 </Field>
             </Fieldset>
         </Form>
diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml b/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml
index 7e5dff7f..cf87e782 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml
@@ -41,10 +41,10 @@
                 <TextField fx:id="label" maxWidth="160"/>
             </Field>
             <Field text="Master fingerprint:">
-                <TextField fx:id="fingerprint" maxWidth="80" promptText="00000000"/> <HelpLabel helpText="A master fingerprint is the first 4 bytes of the master public key hash. It is safe to use any valid value (00000000) for Watch Only Wallets." />
+                <TextField fx:id="fingerprint" maxWidth="80" promptText="00000000"/> <HelpLabel helpText="A master fingerprint is the first 4 bytes of the master public key hash.\nIt is safe to use any valid value (00000000) for Watch Only Wallets." />
             </Field>
             <Field text="Derivation:">
-                <TextField fx:id="derivation" maxWidth="200"/> <HelpLabel helpText="The derivation path to the xPub from the master private key. For safety, derivations that match defaults for other script types are not valid." />
+                <TextField fx:id="derivation" maxWidth="200"/> <HelpLabel helpText="The derivation path to the xPub from the master private key.\nFor safety, derivations that match defaults for other script types are not valid." />
             </Field>
             <Field fx:id="xpubField" text="xPub:">
                 <TextArea fx:id="xpub" wrapText="true" prefRowCount="2" maxHeight="52" />