fix(chat): move folder (Issue #670)

epam · Feb 12, 2024 · b00c137 · b00c137
1 parent 0a9aaeb
commit b00c137
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/apps/chat/src/store/conversations/conversations.epics.ts b/apps/chat/src/store/conversations/conversations.epics.ts
@@ -591,6 +591,20 @@ const updateFolderEpic: AppEpic = (action$, state$) =>
           );
 
           const actions: Observable<AnyAction>[] = [];
+          if (conversations.length) {
+            conversations.forEach((conversation) => {
+              actions.push(
+                of(
+                  ConversationsActions.updateConversation({
+                    id: conversation.id,
+                    values: {
+                      folderId: updateFolderId(conversation.folderId),
+                    },
+                  }),
+                ),
+              );
+            });
+          }
           actions.push(
             of(
               ConversationsActions.updateFolderSuccess({
@@ -606,20 +620,6 @@ const updateFolderEpic: AppEpic = (action$, state$) =>
               }),
             ),
           );
-          if (conversations.length) {
-            conversations.forEach((conversation) => {
-              actions.push(
-                of(
-                  ConversationsActions.updateConversation({
-                    id: conversation.id,
-                    values: {
-                      folderId: updateFolderId(conversation.folderId),
-                    },
-                  }),
-                ),
-              );
-            });
-          }
 
           return concat(...actions);
         }),
@@ -2064,7 +2064,7 @@ const getOrUploadConversation = (
     payload.id,
   ) as Conversation;
 
-  if (conversation?.status !== UploadStatus.LOADED) {
+  if (conversation && conversation?.status !== UploadStatus.LOADED) {
     return forkJoin({
       conversation: ConversationService.getConversation(conversation),
       payload: of(payload),