fix: handle msg pushing

Signed-off-by: Azanul <azanulhaque@gmail.com>
Azanul · Jun 8, 2024 · 4468906 · 4468906
1 parent a3fe07b
commit 4468906
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/frontend/src/features/wuphf/Wuphf.tsx b/frontend/src/features/wuphf/Wuphf.tsx
@@ -8,15 +8,14 @@ import { useParams } from 'react-router-dom';
 const Wuphf: React.FC = () => {
   const { chatId } = useParams();
   const dispatch = useDispatch<AppDispatch>();
-  const messages = useSelector((state: RootState) => state.wuphf.chats);
+  const messages = useSelector((state: RootState) => state.wuphf.chats.find((chat) => chat.chatId === chatId)?.messages);
   const loading = useSelector((state: RootState) => state.wuphf.loading);
   const error = useSelector((state: RootState) => state.wuphf.error);
 
   useEffect(() => {
     dispatch(fetchMessages(chatId || ''));
   }, [chatId, dispatch]);
 
-  console.log(messages)
   return (
     <div className="container mx-auto p-4">
       <h1 className="text-3xl font-bold text-center mb-6">WUPHF.com</h1>

diff --git a/frontend/src/features/wuphf/wuphfSlice.tsx b/frontend/src/features/wuphf/wuphfSlice.tsx
@@ -1,6 +1,6 @@
 import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-type chat = { chatId: string, messages: string[] };
+type chat = { chatId: string, messages: any[] };
 
 interface WuphfState {
   chats: chat[];
@@ -35,7 +35,8 @@ export const fetchMessages = createAsyncThunk('wuphf/fetchMessages', async (chat
   if (!response.ok) {
     throw new Error('Failed to fetch chats');
   }
-  return await response.json();
+  const messages = await response.json();
+  return { chatId, messages };
 });
 
 const wuphfSlice = createSlice({
@@ -44,10 +45,7 @@ const wuphfSlice = createSlice({
   reducers: {
     sendWuphf: (state, action: PayloadAction<{ chatId: string; message: string }>) => {
       const { chatId, message } = action.payload;
-      const chat = state.chats.find((chat) => chat.chatId === chatId);
-      if (chat) {
-        chat.messages.push(message);
-      }
+      state.chats.find((chat) => chat.chatId === chatId)?.messages.push({sender: localStorage.getItem('user_id'), msg: message});
     },
   },
   extraReducers: (builder) => {
@@ -70,7 +68,13 @@ const wuphfSlice = createSlice({
       })
       .addCase(fetchMessages.fulfilled, (state, action) => {
         state.loading = false;
-        state.chats = action.payload;
+        const updatedChat = action.payload;
+        const chatIndex = state.chats.findIndex(chat => chat.chatId === updatedChat.chatId);
+        if (chatIndex >= 0) {
+          state.chats[chatIndex] = updatedChat;
+        } else {
+          state.chats.push(updatedChat);
+        }
       })
       .addCase(fetchMessages.rejected, (state, action) => {
         state.loading = false;