From 2fe945e102f1b3504ec598546501ddf7fb65fdd5 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Sun, 20 Oct 2024 18:18:40 -0500
Subject: [PATCH 1/2] Bootstrap: Don't install the spyder-remote-services
 subrepo

---
 bootstrap.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bootstrap.py b/bootstrap.py
index c011d4fff98..99bdf33f37d 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -101,11 +101,14 @@
         REPOS[DEVPATH.name]["editable"] = False
 
     for name in REPOS.keys():
-        if not REPOS[name]['editable']:
-            install_repo(name)
-            installed_dev_repo = True
-        else:
-            logger.info("%s installed in editable mode", name)
+        # Don't install the spyder-remote-services subrepo because it's not
+        # necessary on the Spyder side.
+        if name != "spyder-remote-services":
+            if not REPOS[name]['editable']:
+                install_repo(name)
+                installed_dev_repo = True
+            else:
+                logger.info("%s installed in editable mode", name)
 
 if installed_dev_repo:
     logger.info("Restarting bootstrap to pick up installed subrepos")

From 581ce15f4c7d6d1e00aca539bb0eb6d54c057c62 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Sun, 20 Oct 2024 18:24:55 -0500
Subject: [PATCH 2/2] Application: Add "Help Spyder" entry to the Help menu

This will help users to find where to donate in our interface in case
they miss the heart hint we show in the status bar.
---
 spyder/plugins/application/container.py      |  8 ++++++++
 spyder/plugins/application/plugin.py         | 11 ++++++++---
 spyder/plugins/application/widgets/status.py |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/spyder/plugins/application/container.py b/spyder/plugins/application/container.py
index 39654bb5c30..7b4bd29370f 100644
--- a/spyder/plugins/application/container.py
+++ b/spyder/plugins/application/container.py
@@ -55,6 +55,7 @@ class ApplicationActions:
     SpyderTroubleshootingAction = "spyder_troubleshooting_action"
     SpyderDependenciesAction = "spyder_dependencies_action"
     SpyderSupportAction = "spyder_support_action"
+    HelpSpyderAction = "help_spyder_action"
     SpyderAbout = "spyder_about_action"
 
     # Tools
@@ -137,6 +138,13 @@ def setup(self):
             _("Spyder support..."),
             triggered=lambda: start_file(__forum_url__))
 
+        self.create_action(
+            ApplicationActions.HelpSpyderAction,
+            _("Help Spyder..."),
+            icon=self.create_icon("inapp_appeal"),
+            triggered=self.inapp_appeal_status.show_appeal
+        )
+
         # About action
         self.about_action = self.create_action(
             ApplicationActions.SpyderAbout,
diff --git a/spyder/plugins/application/plugin.py b/spyder/plugins/application/plugin.py
index 3ae21547916..e49e04598a8 100644
--- a/spyder/plugins/application/plugin.py
+++ b/spyder/plugins/application/plugin.py
@@ -223,13 +223,18 @@ def _populate_help_menu_support_section(self):
         """Add Spyder base support actions to the Help main menu."""
         mainmenu = self.get_plugin(Plugins.MainMenu)
         for support_action in [
-                self.trouble_action, self.report_action,
-                self.dependencies_action, self.support_group_action]:
+            self.trouble_action,
+            self.report_action,
+            self.dependencies_action,
+            self.support_group_action,
+            self.get_action(ApplicationActions.HelpSpyderAction),
+        ]:
             mainmenu.add_item_to_application_menu(
                 support_action,
                 menu_id=ApplicationMenus.Help,
                 section=HelpMenuSections.Support,
-                before_section=HelpMenuSections.ExternalDocumentation)
+                before_section=HelpMenuSections.ExternalDocumentation
+            )
 
     def _populate_help_menu_about_section(self):
         """Create Spyder base about actions."""
diff --git a/spyder/plugins/application/widgets/status.py b/spyder/plugins/application/widgets/status.py
index ce433706e49..80c89caf0e8 100644
--- a/spyder/plugins/application/widgets/status.py
+++ b/spyder/plugins/application/widgets/status.py
@@ -118,6 +118,8 @@ def _on_click(self):
     def show_appeal(self):
         if self._appeal_dialog is None:
             self._appeal_dialog = InAppAppealDialog(self)
+
+        if not self._appeal_dialog.isVisible():
             self._appeal_dialog.show()
 
     # ---- StatusBarWidget API