sceyt-chat-react-uikit 1.7.4-beta.6 → 1.7.4-beta.7

package/index.js

@@ -10304,6 +10304,11 @@ var setPendingMessage = function setPendingMessage(channelId, pendingMessage) {
 var getPendingMessagesMap = function getPendingMessagesMap() {
   return pendingMessagesMap;
 };
+var clearPendingMessagesMap = function clearPendingMessagesMap() {
+  Object.keys(pendingMessagesMap).forEach(function (channelId) {
+    delete pendingMessagesMap[channelId];
+  });
+};
 var draftMessagesMap = {};
 var audioRecordingMap = {};
 var getDraftMessageFromMap = function getDraftMessageFromMap(channelId) {
@@ -18245,9 +18250,15 @@ function sendMessage(action) {
         _t2 = _context3.v;
         log.error('error on send message ... ', _t2);
       case 19:
+        _context3.p = 19;
+        _context3.n = 20;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 20:
+        return _context3.f(19);
+      case 21:
         return _context3.a(2);
     }
-  }, _marked$3, null, [[1, 18]]);
+  }, _marked$3, null, [[1, 18, 19, 21]]);
 }
 function sendTextMessage(action) {
   var payload, message, connectionState, channelId, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
@@ -18403,15 +18414,12 @@ function sendTextMessage(action) {
         throw new Error('Connection required to send message');
       case 17:
         _context4.n = 18;
-        return effects.put(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
-      case 18:
-        _context4.n = 19;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        _context4.n = 22;
+      case 18:
+        _context4.n = 21;
         break;
-      case 20:
-        _context4.p = 20;
+      case 19:
+        _context4.p = 19;
         _t3 = _context4.v;
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
@@ -18421,23 +18429,23 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 21;
+          _context4.n = 20;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 21;
+        _context4.n = 20;
         return effects.put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 21:
-        _context4.n = 22;
+      case 20:
+        _context4.n = 21;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 22:
+      case 21:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 20]]);
+  }, _marked2$2, null, [[3, 19]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, isForward, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
@@ -19075,7 +19083,7 @@ function editMessage(action) {
   }, _marked6$1, null, [[0, 5]]);
 }
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, shouldReloadFromServer, secondResult, pendingMessages, messagesMap, uniqueMessagesMap, currentMessagesInState, preservedMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _pendingMessages, _messagesMap, filteredPendingMessages, _secondResult4, updatedMessages, _currentMessagesInState, _messagesMap2, preservedFromRedux, _pendingMessages2, _messagesMap3, _filteredPendingMessages, _t9;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
@@ -19083,9 +19091,9 @@ function getMessagesQuery(action) {
         _context9.n = 1;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
+        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
         if (!(channel.id && !channel.isMockChannel)) {
-          _context9.n = 48;
+          _context9.n = 50;
           break;
         }
         SceytChatClient = getClient();
@@ -19103,13 +19111,14 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context9.n = 13;
+          _context9.n = 14;
           break;
         }
         allMessages = getAllMessages();
         havLastMessage = allMessages && allMessages.length && channel.lastMessage && allMessages[allMessages.length - 1] && allMessages[allMessages.length - 1].id === channel.lastMessage.id;
-        if (!(channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage)) {
-          _context9.n = 8;
+        shouldReloadFromServer = channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage;
+        if (!shouldReloadFromServer) {
+          _context9.n = 9;
           break;
         }
         setHasPrevCached(false);
@@ -19131,52 +19140,86 @@ function getMessagesQuery(action) {
         result.messages = [].concat(secondResult.messages, result.messages);
         result.hasNext = secondResult.hasNext;
       case 5:
-        sentMessages = [];
-        if (withDeliveredMessages) {
-          sentMessages = getFromAllMessagesByMessageId('', '', true);
-        }
+        pendingMessages = getPendingMessages(channel.id) || [];
         messagesMap = {};
         result.messages.forEach(function (msg) {
-          messagesMap[msg.tid || ''] = msg;
+          if (msg.id) messagesMap[msg.id] = msg;
+          if (msg.tid) messagesMap[msg.tid] = msg;
         });
-        filteredSentMessages = sentMessages.filter(function (msg) {
-          return !messagesMap[msg.tid || ''];
+        pendingMessages.forEach(function (msg) {
+          var alreadyExists = msg.id && messagesMap[msg.id] || msg.tid && messagesMap[msg.tid] || msg.tid && msg.id && (messagesMap[msg.tid] || messagesMap[msg.id]);
+          if (!alreadyExists) {
+            if (msg.id) messagesMap[msg.id] = msg;
+            if (msg.tid) messagesMap[msg.tid] = msg;
+          }
+        });
+        uniqueMessagesMap = {};
+        result.messages = result.messages.filter(function (msg) {
+          var key = msg.id || msg.tid;
+          if (key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            return true;
+          }
+          return false;
+        });
+        pendingMessages.forEach(function (msg) {
+          var key = msg.id || msg.tid;
+          var alreadyExists = msg.id && uniqueMessagesMap[msg.id] || msg.tid && uniqueMessagesMap[msg.tid];
+          if (!alreadyExists && key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            result.messages.push(msg);
+          }
         });
-        result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
         _context9.n = 6;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        return effects.select(function (state) {
+          return state.MessageReducer.activeChannelMessages;
+        });
       case 6:
-        setMessagesToMap(channel.id, result.messages);
-        setAllMessages(result.messages);
+        currentMessagesInState = _context9.v;
+        preservedMessages = [];
+        currentMessagesInState.forEach(function (msg) {
+          var key = msg.id || msg.tid;
+          var alreadyExists = msg.id && uniqueMessagesMap[msg.id] || msg.tid && uniqueMessagesMap[msg.tid];
+          if (!alreadyExists && key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            result.messages.push(msg);
+            preservedMessages.push(msg);
+          }
+        });
         _context9.n = 7;
-        return effects.put(setMessagesHasPrevAC(true));
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 7:
-        _context9.n = 10;
-        break;
+        setMessagesToMap(channel.id, result.messages);
+        setAllMessages(result.messages);
+        _context9.n = 8;
+        return effects.put(setMessagesHasPrevAC(result.hasNext));
       case 8:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context9.n = 9;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        _context9.n = 11;
+        break;
       case 9:
+        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context9.n = 10;
-        return effects.put(setMessagesHasPrevAC(true));
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 10:
         _context9.n = 11;
-        return effects.put(setMessagesHasNextAC(false));
+        return effects.put(setMessagesHasPrevAC(true));
       case 11:
+        _context9.n = 12;
+        return effects.put(setMessagesHasNextAC(false));
+      case 12:
         setHasNextCached(false);
         if (!messageId) {
-          _context9.n = 12;
+          _context9.n = 13;
           break;
         }
-        _context9.n = 12;
+        _context9.n = 13;
         return effects.put(setScrollToMessagesAC(messageId, highlight, behavior));
-      case 12:
-        _context9.n = 46;
-        break;
       case 13:
+        _context9.n = 49;
+        break;
+      case 14:
         if (!messageId) {
-          _context9.n = 26;
+          _context9.n = 27;
           break;
         }
         _allMessages = getAllMessages();
@@ -19185,168 +19228,182 @@ function getMessagesQuery(action) {
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context9.n = 16;
+          _context9.n = 17;
           break;
         }
         result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context9.n = 14;
+        _context9.n = 15;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 14:
+      case 15:
         setHasPrevCached(messageIndex > maxLengthPart);
         setHasNextCached(_allMessages.length > maxLengthPart);
-        _context9.n = 15;
+        _context9.n = 16;
         return effects.put(setMessagesHasPrevAC(true));
-      case 15:
-        _context9.n = 22;
-        break;
       case 16:
+        _context9.n = 23;
+        break;
+      case 17:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         log.info('load by message id from server ...............', messageId);
-        _context9.n = 17;
+        _context9.n = 18;
         return effects.call(messageQuery.loadNearMessageId, messageId);
-      case 17:
+      case 18:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 20;
+          _context9.n = 21;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 18;
+        _context9.n = 19;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 18:
+      case 19:
         _secondResult = _context9.v;
         messageQuery.reverse = false;
-        _context9.n = 19;
+        _context9.n = 20;
         return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 19:
+      case 20:
         thirdResult = _context9.v;
         result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
         result.hasNext = _secondResult.hasNext;
         messageQuery.reverse = true;
-        _context9.n = 20;
-        return effects.put(setMessagesHasPrevAC(_secondResult.hasNext));
-      case 20:
         _context9.n = 21;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        return effects.put(setMessagesHasPrevAC(_secondResult.hasNext));
       case 21:
+        _context9.n = 22;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+      case 22:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 22:
-        _context9.n = 23;
-        return effects.put(setMessagesHasNextAC(true));
       case 23:
         _context9.n = 24;
-        return effects.put(setScrollToMessagesAC(messageId, true, behavior));
+        return effects.put(setMessagesHasNextAC(true));
       case 24:
         _context9.n = 25;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setScrollToMessagesAC(messageId, true, behavior));
       case 25:
-        _context9.n = 46;
-        break;
+        _context9.n = 26;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 26:
+        _context9.n = 49;
+        break;
+      case 27:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context9.n = 39;
+          _context9.n = 40;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context9.n = 32;
+          _context9.n = 33;
           break;
         }
-        _context9.n = 27;
+        _context9.n = 28;
         return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 27:
+      case 28:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 31;
+          _context9.n = 32;
           break;
         }
         messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 28;
+        _context9.n = 29;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 28:
+      case 29:
         _secondResult2 = _context9.v;
         if (!(channel.newMessageCount > 25)) {
-          _context9.n = 30;
+          _context9.n = 31;
           break;
         }
         messageQuery.reverse = false;
-        _context9.n = 29;
+        _context9.n = 30;
         return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 29:
+      case 30:
         _thirdResult = _context9.v;
         result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
         messageQuery.reverse = true;
-        _context9.n = 31;
+        _context9.n = 32;
         break;
-      case 30:
-        result.messages = [].concat(_secondResult2.messages, result.messages);
       case 31:
-        _context9.n = 35;
-        break;
+        result.messages = [].concat(_secondResult2.messages, result.messages);
       case 32:
-        _context9.n = 33;
-        return effects.call(messageQuery.loadPrevious);
+        _context9.n = 36;
+        break;
       case 33:
+        _context9.n = 34;
+        return effects.call(messageQuery.loadPrevious);
+      case 34:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 35;
+          _context9.n = 36;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 34;
+        _context9.n = 35;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 34:
+      case 35:
         _secondResult3 = _context9.v;
         result.messages = [].concat(_secondResult3.messages, result.messages);
         result.hasNext = _secondResult3.hasNext;
-      case 35:
-        _context9.n = 36;
-        return effects.put(setMessagesHasPrevAC(true));
       case 36:
         _context9.n = 37;
-        return effects.put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
+        return effects.put(setMessagesHasPrevAC(true));
       case 37:
+        _context9.n = 38;
+        return effects.put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
+      case 38:
+        _pendingMessages = getPendingMessages(channel.id);
+        if (_pendingMessages && _pendingMessages.length) {
+          _messagesMap = {};
+          result.messages.forEach(function (msg) {
+            if (msg.tid) _messagesMap[msg.tid] = true;
+            if (msg.id) _messagesMap[msg.id] = true;
+          });
+          filteredPendingMessages = _pendingMessages.filter(function (msg) {
+            return !(_messagesMap[msg.tid || ''] || _messagesMap[msg.id || '']);
+          });
+          if (filteredPendingMessages.length > 0) {
+            result.messages = [].concat(result.messages, filteredPendingMessages);
+          }
+        }
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
-        _context9.n = 38;
+        _context9.n = 39;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 38:
-        _context9.n = 46;
-        break;
       case 39:
+        _context9.n = 49;
+        break;
+      case 40:
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         if (!(cachedMessages && cachedMessages.length)) {
-          _context9.n = 40;
+          _context9.n = 41;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([].concat(cachedMessages));
-        _context9.n = 40;
+        _context9.n = 41;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 40:
+      case 41:
         log.info('load message from server');
-        _context9.n = 41;
+        _context9.n = 42;
         return effects.call(messageQuery.loadPrevious);
-      case 41:
+      case 42:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 43;
+          _context9.n = 44;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 42;
+        _context9.n = 43;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 42:
+      case 43:
         _secondResult4 = _context9.v;
         result.messages = [].concat(_secondResult4.messages, result.messages);
         result.hasNext = _secondResult4.hasNext;
-      case 43:
+      case 44:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -19356,58 +19413,86 @@ function getMessagesQuery(action) {
           updateMessageOnAllMessages(msg.id, updatedMessage || msg);
           updatedMessages.push(updatedMessage || msg);
         });
+        _context9.n = 45;
+        return effects.select(function (state) {
+          return state.MessageReducer.activeChannelMessages;
+        });
+      case 45:
+        _currentMessagesInState = _context9.v;
+        _messagesMap2 = {};
+        updatedMessages.forEach(function (msg) {
+          if (msg.tid) _messagesMap2[msg.tid] = true;
+          if (msg.id) _messagesMap2[msg.id] = true;
+        });
+        preservedFromRedux = [];
+        _currentMessagesInState.forEach(function (msg) {
+          var alreadyExists = msg.id && _messagesMap2[msg.id] || msg.tid && _messagesMap2[msg.tid];
+          if (!alreadyExists) {
+            var key = msg.id || msg.tid;
+            if (key && !_messagesMap2[key]) {
+              _messagesMap2[key] = true;
+              updatedMessages.push(msg);
+              preservedFromRedux.push(msg);
+            }
+          }
+        });
         setMessagesToMap(channel.id, updatedMessages);
         setAllMessages([].concat(updatedMessages));
-        _context9.n = 44;
+        _context9.n = 46;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(updatedMessages))));
-      case 44:
-        _context9.n = 45;
+      case 46:
+        _context9.n = 47;
         return effects.put(setMessagesHasPrevAC(result.hasNext));
-      case 45:
-        _context9.n = 46;
+      case 47:
+        _context9.n = 48;
         return effects.put(setMessagesHasNextAC(false));
-      case 46:
-        pendingMessages = getPendingMessages(channel.id);
-        if (!(pendingMessages && pendingMessages.length)) {
-          _context9.n = 47;
+      case 48:
+        _pendingMessages2 = getPendingMessages(channel.id);
+        if (!(_pendingMessages2 && _pendingMessages2.length)) {
+          _context9.n = 49;
           break;
         }
-        _messagesMap = {};
-        result.messages.forEach(function (msg) {
-          _messagesMap[msg.tid || ''] = msg;
+        _messagesMap3 = {};
+        updatedMessages.forEach(function (msg) {
+          if (msg.tid) _messagesMap3[msg.tid] = true;
+          if (msg.id) _messagesMap3[msg.id] = true;
         });
-        filteredPendingMessages = pendingMessages.filter(function (msg) {
-          return !_messagesMap[msg.tid || ''];
+        _filteredPendingMessages = _pendingMessages2.filter(function (msg) {
+          return !(_messagesMap3[msg.tid || ''] || _messagesMap3[msg.id || '']);
         });
-        _context9.n = 47;
-        return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 47:
-        _context9.n = 49;
-        break;
-      case 48:
-        if (!channel.isMockChannel) {
+        if (!(_filteredPendingMessages.length > 0)) {
           _context9.n = 49;
           break;
         }
         _context9.n = 49;
-        return effects.put(setMessagesAC([]));
+        return effects.put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 49:
         _context9.n = 51;
         break;
       case 50:
-        _context9.p = 50;
-        _t9 = _context9.v;
-        log.error('error in message query', _t9);
+        if (!channel.isMockChannel) {
+          _context9.n = 51;
+          break;
+        }
+        _context9.n = 51;
+        return effects.put(setMessagesAC([]));
       case 51:
-        _context9.p = 51;
-        _context9.n = 52;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        _context9.n = 53;
+        break;
       case 52:
-        return _context9.f(51);
+        _context9.p = 52;
+        _t9 = _context9.v;
+        log.error('error in message query', _t9);
       case 53:
+        _context9.p = 53;
+        _context9.n = 54;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 54:
+        return _context9.f(53);
+      case 55:
         return _context9.a(2);
     }
-  }, _marked7$1, null, [[0, 50, 51, 53]]);
+  }, _marked7$1, null, [[0, 52, 53, 55]]);
 }
 function getMessageQuery(action) {
   var payload, channelId, messageId, channel, messages, fetchedMessage, _t0;
@@ -39308,6 +39393,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
       var pendingMessagesMap = getPendingMessagesMap();
       var pendingMessagesMapCopy = JSON.parse(JSON.stringify(pendingMessagesMap));
+      clearPendingMessagesMap();
       setTimeout(function () {
         Object.keys(pendingMessagesMapCopy).forEach(function (key) {
           pendingMessagesMapCopy[key].forEach(function (msg) {

package/index.modern.js

@@ -10302,6 +10302,11 @@ var setPendingMessage = function setPendingMessage(channelId, pendingMessage) {
 var getPendingMessagesMap = function getPendingMessagesMap() {
   return pendingMessagesMap;
 };
+var clearPendingMessagesMap = function clearPendingMessagesMap() {
+  Object.keys(pendingMessagesMap).forEach(function (channelId) {
+    delete pendingMessagesMap[channelId];
+  });
+};
 var draftMessagesMap = {};
 var audioRecordingMap = {};
 var getDraftMessageFromMap = function getDraftMessageFromMap(channelId) {
@@ -18244,9 +18249,15 @@ function sendMessage(action) {
         _t2 = _context3.v;
         log.error('error on send message ... ', _t2);
       case 19:
+        _context3.p = 19;
+        _context3.n = 20;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 20:
+        return _context3.f(19);
+      case 21:
         return _context3.a(2);
     }
-  }, _marked$3, null, [[1, 18]]);
+  }, _marked$3, null, [[1, 18, 19, 21]]);
 }
 function sendTextMessage(action) {
   var payload, message, connectionState, channelId, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
@@ -18402,15 +18413,12 @@ function sendTextMessage(action) {
         throw new Error('Connection required to send message');
       case 17:
         _context4.n = 18;
-        return put(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
-      case 18:
-        _context4.n = 19;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        _context4.n = 22;
+      case 18:
+        _context4.n = 21;
         break;
-      case 20:
-        _context4.p = 20;
+      case 19:
+        _context4.p = 19;
         _t3 = _context4.v;
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
@@ -18420,23 +18428,23 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 21;
+          _context4.n = 20;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 21;
+        _context4.n = 20;
         return put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 21:
-        _context4.n = 22;
+      case 20:
+        _context4.n = 21;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 22:
+      case 21:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 20]]);
+  }, _marked2$2, null, [[3, 19]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, isForward, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
@@ -19074,7 +19082,7 @@ function editMessage(action) {
   }, _marked6$1, null, [[0, 5]]);
 }
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, shouldReloadFromServer, secondResult, pendingMessages, messagesMap, uniqueMessagesMap, currentMessagesInState, preservedMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _pendingMessages, _messagesMap, filteredPendingMessages, _secondResult4, updatedMessages, _currentMessagesInState, _messagesMap2, preservedFromRedux, _pendingMessages2, _messagesMap3, _filteredPendingMessages, _t9;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
@@ -19082,9 +19090,9 @@ function getMessagesQuery(action) {
         _context9.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
+        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
         if (!(channel.id && !channel.isMockChannel)) {
-          _context9.n = 48;
+          _context9.n = 50;
           break;
         }
         SceytChatClient = getClient();
@@ -19102,13 +19110,14 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context9.n = 13;
+          _context9.n = 14;
           break;
         }
         allMessages = getAllMessages();
         havLastMessage = allMessages && allMessages.length && channel.lastMessage && allMessages[allMessages.length - 1] && allMessages[allMessages.length - 1].id === channel.lastMessage.id;
-        if (!(channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage)) {
-          _context9.n = 8;
+        shouldReloadFromServer = channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage;
+        if (!shouldReloadFromServer) {
+          _context9.n = 9;
           break;
         }
         setHasPrevCached(false);
@@ -19130,52 +19139,86 @@ function getMessagesQuery(action) {
         result.messages = [].concat(secondResult.messages, result.messages);
         result.hasNext = secondResult.hasNext;
       case 5:
-        sentMessages = [];
-        if (withDeliveredMessages) {
-          sentMessages = getFromAllMessagesByMessageId('', '', true);
-        }
+        pendingMessages = getPendingMessages(channel.id) || [];
         messagesMap = {};
         result.messages.forEach(function (msg) {
-          messagesMap[msg.tid || ''] = msg;
+          if (msg.id) messagesMap[msg.id] = msg;
+          if (msg.tid) messagesMap[msg.tid] = msg;
         });
-        filteredSentMessages = sentMessages.filter(function (msg) {
-          return !messagesMap[msg.tid || ''];
+        pendingMessages.forEach(function (msg) {
+          var alreadyExists = msg.id && messagesMap[msg.id] || msg.tid && messagesMap[msg.tid] || msg.tid && msg.id && (messagesMap[msg.tid] || messagesMap[msg.id]);
+          if (!alreadyExists) {
+            if (msg.id) messagesMap[msg.id] = msg;
+            if (msg.tid) messagesMap[msg.tid] = msg;
+          }
+        });
+        uniqueMessagesMap = {};
+        result.messages = result.messages.filter(function (msg) {
+          var key = msg.id || msg.tid;
+          if (key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            return true;
+          }
+          return false;
+        });
+        pendingMessages.forEach(function (msg) {
+          var key = msg.id || msg.tid;
+          var alreadyExists = msg.id && uniqueMessagesMap[msg.id] || msg.tid && uniqueMessagesMap[msg.tid];
+          if (!alreadyExists && key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            result.messages.push(msg);
+          }
         });
-        result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
         _context9.n = 6;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        return select(function (state) {
+          return state.MessageReducer.activeChannelMessages;
+        });
       case 6:
-        setMessagesToMap(channel.id, result.messages);
-        setAllMessages(result.messages);
+        currentMessagesInState = _context9.v;
+        preservedMessages = [];
+        currentMessagesInState.forEach(function (msg) {
+          var key = msg.id || msg.tid;
+          var alreadyExists = msg.id && uniqueMessagesMap[msg.id] || msg.tid && uniqueMessagesMap[msg.tid];
+          if (!alreadyExists && key && !uniqueMessagesMap[key]) {
+            uniqueMessagesMap[key] = msg;
+            result.messages.push(msg);
+            preservedMessages.push(msg);
+          }
+        });
         _context9.n = 7;
-        return put(setMessagesHasPrevAC(true));
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 7:
-        _context9.n = 10;
-        break;
+        setMessagesToMap(channel.id, result.messages);
+        setAllMessages(result.messages);
+        _context9.n = 8;
+        return put(setMessagesHasPrevAC(result.hasNext));
       case 8:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context9.n = 9;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        _context9.n = 11;
+        break;
       case 9:
+        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context9.n = 10;
-        return put(setMessagesHasPrevAC(true));
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 10:
         _context9.n = 11;
-        return put(setMessagesHasNextAC(false));
+        return put(setMessagesHasPrevAC(true));
       case 11:
+        _context9.n = 12;
+        return put(setMessagesHasNextAC(false));
+      case 12:
         setHasNextCached(false);
         if (!messageId) {
-          _context9.n = 12;
+          _context9.n = 13;
           break;
         }
-        _context9.n = 12;
+        _context9.n = 13;
         return put(setScrollToMessagesAC(messageId, highlight, behavior));
-      case 12:
-        _context9.n = 46;
-        break;
       case 13:
+        _context9.n = 49;
+        break;
+      case 14:
         if (!messageId) {
-          _context9.n = 26;
+          _context9.n = 27;
           break;
         }
         _allMessages = getAllMessages();
@@ -19184,168 +19227,182 @@ function getMessagesQuery(action) {
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context9.n = 16;
+          _context9.n = 17;
           break;
         }
         result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context9.n = 14;
+        _context9.n = 15;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 14:
+      case 15:
         setHasPrevCached(messageIndex > maxLengthPart);
         setHasNextCached(_allMessages.length > maxLengthPart);
-        _context9.n = 15;
+        _context9.n = 16;
         return put(setMessagesHasPrevAC(true));
-      case 15:
-        _context9.n = 22;
-        break;
       case 16:
+        _context9.n = 23;
+        break;
+      case 17:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         log.info('load by message id from server ...............', messageId);
-        _context9.n = 17;
+        _context9.n = 18;
         return call(messageQuery.loadNearMessageId, messageId);
-      case 17:
+      case 18:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 20;
+          _context9.n = 21;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 18;
+        _context9.n = 19;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 18:
+      case 19:
         _secondResult = _context9.v;
         messageQuery.reverse = false;
-        _context9.n = 19;
+        _context9.n = 20;
         return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 19:
+      case 20:
         thirdResult = _context9.v;
         result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
         result.hasNext = _secondResult.hasNext;
         messageQuery.reverse = true;
-        _context9.n = 20;
-        return put(setMessagesHasPrevAC(_secondResult.hasNext));
-      case 20:
         _context9.n = 21;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        return put(setMessagesHasPrevAC(_secondResult.hasNext));
       case 21:
+        _context9.n = 22;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+      case 22:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 22:
-        _context9.n = 23;
-        return put(setMessagesHasNextAC(true));
       case 23:
         _context9.n = 24;
-        return put(setScrollToMessagesAC(messageId, true, behavior));
+        return put(setMessagesHasNextAC(true));
       case 24:
         _context9.n = 25;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return put(setScrollToMessagesAC(messageId, true, behavior));
       case 25:
-        _context9.n = 46;
-        break;
+        _context9.n = 26;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 26:
+        _context9.n = 49;
+        break;
+      case 27:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context9.n = 39;
+          _context9.n = 40;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context9.n = 32;
+          _context9.n = 33;
           break;
         }
-        _context9.n = 27;
+        _context9.n = 28;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 27:
+      case 28:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 31;
+          _context9.n = 32;
           break;
         }
         messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 28;
+        _context9.n = 29;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 28:
+      case 29:
         _secondResult2 = _context9.v;
         if (!(channel.newMessageCount > 25)) {
-          _context9.n = 30;
+          _context9.n = 31;
           break;
         }
         messageQuery.reverse = false;
-        _context9.n = 29;
+        _context9.n = 30;
         return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 29:
+      case 30:
         _thirdResult = _context9.v;
         result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
         messageQuery.reverse = true;
-        _context9.n = 31;
+        _context9.n = 32;
         break;
-      case 30:
-        result.messages = [].concat(_secondResult2.messages, result.messages);
       case 31:
-        _context9.n = 35;
-        break;
+        result.messages = [].concat(_secondResult2.messages, result.messages);
       case 32:
-        _context9.n = 33;
-        return call(messageQuery.loadPrevious);
+        _context9.n = 36;
+        break;
       case 33:
+        _context9.n = 34;
+        return call(messageQuery.loadPrevious);
+      case 34:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 35;
+          _context9.n = 36;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 34;
+        _context9.n = 35;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 34:
+      case 35:
         _secondResult3 = _context9.v;
         result.messages = [].concat(_secondResult3.messages, result.messages);
         result.hasNext = _secondResult3.hasNext;
-      case 35:
-        _context9.n = 36;
-        return put(setMessagesHasPrevAC(true));
       case 36:
         _context9.n = 37;
-        return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
+        return put(setMessagesHasPrevAC(true));
       case 37:
+        _context9.n = 38;
+        return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
+      case 38:
+        _pendingMessages = getPendingMessages(channel.id);
+        if (_pendingMessages && _pendingMessages.length) {
+          _messagesMap = {};
+          result.messages.forEach(function (msg) {
+            if (msg.tid) _messagesMap[msg.tid] = true;
+            if (msg.id) _messagesMap[msg.id] = true;
+          });
+          filteredPendingMessages = _pendingMessages.filter(function (msg) {
+            return !(_messagesMap[msg.tid || ''] || _messagesMap[msg.id || '']);
+          });
+          if (filteredPendingMessages.length > 0) {
+            result.messages = [].concat(result.messages, filteredPendingMessages);
+          }
+        }
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
-        _context9.n = 38;
+        _context9.n = 39;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 38:
-        _context9.n = 46;
-        break;
       case 39:
+        _context9.n = 49;
+        break;
+      case 40:
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         if (!(cachedMessages && cachedMessages.length)) {
-          _context9.n = 40;
+          _context9.n = 41;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([].concat(cachedMessages));
-        _context9.n = 40;
+        _context9.n = 41;
         return put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 40:
+      case 41:
         log.info('load message from server');
-        _context9.n = 41;
+        _context9.n = 42;
         return call(messageQuery.loadPrevious);
-      case 41:
+      case 42:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 43;
+          _context9.n = 44;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 42;
+        _context9.n = 43;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 42:
+      case 43:
         _secondResult4 = _context9.v;
         result.messages = [].concat(_secondResult4.messages, result.messages);
         result.hasNext = _secondResult4.hasNext;
-      case 43:
+      case 44:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -19355,58 +19412,86 @@ function getMessagesQuery(action) {
           updateMessageOnAllMessages(msg.id, updatedMessage || msg);
           updatedMessages.push(updatedMessage || msg);
         });
+        _context9.n = 45;
+        return select(function (state) {
+          return state.MessageReducer.activeChannelMessages;
+        });
+      case 45:
+        _currentMessagesInState = _context9.v;
+        _messagesMap2 = {};
+        updatedMessages.forEach(function (msg) {
+          if (msg.tid) _messagesMap2[msg.tid] = true;
+          if (msg.id) _messagesMap2[msg.id] = true;
+        });
+        preservedFromRedux = [];
+        _currentMessagesInState.forEach(function (msg) {
+          var alreadyExists = msg.id && _messagesMap2[msg.id] || msg.tid && _messagesMap2[msg.tid];
+          if (!alreadyExists) {
+            var key = msg.id || msg.tid;
+            if (key && !_messagesMap2[key]) {
+              _messagesMap2[key] = true;
+              updatedMessages.push(msg);
+              preservedFromRedux.push(msg);
+            }
+          }
+        });
         setMessagesToMap(channel.id, updatedMessages);
         setAllMessages([].concat(updatedMessages));
-        _context9.n = 44;
+        _context9.n = 46;
         return put(setMessagesAC(JSON.parse(JSON.stringify(updatedMessages))));
-      case 44:
-        _context9.n = 45;
+      case 46:
+        _context9.n = 47;
         return put(setMessagesHasPrevAC(result.hasNext));
-      case 45:
-        _context9.n = 46;
+      case 47:
+        _context9.n = 48;
         return put(setMessagesHasNextAC(false));
-      case 46:
-        pendingMessages = getPendingMessages(channel.id);
-        if (!(pendingMessages && pendingMessages.length)) {
-          _context9.n = 47;
+      case 48:
+        _pendingMessages2 = getPendingMessages(channel.id);
+        if (!(_pendingMessages2 && _pendingMessages2.length)) {
+          _context9.n = 49;
           break;
         }
-        _messagesMap = {};
-        result.messages.forEach(function (msg) {
-          _messagesMap[msg.tid || ''] = msg;
+        _messagesMap3 = {};
+        updatedMessages.forEach(function (msg) {
+          if (msg.tid) _messagesMap3[msg.tid] = true;
+          if (msg.id) _messagesMap3[msg.id] = true;
         });
-        filteredPendingMessages = pendingMessages.filter(function (msg) {
-          return !_messagesMap[msg.tid || ''];
+        _filteredPendingMessages = _pendingMessages2.filter(function (msg) {
+          return !(_messagesMap3[msg.tid || ''] || _messagesMap3[msg.id || '']);
         });
-        _context9.n = 47;
-        return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 47:
-        _context9.n = 49;
-        break;
-      case 48:
-        if (!channel.isMockChannel) {
+        if (!(_filteredPendingMessages.length > 0)) {
           _context9.n = 49;
           break;
         }
         _context9.n = 49;
-        return put(setMessagesAC([]));
+        return put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 49:
         _context9.n = 51;
         break;
       case 50:
-        _context9.p = 50;
-        _t9 = _context9.v;
-        log.error('error in message query', _t9);
+        if (!channel.isMockChannel) {
+          _context9.n = 51;
+          break;
+        }
+        _context9.n = 51;
+        return put(setMessagesAC([]));
       case 51:
-        _context9.p = 51;
-        _context9.n = 52;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        _context9.n = 53;
+        break;
       case 52:
-        return _context9.f(51);
+        _context9.p = 52;
+        _t9 = _context9.v;
+        log.error('error in message query', _t9);
       case 53:
+        _context9.p = 53;
+        _context9.n = 54;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 54:
+        return _context9.f(53);
+      case 55:
         return _context9.a(2);
     }
-  }, _marked7$1, null, [[0, 50, 51, 53]]);
+  }, _marked7$1, null, [[0, 52, 53, 55]]);
 }
 function getMessageQuery(action) {
   var payload, channelId, messageId, channel, messages, fetchedMessage, _t0;
@@ -39307,6 +39392,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
       var pendingMessagesMap = getPendingMessagesMap();
       var pendingMessagesMapCopy = JSON.parse(JSON.stringify(pendingMessagesMap));
+      clearPendingMessagesMap();
       setTimeout(function () {
         Object.keys(pendingMessagesMapCopy).forEach(function (key) {
           pendingMessagesMapCopy[key].forEach(function (msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.7.4-beta.6",
+  "version": "1.7.4-beta.7",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",