From a825a693c1b9ee71593451956ccc476f612c5487 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Wed, 19 Jan 2022 09:41:53 +0200
Subject: [PATCH] fix loss of transaction labels when switching servers

---
 src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java b/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
index f8688a41..b0c82d95 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
@@ -153,7 +153,7 @@ public class WalletForm {
 
                     wallet.clearHistory();
                     AppServices.clearTransactionHistoryCache(wallet);
-                    EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet, getWalletId()));
+                    EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet == null ? previousWallet : pastWallet, getWalletId()));
                 } else {
                     if(AppServices.isConnected()) {
                         log.error("Error retrieving wallet history", workerStateEvent.getSource().getException());