quickblox-react-ui-kit 0.3.0 → 0.3.1-beta.1

package/src/Data/mapper/DialogRemoteDTOMapper.ts

@@ -1,3 +1,4 @@
+import QB from 'quickblox/quickblox';
 import { IMapper } from './IMapper';
 import { DialogEntity } from '../../Domain/entity/DialogEntity';
 import { DialogType } from '../../Domain/entity/DialogTypes';
@@ -86,9 +87,7 @@ export class DialogRemoteDTOMapper implements IMapper {
           dialog.id,
           dialog.name,
           {
-            dateSent: dialog.lastMessageDateSent
-              ? dialog.lastMessageDateSent
-              : '',
+            dateSent: dialog.lastMessageDateSent,
             text: dialog.lastMessageText ? dialog.lastMessageText : '',
             userId: parseInt(dialog.lastMessageUserId, 10),
           },
@@ -104,9 +103,7 @@ export class DialogRemoteDTOMapper implements IMapper {
           { todo: '' },
           dialog.id,
           {
-            dateSent: dialog.lastMessageDateSent
-              ? dialog.lastMessageDateSent
-              : '',
+            dateSent: dialog.lastMessageDateSent,
             text: dialog.lastMessageText ? dialog.lastMessageText : '',
             userId: parseInt(dialog.lastMessageUserId, 10),
           },
@@ -123,9 +120,7 @@ export class DialogRemoteDTOMapper implements IMapper {
           { todo: '' },
           dialog.id,
           {
-            dateSent: dialog.lastMessageDateSent
-              ? dialog.lastMessageDateSent
-              : '',
+            dateSent: dialog.lastMessageDateSent,
             text: dialog.lastMessageText ? dialog.lastMessageText : '',
             userId: parseInt(dialog.lastMessageUserId, 10),
           },
@@ -186,7 +181,7 @@ export class DialogRemoteDTOMapper implements IMapper {
   public static createDefaultDialogEntity(owner_id: string): DialogEntity {
     return {
       customData: { todo: '' },
-      lastMessage: { dateSent: '', text: '', userId: 0 },
+      lastMessage: { dateSent: 0, text: '', userId: 0 },
       ownerId: owner_id,
       type: DialogType.public,
       unreadMessageCount: 0,

package/src/Data/repository/ConnectionRepository.ts

@@ -1,3 +1,4 @@
+import QB from 'quickblox/quickblox';
 import { SubscriptionPerformer } from '../../Domain/use_cases/base/Subscribable/SubscriptionPerformer';
 import { stringifyError } from '../../utils/parse';
 

package/src/Data/repository/UsersRepository.ts

@@ -203,7 +203,7 @@ export default class UsersRepository {
       for (let i = 0; i < usersIds.length; i += 1) {
         let dto: RemoteUserDTO = new RemoteUserDTO();
 
-        dto.id = usersIds[i].toString();
+        dto.id = usersIds[i]?.toString() || '-1';
         // eslint-disable-next-line no-await-in-loop
         dto = await this.remoteDataSource.getUser(dto);
         arrayUserDTO.push(dto);

package/src/Data/source/local/ChatLocalStorageDataSource.ts

@@ -6,7 +6,7 @@ const listChats: PublicDialogEntity[] = [
     id: '1',
     name: 'Chat 1',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -17,7 +17,7 @@ const listChats: PublicDialogEntity[] = [
     id: '2',
     name: 'Chat 2',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -28,7 +28,7 @@ const listChats: PublicDialogEntity[] = [
     id: '3',
     name: 'Chat 3',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -39,7 +39,7 @@ const listChats: PublicDialogEntity[] = [
     id: '4',
     name: 'Chat 4',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -50,7 +50,7 @@ const listChats: PublicDialogEntity[] = [
     id: '5',
     name: 'Chat 5',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -64,7 +64,7 @@ const listCasheChats: PublicDialogEntity[] = [
     id: '1',
     name: 'Cash Chat 1',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -75,7 +75,7 @@ const listCasheChats: PublicDialogEntity[] = [
     id: '2',
     name: 'Cash Chat 2',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -86,7 +86,7 @@ const listCasheChats: PublicDialogEntity[] = [
     id: '3',
     name: 'Chat 3 from Cash',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -97,7 +97,7 @@ const listCasheChats: PublicDialogEntity[] = [
     id: '4',
     name: 'Chat 4 from Cash',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -108,7 +108,7 @@ const listCasheChats: PublicDialogEntity[] = [
     id: '5',
     name: 'Chat 5 from Cash',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -119,7 +119,7 @@ const listCasheChats: PublicDialogEntity[] = [
     id: '6',
     name: 'Chat 6 from Cash',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -133,7 +133,7 @@ const preloadedChats: PublicDialogEntity[] = [
     id: '1',
     name: 'Preload Chat 1',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -144,7 +144,7 @@ const preloadedChats: PublicDialogEntity[] = [
     id: '2',
     name: 'Preload Chat 2',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,
@@ -155,7 +155,7 @@ const preloadedChats: PublicDialogEntity[] = [
     id: '3',
     name: 'Preload Chat 3',
     customData: { todo: '' },
-    lastMessage: { dateSent: '', text: '', userId: 0 },
+    lastMessage: { dateSent: 0, text: '', userId: 0 },
     ownerId: '',
     photo: '',
     type: 0,

package/src/Data/source/remote/Mapper/DialogDTOMapper.ts

@@ -8,6 +8,10 @@ import {
   UNEXPECTED_MAPPER_DTO_EXCEPTION_EXCEPTION_CODE,
   UNEXPECTED_MAPPER_DTO_EXCEPTION_MESSAGE,
 } from '../../exception/MapperDTOException';
+import {
+  QBChatDialogType,
+  QBUIKitChatDialog,
+} from '../../../../CommonTypes/CommonTypes';
 
 type DtoValidator<T> = {
   [key in keyof T]: (v: unknown) => v is T[key];
@@ -26,7 +30,7 @@ export class DialogDTOMapper implements IDTOMapper {
 
     DialogDTOMapper.validateDTO(dialogDTO);
 
-    const dialog: QBChatDialog = {
+    const dialog: QBUIKitChatDialog = {
       _id: dialogDTO.id,
       created_at: '',
       last_message: DialogDTOMapper.formatLastMessageText(
@@ -53,7 +57,8 @@ export class DialogDTOMapper implements IDTOMapper {
 
   // eslint-disable-next-line class-methods-use-this
   toTDO<TArg, TResult>(qbEntity: TArg): Promise<TResult> {
-    const qbDialog: QBChatDialog = qbEntity as unknown as QBChatDialog;
+    const qbDialog: QBUIKitChatDialog =
+      qbEntity as unknown as QBUIKitChatDialog;
 
     DialogDTOMapper.validateQBChatDialog(qbDialog);
 
@@ -62,11 +67,13 @@ export class DialogDTOMapper implements IDTOMapper {
     dto.id = qbDialog._id;
     dto.lastMessageId = qbDialog.last_message_id || '';
     dto.lastMessageText = qbDialog.last_message as string;
-    dto.lastMessageDateSent = qbDialog.last_message_date_sent as string;
+    dto.lastMessageDateSent = qbDialog.last_message_date_sent || 0;
     dto.lastMessageUserId =
       qbDialog.last_message_user_id === null
         ? ''
-        : qbDialog.last_message_user_id.toString();
+        : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+          qbDialog.last_message_user_id.toString();
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     dto.ownerId = qbDialog.user_id.toString();
     dto.type = qbDialog.type as number;
     dto.unreadMessageCount =
@@ -74,6 +81,7 @@ export class DialogDTOMapper implements IDTOMapper {
         ? 0
         : qbDialog.unread_messages_count;
     dto.updatedAt = qbDialog.updated_at;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     dto.participantId = qbDialog.user_id.toString();
     dto.name = qbDialog.name;
     dto.photo = qbDialog.photo === null ? '' : qbDialog.photo;
@@ -89,14 +97,17 @@ export class DialogDTOMapper implements IDTOMapper {
 
         dto.participantId = interlocutorId
           ? interlocutorId.toString()
-          : qbDialog.user_id.toString();
+          : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+            qbDialog.user_id.toString();
         dto.id = qbDialog._id;
         dto.lastMessageText = qbDialog.last_message as string;
-        dto.lastMessageDateSent = qbDialog.last_message_date_sent as string;
+        dto.lastMessageDateSent = qbDialog.last_message_date_sent || 0;
         dto.lastMessageUserId =
           qbDialog.last_message_user_id === null
             ? ''
-            : qbDialog.last_message_user_id.toString();
+            : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+              qbDialog.last_message_user_id.toString();
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         dto.ownerId = qbDialog.user_id.toString();
         dto.type = qbDialog.type;
         dto.unreadMessageCount =
@@ -108,11 +119,13 @@ export class DialogDTOMapper implements IDTOMapper {
       case DialogType.public:
         dto.id = qbDialog._id;
         dto.lastMessageText = qbDialog.last_message as string;
-        dto.lastMessageDateSent = qbDialog.last_message_date_sent as string;
+        dto.lastMessageDateSent = qbDialog.last_message_date_sent || 0;
         dto.lastMessageUserId =
           qbDialog.last_message_user_id === null
             ? ''
-            : qbDialog.last_message_user_id.toString();
+            : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+              qbDialog.last_message_user_id.toString();
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         dto.ownerId = qbDialog.user_id.toString();
         dto.type = qbDialog.type;
         dto.unreadMessageCount =
@@ -120,6 +133,7 @@ export class DialogDTOMapper implements IDTOMapper {
             ? 0
             : qbDialog.unread_messages_count;
         dto.updatedAt = qbDialog.updated_at;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         dto.participantId = qbDialog.user_id.toString();
         dto.name = qbDialog.name;
         dto.photo = qbDialog.photo === null ? '' : qbDialog.photo;
@@ -127,11 +141,13 @@ export class DialogDTOMapper implements IDTOMapper {
       case DialogType.group:
         dto.id = qbDialog._id;
         dto.lastMessageText = qbDialog.last_message as string;
-        dto.lastMessageDateSent = qbDialog.last_message_date_sent as string;
+        dto.lastMessageDateSent = qbDialog.last_message_date_sent || 0;
         dto.lastMessageUserId =
           qbDialog.last_message_user_id === null
             ? ''
-            : qbDialog.last_message_user_id.toString();
+            : // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+              qbDialog.last_message_user_id.toString();
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         dto.ownerId = qbDialog.user_id.toString();
         dto.type = qbDialog.type;
         dto.unreadMessageCount =
@@ -282,105 +298,107 @@ export class DialogDTOMapper implements IDTOMapper {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  private static validateQBChatDialog(qbDialog: QBChatDialog) {
-    const qbDialogValidator: DtoValidator<QBChatDialog> = {
-      _id(v: unknown): v is QBChatDialog['_id'] {
-        const { _id } = v as QBChatDialog;
+  private static validateQBChatDialog(qbDialog: QBUIKitChatDialog) {
+    const qbDialogValidator: DtoValidator<QBUIKitChatDialog> = {
+      _id(v: unknown): v is QBUIKitChatDialog['_id'] {
+        const { _id } = v as QBUIKitChatDialog;
 
         return _id !== undefined && _id !== null;
       },
-      created_at(v: unknown): v is QBChatDialog['created_at'] {
-        const { created_at } = v as QBChatDialog;
+      created_at(v: unknown): v is QBUIKitChatDialog['created_at'] {
+        const { created_at } = v as QBUIKitChatDialog;
 
         return created_at !== undefined && created_at !== null;
       },
-      data(v: unknown): v is QBChatDialog['data'] {
-        const { data } = v as QBChatDialog;
+      data(v: unknown): v is QBUIKitChatDialog['data'] {
+        const { data } = v as QBUIKitChatDialog;
 
         return data !== undefined && data !== null;
       },
-      joined(v: unknown): v is QBChatDialog['joined'] {
-        const { joined } = v as QBChatDialog;
+      joined(v: unknown): v is QBUIKitChatDialog['joined'] {
+        const { joined } = v as QBUIKitChatDialog;
 
         return joined !== undefined && joined !== null;
       },
-      last_message(v: unknown): v is QBChatDialog['last_message'] {
+      last_message(v: unknown): v is QBUIKitChatDialog['last_message'] {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { last_message } = v as QBChatDialog;
+        const { last_message } = v as QBUIKitChatDialog;
 
         // return last_message !== undefined && last_message !== null;
         return true;
       },
       last_message_date_sent(
         v: unknown,
-      ): v is QBChatDialog['last_message_date_sent'] {
-        const { last_message_date_sent } = v as QBChatDialog;
+      ): v is QBUIKitChatDialog['last_message_date_sent'] {
+        const { last_message_date_sent } = v as QBUIKitChatDialog;
 
         return (
           last_message_date_sent !== undefined &&
           last_message_date_sent !== null
         );
       },
-      last_message_id(v: unknown): v is QBChatDialog['last_message_id'] {
-        const { last_message_id } = v as QBChatDialog;
+      last_message_id(v: unknown): v is QBUIKitChatDialog['last_message_id'] {
+        const { last_message_id } = v as QBUIKitChatDialog;
 
         return last_message_id !== undefined && last_message_id !== null;
       },
       last_message_user_id(
         v: unknown,
-      ): v is QBChatDialog['last_message_user_id'] {
-        const { last_message_user_id } = v as QBChatDialog;
+      ): v is QBUIKitChatDialog['last_message_user_id'] {
+        const { last_message_user_id } = v as QBUIKitChatDialog;
 
         return (
           last_message_user_id !== undefined && last_message_user_id !== null
         );
       },
-      name(v: unknown): v is QBChatDialog['name'] {
-        const { name } = v as QBChatDialog;
+      name(v: unknown): v is QBUIKitChatDialog['name'] {
+        const { name } = v as QBUIKitChatDialog;
 
         return name !== undefined && name !== null;
       },
-      occupants_ids(v: unknown): v is QBChatDialog['occupants_ids'] {
-        const { occupants_ids } = v as QBChatDialog;
+      occupants_ids(v: unknown): v is QBUIKitChatDialog['occupants_ids'] {
+        const { occupants_ids } = v as QBUIKitChatDialog;
 
         return occupants_ids !== undefined && occupants_ids !== null;
       },
-      new_occupants_ids(v: unknown): v is QBChatDialog['new_occupants_ids'] {
-        const { new_occupants_ids } = v as QBChatDialog;
+      new_occupants_ids(
+        v: unknown,
+      ): v is QBUIKitChatDialog['new_occupants_ids'] {
+        const { new_occupants_ids } = v as QBUIKitChatDialog;
 
         return new_occupants_ids !== undefined && new_occupants_ids !== null;
       },
-      photo(v: unknown): v is QBChatDialog['photo'] {
-        const { photo } = v as QBChatDialog;
+      photo(v: unknown): v is QBUIKitChatDialog['photo'] {
+        const { photo } = v as QBUIKitChatDialog;
 
         return photo !== undefined && photo !== null;
       },
-      type(v: unknown): v is QBChatDialog['type'] {
-        const { type } = v as QBChatDialog;
+      type(v: unknown): v is QBUIKitChatDialog['type'] {
+        const { type } = v as QBUIKitChatDialog;
 
         return type !== undefined && type !== null;
       },
       unread_messages_count(
         v: unknown,
-      ): v is QBChatDialog['unread_messages_count'] {
-        const { unread_messages_count } = v as QBChatDialog;
+      ): v is QBUIKitChatDialog['unread_messages_count'] {
+        const { unread_messages_count } = v as QBUIKitChatDialog;
 
         return (
           unread_messages_count !== undefined && unread_messages_count !== null
         );
       },
-      updated_at(v: unknown): v is QBChatDialog['updated_at'] {
-        const { updated_at } = v as QBChatDialog;
+      updated_at(v: unknown): v is QBUIKitChatDialog['updated_at'] {
+        const { updated_at } = v as QBUIKitChatDialog;
 
         return updated_at !== undefined && updated_at !== null;
       },
-      user_id(v: unknown): v is QBChatDialog['user_id'] {
-        const { user_id } = v as QBChatDialog;
+      user_id(v: unknown): v is QBUIKitChatDialog['user_id'] {
+        const { user_id } = v as QBUIKitChatDialog;
 
         return user_id !== undefined && user_id !== null;
       },
-      xmpp_room_jid(v: unknown): v is QBChatDialog['xmpp_room_jid'] {
-        const { xmpp_room_jid } = v as QBChatDialog;
+      xmpp_room_jid(v: unknown): v is QBUIKitChatDialog['xmpp_room_jid'] {
+        const { xmpp_room_jid } = v as QBUIKitChatDialog;
 
         return xmpp_room_jid !== undefined && xmpp_room_jid !== null;
       },

package/src/Data/source/remote/Mapper/FileDTOMapper.ts

@@ -1,3 +1,7 @@
+import QB, {
+  QBBlobCreate,
+  QBBlobCreateUploadParams,
+} from 'quickblox/quickblox';
 import { IDTOMapper } from './IDTOMapper';
 import { RemoteFileDTO } from '../../../dto/file/RemoteFileDTO';
 import {

package/src/Data/source/remote/Mapper/MessageDTOMapper.ts

@@ -1,3 +1,4 @@
+import QB, { ChatMessageAttachment, QBChatMessage } from 'quickblox/quickblox';
 import { IDTOMapper } from './IDTOMapper';
 import { RemoteMessageDTO } from '../../../dto/message/RemoteMessageDTO';
 import {

package/src/Data/source/remote/Mapper/UserDTOMapper.ts

@@ -1,3 +1,4 @@
+import { QBUser } from 'quickblox/quickblox';
 import { IDTOMapper } from './IDTOMapper';
 import { RemoteUserDTO } from '../../../dto/user/RemoteUserDTO';
 import {

package/src/Data/source/remote/RemoteDataSource.ts

@@ -1,3 +1,19 @@
+import QB, {
+  ChatMessageAttachment,
+  GetMessagesResult,
+  GetUserParams,
+  ListUserResponse,
+  QBBlobCreate,
+  QBBlobCreateUploadParams,
+  QBChatDialog,
+  QBChatMessage,
+  QBChatXMPPMessage,
+  QBGetDialogResult,
+  QBLoginParams,
+  QBSession,
+  QBSystemMessage,
+  QBUser,
+} from 'quickblox/quickblox';
 import { RemoteDialogDTO } from '../../dto/dialog/RemoteDialogDTO';
 import {
   INCORRECT_REMOTE_DATASOURCE_DATA_EXCEPTION_CODE,
@@ -59,6 +75,11 @@ import { FileDTOMapper } from './Mapper/FileDTOMapper';
 import { DialogEventInfo } from '../../../Domain/entity/DialogEventInfo';
 import { IRemoteDataSource } from './IRemoteDataSource';
 import { QBConfig } from '../../../QBconfig';
+import {
+  QBUIKitChatDialog,
+  QBUIKitChatNewMessage,
+  QBUIKitSystemMessage,
+} from '../../../CommonTypes/CommonTypes';
 
 export type PaginatedDTOResult = {
   PaginationResult: Pagination;
@@ -335,18 +356,18 @@ export class RemoteDataSource implements IRemoteDataSource {
 
   public initEventsHandlers() {
     console.log('CALL--initEventsHandlers--CALL');
-    QB.chat.onSystemMessageListener = (message) => {
+    QB.chat.onSystemMessageListener = (message: QBUIKitSystemMessage) => {
       console.log(`EVENT: receive system message: ${JSON.stringify(message)}`);
       const resultMessage = new RemoteMessageDTO();
 
       resultMessage.sender_id = message.userId;
       resultMessage.message = message.body || 'system message';
       resultMessage.notification_type =
-        message.extension.notification_type || NotificationTypes.UPDATE_DIALOG;
+        message.extension?.notification_type || NotificationTypes.UPDATE_DIALOG;
       resultMessage.dialogId = message?.extension?.dialog_id || '';
 
       this.subscriptionOnSystemMessages[
-        resultMessage.notification_type
+        resultMessage.notification_type!
       ].informSubscribers(resultMessage, EventMessageType.SystemMessage);
     };
 
@@ -821,7 +842,7 @@ export class RemoteDataSource implements IRemoteDataSource {
   }
 
   async updateDialog(dto: RemoteDialogDTO): Promise<RemoteDialogDTO> {
-    const qbEntity: QBChatDialog =
+    const qbEntity: QBUIKitChatDialog =
       await this.getCurrentDialogDTOMapper().fromDTO(dto);
 
     let data = {};
@@ -847,7 +868,10 @@ export class RemoteDataSource implements IRemoteDataSource {
       };
     }
 
-    const qbDialogs: QBChatDialog = await QBUpdateDialog(qbEntity._id, data);
+    const qbDialogs: QBUIKitChatDialog = await QBUpdateDialog(
+      qbEntity._id,
+      data,
+    );
 
     if (qbDialogs === null || qbDialogs === undefined) {
       return Promise.reject(
@@ -1185,7 +1209,7 @@ export class RemoteDataSource implements IRemoteDataSource {
     //
     const messageText = dto.message;
 
-    const qbEntity: QBChatNewMessage = {
+    const qbEntity: QBUIKitChatNewMessage = {
       type: dto.dialog_type === DialogType.private ? 'chat' : 'groupchat',
       body: messageText || '',
       notification_type: dto.notification_type,
@@ -1259,10 +1283,7 @@ export class RemoteDataSource implements IRemoteDataSource {
     let qbMessages: QBSystemMessage | QBChatMessage['_id'] | undefined;
 
     if (dto.notification_type && dto.notification_type.length > 0) {
-      const systemMessage: QBSystemMessage = {
-        body: null,
-        id: '',
-        userId: this.authInformation?.userId || 0,
+      const systemMessage: { extension: QBSystemMessage['extension'] } = {
         extension: {
           notification_type: dto.notification_type,
           dialog_id: dto.dialogId,

package/src/Domain/entity/LastMessageEntity.ts

@@ -1,5 +1,5 @@
 export interface LastMessageEntity {
   text: string;
-  dateSent: string;
+  dateSent: number;
   userId: number;
 }

package/src/Presentation/Views/Dialog/useDialogViewModel.ts

@@ -407,6 +407,14 @@ export default function useDialogViewModel(
 
               return newState;
             });
+            if (dialog?.type === DialogType.private) {
+              const updDialog = { ...dialog };
+
+              updDialog.lastMessage.dateSent = messageEntity.date_sent;
+              updDialog.lastMessage.text = messageEntity.message;
+              updDialog.lastMessage.userId = messageEntity.sender_id;
+              setDialog(updDialog);
+            }
           });
         //
       })

package/src/Presentation/Views/DialogInfo/DialogInfo.tsx

@@ -430,7 +430,7 @@ const DialogInfo: React.FC<HeaderDialogsProps> = ({
                   className="dialog-info-action-wrapper-button"
                   onClick={() => onShowAllMemberClick(true)}
                   variant="outlined"
-                  disabled={dialog.ownerId !== currentUserId}
+                  disabled={disableAction}
                 >
                   See all members
                 </Button>