From 0fb811b36f6ded446197e3889bd3af55fd2083a0 Mon Sep 17 00:00:00 2001
From: Joseph Hau <hexart@gmail.com>
Date: Wed, 12 Feb 2025 06:46:14 +0800
Subject: [PATCH] fix: prevent orphaned thread record when deleting active
 conversation (#1883)

* fix: prevent orphaned thread record when deleting active conversation

* refactor: optimize thread deletion navigation logic
---
 .../src/components/LeftSidebar/ThreadList.tsx    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/LeftSidebar/ThreadList.tsx b/frontend/src/components/LeftSidebar/ThreadList.tsx
index 19a1d4d0be..f267025869 100644
--- a/frontend/src/components/LeftSidebar/ThreadList.tsx
+++ b/frontend/src/components/LeftSidebar/ThreadList.tsx
@@ -101,25 +101,23 @@ export function ThreadList({
 
   const handleDeleteThread = () => {
     if (!threadIdToDelete) return;
+    if (
+      threadIdToDelete === idToResume ||
+      threadIdToDelete === currentThreadId
+    ) {
+      clear();
+    }
 
     toast.promise(apiClient.deleteThread(threadIdToDelete), {
       loading: (
         <Translator path="threadHistory.thread.actions.delete.inProgress" />
       ),
       success: () => {
-        if (
-          threadIdToDelete === idToResume ||
-          threadIdToDelete === currentThreadId
-        ) {
-          clear();
-        }
-        if (threadIdToDelete === threadHistory.currentThreadId) {
-          navigate('/');
-        }
         setThreadHistory((prev) => ({
           ...prev,
           threads: prev?.threads?.filter((t) => t.id !== threadIdToDelete)
         }));
+        navigate('/');
         return (
           <Translator path="threadHistory.thread.actions.delete.success" />
         );