From 6cb9474e04d0df301d44cc40074d958a83835034 Mon Sep 17 00:00:00 2001
From: Vasilica Olariu <olariu.vasilica@gmail.com>
Date: Tue, 25 Nov 2025 15:55:43 +0200
Subject: [PATCH 1/2] PM-2921 - fix screener multiple submissions showing up

---
 .../SubmissionHistoryModal/SubmissionHistoryModal.tsx    | 2 +-
 .../TableSubmissionScreening.tsx                         | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx b/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx
index 321461b41..675e641ab 100644
--- a/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx
+++ b/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx
@@ -279,7 +279,7 @@ export const SubmissionHistoryModal: FC<SubmissionHistoryModalProps> = (props: S
                         <td className={styles.aiReviewersTableRow} colSpan={4}>
                             <div className={styles.aiReviewersTable}>
                                 <AiReviewsTable
-                                    reviewers={props.aiReviewers!}
+                                    reviewers={props.aiReviewers ?? []}
                                     submission={submission}
                                 />
                             </div>
diff --git a/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx b/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
index ce875acee..55128d872 100644
--- a/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
+++ b/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
@@ -802,13 +802,18 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
         [historySourceSubmissions, primarySubmissionInfos],
     )
 
-    const { historyByMember }: SubmissionHistoryPartition = submissionHistory
+    const { historyByMember, latestSubmissionIds }: SubmissionHistoryPartition = submissionHistory
 
     const shouldShowHistoryActions = useMemo(
         () => hasIsLatestFlag(primarySubmissionInfos),
         [primarySubmissionInfos],
     )
 
+    const fitleredScreenings = useMemo(() => (
+        props.screenings
+            .filter(screening => latestSubmissionIds.has(screening.submissionId))
+    ), [props.screenings, latestSubmissionIds])
+
     const hasAnyScreeningAssignment = useMemo(
         () => props.screenings.some(screening => Boolean(screening.myReviewResourceId)),
         [props.screenings],
@@ -1172,7 +1177,7 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
             ) : (
                 <Table
                     columns={columns}
-                    data={props.screenings}
+                    data={fitleredScreenings}
                     disableSorting
                     onToggleSort={_.noop}
                     removeDefaultSort

From 925d190aa1a2d44a93b6aeae579dbec5cbc5db6e Mon Sep 17 00:00:00 2001
From: Vasilica Olariu <olariu.vasilica@gmail.com>
Date: Tue, 25 Nov 2025 16:20:19 +0200
Subject: [PATCH 2/2] lint fix

---
 .../SubmissionHistoryModal/SubmissionHistoryModal.tsx        | 5 +++--
 .../TableSubmissionScreening/TableSubmissionScreening.tsx    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx b/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx
index 675e641ab..d9e0057c2 100644
--- a/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx
+++ b/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx
@@ -100,7 +100,8 @@ export const SubmissionHistoryModal: FC<SubmissionHistoryModalProps> = (props: S
         [props.submissions],
     )
 
-    const aiReviewersCount = useMemo(() => (props.aiReviewers?.length ?? 0) + 1, [props.aiReviewers])
+    const aiReviewers = useMemo(() => props.aiReviewers ?? [], [props.aiReviewers])
+    const aiReviewersCount = useMemo(() => (aiReviewers.length ?? 0) + 1, [aiReviewers])
 
     const [toggledRows, setToggledRows] = useState(new Set<string>())
 
@@ -279,7 +280,7 @@ export const SubmissionHistoryModal: FC<SubmissionHistoryModalProps> = (props: S
                         <td className={styles.aiReviewersTableRow} colSpan={4}>
                             <div className={styles.aiReviewersTable}>
                                 <AiReviewsTable
-                                    reviewers={props.aiReviewers ?? []}
+                                    reviewers={aiReviewers}
                                     submission={submission}
                                 />
                             </div>
diff --git a/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx b/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
index 55128d872..bd97cc227 100644
--- a/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
+++ b/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
@@ -809,7 +809,7 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
         [primarySubmissionInfos],
     )
 
-    const fitleredScreenings = useMemo(() => (
+    const filteredScreenings = useMemo(() => (
         props.screenings
             .filter(screening => latestSubmissionIds.has(screening.submissionId))
     ), [props.screenings, latestSubmissionIds])
@@ -1177,7 +1177,7 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
             ) : (
                 <Table
                     columns={columns}
-                    data={fitleredScreenings}
+                    data={filteredScreenings}
                     disableSorting
                     onToggleSort={_.noop}
                     removeDefaultSort