From 5d55248b7eaaf39b33273087df6113a7ac370931 Mon Sep 17 00:00:00 2001
From: yonson2023 <122909161+yonson2023@users.noreply.github.com>
Date: Wed, 25 Jan 2023 10:38:19 -0600
Subject: [PATCH] Differenciate offer removal pop-ups for BSQ swaps and regular
 trades.

---
 .../bisq/desktop/main/offer/offerbook/OfferBookView.java  | 8 ++++----
 .../desktop/main/portfolio/openoffer/OpenOffersView.java  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
index 74b426e2be..197e484283 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
@@ -723,11 +723,11 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
 
     private void onRemoveOpenOffer(Offer offer) {
         if (model.isBootstrappedOrShowPopup()) {
-            String key = "RemoveOfferWarning";
+            String key = (offer.isBsqSwapOffer() ? "RemoveBsqSwapWarning" : "RemoveOfferWarning");
             if (DontShowAgainLookup.showAgain(key)) {
-                String message = offer.getMakerFee().isPositive() ?
-                        Res.get("popup.warning.removeOffer", model.getMakerFeeAsString(offer)) :
-                        Res.get("popup.warning.removeNoFeeOffer");
+                String message = offer.isBsqSwapOffer() ?
+                        Res.get("popup.warning.removeNoFeeOffer") :
+                        Res.get("popup.warning.removeOffer", model.getMakerFeeAsString(offer));
                 new Popup().warning(message)
                         .actionButtonText(Res.get("shared.removeOffer"))
                         .onAction(() -> doRemoveOffer(offer))
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
index a0c497ccc0..7a0d8d59c1 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
@@ -359,11 +359,11 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
     private void onRemoveOpenOffer(OpenOfferListItem item) {
         OpenOffer openOffer = item.getOpenOffer();
         if (model.isBootstrappedOrShowPopup()) {
-            String key = "RemoveOfferWarning";
+            String key = (openOffer.getOffer().isBsqSwapOffer() ? "RemoveBsqSwapWarning" : "RemoveOfferWarning");
             if (DontShowAgainLookup.showAgain(key)) {
-                String message = item.hasMakerFee() ?
-                        Res.get("popup.warning.removeOffer", item.getMakerFeeAsString()) :
-                        Res.get("popup.warning.removeNoFeeOffer");
+                String message = openOffer.getOffer().isBsqSwapOffer() ?
+                        Res.get("popup.warning.removeNoFeeOffer") :
+                        Res.get("popup.warning.removeOffer", item.getMakerFeeAsString());
                 new Popup().warning(message)
                         .actionButtonText(Res.get("shared.removeOffer"))
                         .onAction(() -> doRemoveOpenOffer(openOffer))