From df0acf1469a53b4ed9a707b3d1afb19820f67fee Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:14:02 -0600
Subject: [PATCH 1/2] Improve mediation tools.

Emergency payout tool to also show Open mediation tickets.
Log txHex of MediatedPayoutTxPublished.
---
 .../mediation/ProcessMediatedPayoutTxPublishedMessage.java    | 4 +++-
 .../desktop/main/overlays/windows/ManualPayoutTxWindow.java   | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java b/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java
index 39435ab6ec7..cb06ed645e8 100644
--- a/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java
+++ b/core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java
@@ -29,6 +29,7 @@
 import bisq.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.Utils;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -56,7 +57,8 @@ protected void run() {
             if (trade.getPayoutTx() == null) {
                 Transaction committedMediatedPayoutTx = WalletService.maybeAddNetworkTxToWallet(message.getPayoutTx(), processModel.getBtcWalletService().getWallet());
                 trade.setPayoutTx(committedMediatedPayoutTx);
-                BtcWalletService.printTx("MediatedPayoutTx received from peer", committedMediatedPayoutTx);
+                log.info("MediatedPayoutTx received from peer.  Txid: {}\nhex: {}",
+                        committedMediatedPayoutTx.getTxId().toString(), Utils.HEX.encode(committedMediatedPayoutTx.bitcoinSerialize()));
 
                 trade.setMediationResultState(MediationResultState.RECEIVED_PAYOUT_TX_PUBLISHED_MSG);
 
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java
index 4e311534099..2bd17be0958 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java
@@ -496,8 +496,6 @@ private void populateMediationTicketCombo(boolean recentTicketsOnly) {
         for (Dispute dispute :disputeObservableList) {
             if (dispute.getDisputePayoutTxId() != null)    // only show disputes not paid out
                 continue;
-            if (!dispute.isClosed())    // only show closed disputes
-                continue;
             if (recentTicketsOnly && dispute.getOpeningDate().toInstant().isBefore(twoWeeksAgo))
                 continue;
             if (!disputeIds.contains(dispute.getTradeId()))

From 9777181ff937768d709264ebb40482cdfe2c878a Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Wed, 3 Mar 2021 16:16:26 -0600
Subject: [PATCH 2/2] Dark mode: highlight text fields +8% vs background

---
 desktop/src/main/java/bisq/desktop/theme-dark.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/src/main/java/bisq/desktop/theme-dark.css b/desktop/src/main/java/bisq/desktop/theme-dark.css
index 5a54909171d..ef062501301 100644
--- a/desktop/src/main/java/bisq/desktop/theme-dark.css
+++ b/desktop/src/main/java/bisq/desktop/theme-dark.css
@@ -212,7 +212,7 @@
 /* text field */
 .jfx-text-field, .jfx-text-area,
 .jfx-combo-box, .jfx-combo-box > .list-cell {
-    -fx-background-color: -bs-background-color;
+    -fx-background-color: derive(-bs-background-color, 8%);
     -fx-prompt-text-fill: -bs-color-gray-3;
     -fx-text-fill: -bs-color-gray-11;
 }