From a37654e116cf11c6c67e295610c97163b7109fa9 Mon Sep 17 00:00:00 2001 From: woodser <13068859+woodser@users.noreply.github.com> Date: Wed, 28 May 2025 09:18:20 -0400 Subject: [PATCH] arbitrator transactions show maker and taker fees --- core/src/main/resources/i18n/displayStrings.properties | 2 ++ .../main/funds/transactions/TransactionsListItem.java | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 8133a7b0..d3ce81f9 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1138,6 +1138,8 @@ funds.tx.disputeLost=Lost dispute case: {0} funds.tx.collateralForRefund=Refund collateral: {0} funds.tx.timeLockedPayoutTx=Time locked payout tx: {0} funds.tx.refund=Refund from arbitration: {0} +funds.tx.makerTradeFee=Maker fee: {0} +funds.tx.takerTradeFee=Taker fee: {0} funds.tx.unknown=Unknown reason: {0} funds.tx.noFundsFromDispute=No refund from dispute funds.tx.receivedFunds=Received funds diff --git a/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java index b325b04e..11a013e4 100644 --- a/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java +++ b/desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java @@ -22,6 +22,7 @@ import com.google.common.base.Suppliers; import haveno.core.locale.Res; import haveno.core.offer.Offer; import haveno.core.offer.OpenOffer; +import haveno.core.trade.ArbitratorTrade; import haveno.core.trade.HavenoUtils; import haveno.core.trade.Tradable; import haveno.core.trade.Trade; @@ -159,6 +160,13 @@ public class TransactionsListItem { } } else { details = Res.get("funds.tx.unknown", tradeId); + if (trade instanceof ArbitratorTrade) { + if (txId.equals(trade.getMaker().getDepositTxHash())) { + details = Res.get("funds.tx.makerTradeFee", tradeId); + } else if (txId.equals(trade.getTaker().getDepositTxHash())) { + details = Res.get("funds.tx.takerTradeFee", tradeId); + } + } } } }