From b8d7e11744673dabbe2af006889c66571eee6c8e Mon Sep 17 00:00:00 2001
From: Tom <mottoes_recap0u@icloud.com>
Date: Wed, 10 May 2023 10:00:08 +0200
Subject: [PATCH] fix loop bug in thread view

---
 src/components/ReplyModal.jsx   |  6 ++----
 src/components/views/Thread.jsx | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/ReplyModal.jsx b/src/components/ReplyModal.jsx
index f11df31f..fa421a25 100644
--- a/src/components/ReplyModal.jsx
+++ b/src/components/ReplyModal.jsx
@@ -1,5 +1,4 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { useLocation } from 'react-router-dom';
 import { usePublishComment } from '@plebbit/plebbit-react-hooks';
 import { StyledModal } from './styled/ReplyModal.styled';
 import useGeneralStore from '../hooks/stores/useGeneralStore';
@@ -33,8 +32,7 @@ const ReplyModal = ({ isOpen, closeModal }) => {
   const [selectedText, setSelectedText] = useState('');
   
   useError(errorMessage, [errorMessage]);
-  
-  const location = useLocation();
+
 
   
   const onModalOpen = () => {
@@ -109,7 +107,7 @@ const ReplyModal = ({ isOpen, closeModal }) => {
     if (index !== undefined) {
       setPendingCommentIndex(index);
     }
-  }, [index, location, setPendingCommentIndex]);
+  }, [index, setPendingCommentIndex]);
 
   
   const resetFields = useCallback(() => {
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index 902b9565..47029d09 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -52,6 +52,11 @@ const Thread = () => {
   const commentRef = useRef();
   const linkRef = useRef();
 
+  const [triggerPublishComment, setTriggerPublishComment] = useState(false);
+
+  const [errorMessage, setErrorMessage] = useState(null);
+  useError(errorMessage, [errorMessage]);
+
   const [isReplyOpen, setIsReplyOpen] = useState(false);
   const navigate = useNavigate();
   const [prevScrollPos, setPrevScrollPos] = useState(0);
@@ -63,6 +68,10 @@ const Thread = () => {
 
   const stateString = useStateString(comment?.clients);
 
+  const commentMediaInfo = getCommentMediaInfo(comment);
+  const fallbackImgUrl = "assets/filedeleted-res.gif";
+
+
   const errorString = useMemo(() => {
     if (comment?.state === 'failed') {
       let errorString = 'Failed fetching thread.'
@@ -73,20 +82,13 @@ const Thread = () => {
     }
   }, [comment?.state, comment?.error])
 
+
   useEffect(() => {
     if (errorString) {
       setErrorMessage(errorString);
     }
   }, [errorString]);
 
-  const commentMediaInfo = getCommentMediaInfo(comment);
-  const fallbackImgUrl = "assets/filedeleted-res.gif";
-
-  const [errorMessage, setErrorMessage] = useState(null);
-  useError(errorMessage, [errorMessage]);
-
-  const [triggerPublishComment, setTriggerPublishComment] = useState(false);
-
 
   const flattenedReplies = useMemo(() => 
     flattenCommentsPages(comment.replies), [comment.replies]
@@ -228,6 +230,7 @@ const Thread = () => {
         await publishComment();
         resetFields();
       })();
+      setTriggerPublishComment(false);
     }
   }, [publishCommentOptions, triggerPublishComment, publishComment, resetFields]);