From d67dd515c4aa68f10c5347ea26d32c046b1c3ec1 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Wed, 10 Mar 2021 13:49:21 +0200
Subject: [PATCH] stop progress bar when loading wallet is closed

---
 .../com/sparrowwallet/sparrow/AppController.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java
index f6433173..f7e1b4eb 100644
--- a/src/main/java/com/sparrowwallet/sparrow/AppController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java
@@ -120,6 +120,8 @@ public class AppController implements Initializable {
 
     private Timeline statusTimeline;
 
+    private final List<Wallet> loadingWallets = new ArrayList<>();
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         EventManager.get().register(this);
@@ -1370,12 +1372,25 @@ public class AppController implements Initializable {
         }
     }
 
+    @Subscribe
+    public void walletTabsClosed(WalletTabsClosedEvent event) {
+        if(event.getClosedWalletTabData().stream().map(WalletTabData::getWallet).anyMatch(loadingWallets::remove) && loadingWallets.isEmpty()) {
+            if(statusBar.getText().equals("Loading transactions...")) {
+                statusBar.setText("");
+            }
+            if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
+                statusBar.setProgress(0);
+            }
+        }
+    }
+
     @Subscribe
     public void walletHistoryStarted(WalletHistoryStartedEvent event) {
         if(AppServices.isConnected() && getOpenWallets().containsKey(event.getWallet())) {
             statusUpdated(new StatusEvent("Loading transactions...", 120));
             if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
                 statusBar.setProgress(-1);
+                loadingWallets.add(event.getWallet());
             }
         }
     }
@@ -1389,6 +1404,7 @@ public class AppController implements Initializable {
             if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
                 statusBar.setProgress(0);
             }
+            loadingWallets.remove(event.getWallet());
         }
     }