Merge pull request #4178 from jmacxx/fix_issue_3871

When accepting an offer do not round the BTC amount outside range
bisq-network · May 11, 2020 · d51c4c8 · d51c4c8
2 parents c07988f + 223a1d3
commit d51c4c8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java
@@ -361,7 +361,7 @@ void onFocusOutAmountTextField(boolean oldValue, boolean newValue, String userIn
                     dataModel.applyAmount(adjustedAmountForHalCash);
                     amount.set(btcFormatter.formatCoin(dataModel.getAmount().get()));
                 } else if (CurrencyUtil.isFiatCurrency(dataModel.getCurrencyCode())) {
-                    if (!isAmountEqualMinAmount(dataModel.getAmount().get())) {
+                    if (!isAmountEqualMinAmount(dataModel.getAmount().get()) && (!isAmountEqualMaxAmount(dataModel.getAmount().get()))) {
                         // We only apply the rounding if the amount is variable (minAmount is lower as amount).
                         // Otherwise we could get an amount lower then the minAmount set by rounding
                         Coin roundedAmount = OfferUtil.getRoundedFiatAmount(dataModel.getAmount().get(), tradePrice,
@@ -644,7 +644,8 @@ private void setAmountToModel() {
             if (price != null) {
                 if (dataModel.isHalCashAccount()) {
                     amount = OfferUtil.getAdjustedAmountForHalCash(amount, price, maxTradeLimit);
-                } else if (CurrencyUtil.isFiatCurrency(dataModel.getCurrencyCode()) && !isAmountEqualMinAmount(amount)) {
+                } else if (CurrencyUtil.isFiatCurrency(dataModel.getCurrencyCode())
+                        && !isAmountEqualMinAmount(amount) && !isAmountEqualMaxAmount(amount)) {
                     // We only apply the rounding if the amount is variable (minAmount is lower as amount).
                     // Otherwise we could get an amount lower then the minAmount set by rounding
                     amount = OfferUtil.getRoundedFiatAmount(amount, price, maxTradeLimit);
@@ -658,6 +659,9 @@ private boolean isAmountEqualMinAmount(Coin amount) {
         return amount.value == offer.getMinAmount().value;
     }
 
+    private boolean isAmountEqualMaxAmount(Coin amount) {
+        return amount.value == offer.getAmount().value;
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Getters