fix inverted buy/sell label on make or take crypto offer

haveno-dex · Nov 15, 2024 · 264cb5f · 264cb5f
1 parent c9e9924
commit 264cb5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferView.java
@@ -308,7 +308,7 @@ public void initWithData(OfferDirection direction, TradeCurrency tradeCurrency,
             if (CurrencyUtil.isTraditionalCurrency(tradeCurrency.getCode())) {
                 placeOfferButtonLabel = Res.get("createOffer.placeOfferButton", Res.get("shared.buy"));
             } else {
-                placeOfferButtonLabel = Res.get("createOffer.placeOfferButtonCrypto", Res.get("shared.buy"), tradeCurrency.getCode());
+                placeOfferButtonLabel = Res.get("createOffer.placeOfferButtonCrypto", Res.get("shared.sell"), tradeCurrency.getCode());
             }
             nextButton.setId("buy-button");
             fundFromSavingsWalletButton.setId("buy-button");
@@ -317,7 +317,7 @@ public void initWithData(OfferDirection direction, TradeCurrency tradeCurrency,
             if (CurrencyUtil.isTraditionalCurrency(tradeCurrency.getCode())) {
                 placeOfferButtonLabel = Res.get("createOffer.placeOfferButton", Res.get("shared.sell"));
             } else {
-                placeOfferButtonLabel = Res.get("createOffer.placeOfferButtonCrypto", Res.get("shared.sell"), tradeCurrency.getCode());
+                placeOfferButtonLabel = Res.get("createOffer.placeOfferButtonCrypto", Res.get("shared.buy"), tradeCurrency.getCode());
             }
             nextButton.setId("sell-button");
             fundFromSavingsWalletButton.setId("sell-button");
@@ -707,10 +707,10 @@ private void createListeners() {
             triggerPriceInputTextField.clear();
             if (!CurrencyUtil.isTraditionalCurrency(newValue)) {
                 if (model.isShownAsBuyOffer()) {
-                    placeOfferButton.updateText(Res.get("createOffer.placeOfferButtonCrypto", Res.get("shared.buy"),
+                    placeOfferButton.updateText(Res.get("createOffer.placeOfferButtonCrypto", Res.get("shared.sell"),
                             model.getTradeCurrency().getCode()));
                 } else {
-                    placeOfferButton.updateText(Res.get("createOffer.placeOfferButtonCrypto", Res.get("shared.sell"),
+                    placeOfferButton.updateText(Res.get("createOffer.placeOfferButtonCrypto", Res.get("shared.buy"),
                             model.getTradeCurrency().getCode()));
                 }
             }

diff --git a/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java
@@ -306,12 +306,12 @@ public void initWithData(Offer offer) {
             takeOfferButton.setId("buy-button-big");
             nextButton.setId("buy-button");
             fundFromSavingsWalletButton.setId("buy-button");
-            takeOfferButton.updateText(getTakeOfferLabel(offer, Res.get("shared.buy")));
+            takeOfferButton.updateText(getTakeOfferLabel(offer, false));
         } else {
             takeOfferButton.setId("sell-button-big");
             nextButton.setId("sell-button");
             fundFromSavingsWalletButton.setId("sell-button");
-            takeOfferButton.updateText(getTakeOfferLabel(offer, Res.get("shared.sell")));
+            takeOfferButton.updateText(getTakeOfferLabel(offer, true));
         }
         priceAsPercentageDescription.setText(model.getPercentagePriceDescription());
 
@@ -1232,11 +1232,11 @@ private GridPane createInfoPopover() {
     }
 
     @NotNull
-    private String getTakeOfferLabel(Offer offer, String direction) {
+    private String getTakeOfferLabel(Offer offer, boolean isBuyOffer) {
         return offer.isTraditionalOffer() ?
-                Res.get("takeOffer.takeOfferButton", direction) :
+                Res.get("takeOffer.takeOfferButton", isBuyOffer ? Res.get("shared.sell") : Res.get("shared.buy")) :
                 Res.get("takeOffer.takeOfferButtonCrypto",
-                        direction,
+                        isBuyOffer ? Res.get("shared.buy") : Res.get("shared.sell"),
                         offer.getCurrencyCode());
     }