Merge branch 'main-dev' into dev-refactor

app/src/components/layout/scenes/MainScene.tsx

@@ -3,6 +3,7 @@ import {
   useLoadingProgress,
   useRenameModeStore,
   useSaveVersion,
+  useSelectedComment,
   useSelectedFloorItem,
   useSocketStore,
   useWidgetSubOption,
@@ -39,6 +40,7 @@ import { useVersionHistoryStore } from "../../../store/builder/useVersionHistory
 import { useVersionContext } from "../../../modules/builder/version/versionContext";
 import VersionSaved from "../sidebarRight/versionHisory/VersionSaved";
 import Footer from "../../footer/Footer";
+import ThreadChat from "../../ui/collaboration/ThreadChat";
 
 function MainScene() {
   const { setMainProduct } = useMainProduct();
@@ -64,6 +66,7 @@ function MainScene() {
   const { versionHistory } = useVersionHistoryStore();
   const { selectedVersionStore } = useVersionContext();
   const { selectedVersion, setSelectedVersion } = selectedVersionStore();
+  const { selectedComment, commentPositionState } = useSelectedComment();
 
   useEffect(() => {
     if (activeModule !== 'simulation') {
@@ -185,6 +188,7 @@ function MainScene() {
       {activeModule !== "market" && !selectedUser && <Footer />}
 
       <VersionSaved />
+      {(commentPositionState !== null || selectedComment !== null) && <ThreadChat/>}
 
     </>
   );

app/src/components/layout/sidebarLeft/Header.tsx

@@ -5,16 +5,25 @@ import FileMenu from "../../ui/FileMenu";
 import { useToggleStore } from "../../../store/useUIToggleStore";
 import useModuleStore from "../../../store/useModuleStore";
 import { useNavigate } from "react-router-dom";
+import useRestStates from "../../../hooks/useResetStates";
 
 const Header: React.FC = () => {
   const { toggleUILeft, toggleUIRight, setToggleUI } = useToggleStore();
   const { activeModule } = useModuleStore();
   const navigate = useNavigate();
+  const { resetStates } = useRestStates();
 
   return (
     <div className="header-container">
       <div className="header-content">
-        <button className="logo-container" onClick={() => navigate("/Dashboard")} title="Back to Dashboard">
+        <button
+          className="logo-container"
+          onClick={() => {
+            resetStates();
+            navigate("/Dashboard")
+          }}
+          title="Back to Dashboard"
+        >
           <LogoIcon />
         </button>
         <div className="header-title">