From d020b08955e6f2bab0fe2e71a07a747875af3419 Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Fri, 24 Apr 2026 07:27:41 -0500
Subject: [PATCH] fix: handle remaining issue thread greptile notes

---
 server/src/routes/issues.ts           | 15 +++++++++------
 ui/src/components/IssueChatThread.tsx |  7 +++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/server/src/routes/issues.ts b/server/src/routes/issues.ts
index 7e94b1bdb06..0df9172cc02 100644
--- a/server/src/routes/issues.ts
+++ b/server/src/routes/issues.ts
@@ -1909,13 +1909,16 @@ export function issueRoutes(
     if (reviewRequest !== undefined && transition.patch.executionState === undefined) {
       const existingExecutionState = parseIssueExecutionState(existing.executionState);
       if (!existingExecutionState || existingExecutionState.status !== "pending") {
-        res.status(422).json({ error: "reviewRequest requires an active review or approval stage" });
-        return;
+        if (reviewRequest !== null) {
+          res.status(422).json({ error: "reviewRequest requires an active review or approval stage" });
+          return;
+        }
+      } else {
+        updateFields.executionState = {
+          ...existingExecutionState,
+          reviewRequest,
+        };
       }
-      updateFields.executionState = {
-        ...existingExecutionState,
-        reviewRequest,
-      };
     }
 
     const nextAssigneeAgentId =
diff --git a/ui/src/components/IssueChatThread.tsx b/ui/src/components/IssueChatThread.tsx
index ccd5fb09fba..ea1d4d3aff0 100644
--- a/ui/src/components/IssueChatThread.tsx
+++ b/ui/src/components/IssueChatThread.tsx
@@ -2237,9 +2237,12 @@ const IssueChatComposer = forwardRef<IssueChatComposerHandle, IssueChatComposerP
       }}
       onDrop={(evt) => {
         if (!canAcceptFiles) return;
-        resetDragState();
-        if (evt.defaultPrevented) return;
+        if (evt.defaultPrevented) {
+          resetDragState();
+          return;
+        }
         evt.preventDefault();
+        resetDragState();
         void handleDroppedFiles(evt.dataTransfer?.files);
       }}
     >