diff --git a/clive/__private/ui/app.py b/clive/__private/ui/app.py index c4975138ab5038ed74c3561765e4e526a67f16b5..a3ad343c0d5cd0757a8ab8de8aa4baf505640554 100644 --- a/clive/__private/ui/app.py +++ b/clive/__private/ui/app.py @@ -245,10 +245,7 @@ class Clive(App[int]): def update_alarms_data_asap_on_newest_node_data(self) -> Worker[None]: """Update alarms on the newest possible node data.""" self.update_data_from_node() - worker = self.update_alarms_data() - self.resume_refresh_node_data_interval() - self.resume_refresh_alarms_data_interval() - return worker + return self.update_alarms_data() @work(name="alarms data update worker", group="alarms_data", exclusive=True) async def update_alarms_data(self) -> None: diff --git a/clive/__private/ui/forms/create_profile/finish_profile_creation_mixin.py b/clive/__private/ui/forms/create_profile/finish_profile_creation_mixin.py index 96fd80205d52aa7ea46f8d448f15fc2ff380bba3..ad69c5f655815fafae63112b750894c1be0b8e7b 100644 --- a/clive/__private/ui/forms/create_profile/finish_profile_creation_mixin.py +++ b/clive/__private/ui/forms/create_profile/finish_profile_creation_mixin.py @@ -13,7 +13,9 @@ class FinishProfileCreationMixin(FormScreenBase[CreateProfileContext]): self.app.run_worker(self._finish()) async def _finish(self) -> None: - self._owner.add_post_action(self.app.update_alarms_data_asap_on_newest_node_data) + self._owner.add_post_action( + self.app.update_alarms_data_asap_on_newest_node_data, self.app.resume_refresh_alarms_data_interval + ) profile = self.context.profile profile.enable_saving() diff --git a/clive/__private/ui/screens/unlock/unlock.py b/clive/__private/ui/screens/unlock/unlock.py index 0c5fa454249afc93e068dd5eb1d72fa09c6d3378..194b55e9caf5441fe8eeabd253810a13beebf7ee 100644 --- a/clive/__private/ui/screens/unlock/unlock.py +++ b/clive/__private/ui/screens/unlock/unlock.py @@ -124,6 +124,8 @@ class Unlock(BaseScreen): await self.app.switch_mode("dashboard") self._remove_welcome_modes() self.app.update_alarms_data_asap_on_newest_node_data() + self.app.resume_refresh_node_data_interval() + self.app.resume_refresh_alarms_data_interval() @on(Button.Pressed, "#new-profile-button") async def create_new_profile(self) -> None: diff --git a/tests/tui/conftest.py b/tests/tui/conftest.py index 483b3944293ef4c53b6c80250599e86b1a08c13e..ba93a4058aee8f043d9d94eebbc32ab0815fb763 100644 --- a/tests/tui/conftest.py +++ b/tests/tui/conftest.py @@ -97,8 +97,10 @@ async def prepared_tui_on_dashboard(prepared_env: PreparedTuiEnv) -> PreparedTui node, wallet, pilot = prepared_env await pilot.app.world.load_profile(WORKING_ACCOUNT_DATA.account.name, WORKING_ACCOUNT_PASSWORD) - # update the data (pilot skips onboarding/unlocking via TUI - updating is handled there) + # update the data and resume timers (pilot skips onboarding/unlocking via TUI - updating is handled there) await pilot.app.update_alarms_data_asap_on_newest_node_data().wait() + pilot.app.resume_refresh_node_data_interval() + pilot.app.resume_refresh_alarms_data_interval() await pilot.app.push_screen(Dashboard()) await wait_for_screen(pilot, Dashboard)