From f2f519ada66a1dfeb39e428619f1b57ee2b5b76e Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Tue, 12 May 2020 15:17:10 -0500
Subject: [PATCH] Display correct trade and tx fees in CSV export

When exporting trade history to CSV, users would expect to see
their own transaction and trade fees listed.  Maker fees are
stored on the Offer, Taker fees are stored on the Trade object.
The code was not properly checking whether the user was the
Offer Maker or Taker, and as such the report was always displaying
the Taker information for Tx and Trade fee.  Therefore any trades
where the user was Maker showed the wrong fees.

The column title `Maker Fee` is incorrect and misleading since
the user doing the export is not necessarily the Maker.  We
rename this column to `Trade Fee` to indicate that it is the fee
the user paid for trading regardless of Maker/Taker status.

Fixes #4207
---
 .../main/resources/i18n/displayStrings.properties  |  2 +-
 .../portfolio/closedtrades/ClosedTradesView.fxml   |  2 +-
 .../portfolio/closedtrades/ClosedTradesView.java   | 14 +++++++-------
 .../closedtrades/ClosedTradesViewModel.java        |  8 ++++++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 2e8e17cb62..aebb698dcf 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -63,7 +63,7 @@ shared.priceInCurForCur=Price in {0} for 1 {1}
 shared.fixedPriceInCurForCur=Fixed price in {0} for 1 {1}
 shared.amount=Amount
 shared.txFee=Transaction Fee
-shared.makerFee=Maker Fee
+shared.tradeFee=Trade Fee
 shared.buyerSecurityDeposit=Buyer Deposit
 shared.sellerSecurityDeposit=Seller Deposit
 shared.amountWithCur=Amount in {0}
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml
index 04ed87f4ba..25900ef61a 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml
@@ -41,7 +41,7 @@
             <TableColumn fx:id="amountColumn" minWidth="130"/>
             <TableColumn fx:id="volumeColumn" minWidth="130"/>
             <TableColumn fx:id="txFeeColumn" visible="false"/>
-            <TableColumn fx:id="makerFeeColumn" visible="false"/>
+            <TableColumn fx:id="tradeFeeColumn" visible="false"/>
             <TableColumn fx:id="buyerSecurityDepositColumn" visible="false"/>
             <TableColumn fx:id="sellerSecurityDepositColumn" visible="false"/>
             <TableColumn fx:id="directionColumn" minWidth="80"/>
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
index 193cc4561d..c282e86db0 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
@@ -82,7 +82,7 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
     @FXML
     TableView<ClosedTradableListItem> tableView;
     @FXML
-    TableColumn<ClosedTradableListItem, ClosedTradableListItem> priceColumn, amountColumn, volumeColumn, txFeeColumn, makerFeeColumn, buyerSecurityDepositColumn, sellerSecurityDepositColumn,
+    TableColumn<ClosedTradableListItem, ClosedTradableListItem> priceColumn, amountColumn, volumeColumn, txFeeColumn, tradeFeeColumn, buyerSecurityDepositColumn, sellerSecurityDepositColumn,
             marketColumn, directionColumn, dateColumn, tradeIdColumn, stateColumn, avatarColumn;
     @FXML
     HBox footerBox;
@@ -121,7 +121,7 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
 	@Override
 	public void initialize() {
 		txFeeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.txFee")));
-		makerFeeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.makerFee")));
+		tradeFeeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.tradeFee")));
 		buyerSecurityDepositColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.buyerSecurityDeposit")));
 		sellerSecurityDepositColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.sellerSecurityDeposit")));
         priceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.price")));
@@ -141,7 +141,7 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
         setDirectionColumnCellFactory();
         setAmountColumnCellFactory();
 		setTxFeeColumnCellFactory();
-		setMakerFeeColumnCellFactory();
+		setTradeFeeColumnCellFactory();
 		setBuyerSecurityDepositColumnCellFactory();
 		setSellerSecurityDepositColumnCellFactory();
         setPriceColumnCellFactory();
@@ -167,7 +167,7 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
         txFeeColumn.setComparator(nullsFirstComparing(o ->
                 o instanceof Trade ? ((Trade) o).getTxFee() : o.getOffer().getTxFee()
         ));
-        makerFeeColumn.setComparator(nullsFirstComparing(o ->
+        tradeFeeColumn.setComparator(nullsFirstComparing(o ->
                 o instanceof Trade ? ((Trade) o).getTakerFee() : o.getOffer().getMakerFee()
         ));
         buyerSecurityDepositColumn.setComparator(nullsFirstComparing(o ->
@@ -518,9 +518,9 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
                 });
 	}
 
-	private void setMakerFeeColumnCellFactory() {
-		makerFeeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
-		makerFeeColumn.setCellFactory(
+	private void setTradeFeeColumnCellFactory() {
+		tradeFeeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
+		tradeFeeColumn.setCellFactory(
                 new Callback<>() {
                     @Override
                     public TableCell<ClosedTradableListItem, ClosedTradableListItem> call(
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 26ae7a903d..e359e4f0ee 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
@@ -91,7 +91,7 @@ class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataMod
         if (item == null)
             return "";
         Tradable tradable = item.getTradable();
-        if (tradable instanceof Trade)
+        if (!wasMyOffer(tradable) && (tradable instanceof Trade))
             return formatter.formatCoin(((Trade) tradable).getTxFee());
         else
             return formatter.formatCoin(tradable.getOffer().getTxFee());
@@ -101,7 +101,7 @@ class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataMod
         if (item == null)
             return "";
         Tradable tradable = item.getTradable();
-        if (tradable instanceof Trade)
+        if (!wasMyOffer(tradable) && (tradable instanceof Trade))
             return formatter.formatCoin(((Trade) tradable).getTakerFee());
         else
             return formatter.formatCoin(tradable.getOffer().getMakerFee());
@@ -195,4 +195,8 @@ class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataMod
                 .collect(Collectors.toSet())
                 .size();
     }
+
+    boolean wasMyOffer(Tradable tradable) {
+        return dataModel.closedTradableManager.wasMyOffer(tradable.getOffer());
+    }
 }