Merge pull request #5206 from jmacxx/improve_mediation_tools

Improve mediation tools / logging.
bisq-network · Mar 11, 2021 · 7394da5 · 7394da5
2 parents 337c7bb + 9777181
commit 7394da5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...ava/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java b/...ava/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
@@ -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()))

diff --git 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;
 }