v0.1.4

Author: Artem-K-Koltunov

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "quickblox-react-ui-kit",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "dist/index-ui.js",
   "license": "MIT",
   "keywords": [

package.json

@@ -97,6 +97,7 @@ export class DialogRemoteDTOMapper implements IMapper {
           dialog.type,
           dialog.unreadMessageCount,
           dialog.updatedAt,
+          // interlocutorId,
           parseInt(dialog.participantId, 10),
         );
         break;

src/Data/mapper/DialogRemoteDTOMapper.ts

@@ -293,7 +293,8 @@ export class MessageRemoteDTOMapper implements IMapper {
       message(v: unknown): v is RemoteMessageDTO['message'] {
         const { message } = v as RemoteMessageDTO;
 
-        return message !== undefined && message !== null && message.length > 0;
+        return message !== undefined && message !== null;
+        // && message.length > 0;
       },
       read(v: unknown): v is RemoteMessageDTO['read'] {
         const { read } = v as RemoteMessageDTO;

src/Data/mapper/MessageRemoteDTOMapper.ts

@@ -14,6 +14,12 @@ type DtoValidator<T> = {
 };
 
 export class DialogDTOMapper implements IDTOMapper {
+  private readonly currentUserId: number;
+
+  constructor(currentUserId: number) {
+    this.currentUserId = currentUserId;
+  }
+
   // eslint-disable-next-line class-methods-use-this
   fromDTO<TArg, TResult>(dto: TArg): Promise<TResult> {
     const dialogDTO: RemoteDialogDTO = dto as unknown as RemoteDialogDTO;
@@ -74,6 +80,14 @@ export class DialogDTOMapper implements IDTOMapper {
 
     switch (qbDialog.type) {
       case DialogType.private:
+        // eslint-disable-next-line no-case-declarations
+        const interlocutorId = dto.participantsIds.find(
+          (p) => p !== this.currentUserId,
+        ); // ;
+
+        dto.participantId = interlocutorId
+          ? interlocutorId.toString()
+          : qbDialog.user_id.toString();
         dto.id = qbDialog._id;
         dto.lastMessageText = qbDialog.last_message as string;
         dto.lastMessageDateSent = qbDialog.last_message_date_sent as string;