allow offer trigger price outside of current price

haveno-dex · Feb 14, 2025 · 867f72d · 867f72d
1 parent 7ba72dc
commit 867f72d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/core/src/main/java/haveno/core/offer/OpenOfferManager.java b/core/src/main/java/haveno/core/offer/OpenOfferManager.java
@@ -595,6 +595,7 @@ public void activateOpenOffer(OpenOffer openOffer,
             offerBookService.activateOffer(offer,
                     () -> {
                         openOffer.setState(OpenOffer.State.AVAILABLE);
+                        applyTriggerState(openOffer);
                         requestPersistence();
                         log.debug("activateOpenOffer, offerId={}", offer.getId());
                         resultHandler.handleResult();
@@ -603,6 +604,13 @@ public void activateOpenOffer(OpenOffer openOffer,
         }
     }
 
+    private void applyTriggerState(OpenOffer openOffer) {
+        if (openOffer.getState() != OpenOffer.State.AVAILABLE) return;
+        if (TriggerPriceService.isTriggered(priceFeedService.getMarketPrice(openOffer.getOffer().getCurrencyCode()), openOffer)) {
+            openOffer.deactivate(true);
+        }
+    }
+
     public void deactivateOpenOffer(OpenOffer openOffer,
                                     boolean deactivatedByTrigger,
                                     ResultHandler resultHandler,
@@ -688,7 +696,12 @@ public void editOpenOfferPublish(Offer editedOffer,
             removeOpenOffer(openOffer);
 
             OpenOffer editedOpenOffer = new OpenOffer(editedOffer, triggerPrice, openOffer);
-            editedOpenOffer.setState(originalState);
+            if (originalState == OpenOffer.State.DEACTIVATED && openOffer.isDeactivatedByTrigger()) {
+                editedOpenOffer.setState(OpenOffer.State.AVAILABLE);
+                applyTriggerState(editedOpenOffer);
+            } else {
+                editedOpenOffer.setState(originalState);
+            }
 
             addOpenOffer(editedOpenOffer);
 

diff --git a/core/src/main/java/haveno/core/util/PriceUtil.java b/core/src/main/java/haveno/core/util/PriceUtil.java
@@ -69,27 +69,8 @@ public static InputValidator.ValidationResult isTriggerPriceValid(String trigger
         if (!result.isValid) {
             return result;
         }
-
-        long triggerPriceAsLong = PriceUtil.getMarketPriceAsLong(triggerPriceAsString, marketPrice.getCurrencyCode());
-        long marketPriceAsLong = PriceUtil.getMarketPriceAsLong("" +  marketPrice.getPrice(), marketPrice.getCurrencyCode());
-        String marketPriceAsString = FormattingUtils.formatMarketPrice(marketPrice.getPrice(), marketPrice.getCurrencyCode());
-
-        boolean isCryptoCurrency = CurrencyUtil.isCryptoCurrency(currencyCode);
-        if ((isSellOffer && !isCryptoCurrency) || (!isSellOffer && isCryptoCurrency)) {
-            if (triggerPriceAsLong >= marketPriceAsLong) {
-                return new InputValidator.ValidationResult(false,
-                        Res.get("createOffer.triggerPrice.invalid.tooHigh", marketPriceAsString));
-            } else {
-                return new InputValidator.ValidationResult(true);
-            }
-        } else {
-            if (triggerPriceAsLong <= marketPriceAsLong) {
-                return new InputValidator.ValidationResult(false,
-                        Res.get("createOffer.triggerPrice.invalid.tooLow", marketPriceAsString));
-            } else {
-                return new InputValidator.ValidationResult(true);
-            }
-        }
+
+        return new InputValidator.ValidationResult(true);
     }
 
     public static Price marketPriceToPrice(MarketPrice marketPrice) {

diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java
@@ -692,7 +692,7 @@ public TableCell<OpenOfferListItem, OpenOfferListItem> call(TableColumn<OpenOffe
                             AutoTooltipSlideToggleButton checkBox;
 
                             private void updateState(@NotNull OpenOffer openOffer) {
-                                if (checkBox != null) checkBox.setSelected(!openOffer.isDeactivated());
+                                if (checkBox != null) checkBox.setSelected(openOffer.getState() == OpenOffer.State.AVAILABLE);
                             }
 
                             @Override