From 6ef333ae2ac6db16d462fbbd9fb5d44f7de5f9ed Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Fri, 17 Jul 2020 17:37:51 +0200
Subject: [PATCH] finalize psbt tweaks

---
 .../sparrow/transaction/HeadersController.java           | 9 +++++++--
 .../com/sparrowwallet/sparrow/transaction/headers.css    | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java
index a6af5f70..ab18d470 100644
--- a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java
@@ -284,7 +284,6 @@ public class HeadersController extends TransactionFormController implements Init
                 signaturesForm.setVisible(true);
             }
 
-            signingWallet.valueProperty().addListener((observable, oldValue, newValue) -> headersForm.setSigningWallet(newValue));
             EventManager.get().post(new RequestOpenWalletsEvent());
 
             signingWallet.managedProperty().bind(signingWallet.visibleProperty());
@@ -386,6 +385,9 @@ public class HeadersController extends TransactionFormController implements Init
 
     private void updateTxId() {
         id.setText(headersForm.getTransaction().calculateTxId(false).toString());
+        if(headersForm.getPsbt() != null && headersForm.isEditable()) {
+            id.getStyleClass().add("unfinalized-psbt");
+        }
     }
 
     public void copyId(ActionEvent event) {
@@ -399,7 +401,7 @@ public class HeadersController extends TransactionFormController implements Init
     }
 
     public void finalizeTransaction(ActionEvent event) {
-        EventManager.get().post(new FinalizePSBTEvent(headersForm.getPsbt(), headersForm.getSigningWallet()));
+        EventManager.get().post(new FinalizePSBTEvent(headersForm.getPsbt(), signingWallet.getValue()));
     }
 
     @Subscribe
@@ -465,6 +467,9 @@ public class HeadersController extends TransactionFormController implements Init
             locktimeDateType.setDisable(true);
             locktimeBlock.setDisable(true);
             locktimeDate.setDisable(true);
+            id.getStyleClass().remove("unfinalized-psbt");
+
+            headersForm.setSigningWallet(event.getSigningWallet());
 
             finalizeForm.setVisible(false);
             signaturesForm.setVisible(true);
diff --git a/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.css b/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.css
index 654d870d..667cbdc3 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.css
+++ b/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.css
@@ -24,6 +24,10 @@
     -fx-padding: 10 0 0 0;
 }
 
+.unfinalized-psbt {
+    -fx-text-fill: #a0a1a7;
+}
+
 #finalizeForm .input-container {
     -fx-alignment: center-left;
     -fx-pref-height: 30;