From fa699c96013cb005f32391c9928a165afffb9b92 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Sun, 25 Feb 2024 11:08:58 -0500
Subject: [PATCH 1/2] do not sync trade wallet on deletion if deposit not
 requested

---
 core/src/main/java/haveno/core/trade/Trade.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
index 3e7cafb3af8..374b62cd6ee 100644
--- a/core/src/main/java/haveno/core/trade/Trade.java
+++ b/core/src/main/java/haveno/core/trade/Trade.java
@@ -949,7 +949,7 @@ public void deleteWallet() {
                     }
 
                     // wallet must be synced
-                    if (!isSyncedWithinTolerance()) {
+                    if (isDepositRequested() && !isSyncedWithinTolerance()) {
                         log.warn("Wallet is not synced for {} {}, syncing", getClass().getSimpleName(), getId());
                         syncWallet(true);
                     }

From 6ec59b5e72b02b5b03db0faaa555189d9663e69a Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Sun, 25 Feb 2024 12:29:10 -0500
Subject: [PATCH 2/2] remove trade after cleared and shut down

---
 core/src/main/java/haveno/core/trade/TradeManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
index 3973dc02e6a..5af9cc076b6 100644
--- a/core/src/main/java/haveno/core/trade/TradeManager.java
+++ b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -1311,13 +1311,13 @@ private void removeTradeOnError(Trade trade) {
             if (trade instanceof MakerTrade && openOffer.isPresent()) {
                 openOfferManager.unreserveOpenOffer(openOffer.get());
             }
-
-            // remove trade from list
-            removeTrade(trade);
         }
 
         // clear and shut down trade
         trade.clearAndShutDown();
+
+        // remove trade from list
+        removeTrade(trade);
     }
 
     private void listenForCleanup(Trade trade) {