small bug fixes

Author: FaserF

src/switchcraft/assets/splash.png

@@ -153,7 +153,10 @@ def __init__(self, page: ft.Page, splash_proc=None):
 
         # Now add listener
         self.notification_service.add_listener(self._on_notification_update)
-        # Sync initial state (badge, etc)
+        # Sync initial state (badge, etc) WITHOUT triggering system toasts for old ones
+        notifs = self.notification_service.get_notifications()
+        if notifs:
+            self._last_notif_id = notifs[0]["id"]
         self._on_notification_update()
 
         # Back button (Early init for AppBar)
@@ -269,14 +272,29 @@ def _open_help(self, e):
             url = self._get_help_url(current_idx)
             logger.info(f"Opening help for index {current_idx}: {url}")
 
-            # Use page.launch_url for cross-platform compatibility (Web/Desktop)
+            if not url:
+                return
+
+            # Try usage of webbrowser for desktop (more reliable)
+            if not IS_WEB:
+                try:
+                    import webbrowser
+                    webbrowser.open(url)
+                    return
+                except Exception as wb_ex:
+                    logger.warning(f"webbrowser.open failed: {wb_ex}")
+
+            # Fallback to Flet's launch_url (Web or fallback)
             self.page.launch_url(url)
 
         except Exception as ex:
             logger.error(f"Failed to open help: {ex}")
-            self.page.snack_bar = ft.SnackBar(ft.Text(f"Failed to open help: {ex}"), bgcolor="RED")
-            self.page.snack_bar.open = True
-            self.page.update()
+            try:
+                self.page.snack_bar = ft.SnackBar(ft.Text(f"Failed to open help: {ex}"), bgcolor="RED")
+                self.page.snack_bar.open = True
+                self.page.update()
+            except Exception:
+                pass
 
     def _terminate_splash(self):
         """

src/switchcraft/gui_modern/app.py

@@ -401,16 +401,16 @@ def _open_dialog_safe(self, dlg):
              return False
 
         try:
-            # Method 1: Modern API (Preferred)
-            if hasattr(page, 'open'):
-                try:
-                    logger.debug("Attempting to open dialog using page.open()...")
-                    page.open(dlg)
-                    page.update()
-                    logger.info("Dialog opened successfully using page.open()")
-                    return True
-                except Exception as e:
-                    logger.warning(f"page.open(dlg) failed: {e}. Falling back to legacy mode.")
+            # Method 1: Modern API (Preferred) - DISABLED due to visibility issues on Windows Desktop
+            # if hasattr(page, 'open'):
+            #     try:
+            #         logger.debug("Attempting to open dialog using page.open()...")
+            #         page.open(dlg)
+            #         page.update()
+            #         logger.info("Dialog opened successfully using page.open()")
+            #         return True
+            #     except Exception as e:
+            #         logger.warning(f"page.open(dlg) failed: {e}. Falling back to legacy mode.")
 
             # Method 2: Legacy API (Fallback)
             logger.debug("Attempting to open dialog using legacy page.dialog...")

src/switchcraft/gui_modern/utils/view_utils.py

@@ -823,38 +823,22 @@ def _run():
         self._run_in_background(_run)
 
     def _on_github_login_click(self, e):
-        """Handle GitHub login button click."""
-        self._ensure_backend()
+        """Handle the GitHub login button click."""
         try:
-            logger.debug("_on_github_login_click STARTED")
-            # Visual feedback
-            if hasattr(e.control, 'text'):
-                e.control.text = "Clicked..."
-                e.control.update()
-            elif hasattr(e.control, 'content') and hasattr(e.control.content, 'controls'):
-                 # It's likely a row with Icon+Text
-                 for c in e.control.content.controls:
-                     if isinstance(c, ft.Text):
-                         c.value = "Clicked..."
-                 e.control.update()
-
-            logger.info("GitHub login clicked (direct handler)")
+            logger.info("[GITHUB_LOGIN] Button clicked. Context: " + ("Desktop" if not IS_WEB else "Web"))
             self._ensure_backend() # Restore context first
+
             # Show snack immediately
-            self._show_snack("Starting GitHub Login...", "BLUE")
+            self.app_page.snack_bar = ft.SnackBar(ft.Text("Starting GitHub Login flow..."), bgcolor="BLUE")
+            self.app_page.snack_bar.open = True
+            self.app_page.update()
+
+            logger.info("[GITHUB_LOGIN] Showing permission dialog...")
             # Proceed to permission dialog
             self._show_permission_dialog(self._start_github_login)
-            logger.debug("_on_github_login_click FINISHED")
+            logger.debug("[GITHUB_LOGIN] _on_github_login_click method finished")
         except Exception as ex:
-            logger.exception(f"CRITICAL: Failed in _on_github_login_click: {ex}")
-            # Try to show error on button
-            try:
-                if hasattr(e.control, 'text'):
-                    e.control.text = f"Err: {str(ex)[:20]}"
-                    e.control.bgcolor = "RED"
-                    e.control.update()
-            except:
-                pass
+            logger.exception(f"[GITHUB_LOGIN] CRITICAL error in _on_github_login_click: {ex}")
             self._show_snack(f"Login Error: {ex}", "RED")
 
     def _show_permission_dialog(self, callback):
@@ -973,6 +957,7 @@ async def _run_login_flow():
                 # We run this in a thread executor if it's synchronous, or directly if async
                 # AuthService.initiate_device_flow is likely sync (requests), so we wrap it
                 import asyncio
+                from switchcraft.services.auth_service import AuthService
 
                 logger.debug("Starting GitHub login flow (Async)...")
 

src/switchcraft/gui_modern/views/settings_view.py

@@ -77,7 +77,7 @@ def check_token_once(cls, device_code: str) -> Optional[str]:
         """
         headers = {"Accept": "application/json"}
         data = {
-            "client_id": cls.CLIENT_ID,
+            "client_id": cls.get_client_id() or "Ov23liFQxD8H5In5LqBM",
             "device_code": device_code,
             "grant_type": "urn:ietf:params:oauth:grant-type:device_code"
         }
@@ -116,7 +116,7 @@ def poll_for_token(cls, device_code: str, interval: int = 5, expires_in: int = 9
 
         headers = {"Accept": "application/json"}
         data = {
-            "client_id": cls.CLIENT_ID,
+            "client_id": cls.get_client_id() or "Ov23liFQxD8H5In5LqBM",
             "device_code": device_code,
             "grant_type": "urn:ietf:params:oauth:grant-type:device_code"
         }

src/switchcraft/services/auth_service.py

@@ -340,7 +340,7 @@ def get_package_details(self, package_id: str) -> Dict[str, str]:
         try:
             # Use 'winget show' which provides full manifest details
             # Add --disable-interactivity to prevent any interactive prompts
-            cmd = ["winget", "show", "--id", package_id, "--source", "winget",
+            cmd = ["winget", "show", "--id", package_id,
                    "--disable-interactivity"]
             kwargs = self._get_subprocess_kwargs()
             logger.debug(f"Getting package details via CLI for: {package_id}")