diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java index 2d24efe97c4..c5e0dcfd128 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java @@ -25,6 +25,7 @@ import bisq.core.monetary.Volume; import bisq.core.offer.Offer; import bisq.core.offer.OfferPayload; +import bisq.core.offer.OpenOffer; import bisq.core.provider.price.MarketPrice; import bisq.core.provider.price.PriceFeedService; import bisq.core.trade.Tradable; @@ -159,7 +160,7 @@ public Coin getTotalTxFee() { return Coin.valueOf(getList().stream() .map(ClosedTradableListItem::getTradable) .mapToLong(tradable -> { - if (wasMyOffer(tradable)) { + if (wasMyOffer(tradable) || tradable instanceof OpenOffer) { return tradable.getOffer().getTxFee().value; } else { // taker pays for 3 transactions @@ -178,7 +179,7 @@ public Coin getTotalTradeFee(boolean expectBtcFee) { protected long getTradeFee(Tradable tradable, boolean expectBtcFee) { Offer offer = tradable.getOffer(); - if (wasMyOffer(tradable)) { + if (wasMyOffer(tradable) || tradable instanceof OpenOffer) { String makerFeeTxId = offer.getOfferFeePaymentTxId(); boolean notInBsqWallet = bsqWalletService.getTransaction(makerFeeTxId) == null; if (expectBtcFee) { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java index 0a011f48466..7bfe454bfdf 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java @@ -152,7 +152,7 @@ boolean isCurrencyForTradeFeeBtc(ClosedTradableListItem item) { Tradable tradable = item.getTradable(); Offer offer = tradable.getOffer(); - if (wasMyOffer(tradable)) { + if (wasMyOffer(tradable) || tradable instanceof OpenOffer) { // I was maker so we use offer return offer.isCurrencyForMakerFeeBtc(); } else {