fix: resolve out of sync inferencing and isStreaming by referencing d…

…irectly from modelStore
a-ghorbani · Dec 6, 2024 · a6f62f8 · a6f62f8
1 parent 150bbf4
commit a6f62f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/hooks/useChatSession.ts b/src/hooks/useChatSession.ts
@@ -186,7 +186,5 @@ export const useChatSession = (
     handleSendPress,
     handleResetConversation,
     handleStopPress,
-    inferencing: modelStore.inferencing,
-    isStreaming: modelStore.isStreaming,
   };
 };
diff --git a/src/screens/ChatScreen/ChatScreen.tsx b/src/screens/ChatScreen/ChatScreen.tsx
@@ -41,11 +41,15 @@ export const ChatScreen: React.FC = observer(() => {
   const l10n = React.useContext(L10nContext);
   const messages = chatSessionStore.currentSessionMessages;
 
-  const {handleSendPress, handleStopPress, inferencing, isStreaming} =
-    useChatSession(currentMessageInfo, messages, user, assistant);
+  const {handleSendPress, handleStopPress} = useChatSession(
+    currentMessageInfo,
+    messages,
+    user,
+    assistant,
+  );
 
   // Show loading bubble only during the thinking phase (inferencing but not streaming)
-  const isThinking = inferencing && !isStreaming;
+  const isThinking = modelStore.inferencing && !modelStore.isStreaming;
 
   return (
     <SafeAreaProvider>
@@ -60,9 +64,9 @@ export const ChatScreen: React.FC = observer(() => {
         onSendPress={handleSendPress}
         onStopPress={handleStopPress}
         user={user}
-        isStopVisible={inferencing}
+        isStopVisible={modelStore.inferencing}
         isThinking={isThinking}
-        isStreaming={isStreaming}
+        isStreaming={modelStore.isStreaming}
         sendButtonVisibilityMode="editing"
         textInputProps={{
           editable: !!modelStore.context,