diff --git a/src/App.jsx b/src/App.jsx index d865fc5cf4..fa303d94ce 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -5,11 +5,14 @@ import TextChat from './components/main/TextChat'; import Nav from './components/Nav'; import MobileNav from './components/Nav/MobileNav'; import useDocumentTitle from '~/hooks/useDocumentTitle'; -import { useSelector } from 'react-redux'; +import { useDispatch, useSelector } from 'react-redux'; +import { setConvos } from '~/store/convoSlice'; const App = () => { const { messages } = useSelector((state) => state.messages); const { title } = useSelector((state) => state.convo); + const dispatch = useDispatch(); + const { data, error, isLoading, mutate } = swr('http://localhost:3050/convos', (res) => dispatch(setConvos(res))); useDocumentTitle(title); diff --git a/src/components/Conversations/index.jsx b/src/components/Conversations/index.jsx index d74f23314f..bc90bb1e19 100644 --- a/src/components/Conversations/index.jsx +++ b/src/components/Conversations/index.jsx @@ -1,16 +1,13 @@ import React, { useState } from 'react'; import { useSelector } from 'react-redux'; import Conversation from './Conversation'; -import { swr } from '~/utils/fetchers'; +// import { swr } from '~/utils/fetchers'; import useDidMountEffect from '~/hooks/useDidMountEffect'; export default function Conversations() { - const { data, error, isLoading, mutate } = swr('http://localhost:3050/convos'); - const conversations = data; const [isHovering, setIsHovering] = useState(false); const { conversationId } = useSelector((state) => state.convo); - - useDidMountEffect(() => mutate(), [conversationId]); + // useDidMountEffect(() => mutate(), [conversationId]); // const currentRef = useRef(null); // const scrollToTop = () => { diff --git a/src/components/Nav/index.jsx b/src/components/Nav/index.jsx index ce3b32319b..a50bcc0627 100644 --- a/src/components/Nav/index.jsx +++ b/src/components/Nav/index.jsx @@ -4,6 +4,8 @@ import Conversations from '../Conversations'; import NavLinks from './NavLinks'; export default function Nav() { + const { conversationId } = useSelector((state) => state.convo); + return (