From 8cca2cbb52379973840ed806ab4fd781a9e337c0 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Sat, 28 Jun 2025 10:17:38 -0400
Subject: [PATCH] do not color currency code in offer book volume column

---
 .../desktop/main/offer/offerbook/OfferBookView.java    |  5 +++--
 .../main/offer/offerbook/OfferBookViewModel.java       | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
index e3ed68ccf1..7cb2bc7bdb 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
@@ -946,8 +946,9 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
                                         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("");
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
index 9a52902f3e..85ecb1e781 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
@@ -436,11 +436,19 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
         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 {