Skip to content

do not color currency code in offer book volume column #1817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2025
Merged

do not color currency code in offer book volume column #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,9 @@ public void updateItem(final OfferBookListItem item, boolean empty) {
setGraphic(null);
} else {
setText("");
setGraphic(new ColoredDecimalPlacesWithZerosText(model.getVolume(item),
model.getNumberOfDecimalsForVolume(item)));
ColoredDecimalPlacesWithZerosText volumeBox = new ColoredDecimalPlacesWithZerosText(model.getVolumeAmount(item), model.getNumberOfDecimalsForVolume(item));
if (model.showAllTradeCurrenciesProperty.get()) volumeBox.getChildren().add(new Label(" " + item.getOffer().getCurrencyCode()));
setGraphic(volumeBox);
}
} else {
setText("");
Expand Down
10 changes: 9 additions & 1 deletion desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,19 @@ String getVolume(OfferBookListItem item) {
return formatVolume(item.getOffer(), true);
}

String getVolumeAmount(OfferBookListItem item) {
return formatVolume(item.getOffer(), true, false);
}

private String formatVolume(Offer offer, boolean decimalAligned) {
return formatVolume(offer, decimalAligned, showAllTradeCurrenciesProperty.get());
}

private String formatVolume(Offer offer, boolean decimalAligned, boolean appendCurrencyCode) {
Volume offerVolume = offer.getVolume();
Volume minOfferVolume = offer.getMinVolume();
if (offerVolume != null && minOfferVolume != null) {
String postFix = showAllTradeCurrenciesProperty.get() ? " " + offer.getCurrencyCode() : "";
String postFix = appendCurrencyCode ? " " + offer.getCurrencyCode() : "";
decimalAligned = decimalAligned && !showAllTradeCurrenciesProperty.get();
return VolumeUtil.formatVolume(offer, decimalAligned, maxPlacesForVolume.get()) + postFix;
} else {
Expand Down
Loading