From af17c4938d001351930d940dd1716af7746162a9 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 14 Jan 2016 23:44:30 +0100 Subject: [PATCH] fixed wrong fee --- core/src/main/java/io/bitsquare/btc/FeePolicy.java | 2 +- .../io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/io/bitsquare/btc/FeePolicy.java b/core/src/main/java/io/bitsquare/btc/FeePolicy.java index b6dca62517..c9fbe38797 100644 --- a/core/src/main/java/io/bitsquare/btc/FeePolicy.java +++ b/core/src/main/java/io/bitsquare/btc/FeePolicy.java @@ -43,7 +43,7 @@ public class FeePolicy { public static final Coin TX_FEE = Coin.valueOf(20000); // 0.0002 BTC about 0.8 EUR @ 400 EUR/BTC: about 70 satoshi /byte static { - Wallet.SendRequest.DEFAULT_FEE_PER_KB = Coin.valueOf(5000); // 0.0005 BTC we use a higher value. original is Coin.valueOf(1000) + Wallet.SendRequest.DEFAULT_FEE_PER_KB = TX_FEE; } public static final Coin DUST = Coin.valueOf(546); diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java index e291b05bf4..cc3c281c66 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java @@ -211,7 +211,7 @@ public class WithdrawalView extends ActivatableView { } } else { - new Popup().error("The amount to transfer is lower the the transaction fee and the min. possible tx value.").show(); + new Popup().warning("The amount to transfer is lower than the transaction fee and the min. possible tx value.").show(); } }