From 8aa9d1562017963cebe314b05df674151fefb38f Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Sun, 28 Jun 2020 16:05:07 +0200
Subject: [PATCH] recieve fixes

---
 .../com/sparrowwallet/sparrow/wallet/ReceiveController.java   | 2 +-
 .../resources/com/sparrowwallet/sparrow/wallet/receive.css    | 4 ++++
 .../resources/com/sparrowwallet/sparrow/wallet/receive.fxml   | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java
index 18f2b4e9..f373dfef 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java
@@ -164,7 +164,7 @@ public class ReceiveController extends WalletFormController implements Initializ
     @Subscribe
     public void walletHistoryChanged(WalletHistoryChangedEvent event) {
         if(event.getWallet().equals(walletForm.getWallet())) {
-            if(event.getHistoryChangedNodes().contains(currentEntry.getNode())) {
+            if(currentEntry != null && event.getHistoryChangedNodes().contains(currentEntry.getNode())) {
                 updateLastUsed();
             }
         }
diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/receive.css b/src/main/resources/com/sparrowwallet/sparrow/wallet/receive.css
index 20fa274f..611d444f 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/wallet/receive.css
+++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/receive.css
@@ -10,4 +10,8 @@
 .receive-form .form .fieldset:horizontal .label-container {
     -fx-pref-width: 90px;
     -fx-pref-height: 25px;
+}
+
+#lastUsedField .input-container {
+    -fx-alignment: center-left;
 }
\ No newline at end of file
diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/receive.fxml b/src/main/resources/com/sparrowwallet/sparrow/wallet/receive.fxml
index 41a29e80..5e25b7a5 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/wallet/receive.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/receive.fxml
@@ -42,8 +42,8 @@
                     <Field text="Derivation:">
                         <CopyableLabel fx:id="derivationPath" />
                     </Field>
-                    <Field text="Last Used:">
-                        <Label fx:id="lastUsed" />
+                    <Field fx:id="lastUsedField" text="Last Used:">
+                        <Label fx:id="lastUsed" contentDisplay="RIGHT" />
                     </Field>
                 </Fieldset>
             </Form>