From 706877f6a485c38d4da80764329ee23e8281b6e1 Mon Sep 17 00:00:00 2001
From: Aparna <aparna.s@aot-technologies.com>
Date: Thu, 5 Sep 2024 11:15:16 -0700
Subject: [PATCH] FOIMOD-2982-Comments Tab - Type of Comments (Peer Review,
 Internal, General)-Applicant correspondence fix

Applicant correspondence fix
---
 .../FOI/customComponents/Comments/CommentStructure.js       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/forms-flow-web/src/components/FOI/customComponents/Comments/CommentStructure.js b/forms-flow-web/src/components/FOI/customComponents/Comments/CommentStructure.js
index e84a5f4e6..4db8750e7 100644
--- a/forms-flow-web/src/components/FOI/customComponents/Comments/CommentStructure.js
+++ b/forms-flow-web/src/components/FOI/customComponents/Comments/CommentStructure.js
@@ -70,7 +70,7 @@ const CommentStructure = ({ i, reply, parentId, totalcommentCount, currentIndex,
 
   const getHtmlfromRawContent = () => {
     let markup = null
-    if (i.commentTypeId !== 2 && i.commentTypeId !== 3) {
+    if (i.commentTypeId != null && i.commentTypeId !== 2 && i.commentTypeId !== 3) {
       const rawContentFromStore = convertFromRaw(JSON.parse(i.text))
       let initialEditorState = EditorState.createWithContent(rawContentFromStore);
 
@@ -267,7 +267,7 @@ const CommentStructure = ({ i, reply, parentId, totalcommentCount, currentIndex,
           <div className="commentsTwo">
 
             <div className="fullName">{fullName} </div> |  <div className="commentdate">{i.date} </div> 
-            {(i.commentTypeId !== 2 && i.commentTypeId !== 3 && (parentId == null || parentId == undefined)) &&
+            {(i.commentTypeId != null && i.commentTypeId !== 2 && i.commentTypeId !== 3 && (parentId == null || parentId == undefined)) &&
               <div>
                 <Chip
                     item
@@ -293,7 +293,7 @@ const CommentStructure = ({ i, reply, parentId, totalcommentCount, currentIndex,
         </div>
         <div className="userActions">
           <div>
-            {(isEmail || ((i.commentTypeId !== 2 && i.commentTypeId !== 3) && actions.userId === i.userId && actions.user)) && (
+            {(isEmail || ((i.commentTypeId != null && i.commentTypeId !== 2 && i.commentTypeId !== 3) && actions.userId === i.userId && actions.user)) && (
                 <>
                     <IconButton
                     aria-label= "actions"