From 576148bc043a3c8c9d60657c1a9d0c4dbb5664bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20=C5=BBebrak?= <mzebrak@syncad.com>
Date: Fri, 28 Feb 2025 09:26:57 +0100
Subject: [PATCH] Dialogs should dismiss instead of pop_screen
---
clive/__private/ui/dialogs/add_tracked_account_dialog.py | 2 +-
clive/__private/ui/dialogs/clive_base_dialogs.py | 4 ++--
clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py | 2 +-
clive/__private/ui/dialogs/switch_working_account_dialog.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/clive/__private/ui/dialogs/add_tracked_account_dialog.py b/clive/__private/ui/dialogs/add_tracked_account_dialog.py
index 9602ce2c86..5069b64782 100644
--- a/clive/__private/ui/dialogs/add_tracked_account_dialog.py
+++ b/clive/__private/ui/dialogs/add_tracked_account_dialog.py
@@ -31,4 +31,4 @@ class AddTrackedAccountDialog(CliveActionDialog):
async def save_account(self) -> None:
is_account_saved = await self._add_account_container.save_account()
if is_account_saved:
- self.app.pop_screen()
+ self.dismiss()
diff --git a/clive/__private/ui/dialogs/clive_base_dialogs.py b/clive/__private/ui/dialogs/clive_base_dialogs.py
index c4e638cd6e..e8a44517e2 100644
--- a/clive/__private/ui/dialogs/clive_base_dialogs.py
+++ b/clive/__private/ui/dialogs/clive_base_dialogs.py
@@ -130,7 +130,7 @@ class CliveActionDialog(CliveBaseDialog[ScreenResultT], ABC):
@on(CancelOneLineButton.Pressed)
def action_cancel(self) -> None:
- self.app.pop_screen()
+ self.dismiss()
class CliveInfoDialog(CliveBaseDialog[None], ABC):
@@ -141,4 +141,4 @@ class CliveInfoDialog(CliveBaseDialog[None], ABC):
@on(CloseOneLineButton.Pressed)
def action_close(self) -> None:
- self.app.pop_screen()
+ self.dismiss()
diff --git a/clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py b/clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py
index 74303a56a7..d6b1e2735c 100644
--- a/clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py
+++ b/clive/__private/ui/dialogs/mark_alarm_as_harmless_dialog.py
@@ -31,4 +31,4 @@ class MarkAlarmAsHarmlessDialog(ConfirmActionDialog):
self._alarm.is_harmless = True
self.notify(f"Alarm `{self.alarm_info}` was marked as harmless.")
self.app.trigger_profile_watchers()
- self.app.pop_screen()
+ self.dismiss()
diff --git a/clive/__private/ui/dialogs/switch_working_account_dialog.py b/clive/__private/ui/dialogs/switch_working_account_dialog.py
index ad828ae7b0..28442324b1 100644
--- a/clive/__private/ui/dialogs/switch_working_account_dialog.py
+++ b/clive/__private/ui/dialogs/switch_working_account_dialog.py
@@ -32,4 +32,4 @@ class SwitchWorkingAccountDialog(CliveActionDialog):
@on(CliveActionDialog.Confirmed)
def confirm_selected_working_account(self) -> None:
self._switch_working_account_container.confirm_selected_working_account()
- self.app.pop_screen()
+ self.dismiss()
--
GitLab