From cd4d98b75323c9abf4116dc95eb8cbba8fcae237 Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Thu, 18 Nov 2021 17:01:19 -0600
Subject: [PATCH 1/2] Fix exception in Portfolio History screen

---
 .../main/java/bisq/core/trade/ClosedTradableManager.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/bisq/core/trade/ClosedTradableManager.java b/core/src/main/java/bisq/core/trade/ClosedTradableManager.java
index 1fe2dc8701d..0eb00bf5f8f 100644
--- a/core/src/main/java/bisq/core/trade/ClosedTradableManager.java
+++ b/core/src/main/java/bisq/core/trade/ClosedTradableManager.java
@@ -215,8 +215,13 @@ public boolean isBsqTradeFee(Tradable tradable) {
             return !tradable.getOffer().isCurrencyForMakerFeeBtc();
         }
 
-        String feeTxId = castToTrade(tradable).getTakerFeeTxId();
-        return bsqWalletService.getTransaction(feeTxId) != null;
+        try {
+            String feeTxId = castToTrade(tradable).getTakerFeeTxId();
+            return bsqWalletService.getTransaction(feeTxId) != null;
+        } catch (ClassCastException ex) {
+            // this can happen when we have canceled offers in history, made using an old onion address
+            return !tradable.getOffer().isCurrencyForMakerFeeBtc();
+        }
     }
 
     public boolean isMaker(Tradable tradable) {

From e59596d1a10a7c15e2e6a029c2e76009d4588484 Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Mon, 22 Nov 2021 09:46:41 -0600
Subject: [PATCH 2/2] Add new block listener to update locked balance display

---
 core/src/main/java/bisq/core/btc/Balances.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/bisq/core/btc/Balances.java b/core/src/main/java/bisq/core/btc/Balances.java
index 3010f8d4b41..d92a6bf0b40 100644
--- a/core/src/main/java/bisq/core/btc/Balances.java
+++ b/core/src/main/java/bisq/core/btc/Balances.java
@@ -88,6 +88,7 @@ public void onBalanceChanged(Coin balance, Transaction tx) {
                 updateBalance();
             }
         });
+        btcWalletService.addNewBestBlockListener(storedBlock -> updateBalance());
 
         updateBalance();
     }