up to 0.2.6-betta.2

Author: Artem-K-Koltunov

src/Presentation/Views/Dialog/useDialogViewModel.ts

@@ -67,11 +67,11 @@ export default function useDialogViewModel(
     let participants: Array<number> = [];
     let userDictionary: Record<number, UserEntity> = {};
 
-    if (dialog.type === DialogType.group) {
+    if (dialog?.type === DialogType.group) {
       participants = (dialog as GroupDialogEntity).participantIds;
-    } else if (dialog.type === DialogType.private) {
+    } else if (dialog?.type === DialogType.private) {
       participants = [(dialog as PrivateDialogEntity).participantId];
-    } else if (dialog.type === DialogType.public) {
+    } else if (dialog?.type === DialogType.public) {
       participants = [];
     }
     const getAllUsersFromDialogByIdsUseCase: GetUsersByIdsUseCase =

src/Presentation/layouts/Desktop/QuickBloxUIKitDesktopLayout.tsx

@@ -777,12 +777,16 @@ const QuickBloxUIKitDesktopLayout: React.FC<
 
   useEffect(() => {
     console.log('HAVE NEW ENTITY');
-    messagesViewModel.getMessages(new Pagination());
+    if (messagesViewModel.entity) {
+      messagesViewModel.getMessages(new Pagination());
+    }
   }, [messagesViewModel.entity]);
   //
   useEffect(() => {
     console.log('HAVE NEW ENTITY');
-    dialogsViewModel.setWaitLoadingStatus(messagesViewModel?.loading);
+    if (messagesViewModel.entity) {
+      dialogsViewModel.setWaitLoadingStatus(messagesViewModel?.loading);
+    }
   }, [messagesViewModel?.loading]);
   //
   function prepareFirstPage(initData: MessageEntity[]) {