Improve DireWarning vs Error usage and color consistency

Author: kdmukai

src/seedsigner/gui/screens/screen.py

@@ -1013,21 +1013,38 @@ def __post_init__(self):
 
 @dataclass
 class WarningScreen(WarningEdgesMixin, LargeIconStatusScreen):
+    """
+    Exclamation point icon + yellow WARNING color
+    """
     title: str = _mft("Caution")
     status_icon_name: str = SeedSignerIconConstants.WARNING
-    status_color: str = "yellow"
+    status_color: str = GUIConstants.WARNING_COLOR
     status_headline: str = _mft("Privacy Leak!")     # The colored text under the alert icon
     button_data: list = field(default_factory=lambda: [ButtonOption("I Understand")])
 
 
 
 @dataclass
 class DireWarningScreen(WarningScreen):
+    """
+    Exclamation point icon + orange DIRE_WARNING color
+    """
     status_headline: str = _mft("Classified Info!")     # The colored text under the alert icon
     status_color: str = GUIConstants.DIRE_WARNING_COLOR
 
 
 
+@dataclass
+class ErrorScreen(WarningScreen):
+    """
+    X icon + red ERROR color
+    """
+    title: str = _mft("Error")
+    status_icon_name: str = SeedSignerIconConstants.ERROR
+    status_color: str = GUIConstants.ERROR_COLOR
+
+
+
 @dataclass
 class ResetScreen(BaseTopNavScreen):
     def __post_init__(self):

src/seedsigner/views/psbt_views.py

@@ -469,7 +469,6 @@ def run(self):
         DireWarningScreen(
             title=_("Suspicious PSBT"),
             status_headline=_("Address Verification Failed"),
-            status_icon_name=SeedSignerIconConstants.ERROR,
             text=text,
             button_data=[ButtonOption("Discard PSBT")],
             show_back_button=False,

src/seedsigner/views/view.py

@@ -5,7 +5,7 @@
 from seedsigner.helpers.l10n import mark_for_translation as _mft
 from seedsigner.gui.components import SeedSignerIconConstants
 from seedsigner.gui.screens import RET_CODE__POWER_BUTTON, RET_CODE__BACK_BUTTON
-from seedsigner.gui.screens.screen import BaseScreen, ButtonOption, DireWarningScreen, LargeButtonScreen, PowerOffScreen, PowerOffNotRequiredScreen, ResetScreen, WarningScreen
+from seedsigner.gui.screens.screen import BaseScreen, ButtonOption, LargeButtonScreen, WarningScreen, ErrorScreen
 from seedsigner.models.settings import Settings, SettingsConstants
 from seedsigner.models.settings_definition import SettingsDefinition
 from seedsigner.models.threads import BaseThread
@@ -245,6 +245,7 @@ def run(self):
 
 class RestartView(View):
     def run(self):
+        from seedsigner.gui.screens.screen import ResetScreen
         thread = RestartView.DoResetThread()
         thread.start()
         self.run_screen(ResetScreen)
@@ -270,6 +271,7 @@ def run(self):
 
 class PowerOffView(View):
     def run(self):
+        from seedsigner.gui.screens.screen import PowerOffNotRequiredScreen
         self.run_screen(PowerOffNotRequiredScreen)
         return Destination(BackStackView)
 
@@ -308,7 +310,7 @@ class ErrorView(View):
 
     def run(self):
         self.run_screen(
-            WarningScreen,
+            ErrorScreen,
             title=self.title,
             status_icon_name=self.status_icon_name,
             status_headline=self.status_headline,
@@ -349,12 +351,10 @@ def __post_init__(self):
 class UnhandledExceptionView(View):
     error: list[str]
 
-
     def run(self):
         self.run_screen(
-            DireWarningScreen,
+            ErrorScreen,
             title=_("System Error"),
-            status_icon_name=SeedSignerIconConstants.ERROR,
             status_headline=self.error[0],
             text=self.error[1] + "\n" + self.error[2],
             allow_text_overflow=True,  # Fit what we can, let the rest go off the edges