From 23f92db561f5dc74408d74e81a095540f67c5a91 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 7 Feb 2016 10:47:29 +0100 Subject: [PATCH] Fix bug with dust warning --- .../main/offer/takeoffer/TakeOfferDataModel.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java index feb016b99b..681b1682d8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java @@ -290,14 +290,15 @@ class TakeOfferDataModel extends ActivatableDataModel { return true; } - boolean isAmountLargerThanOfferAmountMinusFee() { + boolean wouldCreateDustForOfferer() { //noinspection SimplifiableIfStatement - if (amountAsCoin.get() != null && offer != null) - return amountAsCoin.get() - .add(FeePolicy.getFeePerKb()) - .add(Transaction.MIN_NONDUST_OUTPUT) - .isGreaterThan(offer.getAmount()); - return true; + if (amountAsCoin.get() != null && offer != null) { + Coin customAmount = offer.getAmount().subtract(amountAsCoin.get()); + Coin dustAndFee = FeePolicy.getFeePerKb().add(Transaction.MIN_NONDUST_OUTPUT); + return customAmount.isPositive() && customAmount.isLessThan(dustAndFee); + } else { + return true; + } } public PaymentMethod getPaymentMethod() {