From 864c7a15dbdfb457f4f4d54dc4441f449b336562 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 3 Oct 2014 22:21:23 +0200 Subject: [PATCH] Fix bug with mining fee --- .../gui/main/orders/pending/PendingTradesModel.java | 5 ++--- .../bitsquare/gui/main/orders/pending/PendingTradesPM.java | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java index c5640c1314..6c0845d12b 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java +++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesModel.java @@ -316,10 +316,9 @@ class PendingTradesModel extends UIModel { // TODO handle overpaid collateral if (isOfferer()) - return getTrade().getTradeAmount().add(getTrade().getOffer().getCollateralAmount()).subtract(FeePolicy - .TX_FEE); + return getTrade().getTradeAmount().add(getTrade().getOffer().getCollateralAmount()); else - return getTrade().getCollateralAmount().subtract(FeePolicy.TX_FEE); + return getTrade().getCollateralAmount(); } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java index 88a1ac0874..12562bf5d3 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java +++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java @@ -17,6 +17,7 @@ package io.bitsquare.gui.main.orders.pending; +import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.components.Popups; @@ -150,7 +151,7 @@ public class PendingTradesPM extends PresentationModel { } String getAmountToWithdraw() { - return formatter.formatCoinWithCode(model.getAmountToWithdraw()); + return formatter.formatCoinWithCode(model.getAmountToWithdraw().subtract(FeePolicy.TX_FEE)); } ///////////////////////////////////////////////////////////////////////////////////////////