Fix bug with test in sidebar for desktop, and in display chat

Chat-Your-Way · Jul 7, 2024 · 483175b · 483175b
1 parent ea67403
commit 483175b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/common/Sidebar/Sidebar.jsx b/src/common/Sidebar/Sidebar.jsx
@@ -76,18 +76,18 @@ const Sidebar = () => {
   const isChatOpened = useSelector(selectChatOpened);
 
   useEffect(() => {
-    if (pathname === PATH.HOME) {
-      setShowText(false);
-      setShowMenu(true);
-    } else {
-      setShowText(true);
-    }
+    // if (pathname === PATH.HOME) {
+    //   setShowText(false);
+    //   setShowMenu(true);
+    // } else {
+    //   setShowText(true);
+    // }
     // if (pathname.includes('chat')) {
     //   setShowText(false);
     // } else {
     //   setShowText(true);
     // }
-    if (isChatOpened) {
+    if (isChatOpened && pathname.includes('chat')) {
       setShowText(false);
     } else {
       setShowText(true);

diff --git a/src/common/Sidebar/Sidebar.styled.js b/src/common/Sidebar/Sidebar.styled.js
@@ -76,14 +76,15 @@ export const StyledContentBox = styled(Box, {
 
   @media screen and (min-width: 768px) {
     gap: 0;
-    position: absolute;
+    // position: absolute;
     top: 167px;
     left: 40px;
   }
 
   @media screen and (min-width: 1200px) {
     top: 154px;
     left: 80px;
+    position: absolute;
   }
 `;
 

diff --git a/src/components/Chat/Chat.jsx b/src/components/Chat/Chat.jsx
@@ -19,6 +19,7 @@ import {
   selectSubscribed,
   toggleChatOpened,
   selectChatOpened,
+  setChatOpened,
 } from '../../redux/chatSlice';
 import {
   subscribeToMessages,
@@ -118,6 +119,7 @@ const Chat = ({ children }) => {
     }
 
     // dispatch(toggleChatOpened());
+    dispatch(setChatOpened(true));
 
     return () => {
       dispatch(unsubscribeFromMessages());
@@ -127,7 +129,8 @@ const Chat = ({ children }) => {
       dispatch(clearNewMessages());
       dispatch(clearNotifications());
 
-      dispatch(toggleChatOpened());
+      // dispatch(toggleChatOpened());
+      dispatch(setChatOpened(true));
     };
 
     // eslint-disable-next-line react-hooks/exhaustive-deps