fix: git and terminal selected states are incorrect

Author: devvaannsh

src/extensions/default/Git/src/Panel.js

@@ -1528,14 +1528,14 @@ define(function (require, exports) {
         }
     });
 
-    // When any bottom panel is shown (container is visible),
-    // re-select the git icon if git panel is still open.
     WorkspaceManager.on(WorkspaceManager.EVENT_WORKSPACE_PANEL_SHOWN, function (event, panelID) {
-        if (Main.$icon && Preferences.get("panelEnabled")) {
-            Main.$icon.toggleClass("on", true);
-            Main.$icon.toggleClass("selected-button", true);
-            CommandManager.get(Constants.CMD_GIT_TOGGLE_PANEL).setChecked(true);
+        if (!Main.$icon) {
+            return;
         }
+        const isGitActive = (panelID === "main-git.panel");
+        Main.$icon.toggleClass("on", isGitActive);
+        Main.$icon.toggleClass("selected-button", isGitActive);
+        CommandManager.get(Constants.CMD_GIT_TOGGLE_PANEL).setChecked(isGitActive);
     });
 
     exports.init = init;

src/extensionsIntegrated/Terminal/main.js

@@ -898,9 +898,7 @@ define(function (require, exports, module) {
 
         const PanelView = require("view/PanelView");
         PanelView.on(PanelView.EVENT_PANEL_SHOWN, function (_event, panelId) {
-            if (panelId === PANEL_ID) {
-                $btn.addClass("selected-button");
-            }
+            $btn.toggleClass("selected-button", panelId === PANEL_ID);
         });
         PanelView.on(PanelView.EVENT_PANEL_HIDDEN, function (_event, panelId) {
             if (panelId === PANEL_ID || panelId === WorkspaceManager.DEFAULT_PANEL_ID) {