From 95da9acf6712a8e9b9cc76b9cbb13f1d7cb8c9bb Mon Sep 17 00:00:00 2001
From: kdmukai <kdmukai@gmail.com>
Date: Wed, 9 Aug 2023 09:36:50 -0500
Subject: [PATCH] Remove PR #410 RemoveMicroSDWarningView; post-rebase fixes

---
 src/seedsigner/gui/toast.py |  6 +++---
 tests/base.py               |  1 +
 tests/test_flows_seed.py    | 41 ++-----------------------------------
 tests/test_flows_view.py    |  2 +-
 4 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/src/seedsigner/gui/toast.py b/src/seedsigner/gui/toast.py
index a82fb33b..cb36663c 100644
--- a/src/seedsigner/gui/toast.py
+++ b/src/seedsigner/gui/toast.py
@@ -1,6 +1,6 @@
 import time
 from dataclasses import dataclass
-from seedsigner.gui.components import BaseComponent, FontAwesomeIconConstants, GUIConstants, Icon, TextArea
+from seedsigner.gui.components import BaseComponent, FontAwesomeIconConstants, GUIConstants, Icon, SeedSignerIconConstants, TextArea
 from seedsigner.models.threads import BaseThread
 
 
@@ -185,7 +185,7 @@ class RemoveSDCardToastManagerThread(BaseToastOverlayManagerThread):
 
     def instantiate_toast(self) -> ToastOverlay:
         return ToastOverlay(
-            icon_name=FontAwesomeIconConstants.SDCARD,
+            icon_name=SeedSignerIconConstants.SDCARD,
             label_text="Security tip:\nRemove SD card",
             font_size=GUIConstants.BODY_FONT_SIZE,
             height=GUIConstants.BODY_FONT_SIZE * 2 + GUIConstants.BODY_LINE_SPACING + GUIConstants.EDGE_PADDING,
@@ -211,7 +211,7 @@ class SDCardStateChangeToastManagerThread(BaseToastOverlayManagerThread):
 
     def instantiate_toast(self) -> ToastOverlay:
         return ToastOverlay(
-            icon_name=FontAwesomeIconConstants.SDCARD,
+            icon_name=SeedSignerIconConstants.SDCARD,
             label_text=self.message,
         )
 
diff --git a/tests/base.py b/tests/base.py
index 0628fb1a..fadf6ff7 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -7,6 +7,7 @@ from typing import Callable
 # These must precede any SeedSigner imports.
 sys.modules['seedsigner.gui.renderer'] = MagicMock()
 sys.modules['seedsigner.gui.screens.screensaver'] = MagicMock()
+sys.modules['seedsigner.gui.toast'] = MagicMock()
 sys.modules['seedsigner.views.screensaver'] = MagicMock()
 sys.modules['seedsigner.hardware.buttons'] = MagicMock()
 sys.modules['seedsigner.hardware.camera'] = MagicMock()
diff --git a/tests/test_flows_seed.py b/tests/test_flows_seed.py
index d7896218..f4b83065 100644
--- a/tests/test_flows_seed.py
+++ b/tests/test_flows_seed.py
@@ -14,47 +14,10 @@ from seedsigner.views import seed_views, scan_views, settings_views, tools_views
 def load_seed_into_decoder(view: scan_views.ScanView):
     view.decoder.add_data("0000" * 11 + "0003")
 
+
+
 class TestSeedFlows(FlowTest):
 
-    def test_flow_thru_microsd_warning(self):
-        """
-            Selecting "Scan", "Seeds" or "Tools from the MainMenuView in ss-os with microsd inserted
-            will flow to RemoveMicroSDWarningView -- conditionally, then on to the intended next view
-        """
-        Settings.HOSTNAME = Settings.SEEDSIGNER_OS
-        # will be warned to remove microsd card
-        self.run_sequence([
-            FlowStep(MainMenuView, button_data_selection=MainMenuView.TOOLS),
-            FlowStep(RemoveMicroSDWarningView, screen_return_value=0),
-            FlowStep(tools_views.ToolsMenuView, screen_return_value=RET_CODE__BACK_BUTTON),  # backed-out
-            FlowStep(MainMenuView),
-        ])
-        # but won't be warned again, because microsd.warn_to_remove was set False just above
-        self.run_sequence([
-            FlowStep(MainMenuView, button_data_selection=MainMenuView.SEEDS),
-            FlowStep(seed_views.SeedsMenuView, is_redirect=True),
-            FlowStep(seed_views.LoadSeedView, screen_return_value=RET_CODE__BACK_BUTTON), # backed-out
-            FlowStep(MainMenuView),
-        ])
-        # unless the microsd was re-inserted, which resets microsd.warn_to_remove = True.
-        self.controller.microsd.warn_to_remove = True
-        self.run_sequence([
-            FlowStep(MainMenuView, button_data_selection=MainMenuView.SCAN),
-            FlowStep(RemoveMicroSDWarningView, screen_return_value=0),
-            FlowStep(scan_views.ScanView, before_run=load_seed_into_decoder),  # this time, loaded a seed
-            FlowStep(seed_views.SeedFinalizeView, button_data_selection=seed_views.SeedFinalizeView.FINALIZE),
-            FlowStep(seed_views.SeedOptionsView),
-        ])
-        # won't get warned again if a seed is loaded (like was done above); it's already too late
-        self.controller.microsd.warn_to_remove = True
-        self.run_sequence([
-            FlowStep(MainMenuView, button_data_selection=MainMenuView.SEEDS),
-            FlowStep(seed_views.SeedsMenuView),
-        ])
-        # no warning shown so this flag not cleared, cleanup else following tests will warn
-        self.controller.microsd.warn_to_remove = False
-
-
     def test_scan_seedqr_flow(self):
         """
             Selecting "Scan" from the MainMenuView and scanning a SeedQR should enter the
diff --git a/tests/test_flows_view.py b/tests/test_flows_view.py
index 24c880e6..6d032460 100644
--- a/tests/test_flows_view.py
+++ b/tests/test_flows_view.py
@@ -6,7 +6,7 @@ from base import FlowTest, FlowStep
 from seedsigner.gui.screens.screen import RET_CODE__POWER_BUTTON
 from seedsigner.models.settings import Settings
 from seedsigner.views.tools_views import ToolsCalcFinalWordNumWordsView, ToolsMenuView
-from seedsigner.views.view import MainMenuView, NotYetImplementedView, PowerOptionsView, PowerOffView, RestartView, UnhandledExceptionView, View, RemoveMicroSDWarningView
+from seedsigner.views.view import MainMenuView, NotYetImplementedView, PowerOptionsView, PowerOffView, RestartView, UnhandledExceptionView, View