From 665c527dd08d027dbf95b22e58d44b1cb29212db Mon Sep 17 00:00:00 2001 From: Michael Mallan Date: Fri, 10 Jan 2025 16:57:45 +0000 Subject: [PATCH] fix: set rescan processing to false upon completion Otherwise, the button gets stuck on "Starting rescan...". --- liana-gui/src/app/mod.rs | 5 ++++- liana-gui/src/app/state/settings/bitcoind.rs | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/liana-gui/src/app/mod.rs b/liana-gui/src/app/mod.rs index 93cbb4e8..cbfbb026 100644 --- a/liana-gui/src/app/mod.rs +++ b/liana-gui/src/app/mod.rs @@ -317,7 +317,10 @@ impl App { let current = &self.panels.current; let daemon = self.daemon.clone(); // These are the panels to update with the cache. - let mut panels = [(&mut self.panels.home as &mut dyn State, Menu::Home)]; + let mut panels = [ + (&mut self.panels.home as &mut dyn State, Menu::Home), + (&mut self.panels.settings as &mut dyn State, Menu::Settings), + ]; let commands: Vec<_> = panels .iter_mut() .map(|(panel, menu)| { diff --git a/liana-gui/src/app/state/settings/bitcoind.rs b/liana-gui/src/app/state/settings/bitcoind.rs index 16d92953..0c740e77 100644 --- a/liana-gui/src/app/state/settings/bitcoind.rs +++ b/liana-gui/src/app/state/settings/bitcoind.rs @@ -136,6 +136,9 @@ impl State for BitcoindSettingsState { self.rescan_settings.past_possible_height = true; self.rescan_settings.processing = false; } + Message::UpdatePanelCache(_, Ok(_)) => { + self.rescan_settings.processing = cache.rescan_progress.is_some_and(|p| p < 1.0); + } Message::View(view::Message::Settings(view::SettingsMessage::BitcoindSettings( msg, ))) => {