From 1af87b2db97002aeb6b6b2e9f1980bd84a78fba5 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Thu, 7 Nov 2024 10:44:08 -0500
Subject: [PATCH] do not initialize failed trades until moved back to pending
 trades

---
 .../main/java/haveno/core/trade/TradeManager.java   | 13 ++++++++++++-
 .../portfolio/pendingtrades/PendingTradesView.java  |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
index 10db542e..dc0427c4 100644
--- a/core/src/main/java/haveno/core/trade/TradeManager.java
+++ b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -450,6 +450,13 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                             return;
                         }
 
+                        // skip if marked as failed
+                        if (failedTradesManager.getObservableList().contains(trade)) {
+                            log.warn("Skipping initialization of failed trade {} {}", trade.getClass().getSimpleName(), trade.getId());
+                            tradesToSkip.add(trade);
+                            return;
+                        }
+
                         // initialize trade
                         initPersistedTrade(trade);
 
@@ -1060,7 +1067,11 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
 
     private void addTradeToPendingTrades(Trade trade) {
         if (!trade.isInitialized()) {
-            initPersistedTrade(trade);
+            try {
+                initPersistedTrade(trade);
+            } catch (Exception e) {
+                log.warn("Error initializing {} {} on move to pending trades", trade.getClass().getSimpleName(), trade.getShortId(), e);
+            }
         }
         addTrade(trade);
     }
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
index 5157c9b4..73160484 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
@@ -404,7 +404,7 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
         }
 
         if (trade.getTakerDepositTx() == null) {
-          return Res.get("portfolio.pending.failedTrade.missingDepositTx"); // TODO (woodser): use .missingTakerDepositTx, .missingMakerDepositTx
+          return Res.get("portfolio.pending.failedTrade.missingDepositTx"); // TODO (woodser): use .missingTakerDepositTx, .missingMakerDepositTx, update translation to 2-of-3 multisig
         }
 
         if (trade.hasErrorMessage()) {