Merge pull request #2512 from ripcurlx/fix-problem-with-display-of-ze…

…ro-trading-fees Show the correct BSQ or BTC trading fee if it is maker or taker
bisq-network · Mar 7, 2019 · 6481a53 · 6481a53
2 parents a7b4a56 + 85274b1
commit 6481a53
Showing 1 changed file with 3 additions and 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
@@ -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;