From 9520da668cb88574bfb5761827e3f8683bbb5458 Mon Sep 17 00:00:00 2001
From: "sp.wack" <83104063+amanape@users.noreply.github.com>
Date: Tue, 21 Oct 2025 21:11:15 +0400
Subject: [PATCH] Prevent WebSocket provider remount by defaulting to V1
 (#11458)

---
 frontend/src/routes/conversation.tsx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/frontend/src/routes/conversation.tsx b/frontend/src/routes/conversation.tsx
index 0bc1e16997..c1d7330f41 100644
--- a/frontend/src/routes/conversation.tsx
+++ b/frontend/src/routes/conversation.tsx
@@ -154,7 +154,7 @@ function AppContent() {
     t,
   ]);
 
-  const isV1Conversation = conversation?.conversation_version === "V1";
+  const isV0Conversation = conversation?.conversation_version === "V0";
 
   const content = (
     <ConversationSubscriptionsProvider>
@@ -174,15 +174,11 @@ function AppContent() {
     </ConversationSubscriptionsProvider>
   );
 
-  // Wait for conversation data to load before rendering WebSocket provider
-  // This prevents the provider from unmounting/remounting when version changes from 0 to 1
-  if (!conversation) {
-    return content;
-  }
-
+  // Render WebSocket provider immediately to avoid mount/remount cycles
+  // The providers internally handle waiting for conversation data to be ready
   return (
     <WebSocketProviderWrapper
-      version={isV1Conversation ? 1 : 0}
+      version={isV0Conversation ? 0 : 1}
       conversationId={conversationId}
     >
       {content}