From 1aff1cbb5013b912ef4c817b32852b3348e4f1c0 Mon Sep 17 00:00:00 2001
From: Vasilica Olariu <olariu.vasilica@gmail.com>
Date: Mon, 20 Apr 2026 09:04:48 +0300
Subject: [PATCH 1/2] PM-4512 - Allow multiple comments in scorecard reply

---
 .../ScorecardQuestion/AiFeedback/AiFeedback.tsx        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx
index a9bf48993..7b7803960 100644
--- a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx
+++ b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx
@@ -87,9 +87,13 @@ const AiFeedback: FC<AiFeedbackProps> = props => {
             <AiFeedbackActions
                 feedback={feedback}
                 actionType='runItem'
-                onPressReply={commentsArr.length === 0 ? onShowReply : undefined}
+                onPressReply={onShowReply}
             />
 
+            {commentsArr.length > 0 && (
+                <AiFeedbackComments comments={commentsArr} feedback={feedback} isRoot />
+            )}
+
             {
                 showReply && (
                     <AiFeedbackReply
@@ -100,10 +104,6 @@ const AiFeedback: FC<AiFeedbackProps> = props => {
                     />
                 )
             }
-
-            {commentsArr.length > 0 && (
-                <AiFeedbackComments comments={commentsArr} feedback={feedback} isRoot />
-            )}
         </ScorecardQuestionRow>
     )
 }

From b6608fc9903a8f7494ef39e3d98e2b7a4ed98583 Mon Sep 17 00:00:00 2001
From: Vasilica Olariu <olariu.vasilica@gmail.com>
Date: Mon, 20 Apr 2026 09:14:47 +0300
Subject: [PATCH 2/2] Fix show reply

---
 .../ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx
index 7b7803960..0aa841c61 100644
--- a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx
+++ b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/AiFeedback/AiFeedback.tsx
@@ -33,7 +33,7 @@ const AiFeedback: FC<AiFeedbackProps> = props => {
     const commentsArr: any[] = (feedback?.comments) || []
 
     const onShowReply = useCallback(() => {
-        setShowReply(!showReply)
+        setShowReply(prevShowReply => !prevShowReply)
     }, [])
 
     const onSubmitReply = useCallback(async (content: string) => {