Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/Pages/Messaging/Messaging.js
Original file line number Diff line number Diff line change
@@ -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');

Expand Down Expand Up @@ -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>
);
}
Expand All @@ -46,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('');
}
Expand Down