From 85274b1e526629995c9b077998e9ede6af8b51b8 Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Thu, 7 Mar 2019 18:43:27 +0100
Subject: [PATCH] Show the correct BSQ or BTC trading fee if it is maker or
 taker

---
 .../main/portfolio/pendingtrades/PendingTradesViewModel.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
index daa93a22d81..7d7147c1144 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
@@ -292,8 +292,9 @@ public String getTxFee() {
     }
 
     public String getTradeFee() {
-        if (trade != null && dataModel.getOffer() != null) {
-            if (dataModel.getOffer().isCurrencyForMakerFeeBtc() && trade.getTradeAmount() != null) {
+        if (trade != null && dataModel.getOffer() != null && trade.getTradeAmount() != null) {
+            if (dataModel.isMaker() && dataModel.getOffer().isCurrencyForMakerFeeBtc() ||
+                    !dataModel.isMaker() && dataModel.getTrade().isCurrencyForTakerFeeBtc()) {
                 Coin tradeFeeInBTC = dataModel.getTradeFeeInBTC();
                 String percentage = GUIUtil.getPercentageOfTradeAmount(tradeFeeInBTC, trade.getTradeAmount(), btcFormatter);
                 return btcFormatter.formatCoinWithCode(tradeFeeInBTC) + percentage;