fix(chat): fix the infinite loader for "New conversation" (Issue #2358)…

… (#2359)
epam · Oct 11, 2024 · 838fc31 · 838fc31
1 parent 9324e3e
commit 838fc31
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/apps/chat/src/store/conversations/conversations.epics.ts b/apps/chat/src/store/conversations/conversations.epics.ts
@@ -372,20 +372,29 @@ const createNewConversationsEpic: AppEpic = (action$, state$) =>
             const models = ModelsSelectors.selectModels(state);
             return models.filter((i) => i?.id === isolatedModelId);
           }
+          const models = ModelsSelectors.selectModels(state);
+          const recentModels = ModelsSelectors.selectRecentModels(state);
           if (lastConversation?.model.id) {
             const lastModelId = lastConversation.model.id;
-            const models = ModelsSelectors.selectModels(state);
-            return models.filter((i) => i?.id === lastModelId);
+            return [
+              ...models.filter((i) => i?.id === lastModelId),
+              ...recentModels,
+              ...models,
+            ];
           }
-          return ModelsSelectors.selectRecentModels(state);
+          return [...recentModels, ...models];
         }),
-        filter((models) => models && models.length > 0),
         take(1),
         switchMap((recentModels) => {
           const model = recentModels[0];
 
           if (!model) {
-            return EMPTY;
+            console.error(
+              'Creation failed: no models were found for conversation',
+            );
+            return of(
+              ConversationsActions.setIsActiveConversationRequest(false),
+            );
           }
           const conversationRootId = getConversationRootId();
           const newConversations: Conversation[] = names.map(