From ddd0a550bfec0176a35d3f5c6fea6feb747a8987 Mon Sep 17 00:00:00 2001
From: alvintran <tralvin3@gmail.com>
Date: Sun, 29 Jun 2025 09:28:16 -0700
Subject: [PATCH 1/2] bye props

---
 src/Pages/Messaging/Messaging.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Pages/Messaging/Messaging.js b/src/Pages/Messaging/Messaging.js
index dd1d54ff1..4455dc02c 100644
--- a/src/Pages/Messaging/Messaging.js
+++ b/src/Pages/Messaging/Messaging.js
@@ -1,10 +1,12 @@
 import React, { useState, useEffect } from 'react';
 import { sendMessage, connectToRoom } from '../../APIFunctions/Messaging';
 import { useParams, useHistory } from 'react-router-dom/cjs/react-router-dom.min';
+import { useUser } from '../../Components/context/UserContext';
 
-export default function Messaging(props) {
+export default function Messaging() {
   const { id } = useParams();
   const history = useHistory();
+  const { user } = useUser();
   const [roomIdInput, setRoomIdInput] = useState(id || '');
   const [roomIdSubmit, setRoomIdSubmit] = useState(id || 'general');
 
@@ -33,8 +35,8 @@ export default function Messaging(props) {
             Connect
         </button>
       </form>
-      <Feed token={props.user.token} id={roomIdSubmit || id} />
-      <MessagingForm token={props.user.token} id={roomIdSubmit || id} />
+      <Feed token={user?.token} id={roomIdSubmit || id} />
+      <MessagingForm token={user?.token} id={roomIdSubmit || id} />
     </div>
   );
 }

From ba603c164dd43e77e232400d0dd5ffa01118b74c Mon Sep 17 00:00:00 2001
From: alvintran <tralvin3@gmail.com>
Date: Sun, 29 Jun 2025 09:30:59 -0700
Subject: [PATCH 2/2] fix error message for null message

---
 src/Pages/Messaging/Messaging.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Pages/Messaging/Messaging.js b/src/Pages/Messaging/Messaging.js
index 4455dc02c..6b2cb2f0c 100644
--- a/src/Pages/Messaging/Messaging.js
+++ b/src/Pages/Messaging/Messaging.js
@@ -48,14 +48,13 @@ function MessagingForm(props) {
 
   const { token, id } = props;
 
-
   const handleSubmit = async (event) => {
     event.preventDefault();
 
     const status = await sendMessage(id, token, message);
 
     if (status.error) {
-      setErrorMessage(status.responseData.response.data || 'An error occurred while sending the message.');
+      setErrorMessage(status.responseData?.response?.data || 'An error occurred while sending the message.');
     } else {
       setErrorMessage('');
     }