From d747d498817c3428fbc97a1ba4f8cf52438fe963 Mon Sep 17 00:00:00 2001
From: canove <cassio@economicros.com.br>
Date: Mon, 10 Aug 2020 19:05:31 -0300
Subject: [PATCH] fix: receiving msg while load shows repeated messages in
 ticket

---
 frontend/src/components/MessagesList/index.js | 71 ++++++++++---------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js
index 9be8d00..ec5a6cb 100644
--- a/frontend/src/components/MessagesList/index.js
+++ b/frontend/src/components/MessagesList/index.js
@@ -221,12 +221,13 @@ const useStyles = makeStyles(theme => ({
 	},
 }));
 
+const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
+
 const MessagesList = () => {
 	const { ticketId } = useParams();
 	const history = useHistory();
 	const classes = useStyles();
 
-	const token = localStorage.getItem("token");
 	const userId = +localStorage.getItem("userId");
 
 	const [loading, setLoading] = useState(true);
@@ -255,7 +256,6 @@ const MessagesList = () => {
 						return [...data.messages, ...prevMessages];
 					});
 					setCount(data.count);
-					// setHasMore(res.data.messages.length > 0);
 					setLoading(false);
 					if (pageNumber === 1 && data.messages.length > 1) {
 						scrollToBottom();
@@ -269,15 +269,21 @@ const MessagesList = () => {
 			fetchMessages();
 		}, 1000);
 		return () => clearTimeout(delayDebounceFn);
-	}, [pageNumber, ticketId, token, history]);
+	}, [pageNumber, ticketId, history]);
 
 	useEffect(() => {
-		const socket = openSocket(process.env.REACT_APP_BACKEND_URL);
-
 		socket.emit("joinChatBox", ticketId, () => {});
 
+		return () => {
+			socket.disconnect();
+			setPageNumber(1);
+			setMessagesList([]);
+		};
+	}, [ticketId]);
+
+	useEffect(() => {
 		socket.on("appMessage", data => {
-			if (data.action === "create") {
+			if (data.action === "create" && !loading) {
 				addMessage(data.message);
 				scrollToBottom();
 			} else if (data.action === "update") {
@@ -286,17 +292,11 @@ const MessagesList = () => {
 		});
 
 		socket.on("contact", data => {
-			if (data.action === "update") {
+			if (data.action === "update" && !loading) {
 				setContact(data.contact);
 			}
 		});
-
-		return () => {
-			socket.disconnect();
-			setPageNumber(1);
-			setMessagesList([]);
-		};
-	}, [ticketId]);
+	}, [loading]);
 
 	const loadMore = () => {
 		setPageNumber(prevPageNumber => prevPageNumber + 1);
@@ -316,14 +316,15 @@ const MessagesList = () => {
 	};
 
 	const updateMessageAck = message => {
-		let id = message.id;
 		setMessagesList(prevState => {
-			let aux = [...prevState];
-			let messageIndex = aux.findIndex(message => message.id === id);
+			const messageIndex = prevState.findIndex(m => m.id === message.id);
 			if (messageIndex !== -1) {
+				let aux = [...prevState];
 				aux[messageIndex].ack = message.ack;
+				return aux;
+			} else {
+				return prevState;
 			}
-			return aux;
 		});
 	};
 
@@ -333,6 +334,23 @@ const MessagesList = () => {
 		}
 	};
 
+	const handleScroll = e => {
+		if (count === messagesList.length) return;
+		const { scrollTop } = e.currentTarget;
+
+		if (scrollTop === 0) {
+			document.getElementById("messagesList").scrollTop = 1;
+		}
+
+		if (loading) {
+			return;
+		}
+
+		if (scrollTop < 50) {
+			loadMore();
+		}
+	};
+
 	const checkMessaageMedia = message => {
 		if (message.mediaType === "image") {
 			return (
@@ -415,23 +433,6 @@ const MessagesList = () => {
 		}
 	};
 
-	const handleScroll = e => {
-		if (count === messagesList.length) return;
-		const { scrollTop } = e.currentTarget;
-
-		if (scrollTop === 0) {
-			document.getElementById("messagesList").scrollTop = 50;
-		}
-
-		if (loading) {
-			return;
-		}
-
-		if (scrollTop < 50) {
-			loadMore();
-		}
-	};
-
 	const renderDailyTimestamps = (message, index) => {
 		if (index === 0) {
 			return (