Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-08 06:32:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

re-enable triggered offers if within trigger price again

Browse source
This commit is contained in:
woodser 2025-02-14 11:20:57 -05:00
parent 4a82c69507
commit 290a3738b7
6 changed files with 52 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersDataModel.java
View file

@ -69,7 +69,7 @@ class OpenOffersDataModel extends ActivatableDataModel {
}
void onDeactivateOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
openOfferManager.deactivateOpenOffer(openOffer, resultHandler, errorMessageHandler);
openOfferManager.deactivateOpenOffer(openOffer, false, resultHandler, errorMessageHandler);
}
void onRemoveOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
@ -94,7 +94,7 @@ class OpenOffersDataModel extends ActivatableDataModel {
list.sort((o1, o2) -> o2.getOffer().getDate().compareTo(o1.getOffer().getDate()));
}
boolean wasTriggered(OpenOffer openOffer) {
return TriggerPriceService.wasTriggered(priceFeedService.getMarketPrice(openOffer.getOffer().getCurrencyCode()), openOffer);
boolean isTriggered(OpenOffer openOffer) {
return TriggerPriceService.isTriggered(priceFeedService.getMarketPrice(openOffer.getOffer().getCurrencyCode()), openOffer);
}
}

6
desktop/src/main/java/haveno/desktop/main/portfolio/openoffer/OpenOffersView.java
View file

@ -368,7 +368,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
}
private void onActivateOpenOffer(OpenOffer openOffer) {
if (model.isBootstrappedOrShowPopup() && !model.dataModel.wasTriggered(openOffer)) {
if (model.isBootstrappedOrShowPopup() && !model.dataModel.isTriggered(openOffer)) {
model.onActivateOpenOffer(openOffer,
() -> log.debug("Activate offer was successful"),
(message) -> {
@ -720,7 +720,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
checkBox.setPadding(new Insets(-7, 0, -7, 0));
checkBox.setGraphic(iconView);
}
checkBox.setDisable(model.dataModel.wasTriggered(openOffer));
checkBox.setDisable(model.dataModel.isTriggered(openOffer));
checkBox.setOnAction(event -> {
if (openOffer.isDeactivated()) {
onActivateOpenOffer(openOffer);
@ -798,7 +798,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
boolean triggerPriceSet = item.getOpenOffer().getTriggerPrice() > 0;
button.setVisible(triggerPriceSet);
if (model.dataModel.wasTriggered(item.getOpenOffer())) {
if (model.dataModel.isTriggered(item.getOpenOffer())) {
button.getGraphic().getStyleClass().add("warning");
button.setTooltip(new Tooltip(Res.get("openOffer.triggered")));
} else {