Merge pull request #6593 from jmacxx/limit_min_max_deviation

Limit offer min/max amount deviation to 50%.
bisq-network · Mar 11, 2023 · b88cd58 · b88cd58
2 parents 4e4321e + 8a41637
commit b88cd58
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
@@ -522,6 +522,8 @@ createOffer.resetToDefault=No, reset to the default value
 createOffer.useLowerValue=Yes, use my lower value
 createOffer.priceOutSideOfDeviation=The price you have entered is outside the max. allowed deviation from the market price.\nThe max. allowed deviation is {0} and can be adjusted in the preferences.
 createOffer.changePrice=Change price
+createOffer.amountsOutSideOfDeviation=The BTC amounts ({0} - {1}) are out of range.\nThe minimum amount cannot be less than 50% of the max.
+createOffer.changeAmount=Change amount
 createOffer.tac=With publishing this offer I agree to trade with any trader who fulfills the conditions as defined in this screen.
 createOffer.setDeposit=Set buyer's security deposit (%)
 createOffer.setDepositAsBuyer=Set my security deposit as buyer (%)

diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
@@ -1149,7 +1149,7 @@ private void addOptionsGroup() {
         });
 
         nextButton.setOnAction(e -> {
-            if (model.isPriceInRange()) {
+            if (model.isPriceInRange() && model.areAmountsInRange()) {
                 if (DevEnv.isDaoTradingActivated())
                     showFeeOption();
                 else

diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java
@@ -965,6 +965,27 @@ private void applyBuyerSecurityDepositOnFocusOut() {
     // Getters
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    public boolean areAmountsInRange() {
+        // Limit the minimum trade amount when creating an offer to 50% of the max amount.
+        // github.com/bisq-network/projects/issues/67
+        if (dataModel.getMinAmount().get().isLessThan(dataModel.getAmount().get().divide(2))) {
+            displayAmountsOutOfRangePopup();
+            return false;
+        }
+        return true;
+    }
+
+    private void displayAmountsOutOfRangePopup() {
+        Popup popup = new Popup();
+        popup.warning(Res.get("createOffer.amountsOutSideOfDeviation",
+                dataModel.getMinAmount().get().toPlainString(),
+                dataModel.getAmount().get().toPlainString()))
+                .actionButtonText(Res.get("createOffer.changeAmount"))
+                .onAction(popup::hide)
+                .hideCloseButton()
+                .show();
+    }
+
     public boolean isPriceInRange() {
         if (marketPriceMargin.get() != null && !marketPriceMargin.get().isEmpty()) {
             if (Math.abs(ParsingUtils.parsePercentStringToDouble(marketPriceMargin.get())) > preferences.getMaxPriceDistanceInPercent()) {