From 4761b71105d039b359379077a668d3116342467d Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Mon, 6 May 2024 11:03:58 -0400
Subject: [PATCH] remove repeated popups on offer taken error

---
 .../availability/tasks/ProcessOfferAvailabilityResponse.java | 2 +-
 .../desktop/main/offer/takeoffer/TakeOfferDataModel.java     | 5 ++++-
 .../desktop/main/offer/takeoffer/TakeOfferViewModel.java     | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/haveno/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java b/core/src/main/java/haveno/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java
index cb78a6feb4..e49235e807 100644
--- a/core/src/main/java/haveno/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java
+++ b/core/src/main/java/haveno/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java
@@ -54,7 +54,7 @@ public class ProcessOfferAvailabilityResponse extends Task<OfferAvailabilityMode
             
             // verify maker signature for trade request
             if (!HavenoUtils.isMakerSignatureValid(model.getTradeRequest(), offerAvailabilityResponse.getMakerSignature(), offer.getPubKeyRing())) {
-                offer.setState(Offer.State.NOT_AVAILABLE);
+                offer.setState(Offer.State.UNKNOWN); // TODO: using as invalid state
                 failed("Take offer attempt failed because maker signature is invalid");
                 return;
             }
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java
index 3ae9bd4ef7..94e447b5b9 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferDataModel.java
@@ -147,7 +147,10 @@ class TakeOfferDataModel extends OfferDataModel {
                     this.amount.get(),
                     () -> {
                     },
-                    errorMessage -> new Popup().warning(errorMessage).show());
+                    errorMessage -> {
+                        log.warn(errorMessage);
+                        if (offer.getState() != Offer.State.NOT_AVAILABLE) new Popup().warning(errorMessage).show(); // expected and handled elsewhere in UI
+                    });
         }
     }
 
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java
index 9382ca9d77..559ad75f74 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java
@@ -374,8 +374,8 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
                     takeOfferRequested = false;
                     break;
                 case REMOVED:
-                    if (!takeOfferRequested)
-                        offerWarning.set(Res.get("takeOffer.failed.offerRemoved"));
+                    // if (takeOfferRequested) // TODO: show any warning or removed is expected?
+                    //     offerWarning.set(Res.get("takeOffer.failed.offerRemoved"));
     
                     takeOfferRequested = false;
                     break;