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

fix offer book chart inversions

Browse source
This commit is contained in:
woodser 2025-05-22 02:03:29 -04:00
parent cd9f74dad2
commit 2f3c7098de
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartView.java
View file

@ -234,19 +234,20 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
} }
}); });
boolean isCrypto = CurrencyUtil.isCryptoCurrency(code); String viewBaseCurrencyCode = model.isCrypto() ? code : Res.getBaseCurrencyCode();
String viewBaseCurrencyCode = isCrypto ? code : Res.getBaseCurrencyCode(); String viewPriceCurrencyCode = model.isCrypto() ? Res.getBaseCurrencyCode() : code;
String viewPriceCurrencyCode = isCrypto ? Res.getBaseCurrencyCode() : code;
sellHeaderLabel.setText(Res.get(isCrypto ? "market.offerBook.buyOffersHeaderLabel" : "market.offerBook.sellOffersHeaderLabel", viewBaseCurrencyCode)); sellHeaderLabel.setText(Res.get("market.offerBook.sellOffersHeaderLabel", viewBaseCurrencyCode));
sellButton.updateText(Res.get(isCrypto ? "shared.buyCurrency" : "shared.sellCurrency", viewBaseCurrencyCode)); sellButton.updateText(Res.get("shared.sellCurrency", viewBaseCurrencyCode));
sellButton.setGraphic(GUIUtil.getCurrencyIconWithBorder(viewBaseCurrencyCode)); sellButton.setGraphic(GUIUtil.getCurrencyIconWithBorder(viewBaseCurrencyCode));
sellButton.setId(isCrypto ? "buy-button-big" : "sell-button-big"); sellButton.setOnAction(e -> model.goToOfferView(model.isCrypto() ? OfferDirection.SELL : OfferDirection.BUY));
sellButton.setId("sell-button-big");
buyHeaderLabel.setText(Res.get(isCrypto ? "market.offerBook.sellOffersHeaderLabel" : "market.offerBook.buyOffersHeaderLabel", viewBaseCurrencyCode)); buyHeaderLabel.setText(Res.get("market.offerBook.buyOffersHeaderLabel", viewBaseCurrencyCode));
buyButton.updateText(Res.get(isCrypto ? "shared.sellCurrency" : "shared.buyCurrency", viewBaseCurrencyCode)); buyButton.updateText(Res.get( "shared.buyCurrency", viewBaseCurrencyCode));
buyButton.setGraphic(GUIUtil.getCurrencyIconWithBorder(viewBaseCurrencyCode)); buyButton.setGraphic(GUIUtil.getCurrencyIconWithBorder(viewBaseCurrencyCode));
buyButton.setId(isCrypto ? "sell-button-big" : "buy-button-big"); buyButton.setOnAction(e -> model.goToOfferView(model.isCrypto() ? OfferDirection.BUY : OfferDirection.SELL));
buyButton.setId("buy-button-big");
priceColumnLabel.set(Res.get("shared.priceWithCur", viewPriceCurrencyCode)); priceColumnLabel.set(Res.get("shared.priceWithCur", viewPriceCurrencyCode));
@ -296,8 +297,8 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
currencyComboBox.getSelectionModel().select(model.getSelectedCurrencyListItem().get()); currencyComboBox.getSelectionModel().select(model.getSelectedCurrencyListItem().get());
}; };
buyTableRowSelectionListener = (observable, oldValue, newValue) -> model.goToOfferView(OfferDirection.BUY);
sellTableRowSelectionListener = (observable, oldValue, newValue) -> model.goToOfferView(OfferDirection.SELL); sellTableRowSelectionListener = (observable, oldValue, newValue) -> model.goToOfferView(OfferDirection.SELL);
buyTableRowSelectionListener = (observable, oldValue, newValue) -> model.goToOfferView(OfferDirection.BUY);
havenoWindowVerticalSizeListener = (observable, oldValue, newValue) -> layout(); havenoWindowVerticalSizeListener = (observable, oldValue, newValue) -> layout();
} }
@ -353,17 +354,17 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
} }
private synchronized void updateChartData() { private synchronized void updateChartData() {
volumeSellColumnLabel.set(Res.get("offerbook.volumeTotal", model.getCurrencyCode(), VolumeUtil.formatVolume(model.getTotalVolume(OfferDirection.SELL)))); volumeSellColumnLabel.set(Res.get("offerbook.volumeTotal", model.getCurrencyCode(), VolumeUtil.formatVolume(model.getTotalVolume(model.isCrypto() ? OfferDirection.BUY : OfferDirection.SELL))));
volumeBuyColumnLabel.set(Res.get("offerbook.volumeTotal", model.getCurrencyCode(), VolumeUtil.formatVolume(model.getTotalVolume(OfferDirection.BUY)))); amountSellColumnLabel.set(Res.get("offerbook.XMRTotal", "" + model.getTotalAmount(model.isCrypto() ? OfferDirection.BUY : OfferDirection.SELL)));
amountSellColumnLabel.set(Res.get("offerbook.XMRTotal", "" + model.getTotalAmount(OfferDirection.SELL))); volumeBuyColumnLabel.set(Res.get("offerbook.volumeTotal", model.getCurrencyCode(), VolumeUtil.formatVolume(model.getTotalVolume(model.isCrypto() ? OfferDirection.SELL : OfferDirection.BUY))));
amountBuyColumnLabel.set(Res.get("offerbook.XMRTotal", "" + model.getTotalAmount(OfferDirection.BUY))); amountBuyColumnLabel.set(Res.get("offerbook.XMRTotal", "" + model.getTotalAmount(model.isCrypto() ? OfferDirection.SELL : OfferDirection.BUY)));
seriesBuy.getData().clear();
seriesSell.getData().clear(); seriesSell.getData().clear();
seriesBuy.getData().clear();
areaChart.getData().clear(); areaChart.getData().clear();
seriesBuy.getData().addAll(filterOutliersBuy(model.getBuyData())); seriesSell.getData().addAll(model.isCrypto() ? filterOutliersBuy(model.getBuyData()) : filterOutliersSell(model.getSellData()));
seriesSell.getData().addAll(filterOutliersSell(model.getSellData())); seriesBuy.getData().addAll(model.isCrypto() ? filterOutliersSell(model.getSellData()) : filterOutliersBuy(model.getBuyData()));
areaChart.getData().addAll(List.of(seriesBuy, seriesSell)); areaChart.getData().addAll(List.of(seriesBuy, seriesSell));
} }
@ -653,9 +654,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
AutoTooltipButton button = new AutoTooltipButton(); AutoTooltipButton button = new AutoTooltipButton();
button.setContentDisplay(ContentDisplay.RIGHT); button.setContentDisplay(ContentDisplay.RIGHT);
button.setGraphicTextGap(10); button.setGraphicTextGap(10);
button.updateText(isSellTable ? Res.get("market.offerBook.buy") : Res.get("market.offerBook.sell"));
button.setMinHeight(32); button.setMinHeight(32);
button.setOnAction(e -> model.goToOfferView(direction));
Region spacer = new Region(); Region spacer = new Region();

4
desktop/src/main/java/haveno/desktop/main/market/offerbook/OfferBookChartViewModel.java
View file

@ -239,6 +239,10 @@ class OfferBookChartViewModel extends ActivatableViewModel {
} }
} }
public boolean isCrypto() {
return CurrencyUtil.isCryptoCurrency(getCurrencyCode());
}
public boolean isMyOffer(Offer offer) { public boolean isMyOffer(Offer offer) {
return openOfferManager.isMyOffer(offer); return openOfferManager.isMyOffer(offer);
} }