merge fix

app/src/components/layout/sidebarRight/SideBarRight.tsx

@@ -12,16 +12,15 @@ import {
 import useToggleStore from "../../../store/useUIToggleStore";
 import MachineMechanics from "./mechanics/MachineMechanics";
 import Visualization from "./visualization/Visualization";
-import GlobalProperties from "./properties/GlobalProperties";
-import AsstePropertiies from "./properties/AssetProperties";
 import Analysis from "./analysis/Analysis";
 import Simulations from "./simulation/Simulations";
 import { useSelectedActionSphere } from "../../../store/store";
+import GlobalProperties from "./properties/GlobalProperties";
+import AsstePropertiies from "./properties/AssetProperties";
 import ZoneProperties from "./properties/ZoneProperties";
 
 const SideBarRight: React.FC = () => {
   const { activeModule } = useModuleStore();
-  const [activeList] = useState("properties");
   const { toggleUI } = useToggleStore();
   const { selectedActionSphere } = useSelectedActionSphere();
   const { subModule, setSubModule } = useSubModuleStore();
@@ -54,7 +53,7 @@ const SideBarRight: React.FC = () => {
                 }`}
                 onClick={() => setSubModule("mechanics")}
               >
-                <MechanicsIcon isActive={activeList === "mechanics"} />
+                <MechanicsIcon isActive={subModule === "mechanics"} />
               </div>
               <div
                 className={`sidebar-action-list ${
@@ -62,7 +61,7 @@ const SideBarRight: React.FC = () => {
                 }`}
                 onClick={() => setSubModule("simulations")}
               >
-                <SimulationIcon isActive={activeList === "simulations"} />
+                <SimulationIcon isActive={subModule === "simulations"} />
               </div>
               <div
                 className={`sidebar-action-list ${
@@ -70,7 +69,7 @@ const SideBarRight: React.FC = () => {
                 }`}
                 onClick={() => setSubModule("analysis")}
               >
-                <AnalysisIcon isActive={activeList === "analysis"} />
+                <AnalysisIcon isActive={subModule === "analysis"} />
               </div>
             </>
           )}
@@ -78,7 +77,7 @@ const SideBarRight: React.FC = () => {
       )}
       {/* process builder */}
       {toggleUI &&
-        activeList === "properties" &&
+        subModule === "properties" &&
         activeModule !== "visualization" && (
           <div className="sidebar-right-container">
             <div className="sidebar-right-content-container">
@@ -114,7 +113,7 @@ const SideBarRight: React.FC = () => {
               </div>
             </div>
           )}
-          {activeList === "simulations" && (
+          {subModule === "simulations" && (
             <div className="sidebar-right-container">
               <div className="sidebar-right-content-container">
                 <Simulations />