@viewberapp/chat 0.0.102 → 0.0.104

package/dist/API.d.ts

@@ -36,18 +36,7 @@ export interface GetUserChatUnreadMessageCountParams {
     appointmentIsConfirmedForViewing?: boolean;
 }
 export declare type StoreMessageReturnValue = {
-    message: {
-        id: number;
-        chat_id: number;
-        message: string;
-        sender_id: number;
-        sender: {
-            id: number;
-            first_name: string;
-        };
-        is_admin_message: boolean;
-        created_at: string;
-    };
+    message: Message;
     error?: undefined;
 } | {
     message?: undefined;

package/dist/API.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
-const cuid_1 = __importDefault(require("cuid"));
 const Message_1 = __importDefault(require("./Message"));
 class API {
     constructor(params) {
@@ -82,18 +81,15 @@ class API {
             }).then(response => {
                 this.debugApiResponse('storeMessage', response);
                 resolve({
-                    message: {
+                    message: new Message_1.default({
                         id: response.data.data.id,
-                        chat_id: response.data.data.chat_id,
+                        chatId: response.data.data.chat_id,
                         message: response.data.data.message,
-                        sender_id: response.data.data.sender_id,
-                        sender: {
-                            id: response.data.data.sender.id,
-                            first_name: response.data.data.sender.first_name
-                        },
-                        is_admin_message: response.data.data.is_admin_message,
-                        created_at: response.data.data.created_at
-                    }
+                        senderId: response.data.data.sender_id,
+                        sender: response.data.data.sender,
+                        isAdminMessage: response.data.data.is_admin_message,
+                        createdAt: new Date(response.data.data.created_at),
+                    })
                 });
             }).catch(err => {
                 var _a, _b, _c, _d, _e;
@@ -120,10 +116,8 @@ class API {
                 resolve({
                     messages: response.data.data.map((m) => new Message_1.default({
                         id: m.id,
-                        clientId: (0, cuid_1.default)(),
                         chatId: m.chat_id,
                         message: m.message,
-                        status: 'sent',
                         senderId: m.sender_id,
                         sender: m.sender,
                         isAdminMessage: m.is_admin_message,
@@ -171,9 +165,6 @@ class API {
             });
         });
         this.markChatMessagesReadUpTo = (chatId, message) => new Promise((resolve, reject) => {
-            if (!message.id) {
-                return resolve({ error: undefined });
-            }
             this.axios.post(this.markChatMessagesReadUpToRoute(chatId, message.id), undefined, {
                 headers: this.constructHeaders(),
             }).then(response => {

package/dist/API.js.map

@@ -1 +1 @@
-{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":"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"}

package/dist/CachedChat.d.ts

@@ -1,11 +1,12 @@
 import Ably from 'ably';
 import API from "./API";
 import { Logger } from "./logger";
-import ChatError from './ChatError';
 import OnlineUser from "./OnlineUser";
-import Message from "./Message";
 import { ChannelStatus, ConnectionStatus, DebugOptions } from './Chat';
+import PendingMessage from "./PendingMessage";
+import Message from "./Message";
 import ChatSubscription from "./ChatSubscription";
+import ChatError from './ChatError';
 export interface CachedChatParams {
     id: number;
     api: API;
@@ -18,7 +19,7 @@ export interface CachedChatParams {
 export interface SendMessageOptions {
     isAdminMessage: boolean;
 }
-export declare type Messages = Message[];
+export declare type Messages = (Message | PendingMessage)[];
 export declare type GetLatestMessagesStatus = 'initialized' | 'fetching' | 'success' | 'failed';
 export default class CachedChat {
     private id;
@@ -35,13 +36,14 @@ export default class CachedChat {
     private debug;
     constructor({ id, api, channel, connectionStatus, logger, debugLogger, debug }: CachedChatParams);
     sendMessage(message: string, options?: SendMessageOptions): Promise<void>;
-    sendPendingMessage(pendingMessage: Message): Promise<void>;
+    sendPendingMessage(pendingMessage: PendingMessage): Promise<void>;
     getLatestMessages(): void;
     markMessagesReadUpTo(message: Message): Promise<{
         error: ChatError | undefined;
     }>;
-    addMessage(message: Message): void;
-    private updateMessage;
+    addMessage(message: Message | PendingMessage): void;
+    private replacePendingMessage;
+    private updatePendingMessageStatus;
     addSubscription(subscription: ChatSubscription): void;
     getConnectionStatus(): ConnectionStatus;
     setConnectionStatus(status: ConnectionStatus): void;

package/dist/CachedChat.js

@@ -1,11 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cuid_1 = __importDefault(require("cuid"));
-const util_1 = require("./util");
-const Message_1 = __importDefault(require("./Message"));
+const uuid_1 = require("uuid");
+const PendingMessage_1 = __importStar(require("./PendingMessage"));
+const Message_1 = __importStar(require("./Message"));
 class CachedChat {
     constructor({ id, api, channel, connectionStatus, logger, debugLogger, debug }) {
         this.getLatestMessagesStatus = 'initialized';
@@ -29,10 +49,8 @@ class CachedChat {
             if (message.name === 'chat.message.created') {
                 this.addMessage(new Message_1.default({
                     id: message.data.id,
-                    clientId: (0, cuid_1.default)(),
                     chatId: message.data.chat_id,
                     message: message.data.message,
-                    status: 'sent',
                     senderId: message.data.sender_id,
                     sender: message.data.sender,
                     isAdminMessage: message.data.is_admin_message,
@@ -44,15 +62,11 @@ class CachedChat {
     }
     sendMessage(message, options) {
         return new Promise((resolve, reject) => {
-            const pendingMessage = new Message_1.default({
-                id: undefined,
-                clientId: (0, cuid_1.default)(),
-                chatId: this.id,
+            const pendingMessage = new PendingMessage_1.default({
+                id: (0, uuid_1.v4)(),
                 message,
                 status: 'initialized',
-                senderId: undefined,
-                sender: undefined,
-                isAdminMessage: (options === null || options === void 0 ? void 0 : options.isAdminMessage) || false,
+                options,
                 createdAt: new Date
             });
             this.addMessage(pendingMessage);
@@ -64,41 +78,22 @@ class CachedChat {
     }
     sendPendingMessage(pendingMessage) {
         return new Promise((resolve, reject) => {
-            if (!pendingMessage.isPendingMessage || pendingMessage.status === 'pending') {
+            if (!(0, PendingMessage_1.isPendingMessage)(pendingMessage) || pendingMessage.status === 'pending') {
                 return resolve();
             }
-            this.updateMessage(pendingMessage, {
-                status: 'pending'
-            });
+            this.updatePendingMessageStatus(pendingMessage, 'pending');
             this.fireMessagesEventOnEachNonCancelledSubscription();
-            this.api.storeMessage(this.id, pendingMessage.message, {
-                isAdminMessage: pendingMessage.isAdminMessage
-            }).then(({ message, error }) => {
+            this.api.storeMessage(this.id, pendingMessage.message, pendingMessage.options).then(({ message, error }) => {
                 if (error) {
-                    this.updateMessage(pendingMessage, {
-                        status: 'failed'
-                    });
+                    this.updatePendingMessageStatus(pendingMessage, 'failed');
                     this.fireMessagesEventOnEachNonCancelledSubscription();
                     return reject(new Error(error.message));
                 }
-                this.updateMessage(pendingMessage, {
-                    id: message.id,
-                    chatId: message.chat_id,
-                    message: message.message,
-                    status: 'sent',
-                    senderId: message.sender_id,
-                    sender: {
-                        first_name: message.sender.first_name
-                    },
-                    isAdminMessage: message.is_admin_message,
-                    createdAt: new Date(message.created_at)
-                });
+                this.replacePendingMessage(pendingMessage, message);
                 this.fireMessagesEventOnEachNonCancelledSubscription();
                 resolve();
             }).catch(err => {
-                this.updateMessage(pendingMessage, {
-                    status: 'failed'
-                });
+                this.updatePendingMessageStatus(pendingMessage, 'failed');
                 this.fireMessagesEventOnEachNonCancelledSubscription();
                 reject(err);
             });
@@ -122,22 +117,16 @@ class CachedChat {
         return this.api.markChatMessagesReadUpTo(this.id, message);
     }
     addMessage(message) {
-        if (message.isPendingMessage) {
+        if (message instanceof PendingMessage_1.default) {
             this.messages.push(message);
             return;
         }
         let index = -1;
         for (let i = (this.messages.length - 1); i >= 0; i--) {
-            let iteratedMessage = this.messages[i];
-            if (!(0, util_1.isNil)(message.id)
-                && !(0, util_1.isNil)(iteratedMessage.id)
-                && iteratedMessage.id < message.id
-                && index === -1) {
+            if ((0, Message_1.isMessageAnd)(this.messages[i], m => m.id < message.id) && index === -1) {
                 index = i;
             }
-            if (!(0, util_1.isNil)(message.id)
-                && !(0, util_1.isNil)(iteratedMessage.id)
-                && message.id === iteratedMessage.id) {
+            if ((0, Message_1.isMessageAnd)(this.messages[i], m => m.id === message.id)) {
                 return;
             }
         }
@@ -150,10 +139,16 @@ class CachedChat {
             this.messages = this.messages.concat([]);
         }
     }
-    updateMessage(message, newValues) {
+    replacePendingMessage(pendingMessage, message) {
+        this.messages = this.messages.filter((m) => {
+            return m.id !== pendingMessage.id;
+        });
+        this.addMessage(message);
+    }
+    updatePendingMessageStatus(pendingMessage, status) {
         this.messages = this.messages.map((m) => {
-            if (m.clientId === message.clientId) {
-                return m.clone(newValues);
+            if ((0, PendingMessage_1.isPendingMessage)(m) && m.id === pendingMessage.id) {
+                return m.clone({ status });
             }
             return m;
         });

package/dist/CachedChat.js.map

@@ -1 +1 @@
-{"version":3,"file":"CachedChat.js","sourceRoot":"","sources":["../src/CachedChat.ts"],"names":[],"mappings":";;;;;AACA,gDAAwB;AAExB,iCAA+B;AAI/B,wDAA2D;AA2B3D,MAAqB,UAAU;IAc3B,YAAY,EACR,EAAE,EACF,GAAG,EACH,OAAO,EACP,gBAAgB,EAChB,MAAM,EACN,WAAW,EACX,KAAK,EACU;QAbX,4BAAuB,GAA4B,aAAa,CAAC;QAcrE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACxC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1D,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAA2B,EAAE,EAAE;;YAEnD,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,mBAAmB,EAAE;gBACjC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;aAC9D;YAED,IAAI,OAAO,CAAC,IAAI,KAAK,sBAAsB,EAAE;gBACzC,IAAI,CAAC,UAAU,CAAC,IAAI,iBAAO,CAAC;oBACxB,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;oBACnB,QAAQ,EAAE,IAAA,cAAI,GAAE;oBAChB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO;oBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO;oBAC7B,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS;oBAChC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM;oBAC3B,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,gBAAgB;oBAC7C,SAAS,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;iBAC/C,CAAC,CAAC,CAAC;gBACJ,IAAI,CAAC,+CAA+C,EAAE,CAAC;aAC1D;QACL,CAAC,CAAC,CAAC;IAkFP,CAAC;IAED,WAAW,CAAC,OAAe,EAAE,OAA4B;QACrD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAEnC,MAAM,cAAc,GAAG,IAAI,iBAAO,CAAC;gBAC/B,EAAE,EAAE,SAAS;gBACb,QAAQ,EAAE,IAAA,cAAI,GAAE;gBAChB,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,OAAO;gBACP,MAAM,EAAE,aAAa;gBACrB,QAAQ,EAAE,SAAS;gBACnB,MAAM,EAAE,SAAS;gBACjB,cAAc,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,KAAI,KAAK;gBAChD,SAAS,EAAE,IAAI,IAAI;aACtB,CAAC,CAAC;YAGH,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAGhC,IAAI,CAAC,+CAA+C,EAAE,CAAC;YAGvD,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC;iBAClC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;iBACrB,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,kBAAkB,CAAC,cAAuB;QACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAInC,IAAI,CAAC,cAAc,CAAC,gBAAgB,IAAI,cAAc,CAAC,MAAM,KAAK,SAAS,EAAE;gBACzE,OAAO,OAAO,EAAE,CAAC;aACpB;YAID,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE;gBAC/B,MAAM,EAAE,SAAS;aACpB,CAAC,CAAC;YACH,IAAI,CAAC,+CAA+C,EAAE,CAAC;YAGvD,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,EAAE;gBACnD,cAAc,EAAE,cAAc,CAAC,cAAc;aAChD,CAAC,CAAC,IAAI,CAAC,CAAC,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,EAAE;gBAEzB,IAAI,KAAK,EAAE;oBACP,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE;wBAC/B,MAAM,EAAE,QAAQ;qBACnB,CAAC,CAAC;oBACH,IAAI,CAAC,+CAA+C,EAAE,CAAC;oBACvD,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC3C;gBAGD,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE;oBAC/B,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,MAAM,EAAE,OAAO,CAAC,OAAO;oBACvB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,OAAO,CAAC,SAAS;oBAC3B,MAAM,EAAE;wBACJ,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU;qBACxC;oBACD,cAAc,EAAE,OAAO,CAAC,gBAAgB;oBACxC,SAAS,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;iBAC1C,CAAC,CAAC;gBAGH,IAAI,CAAC,+CAA+C,EAAE,CAAC;gBAGvD,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACX,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE;oBAC/B,MAAM,EAAE,QAAQ;iBACnB,CAAC,CAAC;gBACH,IAAI,CAAC,+CAA+C,EAAE,CAAC;gBACvD,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iBAAiB;QAEb,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;QAG5C,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,EAAE;YAE3D,IAAI,QAAQ,EAAE;gBAEV,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;gBAG1C,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;gBAG3C,IAAI,CAAC,+CAA+C,EAAE,CAAC;gBAGvD,OAAO;aACV;YAGD,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAEX,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACP,CAAC;IAED,oBAAoB,CAAC,OAAgB;QACjC,OAAO,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAMD,UAAU,CAAC,OAAgB;QAIvB,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO;SACV;QAID,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;QAGf,KAAI,IAAI,CAAC,GAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,IAAE,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7C,IAAI,eAAe,GAAY,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAKhD,IACI,CAAC,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE,CAAC;mBACf,CAAC,IAAA,YAAK,EAAC,eAAe,CAAC,EAAE,CAAC;mBAC1B,eAAe,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE;mBAC/B,KAAK,KAAK,CAAC,CAAC,EACjB;gBACE,KAAK,GAAG,CAAC,CAAC;aACb;YAGD,IACI,CAAC,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE,CAAC;mBACf,CAAC,IAAA,YAAK,EAAC,eAAe,CAAC,EAAE,CAAC;mBAC1B,OAAO,CAAC,EAAE,KAAK,eAAe,CAAC,EAAE,EACtC;gBACE,OAAO;aACV;SACJ;QAGD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAQd,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SAC5C;aAAM;YAOH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SAC5C;IACL,CAAC;IAQO,aAAa,CAAC,OAAgB,EAAE,SASvC;QACG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE;YAO7C,IAAI,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,EAAE;gBACjC,OAAO,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;aAC5B;YACD,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;IACP,CAAC;IAED,eAAe,CAAC,YAA8B;QAC1C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,mBAAmB;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,MAAwB;QAExC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAG/B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACtC,IAAI,YAAY,CAAC,SAAS,EAAE,KAAK,WAAW,EAAE;gBAC1C,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aAC3D;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEO,wBAAwB,CAAC,WAA0C;QAEvE,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC;QAGzC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACtC,IAAI,YAAY,CAAC,SAAS,EAAE,KAAK,WAAW,EAAE;gBAC1C,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACrD;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,0BAA0B;QACtB,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACxC,CAAC;IAED,0BAA0B,CAAC,MAA+B;QAEtD,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC;QAGtC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACtC,IAAI,YAAY,CAAC,SAAS,EAAE,KAAK,WAAW,EAAE;gBAC1C,YAAY,CAAC,0BAA0B,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;aACzE;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,QAAkC;QAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAEO,+CAA+C;QACnD,IAAI,CAAC,2BAA2B,CAAC,UAAU,EAAE;YAGzC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;SACnC,EAAE;YACC,gBAAgB,EAAE,CAAC,WAAW,CAAC;SAClC,CAAC,CAAC;IACP,CAAC;IAEO,2BAA2B,CAC/B,IAAW,EACX,IAA8C,EAC9C,OAEC;QAED,KAAK,IAAI,CAAC,GAAC,CAAC,EAAC,EAAE,GAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,GAAC,EAAE,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YAG3C,IAAI,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,EAAE;gBACnH,SAAS;aACZ;YAED,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACtC;IACL,CAAC;IAED,kBAAkB,CAAC,YAA8B;QAC7C,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED,sBAAsB;QAClB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACtC,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAlcD,6BAkcC"}
+{"version":3,"file":"CachedChat.js","sourceRoot":"","sources":["../src/CachedChat.ts"],"names":[],"mappings":"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"}

package/dist/ChatSubscription.d.ts

@@ -3,6 +3,7 @@ import ChatError from "./ChatError";
 import OnlineUser from "./OnlineUser";
 import { ConnectionStatus, ChannelStatus } from "./Chat";
 import CachedChat, { GetLatestMessagesStatus, Messages, SendMessageOptions } from "./CachedChat";
+import PendingMessage from "./PendingMessage";
 export declare type ChatSubscriptionStatus = 'active' | 'cancelled';
 export interface ChatSubscriptionOptions {
     status: ChatSubscriptionStatus;
@@ -63,7 +64,7 @@ export default class ChatSubscription {
     getGetLatestMessagesStatus(): GetLatestMessagesStatus;
     setGetLatestMessagesStatus(status: GetLatestMessagesStatus): void;
     sendMessage(message: string, options?: SendMessageOptions): Promise<any>;
-    sendPendingMessage(pendingMessage: Message): Promise<any>;
+    sendPendingMessage(pendingMessage: PendingMessage): Promise<any>;
     getLatestMessages(): void;
     markMessagesReadUpTo(message: Message): Promise<{
         error?: ChatError | undefined;

package/dist/ChatSubscription.js

@@ -69,7 +69,7 @@ class ChatSubscription {
             if (!messages.length) {
                 return resolve({});
             }
-            let latestMessage = (0, util_1.getLatestMessageThatHasId)(messages);
+            let latestMessage = (0, util_1.getLatestMessage)(messages);
             if ((0, util_1.isNil)(latestMessage)) {
                 return resolve({});
             }

package/dist/ChatSubscription.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChatSubscription.js","sourceRoot":"","sources":["../src/ChatSubscription.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChatSubscription.js","sourceRoot":"","sources":["../src/ChatSubscription.ts"],"names":[],"mappings":";;AAIA,iCAAiD;AAqDjD,MAAqB,gBAAgB;IASjC,YAAY,IAAgB,EAAE,OAAgC;QAFtD,kCAA6B,GAAqB,SAAS,CAAC;QAGhE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC;QAC/D,IAAI,CAAC,aAAa,GAAG;YACjB,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,EAAE;YACf,WAAW,EAAE,EAAE;YACf,YAAY,EAAE,EAAE;YAChB,mBAAmB,EAAE,EAAE;YACvB,sBAAsB,EAAE,EAAE;YAC1B,6BAA6B,EAAE,EAAE;SACpC,CAAC;IACN,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,MAA8B;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;IAC7C,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,gBAAgB,CAAC,MAAqB;QAClC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;IACpD,CAAC;IAED,mBAAmB;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,MAAwB;QACxC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED,0BAA0B;QACtB,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACxC,CAAC;IAED,0BAA0B,CAAC,MAA+B;QACtD,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,+BAA+B,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;IAC9D,CAAC;IAED,WAAW,CAAC,OAAe,EAAE,OAA4B;QACrD,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,kBAAkB,CAAC,cAA8B;QAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;IACxD,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACzC,CAAC;IAED,oBAAoB,CAAC,OAAgB;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,uBAAuB;QACnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;YAGpC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;gBAClB,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;aACtB;YAGD,IAAI,aAAa,GAAG,IAAA,uBAAgB,EAAC,QAAQ,CAAC,CAAC;YAG/C,IAAI,IAAA,YAAK,EAAC,aAAa,CAAC,EAAE;gBACtB,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;aACtB;YAMD,IAAI,CAAC,IAAA,YAAK,EAAC,IAAI,CAAC,6BAA6B,CAAC,IAAI,IAAI,CAAC,6BAA6B,GAAG,aAAa,CAAC,EAAE,CAAC,EAAE;gBACtG,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACnD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;wBACf,IAAI,CAAC,6BAA6B,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,EAAE,CAAC;wBACvD,OAAO,CAAC,EAAE,CAAC,CAAC;wBACZ,OAAO;qBACV;oBACD,OAAO,CAAC,EAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAC,CAAC,CAAA;gBAClC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBACX,OAAO,CAAC,EAAC,KAAK,EAAE;4BACZ,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,GAAG;yBACb,EAAC,CAAC,CAAC;gBACR,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,OAAO,CAAC,EAAE,CAAC,CAAC;aACf;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,EAAE,CAAoD,KAAY,EAAE,OAA6C;QAC7G,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,GAAG,CAAoD,KAAY,EAAE,OAA6C;QAC9G,IAAI,gBAAgB,GAA8C,EAAE,CAAC;QAIrE,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACtE,IAAI,CAAC,KAAK,OAAO,EAAE;gBACf,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAErB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS,CAAoD,IAAW,EAAE,IAA8C;QACpH,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACvC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM;QACF,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACJ;AA1JD,mCA0JC"}

package/dist/Message.d.ts

@@ -1,31 +1,25 @@
 export interface Sender {
     first_name: string;
 }
-export declare type MessageStatus = 'initialized' | 'pending' | 'failed' | 'sent';
 export default class Message {
-    readonly id: number | undefined;
-    readonly clientId: string;
+    readonly id: number;
     readonly chatId: number;
     readonly message: string;
-    readonly status: MessageStatus;
-    readonly senderId: number | undefined;
-    readonly sender: Sender | undefined;
+    readonly senderId: number;
+    readonly sender: Sender;
     readonly isAdminMessage: boolean;
     readonly createdAt: Date;
-    constructor({ id, clientId, chatId, message, status, senderId, sender, isAdminMessage, createdAt }: {
-        id: number | undefined;
-        clientId: string;
+    constructor({ id, chatId, message, senderId, sender, isAdminMessage, createdAt }: {
+        id: number;
         chatId: number;
         message: string;
-        status: MessageStatus;
-        senderId: number | undefined;
-        sender: Sender | undefined;
+        senderId: number;
+        sender: Sender;
         isAdminMessage: boolean;
         createdAt: Date;
     });
     get isPendingMessage(): boolean;
-    clone(params: {
-        message?: string;
-        status?: MessageStatus;
-    }): Message;
 }
+export declare const isMessage: (m: unknown) => m is Message;
+export declare const isMessageAnd: (m: unknown, then: (m: Message) => boolean) => boolean;
+export declare const isMessageThen: (m: unknown, then: (m: Message) => void) => void;

package/dist/Message.js

@@ -1,24 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("./util");
+exports.isMessageThen = exports.isMessageAnd = exports.isMessage = void 0;
 class Message {
-    constructor({ id, clientId, chatId, message, status, senderId, sender, isAdminMessage, createdAt }) {
+    constructor({ id, chatId, message, senderId, sender, isAdminMessage, createdAt }) {
         this.id = id;
-        this.clientId = clientId;
         this.chatId = chatId;
         this.message = message;
-        this.status = status;
         this.senderId = senderId;
         this.sender = sender;
         this.isAdminMessage = isAdminMessage;
         this.createdAt = createdAt;
     }
     get isPendingMessage() {
-        return (0, util_1.isNil)(this.id);
-    }
-    clone(params) {
-        return new Message(Object.assign({ id: this.id, clientId: this.clientId, chatId: this.chatId, message: this.message, status: this.status, senderId: this.senderId, sender: this.sender, isAdminMessage: this.isAdminMessage, createdAt: this.createdAt }, params));
+        return false;
     }
 }
 exports.default = Message;
+const isMessage = (m) => {
+    return m instanceof Message;
+};
+exports.isMessage = isMessage;
+const isMessageAnd = (m, then) => {
+    if ((0, exports.isMessage)(m)) {
+        return then(m);
+    }
+    return false;
+};
+exports.isMessageAnd = isMessageAnd;
+const isMessageThen = (m, then) => {
+    if ((0, exports.isMessage)(m)) {
+        then(m);
+    }
+};
+exports.isMessageThen = isMessageThen;
 //# sourceMappingURL=Message.js.map

package/dist/Message.js.map

@@ -1 +1 @@
-{"version":3,"file":"Message.js","sourceRoot":"","sources":["../src/Message.ts"],"names":[],"mappings":";;AAAA,iCAA+B;AAwB/B,MAAqB,OAAO;IAWxB,YAAY,EACR,EAAE,EACF,QAAQ,EACR,MAAM,EACN,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,EACN,cAAc,EACd,SAAS,EAWZ;QACG,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,IAAW,gBAAgB;QACvB,OAAO,IAAA,YAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;IAQO,KAAK,CAAC,MAGb;QACG,OAAO,IAAI,OAAO,iBACd,EAAE,EAAE,IAAI,CAAC,EAAE,EACX,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,cAAc,EAAE,IAAI,CAAC,cAAc,EACnC,SAAS,EAAE,IAAI,CAAC,SAAS,IACtB,MAAM,EACX,CAAA;IACN,CAAC;CACJ;AAtED,0BAsEC"}
+{"version":3,"file":"Message.js","sourceRoot":"","sources":["../src/Message.ts"],"names":[],"mappings":";;;AAIA,MAAqB,OAAO;IASxB,YAAY,EACR,EAAE,EACF,MAAM,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,cAAc,EACd,SAAS,EASZ;QACG,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,IAAW,gBAAgB;QACvB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAtCD,0BAsCC;AAEM,MAAM,SAAS,GAAG,CAAC,CAAU,EAAgB,EAAE;IAClD,OAAO,CAAC,YAAY,OAAO,CAAC;AAChC,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB;AAEM,MAAM,YAAY,GAAG,CAAC,CAAU,EAAE,IAA6B,EAAW,EAAE;IAC/E,IAAI,IAAA,iBAAS,EAAC,CAAC,CAAC,EAAE;QACd,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;KAClB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AALY,QAAA,YAAY,gBAKxB;AAEM,MAAM,aAAa,GAAG,CAAC,CAAU,EAAE,IAA0B,EAAQ,EAAE;IAC1E,IAAI,IAAA,iBAAS,EAAC,CAAC,CAAC,EAAE;QACd,IAAI,CAAC,CAAC,CAAC,CAAC;KACX;AACL,CAAC,CAAA;AAJY,QAAA,aAAa,iBAIzB"}

package/dist/index.d.ts

@@ -4,5 +4,5 @@ import useAppointmentChat from "./react/useAppointmentChat";
 import { useRealtimeTotalUserUnreadChatMessages } from "./react/useRealtimeTotalUserUnreadChatMessages";
 export { ConsoleLogger, RollbarLogger, NullLogger } from './logger';
 export { Message, MessageRow, MessageList, AdminMessage, ConnectionAndChannelStatusLabel } from './react';
-export { isNil, getLatestMessageThatHasId } from './util';
+export { isNil, getLatestMessage } from './util';
 export { Chat, useChat, useAppointmentChat, useRealtimeTotalUserUnreadChatMessages };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useRealtimeTotalUserUnreadChatMessages = exports.useAppointmentChat = exports.useChat = exports.Chat = exports.getLatestMessageThatHasId = exports.isNil = exports.ConnectionAndChannelStatusLabel = exports.AdminMessage = exports.MessageList = exports.MessageRow = exports.Message = exports.NullLogger = exports.RollbarLogger = exports.ConsoleLogger = void 0;
+exports.useRealtimeTotalUserUnreadChatMessages = exports.useAppointmentChat = exports.useChat = exports.Chat = exports.getLatestMessage = exports.isNil = exports.ConnectionAndChannelStatusLabel = exports.AdminMessage = exports.MessageList = exports.MessageRow = exports.Message = exports.NullLogger = exports.RollbarLogger = exports.ConsoleLogger = void 0;
 const Chat_1 = __importDefault(require("./Chat"));
 exports.Chat = Chat_1.default;
 const useChat_1 = __importDefault(require("./react/useChat"));
@@ -24,5 +24,5 @@ Object.defineProperty(exports, "AdminMessage", { enumerable: true, get: function
 Object.defineProperty(exports, "ConnectionAndChannelStatusLabel", { enumerable: true, get: function () { return react_1.ConnectionAndChannelStatusLabel; } });
 var util_1 = require("./util");
 Object.defineProperty(exports, "isNil", { enumerable: true, get: function () { return util_1.isNil; } });
-Object.defineProperty(exports, "getLatestMessageThatHasId", { enumerable: true, get: function () { return util_1.getLatestMessageThatHasId; } });
+Object.defineProperty(exports, "getLatestMessage", { enumerable: true, get: function () { return util_1.getLatestMessage; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AACb,kDAA0B;AAyBtB,eAzBG,cAAI,CAyBH;AAxBR,8DAAsC;AAyBlC,kBAzBG,iBAAO,CAyBH;AAxBX,oFAA4D;AAyBxD,6BAzBG,4BAAkB,CAyBH;AAxBtB,2GAAwG;AAyBpG,uHAzBK,+EAAsC,OAyBL;AAvB1C,mCAIkB;AAHd,uGAAA,aAAa,OAAA;AACb,uGAAA,aAAa,OAAA;AACb,oGAAA,UAAU,OAAA;AAGd,iCAMiB;AALb,gGAAA,OAAO,OAAA;AACP,mGAAA,UAAU,OAAA;AACV,oGAAA,WAAW,OAAA;AACX,qGAAA,YAAY,OAAA;AACZ,wHAAA,+BAA+B,OAAA;AAGnC,+BAGgB;AAFZ,6FAAA,KAAK,OAAA;AACL,iHAAA,yBAAyB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AACb,kDAA0B;AAyBtB,eAzBG,cAAI,CAyBH;AAxBR,8DAAsC;AAyBlC,kBAzBG,iBAAO,CAyBH;AAxBX,oFAA4D;AAyBxD,6BAzBG,4BAAkB,CAyBH;AAxBtB,2GAAwG;AAyBpG,uHAzBK,+EAAsC,OAyBL;AAvB1C,mCAIkB;AAHd,uGAAA,aAAa,OAAA;AACb,uGAAA,aAAa,OAAA;AACb,oGAAA,UAAU,OAAA;AAGd,iCAMiB;AALb,gGAAA,OAAO,OAAA;AACP,mGAAA,UAAU,OAAA;AACV,oGAAA,WAAW,OAAA;AACX,qGAAA,YAAY,OAAA;AACZ,wHAAA,+BAA+B,OAAA;AAGnC,+BAGgB;AAFZ,6FAAA,KAAK,OAAA;AACL,wGAAA,gBAAgB,OAAA"}

package/dist/react/components/AdminMessage.js

@@ -52,9 +52,7 @@ const AdminMessage = ({ message }) => {
     };
     return (React.createElement("div", { style: containerStyles },
         React.createElement("div", { style: messageStyles, onClick: () => setDateTimeIsShowing(!dateTimeIsShowing) },
-            React.createElement("div", { style: senderLabelStyles }, message.sender
-                ? (message.sender.first_name + '@viewber')
-                : 'viewber'),
+            React.createElement("div", { style: senderLabelStyles }, message.sender.first_name + '@viewber'),
             React.createElement("div", { style: messageContentStyles }, message.message)),
         dateTimeIsShowing && React.createElement(MessageDateTime_1.MessageDateTime, { date: message.createdAt, style: { display: 'block' } })));
 };

package/dist/react/components/AdminMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdminMessage.js","sourceRoot":"","sources":["../../../src/react/components/AdminMessage.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,uDAAoD;AAM7C,MAAM,YAAY,GAAG,CAAC,EAAC,OAAO,EAAoB,EAAE,EAAE;IACzD,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEjF,MAAM,eAAe,GAAwB;QACzC,OAAO,EAAE,cAAc;QACvB,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,iBAAiB;KAC5B,CAAA;IAED,MAAM,aAAa,GAAwB;QACvC,YAAY,EAAE,UAAU;QACxB,MAAM,EAAE,gBAAgB;QACxB,KAAK,EAAE,MAAM;KAChB,CAAC;IAEF,MAAM,iBAAiB,GAAwB;QAC3C,eAAe,EAAE,SAAS;QAC1B,KAAK,EAAE,MAAM;QACb,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,SAAS;QACnB,mBAAmB,EAAE,UAAU;QAC/B,oBAAoB,EAAE,UAAU;KACnC,CAAA;IAED,MAAM,oBAAoB,GAAwB;QAC9C,OAAO,EAAE,cAAc;KAC1B,CAAA;IAED,OAAO,CACH,6BAAK,KAAK,EAAE,eAAe;QACvB,6BAAK,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC,iBAAiB,CAAC;YAC9E,6BAAK,KAAK,EAAE,iBAAiB,IACxB,OAAO,CAAC,MAAM;gBACX,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;gBAC1C,CAAC,CAAC,SAAS,CAEb;YACN,6BAAK,KAAK,EAAE,oBAAoB,IAC3B,OAAO,CAAC,OAAO,CACd,CACJ;QACL,iBAAiB,IAAI,oBAAC,iCAAe,IAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,GAAI,CAC3F,CACT,CAAA;AACL,CAAC,CAAA;AA7CY,QAAA,YAAY,gBA6CxB"}
+{"version":3,"file":"AdminMessage.js","sourceRoot":"","sources":["../../../src/react/components/AdminMessage.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,uDAAoD;AAM7C,MAAM,YAAY,GAAG,CAAC,EAAC,OAAO,EAAoB,EAAE,EAAE;IACzD,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEjF,MAAM,eAAe,GAAwB;QACzC,OAAO,EAAE,cAAc;QACvB,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,iBAAiB;KAC5B,CAAA;IAED,MAAM,aAAa,GAAwB;QACvC,YAAY,EAAE,UAAU;QACxB,MAAM,EAAE,gBAAgB;QACxB,KAAK,EAAE,MAAM;KAChB,CAAC;IAEF,MAAM,iBAAiB,GAAwB;QAC3C,eAAe,EAAE,SAAS;QAC1B,KAAK,EAAE,MAAM;QACb,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,SAAS;QACnB,mBAAmB,EAAE,UAAU;QAC/B,oBAAoB,EAAE,UAAU;KACnC,CAAA;IAED,MAAM,oBAAoB,GAAwB;QAC9C,OAAO,EAAE,cAAc;KAC1B,CAAA;IAED,OAAO,CACH,6BAAK,KAAK,EAAE,eAAe;QACvB,6BAAK,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC,iBAAiB,CAAC;YAC9E,6BAAK,KAAK,EAAE,iBAAiB,IACxB,OAAO,CAAC,MAAM,CAAC,UAAU,GAAG,UAAU,CACrC;YACN,6BAAK,KAAK,EAAE,oBAAoB,IAC3B,OAAO,CAAC,OAAO,CACd,CACJ;QACL,iBAAiB,IAAI,oBAAC,iCAAe,IAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,GAAI,CAC3F,CACT,CAAA;AACL,CAAC,CAAA;AA1CY,QAAA,YAAY,gBA0CxB"}

package/dist/react/components/Message.d.ts

@@ -1,13 +1,14 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import MessageModel from "../../Message";
+import PendingMessage from '../../PendingMessage';
 export interface MessageProps {
-    message: MessageModel;
+    message: MessageModel | PendingMessage;
     isCurrentUser: boolean;
     failedPendingMessageIconClassName?: string;
     failedPendingMessageDescriptionStyles?: React.CSSProperties;
     failedPendingMessageDescriptionClassName?: string;
-    onFailedPendingMessageClick?: (pendingMessage: MessageModel) => void;
+    onFailedPendingMessageClick?: (pendingMessage: PendingMessage) => void;
 }
 export declare const Message: {
     ({ message, isCurrentUser, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick }: MessageProps): JSX.Element;

package/dist/react/components/Message.js

@@ -29,11 +29,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = void 0;
 const React = __importStar(require("react"));
 const prop_types_1 = __importDefault(require("prop-types"));
+const PendingMessage_1 = require("../../PendingMessage");
 const MessageDateTime_1 = require("./MessageDateTime");
 const util_1 = require("../../util");
 const Message = ({ message, isCurrentUser, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick }) => {
     const [dateTimeIsShowing, setDateTimeIsShowing] = React.useState(false);
-    const isFailedPendingMessage = (message.isPendingMessage
+    const isFailedPendingMessage = ((0, PendingMessage_1.isPendingMessage)(message)
         && message.status === 'failed');
     const handleMessageClick = () => {
         if (!isFailedPendingMessage) {

package/dist/react/components/Message.js.map

@@ -1 +1 @@
-{"version":3,"file":"Message.js","sourceRoot":"","sources":["../../../src/react/components/Message.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,4DAAmC;AAEnC,uDAAoD;AACpD,qCAAmC;AAW5B,MAAM,OAAO,GAAG,CAAC,EACpB,OAAO,EACP,aAAa,EACb,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,2BAA2B,EAChB,EAAE,EAAE;IACf,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEjF,MAAM,sBAAsB,GAAG,CAC3B,OAAO,CAAC,gBAAgB;WACrB,OAAO,CAAC,MAAM,KAAK,QAAQ,CACjC,CAAC;IAEF,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC5B,IAAI,CAAC,sBAAsB,EAAE;YACzB,oBAAoB,CAAC,CAAC,iBAAiB,CAAC,CAAC;YACzC,OAAO;SACV;QACD,IAAI,2BAA2B,EAAE;YAC7B,2BAA2B,CAAC,OAAO,CAAC,CAAC;SACxC;IACL,CAAC,CAAA;IAED,MAAM,eAAe,GAAwB;QACzC,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,iBAAiB;KAC5B,CAAA;IAED,MAAM,aAAa,GAAwB;QACvC,OAAO,EAAE,cAAc;QACvB,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,aAAa;YAC1B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS;QACf,KAAK,EAAE,aAAa;YAChB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,SAAS;QACf,OAAO,EAAE,cAAc;KAC1B,CAAC;IAEF,OAAO,CACH,6BAAK,KAAK,EAAE,eAAe;QACvB;YACI,6BAAK,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB;gBAClD,kCAAO,OAAO,CAAC,OAAO,CAAQ,CAC5B;YACL,sBAAsB,IAAI,CAAC,IAAA,YAAK,EAAC,iCAAiC,CAAC;gBAChE,6BAAK,KAAK,EAAE,EAAC,OAAO,EAAE,cAAc,EAAC;oBACjC,2BAAG,SAAS,EAAE,iCAAiC,GAAI,CACjD;YAET,sBAAsB;gBACnB,6BAAK,SAAS,EAAE,wCAAwC,EAAE,KAAK,EAAE,qCAAqC,IAE9F,IAAA,YAAK,EAAC,2BAA2B,CAAC;oBAC9B,CAAC,CAAC,6BAA6B;oBAC/B,CAAC,CAAC,6CAA6C,CAErD;YAET,iBAAiB;gBACd;oBACI,oBAAC,iCAAe,IAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,GAAI,CACrE,CAER,CACJ,CACT,CAAA;AACL,CAAC,CAAA;AAvEY,QAAA,OAAO,WAuEnB;AAED,eAAO,CAAC,SAAS,GAAG;IAChB,OAAO,EAAE,oBAAS,CAAC,MAAM;IACzB,aAAa,EAAE,oBAAS,CAAC,IAAI;IAC7B,iCAAiC,EAAE,oBAAS,CAAC,MAAM;IACnD,qCAAqC,EAAE,oBAAS,CAAC,MAAM;IACvD,wCAAwC,EAAE,oBAAS,CAAC,MAAM;IAC1D,2BAA2B,EAAE,oBAAS,CAAC,IAAI;CAC9C,CAAA"}
+{"version":3,"file":"Message.js","sourceRoot":"","sources":["../../../src/react/components/Message.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,4DAAmC;AAEnC,yDAAwE;AACxE,uDAAoD;AACpD,qCAAmC;AAW5B,MAAM,OAAO,GAAG,CAAC,EACpB,OAAO,EACP,aAAa,EACb,iCAAiC,EACjC,qCAAqC,EACrC,wCAAwC,EACxC,2BAA2B,EAChB,EAAE,EAAE;IACf,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAU,KAAK,CAAC,CAAC;IAEjF,MAAM,sBAAsB,GAAG,CAC3B,IAAA,iCAAgB,EAAC,OAAO,CAAC;WACtB,OAAO,CAAC,MAAM,KAAK,QAAQ,CACjC,CAAC;IAEF,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC5B,IAAI,CAAC,sBAAsB,EAAE;YACzB,oBAAoB,CAAC,CAAC,iBAAiB,CAAC,CAAC;YACzC,OAAO;SACV;QACD,IAAI,2BAA2B,EAAE;YAC7B,2BAA2B,CAAC,OAAO,CAAC,CAAC;SACxC;IACL,CAAC,CAAA;IAED,MAAM,eAAe,GAAwB;QACzC,OAAO,EAAE,cAAc;QACvB,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,iBAAiB;KAC5B,CAAA;IAED,MAAM,aAAa,GAAwB;QACvC,OAAO,EAAE,cAAc;QACvB,YAAY,EAAE,UAAU;QACxB,eAAe,EAAE,aAAa;YAC1B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS;QACf,KAAK,EAAE,aAAa;YAChB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,SAAS;QACf,OAAO,EAAE,cAAc;KAC1B,CAAC;IAEF,OAAO,CACH,6BAAK,KAAK,EAAE,eAAe;QACvB;YACI,6BAAK,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB;gBAClD,kCAAO,OAAO,CAAC,OAAO,CAAQ,CAC5B;YACL,sBAAsB,IAAI,CAAC,IAAA,YAAK,EAAC,iCAAiC,CAAC;gBAChE,6BAAK,KAAK,EAAE,EAAC,OAAO,EAAE,cAAc,EAAC;oBACjC,2BAAG,SAAS,EAAE,iCAAiC,GAAI,CACjD;YAET,sBAAsB;gBACnB,6BAAK,SAAS,EAAE,wCAAwC,EAAE,KAAK,EAAE,qCAAqC,IAE9F,IAAA,YAAK,EAAC,2BAA2B,CAAC;oBAC9B,CAAC,CAAC,6BAA6B;oBAC/B,CAAC,CAAC,6CAA6C,CAErD;YAET,iBAAiB;gBACd;oBACI,oBAAC,iCAAe,IAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,GAAI,CACrE,CAER,CACJ,CACT,CAAA;AACL,CAAC,CAAA;AAvEY,QAAA,OAAO,WAuEnB;AAED,eAAO,CAAC,SAAS,GAAG;IAChB,OAAO,EAAE,oBAAS,CAAC,MAAM;IACzB,aAAa,EAAE,oBAAS,CAAC,IAAI;IAC7B,iCAAiC,EAAE,oBAAS,CAAC,MAAM;IACnD,qCAAqC,EAAE,oBAAS,CAAC,MAAM;IACvD,wCAAwC,EAAE,oBAAS,CAAC,MAAM;IAC1D,2BAA2B,EAAE,oBAAS,CAAC,IAAI;CAC9C,CAAA"}

package/dist/react/components/MessageList.d.ts

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import ChatError from '../../ChatError';
 import MessageModel from '../../Message';
 import { GetLatestMessagesStatus, Messages } from '../../CachedChat';
+import PendingMessage from '../../PendingMessage';
 export interface MessageListProps {
     messages: Messages;
     currentUserId: number;
@@ -11,7 +12,7 @@ export interface MessageListProps {
     failedPendingMessageIconClassName?: string;
     failedPendingMessageDescriptionStyles?: React.CSSProperties;
     failedPendingMessageDescriptionClassName?: string;
-    onFailedPendingMessageClick?: (pendingMessage: MessageModel) => void;
+    onFailedPendingMessageClick?: (pendingMessage: PendingMessage) => void;
     getLatestMessagesStatus: GetLatestMessagesStatus;
     markMessagesReadUpTo(message: MessageModel): Promise<{
         error: ChatError | undefined;

package/dist/react/components/MessageList.js

@@ -32,6 +32,7 @@ const prop_types_1 = __importDefault(require("prop-types"));
 const MessageRow_1 = require("./MessageRow");
 const AdminMessage_1 = require("./AdminMessage");
 const Message_1 = require("./Message");
+const PendingMessage_1 = require("../../PendingMessage");
 const util_1 = require("../../util");
 const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messagesContainerClassName, failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName, onFailedPendingMessageClick, getLatestMessagesStatus, markMessagesReadUpTo, shouldMarkMessagesAsRead, loadingContent, retryContent, noMessagesContent, onMessagesMarkedAsRead, onRequestScrollToBottomOfMessagesScrollContainer }) => {
     const [lastMessageMarkedAsReadUpTo, setLastMessageMarkedAsReadUpTo] = React.useState();
@@ -44,8 +45,8 @@ const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messa
         if (!messages.length || !shouldMarkMessagesAsRead) {
             return;
         }
-        let latestMessage = (0, util_1.getLatestMessageThatHasId)(messages);
-        if ((0, util_1.isNil)(latestMessage) || (0, util_1.isNil)(latestMessage.id)) {
+        let latestMessage = (0, util_1.getLatestMessage)(messages);
+        if ((0, util_1.isNil)(latestMessage)) {
             return;
         }
         if (((0, util_1.isNil)(lastMessageMarkedAsReadUpTo) || lastMessageMarkedAsReadUpTo < latestMessage.id)) {
@@ -72,14 +73,17 @@ const MessageList = ({ messages, currentUserId, messagesScrollContainerId, messa
     return (React.createElement("div", { id: messagesScrollContainerId, className: messagesContainerClassName, style: { maxHeight: '500px', overflowY: 'auto' } }, messages.length === 0
         ? noMessagesContent
         : messages.map(message => {
-            if (message.isAdminMessage) {
-                return (React.createElement(MessageRow_1.MessageRow, { key: message.clientId, isCurrentUser: false },
+            if ((0, PendingMessage_1.isPendingMessage)(message) || (!(0, PendingMessage_1.isPendingMessage)(message) && message.senderId === currentUserId)) {
+                return (React.createElement(MessageRow_1.MessageRow, { key: message.id, isCurrentUser: true },
+                    React.createElement(Message_1.Message, { message: message, isCurrentUser: true, failedPendingMessageIconClassName: failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles: failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName: failedPendingMessageDescriptionClassName, onFailedPendingMessageClick: onFailedPendingMessageClick })));
+            }
+            else if (message.isAdminMessage) {
+                return (React.createElement(MessageRow_1.MessageRow, { key: message.id, isCurrentUser: false },
                     React.createElement(AdminMessage_1.AdminMessage, { message: message })));
             }
             else {
-                const isCurrentUser = message.isPendingMessage || message.senderId === currentUserId;
-                return (React.createElement(MessageRow_1.MessageRow, { key: message.clientId, isCurrentUser: isCurrentUser },
-                    React.createElement(Message_1.Message, { message: message, isCurrentUser: isCurrentUser, failedPendingMessageIconClassName: failedPendingMessageIconClassName, failedPendingMessageDescriptionStyles: failedPendingMessageDescriptionStyles, failedPendingMessageDescriptionClassName: failedPendingMessageDescriptionClassName, onFailedPendingMessageClick: onFailedPendingMessageClick })));
+                return (React.createElement(MessageRow_1.MessageRow, { key: message.id, isCurrentUser: false },
+                    React.createElement(Message_1.Message, { message: message, isCurrentUser: false })));
             }
         })));
 };

package/dist/react/components/MessageList.js.map

@@ -1 +1 @@
-{"version":3,"file":"MessageList.js","sourceRoot":"","sources":["../../../src/react/components/MessageList.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MessageList.js","sourceRoot":"","sources":["../../../src/react/components/MessageList.tsx"],"names":[],"mappings":"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"}

package/dist/react/useChat.d.ts

@@ -4,6 +4,7 @@ import OnlineUser from '../OnlineUser';
 import { ConnectionStatus, ChannelStatus } from '../Chat';
 import { GetLatestMessagesStatus, Messages } from '../CachedChat';
 import { ChatSubscriptionStatus, ChatSubscriptionEventCallbackData } from '../ChatSubscription';
+import PendingMessage from '../PendingMessage';
 export interface UseChatOptions {
     idType?: 'appointment';
     onMessages?: OnMessagesCallback | undefined;
@@ -20,7 +21,7 @@ export interface UseChatReturnValue {
     getLatestMessagesStatus: GetLatestMessagesStatus | undefined;
     initialize: () => void;
     sendMessage: (message: string) => Promise<any> | void;
-    sendPendingMessage: (pendingMessage: Message) => Promise<any> | void;
+    sendPendingMessage: (pendingMessage: PendingMessage) => Promise<any> | void;
     getLatestMessages: () => void;
     markMessagesReadUpTo: (message: Message) => Promise<{
         error?: ChatError | undefined;

package/dist/react/useChat.js.map

@@ -1 +1 @@
-{"version":3,"file":"useChat.js","sourceRoot":"","sources":["../../src/react/useChat.ts"],"names":[],"mappings":";;;;;AAAA,iCAA0C;AAG1C,yCAAsC;AAEtC,mDAAgE;AAChE,uDAAoD;AAkCpD,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE,MAAM,EAAE,UAAU,KAAqB,EAAE,EAAsB,EAAE;IAC5F,MAAM,SAAS,GAAG,IAAA,2BAAY,GAAE,CAAC;IACjC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,GAA8B,CAAC;IAC/E,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAgB,iBAAiB,CAAC,CAAC;IACvE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAW,EAAE,CAAC,CAAC;IACvD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAAe,EAAE,CAAC,CAAC;IACjE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,IAAA,gBAAQ,GAA4C,CAAC;IACzG,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,GAAuC,CAAC;IAC1F,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,IAAA,gBAAQ,GAA0C,CAAC;IACnG,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,IAAA,gBAAQ,GAAiD,CAAC;IAExH,MAAM,cAAc,GAAG,CAAC,EAAC,QAAQ,EAAgD,EAAE,EAAE;QACjF,WAAW,CAAC,QAAQ,CAAC,CAAC;QACtB,IAAI,UAAU;YAAE,UAAU,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC;IAC3C,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,CAAC,EAAC,KAAK,EAA4C,EAAE,EAAE;QACtE,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,EAAC,IAAI,EAAE,KAAK,EAAmD,EAAE,EAAE;QAC1F,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,EAAC,IAAI,EAAE,KAAK,EAAmD,EAAE,EAAE;QAC1F,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,MAAM,8BAA8B,GAAG,CAAC,EAAC,MAAM,EAAoD,EAAE,EAAE;QAKnG,IAAI,SAAS,EAAE,EAAE;YACb,qBAAqB,CAAC,MAAM,CAAC,CAAC;SACjC;IACL,CAAC,CAAA;IAED,MAAM,yBAAyB,GAAG,CAAC,EAAC,MAAM,EAA2D,EAAE,EAAE;QACrG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAA;IAED,MAAM,4BAA4B,GAAG,CAAC,EAAC,MAAM,EAA8D,EAAE,EAAE;QAC3G,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC,CAAA;IAED,MAAM,mCAAmC,GAAG,CAAC,EAAC,MAAM,EAAqE,EAAE,EAAE;QACzH,0BAA0B,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAA;IAED,MAAM,0BAA0B,GAAG,GAAG,EAAE;QAIpC,IAAI,MAAM,KAAK,cAAc,IAAI,CAAC,IAAA,aAAK,EAAC,YAAY,CAAC,EAAE;YAInD,IAAI,CAAC,IAAA,aAAK,EAAC,YAAY,CAAC,IAAI,MAAM,KAAK,aAAa,EAAE;gBAClD,SAAS,CAAC,aAAa,CAAC,CAAC;aAC5B;YAAA,CAAC;YACF,OAAO;SACV;QAGD,SAAS,CAAC,cAAc,CAAC,CAAC;QAG1B,cAAI,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAC,YAAY,EAAE,KAAK,EAAC,EAAE,EAAE;YACtF,IAAI,KAAK,EAAE;gBACP,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACpB,OAAO;aACV;YACD,eAAe,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;YAClB,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,0BAA0B,EAAE,CAAC;IACjC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,IAAI,YAAY,EAAE;YACd,SAAS,CAAC,aAAa,CAAC,CAAC;YACzB,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACnC,qBAAqB,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;YAChD,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAClD,mBAAmB,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC,CAAC;YACxD,0BAA0B,CAAC,YAAY,CAAC,0BAA0B,EAAE,CAAC,CAAC;YACtE,YAAY;iBACP,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;iBACtB,EAAE,CAAC,aAAa,EAAE,iBAAiB,CAAC;iBACpC,EAAE,CAAC,aAAa,EAAE,iBAAiB,CAAC;iBACpC,EAAE,CAAC,UAAU,EAAE,cAAc,CAAC;iBAC9B,EAAE,CAAC,cAAc,EAAE,8BAA8B,CAAC;iBAClD,EAAE,CAAC,qBAAqB,EAAE,yBAAyB,CAAC;iBACpD,EAAE,CAAC,wBAAwB,EAAE,4BAA4B,CAAC;iBAC1D,EAAE,CAAC,+BAA+B,EAAE,mCAAmC,CAAC,CAAC;SACjF;QAED,OAAO,GAAG,EAAE;YACR,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,CAAC;QAC3B,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO;QACH,MAAM;QACN,QAAQ;QACR,WAAW;QACX,kBAAkB;QAClB,aAAa;QACb,gBAAgB;QAChB,uBAAuB;QACvB,UAAU,EAAE,0BAA0B;QACtC,WAAW,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,CAAC,OAAO,CAAC;QACpE,kBAAkB,EAAE,CAAC,cAAuB,EAAE,EAAE,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,kBAAkB,CAAC,cAAc,CAAC;QACjG,iBAAiB,EAAE,GAAG,EAAE,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,iBAAiB,EAAE;QAC1D,oBAAoB,EAAE,CAAC,OAAgB,EAAE,EAAE;YACvC,IAAI,YAAY,EAAE;gBACd,OAAO,YAAY,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;aACrD;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE;oBAC3B,OAAO,EAAE,6BAA6B;oBACtC,IAAI,EAAE,sBAAsB;iBAC/B,EAAC,CAAC,CAAC;QACR,CAAC;KACJ,CAAA;AACL,CAAC,CAAA;AAED,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"useChat.js","sourceRoot":"","sources":["../../src/react/useChat.ts"],"names":[],"mappings":";;;;;AAAA,iCAA0C;AAG1C,yCAAsC;AAEtC,mDAAgE;AAChE,uDAAoD;AAmCpD,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE,MAAM,EAAE,UAAU,KAAqB,EAAE,EAAsB,EAAE;IAC5F,MAAM,SAAS,GAAG,IAAA,2BAAY,GAAE,CAAC;IACjC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,GAA8B,CAAC;IAC/E,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAgB,iBAAiB,CAAC,CAAC;IACvE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAW,EAAE,CAAC,CAAC;IACvD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAAe,EAAE,CAAC,CAAC;IACjE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,IAAA,gBAAQ,GAA4C,CAAC;IACzG,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,GAAuC,CAAC;IAC1F,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,IAAA,gBAAQ,GAA0C,CAAC;IACnG,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,IAAA,gBAAQ,GAAiD,CAAC;IAExH,MAAM,cAAc,GAAG,CAAC,EAAC,QAAQ,EAAgD,EAAE,EAAE;QACjF,WAAW,CAAC,QAAQ,CAAC,CAAC;QACtB,IAAI,UAAU;YAAE,UAAU,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC;IAC3C,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,CAAC,EAAC,KAAK,EAA4C,EAAE,EAAE;QACtE,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,EAAC,IAAI,EAAE,KAAK,EAAmD,EAAE,EAAE;QAC1F,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,EAAC,IAAI,EAAE,KAAK,EAAmD,EAAE,EAAE;QAC1F,cAAc,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,MAAM,8BAA8B,GAAG,CAAC,EAAC,MAAM,EAAoD,EAAE,EAAE;QAKnG,IAAI,SAAS,EAAE,EAAE;YACb,qBAAqB,CAAC,MAAM,CAAC,CAAC;SACjC;IACL,CAAC,CAAA;IAED,MAAM,yBAAyB,GAAG,CAAC,EAAC,MAAM,EAA2D,EAAE,EAAE;QACrG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAA;IAED,MAAM,4BAA4B,GAAG,CAAC,EAAC,MAAM,EAA8D,EAAE,EAAE;QAC3G,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC,CAAA;IAED,MAAM,mCAAmC,GAAG,CAAC,EAAC,MAAM,EAAqE,EAAE,EAAE;QACzH,0BAA0B,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAA;IAED,MAAM,0BAA0B,GAAG,GAAG,EAAE;QAIpC,IAAI,MAAM,KAAK,cAAc,IAAI,CAAC,IAAA,aAAK,EAAC,YAAY,CAAC,EAAE;YAInD,IAAI,CAAC,IAAA,aAAK,EAAC,YAAY,CAAC,IAAI,MAAM,KAAK,aAAa,EAAE;gBAClD,SAAS,CAAC,aAAa,CAAC,CAAC;aAC5B;YAAA,CAAC;YACF,OAAO;SACV;QAGD,SAAS,CAAC,cAAc,CAAC,CAAC;QAG1B,cAAI,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAC,YAAY,EAAE,KAAK,EAAC,EAAE,EAAE;YACtF,IAAI,KAAK,EAAE;gBACP,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACpB,OAAO;aACV;YACD,eAAe,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;YAClB,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,0BAA0B,EAAE,CAAC;IACjC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,IAAI,YAAY,EAAE;YACd,SAAS,CAAC,aAAa,CAAC,CAAC;YACzB,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACnC,qBAAqB,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC;YAChD,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAClD,mBAAmB,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC,CAAC;YACxD,0BAA0B,CAAC,YAAY,CAAC,0BAA0B,EAAE,CAAC,CAAC;YACtE,YAAY;iBACP,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;iBACtB,EAAE,CAAC,aAAa,EAAE,iBAAiB,CAAC;iBACpC,EAAE,CAAC,aAAa,EAAE,iBAAiB,CAAC;iBACpC,EAAE,CAAC,UAAU,EAAE,cAAc,CAAC;iBAC9B,EAAE,CAAC,cAAc,EAAE,8BAA8B,CAAC;iBAClD,EAAE,CAAC,qBAAqB,EAAE,yBAAyB,CAAC;iBACpD,EAAE,CAAC,wBAAwB,EAAE,4BAA4B,CAAC;iBAC1D,EAAE,CAAC,+BAA+B,EAAE,mCAAmC,CAAC,CAAC;SACjF;QAED,OAAO,GAAG,EAAE;YACR,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,CAAC;QAC3B,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO;QACH,MAAM;QACN,QAAQ;QACR,WAAW;QACX,kBAAkB;QAClB,aAAa;QACb,gBAAgB;QAChB,uBAAuB;QACvB,UAAU,EAAE,0BAA0B;QACtC,WAAW,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,CAAC,OAAO,CAAC;QACpE,kBAAkB,EAAE,CAAC,cAA8B,EAAE,EAAE,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,kBAAkB,CAAC,cAAc,CAAC;QACxG,iBAAiB,EAAE,GAAG,EAAE,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,iBAAiB,EAAE;QAC1D,oBAAoB,EAAE,CAAC,OAAgB,EAAE,EAAE;YACvC,IAAI,YAAY,EAAE;gBACd,OAAO,YAAY,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;aACrD;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE;oBAC3B,OAAO,EAAE,6BAA6B;oBACtC,IAAI,EAAE,sBAAsB;iBAC/B,EAAC,CAAC,CAAC;QACR,CAAC;KACJ,CAAA;AACL,CAAC,CAAA;AAED,kBAAe,OAAO,CAAC"}

package/dist/react/useRealtimeTotalUserUnreadChatMessages.d.ts

@@ -3,6 +3,7 @@ export interface UseRealtimeTotalUserUnreadChatMessagesOptions {
     appointmentId?: number;
     requireAppointmentId?: boolean;
     appointmentIsConfirmedForViewing?: boolean;
+    __debug__?: boolean;
 }
 export interface UseRealtimeTotalUserUnreadChatMessagesReturnValue {
     channelStatus: ChannelStatus | undefined;

package/dist/react/useRealtimeTotalUserUnreadChatMessages.js

@@ -42,17 +42,27 @@ const useRealtimeTotalUserUnreadChatMessages = (userId, options) => {
             if (!(0, util_1.isNil)(res.count)) {
                 setTotalUnreadMessages(res.count);
             }
+            if (options === null || options === void 0 ? void 0 : options.__debug__) {
+                console.log(res);
+            }
         }).catch(err => {
+            if (options === null || options === void 0 ? void 0 : options.__debug__) {
+                console.error(err);
+            }
         });
     }, [
         userId,
         options,
         options === null || options === void 0 ? void 0 : options.appointmentId,
+        options === null || options === void 0 ? void 0 : options.requireAppointmentId,
         options === null || options === void 0 ? void 0 : options.appointmentIsConfirmedForViewing
     ]);
     react_1.default.useEffect(() => {
         let listener = (isInitialized) => {
             setChatIsInitialized(isInitialized);
+            if (options === null || options === void 0 ? void 0 : options.__debug__) {
+                console.log("useRealtimeTotalUserUnreadChatMessages chat isInitialized change", isInitialized);
+            }
         };
         Chat_1.default.addEventListener('initialized', listener);
         return () => {
@@ -63,6 +73,14 @@ const useRealtimeTotalUserUnreadChatMessages = (userId, options) => {
         if (!chatIsInitialized
             || (0, util_1.isNil)(userId)
             || ((options === null || options === void 0 ? void 0 : options.requireAppointmentId) && (0, util_1.isNil)(options === null || options === void 0 ? void 0 : options.appointmentId))) {
+            if (options === null || options === void 0 ? void 0 : options.__debug__) {
+                console.log("useRealtimeTotalUserUnreadChatMessages initialize realtime listener early return", {
+                    chatIsInitialized,
+                    userId,
+                    appointmentId: options === null || options === void 0 ? void 0 : options.appointmentId,
+                    requireAppointmentId: options === null || options === void 0 ? void 0 : options.requireAppointmentId
+                });
+            }
             return;
         }
         loadUserChatUnreadMessageCount();
@@ -72,14 +90,33 @@ const useRealtimeTotalUserUnreadChatMessages = (userId, options) => {
             var _a;
             if (!(0, util_1.isNil)(options === null || options === void 0 ? void 0 : options.appointmentId)
                 && ((_a = message.data.chat) === null || _a === void 0 ? void 0 : _a.request_accept_id) !== (options === null || options === void 0 ? void 0 : options.appointmentId)) {
+                if (options === null || options === void 0 ? void 0 : options.__debug__) {
+                    console.log("useRealtimeTotalUserUnreadChatMessages chat.message.created early return", {
+                        userId,
+                        appointmentId: options === null || options === void 0 ? void 0 : options.appointmentId,
+                        requireAppointmentId: options === null || options === void 0 ? void 0 : options.requireAppointmentId,
+                        message
+                    });
+                }
                 return;
             }
+            else if (options === null || options === void 0 ? void 0 : options.__debug__) {
+                console.log("useRealtimeTotalUserUnreadChatMessages chat.message.created", {
+                    userId,
+                    appointmentId: options === null || options === void 0 ? void 0 : options.appointmentId,
+                    requireAppointmentId: options === null || options === void 0 ? void 0 : options.requireAppointmentId,
+                    message
+                });
+            }
             loadUserChatUnreadMessageCount();
         };
         const channelStatusListener = (stateChange) => {
             setChannelStatus(stateChange.current);
         };
         channel.subscribe('chat.message.created', chatMessageCreatedListener, err => {
+            if (options === null || options === void 0 ? void 0 : options.__debug__) {
+                console.error("useRealtimeTotalUserUnreadChatMessages chat.message.created subscribe error", err);
+            }
         });
         channel.on(channelStatusListener);
         return () => {

package/dist/react/useRealtimeTotalUserUnreadChatMessages.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRealtimeTotalUserUnreadChatMessages.js","sourceRoot":"","sources":["../../src/react/useRealtimeTotalUserUnreadChatMessages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useRealtimeTotalUserUnreadChatMessages.js","sourceRoot":"","sources":["../../src/react/useRealtimeTotalUserUnreadChatMessages.ts"],"names":[],"mappings":"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"}

package/dist/util/getLatestMessage.d.ts

@@ -1,2 +1,3 @@
 import Message from "../Message";
-export declare const getLatestMessageThatHasId: (messages: Message[]) => Message | undefined;
+import PendingMessage from "../PendingMessage";
+export declare const getLatestMessage: (messages: (Message | PendingMessage)[]) => Message | undefined;

package/dist/util/getLatestMessage.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLatestMessageThatHasId = void 0;
+exports.getLatestMessage = void 0;
+const Message_1 = require("../Message");
 const isNil_1 = require("./isNil");
-const getLatestMessageThatHasId = (messages) => {
+const getLatestMessage = (messages) => {
     let latestMessage;
     for (let i = 0, il = messages.length; i < il; i++) {
-        const message = messages[i];
-        if (!(0, isNil_1.isNil)(message.id) && ((0, isNil_1.isNil)(latestMessage) || latestMessage.id < message.id)) {
-            latestMessage = message;
-        }
+        (0, Message_1.isMessageThen)(messages[i], message => {
+            if ((0, isNil_1.isNil)(latestMessage) || latestMessage.id < message.id) {
+                latestMessage = message;
+            }
+        });
     }
     return latestMessage;
 };
-exports.getLatestMessageThatHasId = getLatestMessageThatHasId;
+exports.getLatestMessage = getLatestMessage;
 //# sourceMappingURL=getLatestMessage.js.map

package/dist/util/getLatestMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLatestMessage.js","sourceRoot":"","sources":["../../src/util/getLatestMessage.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAEzB,MAAM,yBAAyB,GAAG,CAAC,QAAmB,EAAqB,EAAE;IAChF,IAAI,aAAgC,CAAC;IAErC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,EAAE,GAAC,QAAQ,CAAC,MAAM,EAAC,CAAC,GAAC,EAAE,EAAC,CAAC,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAA,aAAK,EAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,IAAA,aAAK,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,EAAG,GAAG,OAAO,CAAC,EAAE,CAAC,EAAE;YAChF,aAAa,GAAG,OAAO,CAAC;SAC3B;KACJ;IAED,OAAO,aAAa,CAAC;AACzB,CAAC,CAAA;AAXY,QAAA,yBAAyB,6BAWrC"}
+{"version":3,"file":"getLatestMessage.js","sourceRoot":"","sources":["../../src/util/getLatestMessage.ts"],"names":[],"mappings":";;;AAAA,wCAAoD;AAEpD,mCAAgC;AAEzB,MAAM,gBAAgB,GAAG,CAAC,QAAoC,EAAqB,EAAE;IACxF,IAAI,aAAgC,CAAC;IAErC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,EAAE,GAAC,QAAQ,CAAC,MAAM,EAAC,CAAC,GAAC,EAAE,EAAC,CAAC,EAAE,EAAE;QACrC,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE;YACjC,IAAI,IAAA,aAAK,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE;gBACvD,aAAa,GAAG,OAAO,CAAC;aAC3B;QACL,CAAC,CAAC,CAAC;KACN;IAED,OAAO,aAAa,CAAC;AACzB,CAAC,CAAA;AAZY,QAAA,gBAAgB,oBAY5B"}

package/dist/util/index.d.ts

@@ -1,3 +1,4 @@
 import { isNil } from "./isNil";
-import { getLatestMessageThatHasId } from "./getLatestMessage";
-export { isNil, getLatestMessageThatHasId };
+import { groupMessages } from "./groupMessages";
+import { getLatestMessage } from "./getLatestMessage";
+export { isNil, groupMessages, getLatestMessage };

package/dist/util/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLatestMessageThatHasId = exports.isNil = void 0;
+exports.getLatestMessage = exports.groupMessages = exports.isNil = void 0;
 const isNil_1 = require("./isNil");
 Object.defineProperty(exports, "isNil", { enumerable: true, get: function () { return isNil_1.isNil; } });
+const groupMessages_1 = require("./groupMessages");
+Object.defineProperty(exports, "groupMessages", { enumerable: true, get: function () { return groupMessages_1.groupMessages; } });
 const getLatestMessage_1 = require("./getLatestMessage");
-Object.defineProperty(exports, "getLatestMessageThatHasId", { enumerable: true, get: function () { return getLatestMessage_1.getLatestMessageThatHasId; } });
+Object.defineProperty(exports, "getLatestMessage", { enumerable: true, get: function () { return getLatestMessage_1.getLatestMessage; } });
 //# sourceMappingURL=index.js.map

package/dist/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAI5B,sFAJK,aAAK,OAIL;AAHT,yDAA+D;AAI3D,0GAJK,4CAAyB,OAIL"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAK5B,sFALK,aAAK,OAKL;AAJT,mDAAgD;AAK5C,8FALK,6BAAa,OAKL;AAJjB,yDAAsD;AAKlD,iGALK,mCAAgB,OAKL"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewberapp/chat",
-  "version": "0.0.102",
+  "version": "0.0.104",
   "description": "Viewber chat",
   "author": "Jacob <jacob.chen@viewber.co.uk>",
   "homepage": "https://bitbucket.org/ezadr/viewberjs#readme",
@@ -29,7 +29,7 @@
     "url": "https://bitbucket.org/ezadr/viewberjs/issues"
   },
   "dependencies": {
-    "cuid": "^2.1.8"
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@types/react": "^16.14.0",
@@ -42,5 +42,5 @@
     "react": "^16.14.0",
     "rollbar": "^2.25.0"
   },
-  "gitHead": "f16f01758d34a03e2593e4de0f260d03af8ab32d"
+  "gitHead": "210496165ebdab72739d024dc32b8c4522cb8ed6"
 }