From df2e3c1119e2ef1b5e77446b4caa16b80fba7fea Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Wed, 2 Oct 2024 12:57:38 +0100
Subject: [PATCH] Merge pull request #20728 from overleaf/dp-state-field-error

Safeguard against addCommentStateField not existing

GitOrigin-RevId: 06f5f72bc12552b9668892a50d9789d6dfc45a9e
---
 .../components/review-panel-current-file.tsx           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
index f1e4683a25..3f829f645d 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
@@ -147,7 +147,7 @@ const ReviewPanelCurrentFile: FC = () => {
 
   const positionsRef = useRef<Map<string, number>>(new Map())
 
-  const addCommentRanges = state.field(addCommentStateField).ranges
+  const addCommentRanges = state.field(addCommentStateField, false)?.ranges
 
   useEffect(() => {
     if (aggregatedRanges) {
@@ -178,6 +178,10 @@ const ReviewPanelCurrentFile: FC = () => {
             }
           }
 
+          if (!addCommentRanges) {
+            return
+          }
+
           const cursor = addCommentRanges.iter()
 
           while (cursor.value) {
@@ -212,6 +216,10 @@ const ReviewPanelCurrentFile: FC = () => {
   )
 
   const addCommentEntries = useMemo(() => {
+    if (!addCommentRanges) {
+      return []
+    }
+
     const cursor = addCommentRanges.iter()
 
     const entries = []