From 1b571e957577342abcb82302266dc9ec50d8fe48 Mon Sep 17 00:00:00 2001
From: xyzmaker123 <xyzmaker123@protonmail.com>
Date: Fri, 21 Jan 2022 17:20:20 +0100
Subject: [PATCH] Add missing filtering on lists - reusable code for Trade
 filtering

---
 .../desktop/main/funds/locked/LockedView.java | 16 +-------------
 .../closedtrades/ClosedTradesView.java        | 19 +++-------------
 .../failedtrades/FailedTradesView.java        | 16 ++------------
 .../util/filtering/FilteringUtils.java        | 22 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java b/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java
index 7868087a4d..ac59531512 100644
--- a/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java
+++ b/desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java
@@ -259,21 +259,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
                 return true;
             }
 
-            Trade trade = item.getTrade();
-            if (trade != null) {
-                if (trade.getTakerFeeTxId() != null && trade.getTakerFeeTxId().contains(filterString)) {
-                    return true;
-                }
-                if (trade.getDepositTxId() != null && trade.getDepositTxId().contains(filterString)) {
-                    return true;
-                }
-                if (trade.getPayoutTxId() != null && trade.getPayoutTxId().contains(filterString)) {
-                    return true;
-                }
-                return FilteringUtils.match(trade.getContract(), filterString);
-            } else {
-                return false;
-            }
+            return FilteringUtils.match(item.getTrade(), filterString);
         });
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
index 67cdae31c9..94876ad0b0 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
@@ -420,26 +420,13 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
             if (FilteringUtils.match(tradable.getOffer(), filterString)) {
                 return true;
             }
-
             if (tradable instanceof BsqSwapTrade && FilteringUtils.match((BsqSwapTrade) tradable, filterString)) {
                 return true;
             }
-
-            if (tradable instanceof Trade) {
-                Trade trade = (Trade) tradable;
-                if (trade.getTakerFeeTxId() != null && trade.getTakerFeeTxId().contains(filterString)) {
-                    return true;
-                }
-                if (trade.getDepositTxId() != null && trade.getDepositTxId().contains(filterString)) {
-                    return true;
-                }
-                if (trade.getPayoutTxId() != null && trade.getPayoutTxId().contains(filterString)) {
-                    return true;
-                }
-                return FilteringUtils.match(trade.getContract(), filterString);
-            } else {
-                return false;
+            if (tradable instanceof Trade && FilteringUtils.match((Trade) tradable, filterString)) {
+                return true;
             }
+            return false;
         });
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.java
index 9806cfc821..eee22cbd71 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.java
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesView.java
@@ -244,7 +244,7 @@ public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTrades
         filteredList.setPredicate(item -> {
             if (filterString.isEmpty())
                 return true;
-            
+
             if (model.getDate(item).contains(filterString)) {
                 return true;
             }
@@ -266,19 +266,7 @@ public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTrades
             if (FilteringUtils.match(item.getTrade().getOffer(), filterString)) {
                 return true;
             }
-
-            Trade trade = item.getTrade();
-
-            if (trade.getTakerFeeTxId() != null && trade.getTakerFeeTxId().contains(filterString)) {
-                return true;
-            }
-            if (trade.getDepositTxId() != null && trade.getDepositTxId().contains(filterString)) {
-                return true;
-            }
-            if (trade.getPayoutTxId() != null && trade.getPayoutTxId().contains(filterString)) {
-                return true;
-            }
-            return FilteringUtils.match(trade.getContract(), filterString);
+            return FilteringUtils.match(item.getTrade(), filterString);
         });
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/util/filtering/FilteringUtils.java b/desktop/src/main/java/bisq/desktop/util/filtering/FilteringUtils.java
index 559165d80a..07bd2d0589 100644
--- a/desktop/src/main/java/bisq/desktop/util/filtering/FilteringUtils.java
+++ b/desktop/src/main/java/bisq/desktop/util/filtering/FilteringUtils.java
@@ -2,10 +2,11 @@ package bisq.desktop.util.filtering;
 
 import bisq.core.offer.Offer;
 import bisq.core.trade.model.bisq_v1.Contract;
+import bisq.core.trade.model.bisq_v1.Trade;
 import bisq.core.trade.model.bsq_swap.BsqSwapTrade;
 
 public class FilteringUtils {
-    public static boolean match(Contract contract, String filterString) {
+    private static boolean match(Contract contract, String filterString) {
         boolean isBuyerOnion = false;
         boolean isSellerOnion = false;
         boolean matchesBuyersPaymentAccountData = false;
@@ -44,4 +45,23 @@ public class FilteringUtils {
         }
         return false;
     }
+
+    public static boolean match(Trade trade, String filterString) {
+        if (trade == null) {
+            return false;
+        }
+        if (trade.getTakerFeeTxId() != null && trade.getTakerFeeTxId().contains(filterString)) {
+            return true;
+        }
+        if (trade.getDepositTxId() != null && trade.getDepositTxId().contains(filterString)) {
+            return true;
+        }
+        if (trade.getPayoutTxId() != null && trade.getPayoutTxId().contains(filterString)) {
+            return true;
+        }
+        if (match(trade.getContract(), filterString)) {
+            return true;
+        }
+        return false;
+    }
 }