sceyt-chat-react-uikit 1.7.8-beta.1 → 1.7.8-beta.3

package/index.modern.js

@@ -9027,6 +9027,9 @@ var handleVoteDetails = function handleVoteDetails(voteDetails, message) {
     voteDetails: newVoteDetails
   });
 };
+var checkIsTypeKeyPressed = function checkIsTypeKeyPressed(code) {
+  return !(code === 'Enter' || code === 'NumpadEnter' || code === 'Backspace' || code === 'Delete' || code === 'ArrowLeft' || code === 'ArrowRight' || code === 'ArrowUp' || code === 'ArrowDown' || code === 'PageUp' || code === 'PageDown' || code === 'Home' || code === 'End' || code === 'Insert' || code === 'Escape' || code === 'Tab' || code === 'F1' || code === 'F2' || code === 'F3' || code === 'F4' || code === 'F5' || code === 'F6' || code === 'F7' || code === 'F8' || code === 'F9' || code === 'F10' || code === 'F11' || code === 'F12' || code === 'CapsLock' || code === 'Shift' || code === 'ShiftLeft' || code === 'ShiftRight' || code === 'Control' || code === 'ControlLeft' || code === 'ControlRight' || code === 'Alt' || code === 'AltLeft' || code === 'AltRight' || code === 'MetaLeft' || code === 'MetaRight' || code === 'Space' || code === 'Enter' || code === 'NumpadEnter' || code === 'Backspace' || code === 'Delete' || code === 'ArrowLeft' || code === 'ArrowRight' || code === 'ArrowUp' || code === 'ArrowDown' || code === 'PageUp' || code === 'PageDown' || code === 'Home' || code === 'End' || code === 'Insert' || code === 'Escape' || code === 'Tab' || code === 'F1' || code === 'F2' || code === 'F3' || code === 'F4' || code === 'F5' || code === 'F6' || code === 'F7' || code === 'F8' || code === 'F9' || code === 'F10' || code === 'F11' || code === 'F12' || code === 'Shift');
+};
 
 var baseUrlForInviteMembers = '';
 var autoSelectFitsChannel = false;
@@ -10057,46 +10060,76 @@ var hashString = function hashString(str) {
   }
 };
 var formatDisappearingMessageTime = function formatDisappearingMessageTime(periodInMilliseconds) {
-  var _getDisappearingSetti;
   if (!periodInMilliseconds) return 'Off';
   var periodInSeconds = periodInMilliseconds / 1000;
-  switch (periodInSeconds) {
-    case FIXED_TIMER_OPTIONS['1day']:
-      return '1 day';
-    case FIXED_TIMER_OPTIONS['1week']:
-      return '1 week';
-    case FIXED_TIMER_OPTIONS['1month']:
-      return '1 month';
-  }
-  var customOptions = ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.customOptions) || [];
-  var customMatch = customOptions.find(function (option) {
-    return option.seconds === periodInSeconds;
-  });
-  if (customMatch) return customMatch.label;
   var SECONDS_PER_MINUTE = 60;
   var SECONDS_PER_HOUR = SECONDS_PER_MINUTE * 60;
   var SECONDS_PER_DAY = SECONDS_PER_HOUR * 24;
   var DAYS_PER_WEEK = 7;
   var DAYS_PER_MONTH = 30;
-  var days = Math.floor(periodInSeconds / SECONDS_PER_DAY);
-  var weeks = Math.floor(days / DAYS_PER_WEEK);
-  var months = Math.floor(days / DAYS_PER_MONTH);
-  var hours = Math.floor(periodInSeconds / SECONDS_PER_HOUR);
-  var minutes = Math.floor(periodInSeconds / SECONDS_PER_MINUTE);
-  switch (true) {
-    case months > 0:
-      return months + " " + (months === 1 ? 'month' : 'months');
-    case weeks > 0:
-      return weeks + " " + (weeks === 1 ? 'week' : 'weeks');
-    case days > 0:
-      return days + " " + (days === 1 ? 'day' : 'days');
-    case hours > 0:
-      return hours + " " + (hours === 1 ? 'hour' : 'hours');
-    case minutes > 0:
-      return minutes + " " + (minutes === 1 ? 'minute' : 'minutes');
-    default:
-      return periodInSeconds + " " + (periodInSeconds === 1 ? 'second' : 'seconds');
+  var DAYS_PER_YEAR = 365;
+  var remainingSeconds = Math.floor(periodInSeconds);
+  var years = Math.floor(remainingSeconds / (SECONDS_PER_DAY * DAYS_PER_YEAR));
+  remainingSeconds %= SECONDS_PER_DAY * DAYS_PER_YEAR;
+  var months = Math.floor(remainingSeconds / (SECONDS_PER_DAY * DAYS_PER_MONTH));
+  remainingSeconds %= SECONDS_PER_DAY * DAYS_PER_MONTH;
+  var weeks = Math.floor(remainingSeconds / (SECONDS_PER_DAY * DAYS_PER_WEEK));
+  remainingSeconds %= SECONDS_PER_DAY * DAYS_PER_WEEK;
+  var days = Math.floor(remainingSeconds / SECONDS_PER_DAY);
+  remainingSeconds %= SECONDS_PER_DAY;
+  var hours = Math.floor(remainingSeconds / SECONDS_PER_HOUR);
+  remainingSeconds %= SECONDS_PER_HOUR;
+  var minutes = Math.floor(remainingSeconds / SECONDS_PER_MINUTE);
+  remainingSeconds %= SECONDS_PER_MINUTE;
+  var seconds = remainingSeconds;
+  var parts = [];
+  var partCount = 0;
+  if (years > 0) {
+    partCount++;
+  }
+  if (months > 0) {
+    partCount++;
+  }
+  if (weeks > 0) {
+    partCount++;
+  }
+  if (days > 0) {
+    partCount++;
+  }
+  if (hours > 0) {
+    partCount++;
+  }
+  if (minutes > 0) {
+    partCount++;
+  }
+  if (seconds > 0) {
+    partCount++;
+  }
+  if (years > 0) {
+    parts.push("" + years + (partCount > 1 ? 'y' : years === 1 ? ' year' : ' years'));
+  }
+  if (months > 0) {
+    parts.push("" + months + (partCount > 1 ? 'm' : months === 1 ? ' month' : ' months'));
+  }
+  if (weeks > 0) {
+    parts.push("" + weeks + (partCount > 1 ? 'w' : weeks === 1 ? ' week' : ' weeks'));
+  }
+  if (days > 0) {
+    parts.push("" + days + (partCount > 1 ? 'd' : days === 1 ? ' day' : ' days'));
+  }
+  if (hours > 0) {
+    parts.push("" + hours + (partCount > 1 ? 'h' : hours === 1 ? ' hour' : ' hours'));
+  }
+  if (minutes > 0) {
+    parts.push("" + minutes + (partCount > 1 ? 'm' : minutes === 1 ? ' minute' : ' minutes'));
+  }
+  if (seconds > 0) {
+    parts.push("" + seconds + (partCount > 1 ? 's' : seconds === 1 ? ' second' : ' seconds'));
   }
+  if (parts.length === 0) {
+    return '0 seconds';
+  }
+  return parts.join(' ');
 };
 
 var GET_MESSAGES = 'GET_MESSAGES';
@@ -10130,10 +10163,7 @@ var queryDirection = {
   NEAR: 'near'
 };
 
-function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSeparateMessage, isResend, isAddToPendingMessagesMap) {
-  if (isAddToPendingMessagesMap === void 0) {
-    isAddToPendingMessagesMap = true;
-  }
+function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSeparateMessage, isResend) {
   return {
     type: SEND_MESSAGE,
     payload: {
@@ -10141,22 +10171,17 @@ function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSep
       channelId: channelId,
       connectionState: connectionState,
       sendAttachmentsAsSeparateMessage: sendAttachmentsAsSeparateMessage,
-      isResend: isResend,
-      isAddToPendingMessagesMap: isAddToPendingMessagesMap
+      isResend: isResend
     }
   };
 }
-function sendTextMessageAC(message, channelId, connectionState, isAddToPendingMessagesMap) {
-  if (isAddToPendingMessagesMap === void 0) {
-    isAddToPendingMessagesMap = true;
-  }
+function sendTextMessageAC(message, channelId, connectionState) {
   return {
     type: SEND_TEXT_MESSAGE,
     payload: {
       message: message,
       channelId: channelId,
-      connectionState: connectionState,
-      isAddToPendingMessagesMap: isAddToPendingMessagesMap
+      connectionState: connectionState
     }
   };
 }
@@ -10170,21 +10195,17 @@ function resendMessageAC(message, channelId, connectionState) {
     }
   };
 }
-function forwardMessageAC(message, channelId, connectionState, isForward, isAddToPendingMessagesMap) {
+function forwardMessageAC(message, channelId, connectionState, isForward) {
   if (isForward === void 0) {
     isForward = true;
   }
-  if (isAddToPendingMessagesMap === void 0) {
-    isAddToPendingMessagesMap = true;
-  }
   return {
     type: FORWARD_MESSAGE,
     payload: {
       message: message,
       channelId: channelId,
       connectionState: connectionState,
-      isForward: isForward,
-      isAddToPendingMessagesMap: isAddToPendingMessagesMap
+      isForward: isForward
     }
   };
 }
@@ -10731,7 +10752,8 @@ function updatePendingMessageAC(channelId, messageId, updatedMessage) {
   });
 }
 
-var MESSAGES_MAX_LENGTH = 80;
+var MESSAGES_MAX_PAGE_COUNT = 80;
+var MESSAGES_MAX_LENGTH = 50;
 var LOAD_MAX_MESSAGE_COUNT = 30;
 var MESSAGE_LOAD_DIRECTION = {
   PREV: 'prev',
@@ -10797,12 +10819,12 @@ var setAllMessages = function setAllMessages(messages) {
 var addAllMessages = function addAllMessages(messages, direction) {
   if (direction === MESSAGE_LOAD_DIRECTION.PREV) {
     activeChannelAllMessages = [].concat(messages, activeChannelAllMessages);
-    if (activeChannelAllMessages.length > MESSAGES_MAX_LENGTH) {
+    if (activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT) {
       setHasNextCached(true);
     }
   } else {
     activeChannelAllMessages = [].concat(activeChannelAllMessages, messages);
-    if (activeChannelAllMessages.length > MESSAGES_MAX_LENGTH) {
+    if (activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT) {
       setHasPrevCached(true);
     }
   }
@@ -10871,8 +10893,8 @@ var getHasNextCached = function getHasNextCached() {
 var getFromAllMessagesByMessageId = function getFromAllMessagesByMessageId(messageId, direction, getWithLastMessage) {
   var messagesForAdd = [];
   if (getWithLastMessage) {
-    messagesForAdd = [].concat(activeChannelAllMessages.slice(-MESSAGES_MAX_LENGTH));
-    setHasPrevCached(activeChannelAllMessages.length > MESSAGES_MAX_LENGTH);
+    messagesForAdd = [].concat(activeChannelAllMessages.slice(-MESSAGES_MAX_PAGE_COUNT));
+    setHasPrevCached(activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT);
     setHasNextCached(false);
   } else {
     var fromMessageIndex = activeChannelAllMessages.findIndex(function (mes) {
@@ -10900,14 +10922,25 @@ var getFromAllMessagesByMessageId = function getFromAllMessagesByMessageId(messa
   }
   return messagesForAdd;
 };
-function setMessagesToMap(channelId, messages) {
+function setMessagesToMap(channelId, messages, firstMessageId, lastMessageId) {
+  if (firstMessageId === void 0) {
+    firstMessageId = '0';
+  }
+  if (lastMessageId === void 0) {
+    lastMessageId = '0';
+  }
   if (!messagesMap[channelId]) {
     messagesMap[channelId] = {};
   }
-  messages.forEach(function (msg) {
-    if (msg.tid && messagesMap[channelId][msg.tid]) {
-      delete messagesMap[channelId][msg.tid];
+  for (var key in messagesMap[channelId]) {
+    if (Object.prototype.hasOwnProperty.call(messagesMap[channelId], key)) {
+      var element = messagesMap[channelId][key];
+      if (element.id >= firstMessageId && element.id <= lastMessageId) {
+        delete messagesMap[channelId][key];
+      }
     }
+  }
+  messages.forEach(function (msg) {
     messagesMap[channelId][msg.id || msg.tid] = msg;
   });
 }
@@ -10935,8 +10968,6 @@ function updateMessageOnMap(channelId, updatedMessage, voteDetails) {
       updatedPendingMessages.forEach(function (msg) {
         store.dispatch(updatePendingMessageAC(channelId, msg.tid || msg.id, msg));
       });
-    } else {
-      store.dispatch(removePendingMessageAC(channelId, updatedMessage.messageId));
     }
   }
   var updatedMessageData = null;
@@ -11335,42 +11366,36 @@ var messageSlice = createSlice({
         });
       });
       if (direction === MESSAGE_LOAD_DIRECTION.PREV && newMessagesLength > 0) {
-        if (currentMessagesLength + newMessagesLength >= MESSAGES_MAX_LENGTH) {
+        if (currentMessagesLength + newMessagesLength > MESSAGES_MAX_PAGE_COUNT) {
           var _state$activeChannelM;
           setHasNextCached(true);
           if (newMessagesLength > 0) {
-            if (currentMessagesLength >= MESSAGES_MAX_LENGTH) {
+            if (currentMessagesLength >= MESSAGES_MAX_PAGE_COUNT) {
               state.activeChannelMessages.splice(-newMessagesLength);
             } else {
-              state.activeChannelMessages.splice(-(newMessagesLength - (MESSAGES_MAX_LENGTH - currentMessagesLength)));
+              state.activeChannelMessages.splice(-(currentMessagesLength - currentMessagesLength + newMessagesLength - MESSAGES_MAX_PAGE_COUNT));
             }
           }
           (_state$activeChannelM = state.activeChannelMessages).splice.apply(_state$activeChannelM, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
-        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_LENGTH) {
+        } else {
           var _state$activeChannelM2;
-          var sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_LENGTH;
-          setHasNextCached(true);
-          state.activeChannelMessages.splice(-sliceElementCount);
           (_state$activeChannelM2 = state.activeChannelMessages).splice.apply(_state$activeChannelM2, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
-        } else {
-          var _state$activeChannelM3;
-          (_state$activeChannelM3 = state.activeChannelMessages).splice.apply(_state$activeChannelM3, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
         }
-      } else if (direction === 'next' && newMessagesLength > 0) {
-        if (currentMessagesLength >= MESSAGES_MAX_LENGTH) {
-          var _state$activeChannelM4;
+      } else if (direction === MESSAGE_LOAD_DIRECTION.NEXT && newMessagesLength > 0) {
+        if (currentMessagesLength >= MESSAGES_MAX_PAGE_COUNT) {
+          var _state$activeChannelM3;
           setHasPrevCached(true);
           state.activeChannelMessages.splice(0, messagesIsNotIncludeInActiveChannelMessages.length);
+          (_state$activeChannelM3 = state.activeChannelMessages).push.apply(_state$activeChannelM3, messagesIsNotIncludeInActiveChannelMessages);
+        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_PAGE_COUNT) {
+          var _state$activeChannelM4;
+          var sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_PAGE_COUNT;
+          setHasPrevCached(true);
+          state.activeChannelMessages.splice(0, sliceElementCount);
           (_state$activeChannelM4 = state.activeChannelMessages).push.apply(_state$activeChannelM4, messagesIsNotIncludeInActiveChannelMessages);
-        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_LENGTH) {
+        } else {
           var _state$activeChannelM5;
-          var _sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_LENGTH;
-          setHasPrevCached(true);
-          state.activeChannelMessages.splice(0, _sliceElementCount);
           (_state$activeChannelM5 = state.activeChannelMessages).push.apply(_state$activeChannelM5, messagesIsNotIncludeInActiveChannelMessages);
-        } else {
-          var _state$activeChannelM6;
-          (_state$activeChannelM6 = state.activeChannelMessages).push.apply(_state$activeChannelM6, messagesIsNotIncludeInActiveChannelMessages);
         }
       }
     },
@@ -18864,6 +18889,53 @@ var getFrame = function getFrame(videoSrc, time) {
   }
 };
 
+var SDKErrorTypeEnum = {
+  BadRequest: {
+    value: 'BadRequest',
+    isResendable: false
+  },
+  BadParam: {
+    value: 'BadParam',
+    isResendable: false
+  },
+  NotFound: {
+    value: 'NotFound',
+    isResendable: false
+  },
+  NotAllowed: {
+    value: 'NotAllowed',
+    isResendable: false
+  },
+  TooLargeRequest: {
+    value: 'TooLargeRequest',
+    isResendable: false
+  },
+  InternalError: {
+    value: 'InternalError',
+    isResendable: true
+  },
+  TooManyRequests: {
+    value: 'TooManyRequests',
+    isResendable: true
+  },
+  Authentication: {
+    value: 'Authentication',
+    isResendable: true
+  }
+};
+var fromValue = function fromValue(value) {
+  if (!value) return null;
+  var entries = Object.values(SDKErrorTypeEnum);
+  return entries.find(function (entry) {
+    return entry.value === value;
+  }) || null;
+};
+var isResendableError = function isResendableError(value) {
+  var _errorType$isResendab;
+  var errorType = fromValue(value);
+  return (_errorType$isResendab = errorType === null || errorType === void 0 ? void 0 : errorType.isResendable) != null ? _errorType$isResendab : true;
+};
+
 var _marked$3 = /*#__PURE__*/_regenerator().m(sendMessage),
   _marked2$2 = /*#__PURE__*/_regenerator().m(sendTextMessage),
   _marked3$1 = /*#__PURE__*/_regenerator().m(forwardMessage),
@@ -18979,63 +19051,96 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
     return Promise.reject(e);
   }
 };
-var addPendingMessage = function addPendingMessage(message, messageCopy, channel) {
+var addPendingMessage = function addPendingMessage(message, messageCopy, channelId) {
   try {
     var messageToAdd = _extends({}, messageCopy, {
       createdAt: new Date(Date.now()),
       mentionedUsers: message.mentionedUsers,
       parentMessage: message.parentMessage
     });
-    setPendingMessage(channel.id, messageToAdd);
+    setPendingMessage(channelId, messageToAdd);
     return Promise.resolve();
   } catch (e) {
     return Promise.reject(e);
   }
 };
-var updateMessage$1 = function updateMessage(actionType, pending, channel, scrollToNewMessage) {
+var updateMessage$1 = function updateMessage(actionType, pending, channelId, scrollToNewMessage, message) {
   if (scrollToNewMessage === void 0) {
     scrollToNewMessage = true;
   }
   return /*#__PURE__*/_regenerator().m(function _callee() {
-    var activeChannelId;
+    var activeChannelId, channel, messages, _channel$lastMessage2, repliedMessage, scrollRef, _channel$lastMessage3;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           activeChannelId = getActiveChannelId();
           if (!(actionType !== RESEND_MESSAGE)) {
-            _context.n = 2;
+            _context.n = 7;
             break;
           }
-          addMessageToMap(channel.id, pending);
-          if (activeChannelId === channel.id) {
+          if (activeChannelId === channelId) {
             addAllMessages([pending], MESSAGE_LOAD_DIRECTION.NEXT);
           }
-          if (!(activeChannelId === channel.id)) {
+          if (!(activeChannelId === channelId)) {
             _context.n = 1;
             break;
           }
           _context.n = 1;
           return put(addMessageAC(pending));
         case 1:
+          _context.n = 2;
+          return call(addPendingMessage, message, pending, channelId);
+        case 2:
           if (!scrollToNewMessage) {
-            _context.n = 2;
+            _context.n = 7;
             break;
           }
-          _context.n = 2;
-          return put(scrollToNewMessageAC(true, true));
-        case 2:
+          _context.n = 3;
+          return call(getChannelFromAllChannels, channelId);
+        case 3:
+          channel = _context.v;
+          messages = store.getState().MessageReducer.activeChannelMessages;
+          if (!(messages.findIndex(function (msg) {
+            var _channel$lastMessage;
+            return msg.id === (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage = channel.lastMessage) === null || _channel$lastMessage === void 0 ? void 0 : _channel$lastMessage.id);
+          }) >= 10)) {
+            _context.n = 6;
+            break;
+          }
+          _context.n = 4;
+          return put(scrollToNewMessageAC(true, false, false));
+        case 4:
+          _context.n = 5;
+          return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
+        case 5:
+          repliedMessage = document.getElementById(channel === null || channel === void 0 ? void 0 : (_channel$lastMessage2 = channel.lastMessage) === null || _channel$lastMessage2 === void 0 ? void 0 : _channel$lastMessage2.id);
+          if (repliedMessage) {
+            scrollRef = document.getElementById('scrollableDiv');
+            if (scrollRef) {
+              scrollRef.scrollTo({
+                top: 1000,
+                behavior: 'smooth'
+              });
+            }
+          }
+          _context.n = 7;
+          break;
+        case 6:
+          _context.n = 7;
+          return put(getMessagesAC(channel, false, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, undefined, false, 'smooth', true));
+        case 7:
           return _context.a(2);
       }
     }, _callee);
   })();
 };
 function sendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, pending, _loop2, _i, _t2;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, pending, _loop2, _i, _t2;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, sendAttachmentsAsSeparateMessage = payload.sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
+        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, sendAttachmentsAsSeparateMessage = payload.sendAttachmentsAsSeparateMessage;
         pendingMessages = [];
         _context4.p = 1;
         _context4.n = 2;
@@ -19170,8 +19275,12 @@ function sendMessage(action) {
                   createdAt: new Date(Date.now())
                 });
                 pendingMessages.push(_pending);
+                if (!(action.type !== RESEND_MESSAGE)) {
+                  _context2.n = 1;
+                  break;
+                }
                 _context2.n = 1;
-                return call(updateMessage$1, action.type, _pending, channel);
+                return call(updateMessage$1, action.type, _pending, channel.id, true, message);
               case 1:
                 _context2.n = 3;
                 break;
@@ -19219,8 +19328,12 @@ function sendMessage(action) {
           createdAt: new Date(Date.now())
         });
         pendingMessages.push(pending);
+        if (!(action.type !== RESEND_MESSAGE)) {
+          _context4.n = 11;
+          break;
+        }
         _context4.n = 11;
-        return call(updateMessage$1, action.type, pending, channel);
+        return call(updateMessage$1, action.type, pending, channel.id, true, message);
       case 11:
         messageToSend = _extends({}, messageToSend, {
           attachments: attachmentsToSend
@@ -19228,7 +19341,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, connectionIsDisconnected, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -19237,7 +19350,7 @@ function sendMessage(action) {
                 _context3.p = 1;
                 messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
                 if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-                  _context3.n = 12;
+                  _context3.n = 13;
                   break;
                 }
                 _attachmentsToSend = messageAttachment;
@@ -19298,9 +19411,6 @@ function sendMessage(action) {
                 _context3.n = 5;
                 break;
               case 8:
-                if (action.type === RESEND_MESSAGE) {
-                  messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
-                }
                 attachmentsToUpdate = [];
                 if (messageResponse.attachments && messageResponse.attachments.length > 0) {
                   currentAttachmentsMap = {};
@@ -19333,13 +19443,18 @@ function sendMessage(action) {
                   createdAt: messageResponse.createdAt,
                   channelId: channel.id
                 };
+                activeChannelId = getActiveChannelId();
+                if (!(activeChannelId === channel.id)) {
+                  _context3.n = 9;
+                  break;
+                }
                 _context3.n = 9;
-                return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData))));
+                return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
               case 9:
-                updateMessageOnMap(channel.id, {
-                  messageId: messageToSend.tid,
-                  params: messageUpdateData
-                });
+                _context3.n = 10;
+                return put(removePendingMessageAC(channel.id, messageToSend.tid));
+              case 10:
+                addMessageToMap(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
                 updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
                 messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
                 updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
@@ -19348,46 +19463,36 @@ function sendMessage(action) {
                   lastReactedMessage: null
                 };
                 if (!channel.unread) {
-                  _context3.n = 10;
+                  _context3.n = 11;
                   break;
                 }
-                _context3.n = 10;
-                return put(markChannelAsReadAC(channel.id));
-              case 10:
                 _context3.n = 11;
-                return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
+                return put(markChannelAsReadAC(channel.id));
               case 11:
+                _context3.n = 12;
+                return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
+              case 12:
                 updateChannelOnAllChannels(channel.id, channelUpdateParam);
-                _context3.n = 13;
+                _context3.n = 14;
                 break;
-              case 12:
-                throw new Error('Connection required to send message');
               case 13:
+                throw new Error('Connection required to send message');
+              case 14:
                 _context3.n = 19;
                 break;
-              case 14:
-                _context3.p = 14;
+              case 15:
+                _context3.p = 15;
                 _t = _context3.v;
-                pendingMessage = pendingMessages === null || pendingMessages === void 0 ? void 0 : pendingMessages.find(function (pendingMessage) {
-                  return pendingMessage.tid === messageToSend.tid;
-                });
-                if (!(channel && pendingMessage && action.type !== RESEND_MESSAGE)) {
+                isErrorResendable = isResendableError(_t === null || _t === void 0 ? void 0 : _t.type);
+                if (isErrorResendable) {
                   _context3.n = 17;
                   break;
                 }
-                connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
-                if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
-                  _context3.n = 16;
-                  break;
-                }
-                _context3.n = 15;
-                return call(addPendingMessage, message, pendingMessage, channel);
-              case 15:
-                _context3.n = 17;
-                break;
+                _context3.n = 16;
+                return put(removePendingMessageAC(channel.id, messageToSend.tid));
               case 16:
-                _context3.n = 17;
-                return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+                _context3.n = 19;
+                break;
               case 17:
                 log.error('Error on uploading attachment', messageToSend.tid, _t);
                 if (!(messageToSend.attachments && messageToSend.attachments.length)) {
@@ -19413,7 +19518,7 @@ function sendMessage(action) {
               case 19:
                 return _context3.a(2);
             }
-          }, _callee3, null, [[1, 14]]);
+          }, _callee3, null, [[1, 15]]);
         });
         _i = 0;
       case 13:
@@ -19445,12 +19550,12 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId, _t3;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
+        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
         _context5.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
@@ -19464,8 +19569,8 @@ function sendTextMessage(action) {
             setChannelInMap(channel);
           }
         }
+        sendMessageTid = null;
         pendingMessage = null;
-        activeChannelId = getActiveChannelId();
         _context5.p = 3;
         if (!channel.isMockChannel) {
           _context5.n = 6;
@@ -19525,11 +19630,15 @@ function sendTextMessage(action) {
           _context5.n = 8;
           break;
         }
+        if (!(action.type !== RESEND_MESSAGE)) {
+          _context5.n = 8;
+          break;
+        }
         _context5.n = 8;
-        return call(updateMessage$1, action.type, pendingMessage, channel);
+        return call(updateMessage$1, action.type, pendingMessage, channel.id, true, message);
       case 8:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context5.n = 16;
+          _context5.n = 17;
           break;
         }
         if (!sendMessageHandler) {
@@ -19565,19 +19674,20 @@ function sendTextMessage(action) {
           pollDetails: (_messageResponse = messageResponse) === null || _messageResponse === void 0 ? void 0 : _messageResponse.pollDetails,
           channelId: channel.id
         };
+        activeChannelId = getActiveChannelId();
         if (!(activeChannelId === channel.id)) {
           _context5.n = 13;
           break;
         }
         _context5.n = 13;
-        return put(updateMessageAC(messageToSend.tid, messageUpdateData));
+        return put(updateMessageAC(messageToSend.tid, messageUpdateData, true));
       case 13:
-        updateMessageOnMap(channel.id, {
-          messageId: !isAddToPendingMessagesMap ? message.tid : messageToSend.tid,
-          params: messageUpdateData
-        });
+        _context5.n = 14;
+        return put(removePendingMessageAC(channel.id, messageToSend.tid));
+      case 14:
+        addMessageToMap(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
         if (activeChannelId === channel.id) {
-          updateMessageOnAllMessages(!isAddToPendingMessagesMap ? message.tid : messageToSend.tid, messageUpdateData);
+          updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
         }
         messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
         updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
@@ -19585,57 +19695,52 @@ function sendTextMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context5.n = 14;
+        _context5.n = 15;
         return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 14:
+      case 15:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context5.n = 15;
+          _context5.n = 16;
           break;
         }
-        _context5.n = 15;
+        _context5.n = 16;
         return put(markChannelAsReadAC(channel.id));
-      case 15:
+      case 16:
         channel.lastMessage = messageToUpdate;
-        if (action.type === RESEND_MESSAGE) {
-          messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
-        }
-        _context5.n = 17;
+        _context5.n = 18;
         break;
-      case 16:
-        throw new Error('Connection required to send message');
       case 17:
+        throw new Error('Connection required to send message');
+      case 18:
         _context5.n = 22;
         break;
-      case 18:
-        _context5.p = 18;
+      case 19:
+        _context5.p = 19;
         _t3 = _context5.v;
-        if (!(activeChannelId === channel.id && pendingMessage && action.type !== RESEND_MESSAGE)) {
+        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
+        isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
+        if (!(!isErrorResendable && channel.id && sendMessageTid)) {
           _context5.n = 21;
           break;
         }
-        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
-        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
-          _context5.n = 20;
-          break;
-        }
-        _context5.n = 19;
-        return call(addPendingMessage, message, pendingMessage, channel);
-      case 19:
-        _context5.n = 21;
-        break;
+        _context5.n = 20;
+        return put(removePendingMessageAC(channel.id, sendMessageTid));
       case 20:
-        _context5.n = 21;
-        return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+        _context5.n = 22;
+        break;
       case 21:
-        log.error('error on send text message ... ', _t3);
+        if (!(channel.id && sendMessageTid)) {
+          _context5.n = 22;
+          break;
+        }
         updateMessageOnMap(channel.id, {
           messageId: sendMessageTid,
           params: {
             state: MESSAGE_STATUS.FAILED
           }
         });
-        if (!(activeChannelId === channel.id)) {
+        _activeChannelId = getActiveChannelId();
+        if (!(_activeChannelId === channel.id)) {
           _context5.n = 22;
           break;
         }
@@ -19655,15 +19760,15 @@ function sendTextMessage(action) {
       case 24:
         return _context5.a(2);
     }
-  }, _marked2$2, null, [[3, 18, 22, 24]]);
+  }, _marked2$2, null, [[3, 19, 22, 24]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t4;
+  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId2, _t4;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
+        message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward;
         pendingMessage = null;
         channel = null;
         activeChannelId = getActiveChannelId();
@@ -19706,7 +19811,7 @@ function forwardMessage(action) {
         }) : [];
         attachments = message.attachments;
         if ((channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC) && !(channel.userRole === 'admin' || channel.userRole === 'owner')) {
-          _context6.n = 16;
+          _context6.n = 17;
           break;
         }
         if (message.attachments && message.attachments.length) {
@@ -19733,7 +19838,7 @@ function forwardMessage(action) {
           };
         }
         messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisableMentionsCount(getDisableFrowardMentionsCount()).setMetadata(message.metadata ? isJSON(message.metadata) ? message.metadata : JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id).setPollDetails(pollDetails);
-        messageToSend = messageBuilder.create();
+        messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
         messageToSend.tid = action.type === RESEND_MESSAGE ? action.payload.message.tid : messageToSend.tid;
         messageTid = messageToSend.tid;
         pendingMessage = _extends({}, messageToSend, {
@@ -19769,11 +19874,15 @@ function forwardMessage(action) {
           _context6.n = 9;
           break;
         }
+        if (!(action.type !== RESEND_MESSAGE)) {
+          _context6.n = 9;
+          break;
+        }
         _context6.n = 9;
-        return call(updateMessage$1, action.type, pendingMessage, channel, false);
+        return call(updateMessage$1, action.type, pendingMessage, channel.id, false, message);
       case 9:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context6.n = 15;
+          _context6.n = 16;
           break;
         }
         _context6.n = 10;
@@ -19799,61 +19908,55 @@ function forwardMessage(action) {
           break;
         }
         _context6.n = 11;
-        return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData))));
+        return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
       case 11:
         updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
       case 12:
-        if (action.type === RESEND_MESSAGE) {
-          messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
+        if (!messageToSend.tid) {
+          _context6.n = 13;
+          break;
         }
-        updateMessageOnMap(channel.id, {
-          messageId: !isAddToPendingMessagesMap ? message.tid : messageToSend.tid,
-          params: messageUpdateData
-        });
+        _context6.n = 13;
+        return put(removePendingMessageAC(channel.id, messageToSend.tid));
+      case 13:
+        addMessageToMap(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
         messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
         updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
         channelUpdateParam = {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context6.n = 13;
+        _context6.n = 14;
         return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 13:
+      case 14:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context6.n = 14;
+          _context6.n = 15;
           break;
         }
-        _context6.n = 14;
+        _context6.n = 15;
         return put(markChannelAsReadAC(channel.id));
-      case 14:
-        _context6.n = 16;
-        break;
       case 15:
-        throw new Error('Connection required to forward message');
+        _context6.n = 17;
+        break;
       case 16:
+        throw new Error('Connection required to forward message');
+      case 17:
         _context6.n = 22;
         break;
-      case 17:
-        _context6.p = 17;
+      case 18:
+        _context6.p = 18;
         _t4 = _context6.v;
-        if (!(pendingMessage && channel && action.type !== RESEND_MESSAGE)) {
+        isErrorResendable = isResendableError(_t4 === null || _t4 === void 0 ? void 0 : _t4.type);
+        if (isErrorResendable) {
           _context6.n = 20;
           break;
         }
-        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
-        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
-          _context6.n = 19;
-          break;
-        }
-        _context6.n = 18;
-        return call(addPendingMessage, message, pendingMessage, channel);
-      case 18:
-        _context6.n = 20;
-        break;
+        _context6.n = 19;
+        return put(removePendingMessageAC(channel.id, messageTid));
       case 19:
-        _context6.n = 20;
-        return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+        _context6.n = 21;
+        break;
       case 20:
         if (!(channel && messageTid)) {
           _context6.n = 21;
@@ -19865,7 +19968,8 @@ function forwardMessage(action) {
             state: MESSAGE_STATUS.FAILED
           }
         });
-        if (!(activeChannelId === channel.id)) {
+        _activeChannelId2 = getActiveChannelId();
+        if (!(_activeChannelId2 === channel.id)) {
           _context6.n = 21;
           break;
         }
@@ -19887,25 +19991,67 @@ function forwardMessage(action) {
       case 24:
         return _context6.a(2);
     }
-  }, _marked3$1, null, [[1, 17, 22, 24]]);
+  }, _marked3$1, null, [[1, 18, 22, 24]]);
 }
 function resendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isVoiceMessage;
+  var _message$attachments;
+  var payload, message, connectionState, channelId, attachments, sendAttachmentsAsSeparateMessage, isVoiceMessage;
   return _regenerator().w(function (_context7) {
     while (1) switch (_context7.n) {
       case 0:
         payload = action.payload;
         message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
-        if (message.forwardingDetails) {
-          store.dispatch(forwardMessageAC(message, channelId, connectionState, false, false));
-        } else if (message.attachments && message.attachments.length) {
-          sendAttachmentsAsSeparateMessage = getSendAttachmentsAsSeparateMessages();
-          isVoiceMessage = message.attachments[0].type === attachmentTypes.voice;
-          store.dispatch(sendMessageAC(message, channelId, connectionState, isVoiceMessage ? false : sendAttachmentsAsSeparateMessage, false, false));
-        } else {
-          store.dispatch(sendTextMessageAC(message, channelId, connectionState, false));
+        attachments = message === null || message === void 0 ? void 0 : (_message$attachments = message.attachments) === null || _message$attachments === void 0 ? void 0 : _message$attachments.filter(function (att) {
+          return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
+        });
+        if (!message.forwardingDetails) {
+          _context7.n = 2;
+          break;
         }
+        _context7.n = 1;
+        return call(forwardMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: message,
+            connectionState: connectionState,
+            channelId: channelId,
+            isForward: false
+          }
+        });
       case 1:
+        _context7.n = 5;
+        break;
+      case 2:
+        if (!(attachments && attachments.length)) {
+          _context7.n = 4;
+          break;
+        }
+        sendAttachmentsAsSeparateMessage = getSendAttachmentsAsSeparateMessages();
+        isVoiceMessage = message.attachments[0].type === attachmentTypes.voice;
+        _context7.n = 3;
+        return call(sendMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: message,
+            connectionState: connectionState,
+            channelId: channelId,
+            sendAttachmentsAsSeparateMessage: isVoiceMessage ? false : sendAttachmentsAsSeparateMessage
+          }
+        });
+      case 3:
+        _context7.n = 5;
+        break;
+      case 4:
+        _context7.n = 5;
+        return call(sendTextMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: message,
+            connectionState: connectionState,
+            channelId: channelId
+          }
+        });
+      case 5:
         return _context7.a(2);
     }
   }, _marked4$1);
@@ -20067,8 +20213,7 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
             message: msg,
             connectionState: connectionState,
             channelId: channelId,
-            isForward: true,
-            isAddToPendingMessagesMap: false
+            isForward: true
           }
         });
       case 4:
@@ -20086,9 +20231,7 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
             message: msg,
             connectionState: connectionState,
             channelId: channelId,
-            sendAttachmentsAsSeparateMessage: false,
-            isResend: true,
-            isAddToPendingMessagesMap: false
+            sendAttachmentsAsSeparateMessage: false
           }
         });
       case 6:
@@ -20101,8 +20244,7 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
           payload: {
             message: msg,
             connectionState: connectionState,
-            channelId: channelId,
-            isAddToPendingMessagesMap: false
+            channelId: channelId
           }
         });
       case 8:
@@ -20131,26 +20273,13 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
     }
   }, _callee4, null, [[3, 9]]);
 });
-var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, updatedMessages) {
-  var _messages, _Object$values;
-  var previousAllMessages, messages, lastMessageId, setMappedAllMessages, allMessagesAfterLastMessage;
+var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, updatedMessages, firstMessageId, lastMessageId) {
+  var messages;
   return _regenerator().w(function (_context1) {
     while (1) switch (_context1.n) {
       case 0:
-        previousAllMessages = getAllMessages();
         messages = [].concat(updatedMessages);
-        lastMessageId = (_messages = messages[messages.length - 1]) === null || _messages === void 0 ? void 0 : _messages.id;
-        setMappedAllMessages = {};
-        previousAllMessages.forEach(function (msg) {
-          if (msg.channelId === channel.id) {
-            setMappedAllMessages[msg.id || msg.tid || ''] = msg;
-          }
-        });
-        allMessagesAfterLastMessage = lastMessageId ? (_Object$values = Object.values(setMappedAllMessages || {})) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (msg) {
-          return msg.id > lastMessageId || !msg.id;
-        }) : Object.values(setMappedAllMessages || {});
-        messages = [].concat(messages, allMessagesAfterLastMessage || []);
-        setMessagesToMap(channel.id, messages);
+        setMessagesToMap(channel.id, messages, firstMessageId, lastMessageId);
         setAllMessages(messages);
         _context1.n = 1;
         return put(setMessagesAC(JSON.parse(JSON.stringify(messages))));
@@ -20159,8 +20288,23 @@ var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, up
     }
   }, _callee5);
 });
+var getFilteredPendingMessages = function getFilteredPendingMessages(messages) {
+  var filteredPendingMessages = [];
+  var activeChannelId = getActiveChannelId();
+  var pendingMessages = JSON.parse(JSON.stringify(getPendingMessages(activeChannelId) || []));
+  if (pendingMessages && pendingMessages.length) {
+    var messagesMap = {};
+    messages.forEach(function (msg) {
+      messagesMap[msg.tid || ''] = msg;
+    });
+    filteredPendingMessages = pendingMessages.filter(function (msg) {
+      return !messagesMap[msg.tid || ''];
+    });
+  }
+  return filteredPendingMessages;
+};
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, pendingMessages, _messagesMap, filteredPendingMessages, waitToSendPendingMessages, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20, _t21;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, _result$messages$, _result$messages, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _updatedMessages$, _parsedMessages$, _parsedMessages, parsedMessages, _filteredPendingMessages, updatedMessages, messageIdForLoad, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -20171,7 +20315,7 @@ function getMessagesQuery(action) {
         _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, scrollToMessage = _action$payload.scrollToMessage;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel.id && !channel.isMockChannel)) {
-          _context10.n = 76;
+          _context10.n = 59;
           break;
         }
         SceytChatClient = getClient();
@@ -20201,17 +20345,16 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context10.n = 19;
+          _context10.n = 15;
           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)) {
-          _context10.n = 14;
+          _context10.n = 10;
           break;
         }
         setHasPrevCached(false);
-        setMessagesToMap(channel.id, []);
         setAllMessages([]);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context10.n = 6;
@@ -20230,31 +20373,6 @@ function getMessagesQuery(action) {
         };
       case 7:
         result = _t1;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 11;
-          break;
-        }
-        messageQuery.limit = 30;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 9;
-          break;
-        }
-        _context10.n = 8;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 8:
-        _t10 = _context10.v;
-        _context10.n = 10;
-        break;
-      case 9:
-        _t10 = {
-          messages: [],
-          hasNext: false
-        };
-      case 10:
-        secondResult = _t10;
-        result.messages = [].concat(secondResult.messages, result.messages);
-        result.hasNext = secondResult.hasNext;
-      case 11:
         sentMessages = [];
         if (withDeliveredMessages) {
           sentMessages = getFromAllMessagesByMessageId('', '', true);
@@ -20267,40 +20385,40 @@ function getMessagesQuery(action) {
           return !messagesMap[msg.tid || ''];
         });
         result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
-        _context10.n = 12;
+        _context10.n = 8;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 12:
-        setMessagesToMap(channel.id, result.messages);
+      case 8:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$ = result.messages[0]) === null || _result$messages$ === void 0 ? void 0 : _result$messages$.id, (_result$messages = result.messages[result.messages.length - 1]) === null || _result$messages === void 0 ? void 0 : _result$messages.id);
         setAllMessages(result.messages);
-        _context10.n = 13;
+        _context10.n = 9;
         return put(setMessagesHasPrevAC(true));
-      case 13:
-        _context10.n = 16;
+      case 9:
+        _context10.n = 12;
         break;
-      case 14:
+      case 10:
         result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context10.n = 15;
+        _context10.n = 11;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 15:
-        _context10.n = 16;
+      case 11:
+        _context10.n = 12;
         return put(setMessagesHasPrevAC(true));
-      case 16:
-        _context10.n = 17;
+      case 12:
+        _context10.n = 13;
         return put(setMessagesHasNextAC(false));
-      case 17:
+      case 13:
         setHasNextCached(false);
         if (!(messageId && scrollToMessage)) {
-          _context10.n = 18;
+          _context10.n = 14;
           break;
         }
-        _context10.n = 18;
+        _context10.n = 14;
         return put(setScrollToMessagesAC(messageId, highlight, behavior));
-      case 18:
-        _context10.n = 72;
+      case 14:
+        _context10.n = 52;
         break;
-      case 19:
+      case 15:
         if (!messageId) {
-          _context10.n = 38;
+          _context10.n = 27;
           break;
         }
         _allMessages = getAllMessages();
@@ -20309,302 +20427,187 @@ function getMessagesQuery(action) {
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context10.n = 22;
+          _context10.n = 18;
           break;
         }
         result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context10.n = 20;
+        _context10.n = 16;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 20:
+      case 16:
         setHasPrevCached(messageIndex > maxLengthPart);
         setHasNextCached(_allMessages.length > maxLengthPart);
-        _context10.n = 21;
+        _context10.n = 17;
         return put(setMessagesHasPrevAC(true));
-      case 21:
-        _context10.n = 34;
+      case 17:
+        _context10.n = 23;
         break;
-      case 22:
+      case 18:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         log.info('load by message id from server ...............', messageId);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 24;
+          _context10.n = 20;
           break;
         }
-        _context10.n = 23;
+        _context10.n = 19;
         return call(messageQuery.loadNearMessageId, messageId);
-      case 23:
-        _t11 = _context10.v;
-        _context10.n = 25;
-        break;
-      case 24:
-        _t11 = {
-          messages: [],
-          hasNext: false
-        };
-      case 25:
-        result = _t11;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 32;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 27;
-          break;
-        }
-        _context10.n = 26;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 26:
-        _t12 = _context10.v;
-        _context10.n = 28;
-        break;
-      case 27:
-        _t12 = {
-          messages: [],
-          hasNext: false
-        };
-      case 28:
-        _secondResult = _t12;
-        messageQuery.reverse = false;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 30;
-          break;
-        }
-        _context10.n = 29;
-        return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 29:
-        _t13 = _context10.v;
-        _context10.n = 31;
+      case 19:
+        _t10 = _context10.v;
+        _context10.n = 21;
         break;
-      case 30:
-        _t13 = {
+      case 20:
+        _t10 = {
           messages: [],
           hasNext: false
         };
-      case 31:
-        thirdResult = _t13;
-        result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
-        result.hasNext = _secondResult.hasNext;
-        messageQuery.reverse = true;
-        _context10.n = 32;
-        return put(setMessagesHasPrevAC(_secondResult.hasNext));
-      case 32:
-        _context10.n = 33;
+      case 21:
+        result = _t10;
+        _context10.n = 22;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 33:
-        setMessagesToMap(channel.id, result.messages);
+      case 22:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$2 = result.messages[0]) === null || _result$messages$2 === void 0 ? void 0 : _result$messages$2.id, (_result$messages2 = result.messages[result.messages.length - 1]) === null || _result$messages2 === void 0 ? void 0 : _result$messages2.id);
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 34:
-        _context10.n = 35;
+      case 23:
+        _context10.n = 24;
         return put(setMessagesHasNextAC(true));
-      case 35:
+      case 24:
         if (!scrollToMessage) {
-          _context10.n = 36;
+          _context10.n = 25;
           break;
         }
-        _context10.n = 36;
-        return put(setScrollToMessagesAC(messageId, true, behavior));
-      case 36:
-        _context10.n = 37;
+        _context10.n = 25;
+        return put(setScrollToMessagesAC(messageId, highlight, behavior));
+      case 25:
+        _context10.n = 26;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 37:
-        _context10.n = 72;
+      case 26:
+        _context10.n = 52;
         break;
-      case 38:
+      case 27:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context10.n = 61;
+          _context10.n = 39;
           break;
         }
-        setMessagesToMap(channel.id, []);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context10.n = 50;
+          _context10.n = 31;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 40;
+          _context10.n = 29;
           break;
         }
-        _context10.n = 39;
+        _context10.n = 28;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 39:
-        _t14 = _context10.v;
-        _context10.n = 41;
-        break;
-      case 40:
-        _t14 = {
-          messages: [],
-          hasNext: false
-        };
-      case 41:
-        result = _t14;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 49;
-          break;
-        }
-        messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 43;
-          break;
-        }
-        _context10.n = 42;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 42:
-        _t15 = _context10.v;
-        _context10.n = 44;
-        break;
-      case 43:
-        _t15 = {
-          messages: [],
-          hasNext: false
-        };
-      case 44:
-        _secondResult2 = _t15;
-        if (!(channel.newMessageCount > 25)) {
-          _context10.n = 48;
-          break;
-        }
-        messageQuery.reverse = false;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 46;
-          break;
-        }
-        _context10.n = 45;
-        return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 45:
-        _t16 = _context10.v;
-        _context10.n = 47;
+      case 28:
+        _t11 = _context10.v;
+        _context10.n = 30;
         break;
-      case 46:
-        _t16 = {
+      case 29:
+        _t11 = {
           messages: [],
           hasNext: false
         };
-      case 47:
-        _thirdResult = _t16;
-        result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
-        messageQuery.reverse = true;
-        _context10.n = 49;
-        break;
-      case 48:
-        result.messages = [].concat(_secondResult2.messages, result.messages);
-      case 49:
-        _context10.n = 57;
+      case 30:
+        result = _t11;
+        _context10.n = 35;
         break;
-      case 50:
+      case 31:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 52;
+          _context10.n = 33;
           break;
         }
-        _context10.n = 51;
+        _context10.n = 32;
         return call(messageQuery.loadPrevious);
-      case 51:
-        _t17 = _context10.v;
-        _context10.n = 53;
-        break;
-      case 52:
-        _t17 = {
-          messages: [],
-          hasNext: false
-        };
-      case 53:
-        result = _t17;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 57;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 55;
-          break;
-        }
-        _context10.n = 54;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 54:
-        _t18 = _context10.v;
-        _context10.n = 56;
+      case 32:
+        _t12 = _context10.v;
+        _context10.n = 34;
         break;
-      case 55:
-        _t18 = {
+      case 33:
+        _t12 = {
           messages: [],
           hasNext: false
         };
-      case 56:
-        _secondResult3 = _t18;
-        result.messages = [].concat(_secondResult3.messages, result.messages);
-        result.hasNext = _secondResult3.hasNext;
-      case 57:
-        _context10.n = 58;
+      case 34:
+        result = _t12;
+      case 35:
+        _context10.n = 36;
         return put(setMessagesHasPrevAC(true));
-      case 58:
-        _context10.n = 59;
+      case 36:
+        _context10.n = 37;
         return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
-      case 59:
-        setMessagesToMap(channel.id, result.messages);
+      case 37:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$3 = result.messages[0]) === null || _result$messages$3 === void 0 ? void 0 : _result$messages$3.id, (_result$messages3 = result.messages[result.messages.length - 1]) === null || _result$messages3 === void 0 ? void 0 : _result$messages3.id);
         setAllMessages([].concat(result.messages));
-        _context10.n = 60;
+        _context10.n = 38;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 60:
-        _context10.n = 72;
+      case 38:
+        _context10.n = 52;
         break;
-      case 61:
-        setMessagesToMap(channel.id, []);
-        setAllMessages([]);
+      case 39:
         if (!(cachedMessages && cachedMessages.length)) {
-          _context10.n = 62;
+          _context10.n = 41;
           break;
         }
-        setMessagesToMap(channel.id, []);
-        setAllMessages([].concat(cachedMessages));
-        _context10.n = 62;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 62:
+        parsedMessages = JSON.parse(JSON.stringify(cachedMessages));
+        setMessagesToMap(channel.id, parsedMessages, (_parsedMessages$ = parsedMessages[0]) === null || _parsedMessages$ === void 0 ? void 0 : _parsedMessages$.id, (_parsedMessages = parsedMessages[parsedMessages.length - 1]) === null || _parsedMessages === void 0 ? void 0 : _parsedMessages.id);
+        setAllMessages(parsedMessages);
+        _context10.n = 40;
+        return put(setMessagesAC(parsedMessages));
+      case 40:
+        _filteredPendingMessages = getFilteredPendingMessages(parsedMessages);
+        _context10.n = 41;
+        return put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 41:
         log.info('load message from server');
+        result = {
+          messages: [],
+          hasNext: false
+        };
+        if (!((channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage4 = channel.lastMessage) === null || _channel$lastMessage4 === void 0 ? void 0 : _channel$lastMessage4.id))) {
+          _context10.n = 45;
+          break;
+        }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 64;
+          _context10.n = 43;
           break;
         }
-        _context10.n = 63;
-        return call(messageQuery.loadPrevious);
-      case 63:
-        _t19 = _context10.v;
-        _context10.n = 65;
+        _context10.n = 42;
+        return call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
+      case 42:
+        _t13 = _context10.v;
+        _context10.n = 44;
         break;
-      case 64:
-        _t19 = {
+      case 43:
+        _t13 = {
           messages: [],
           hasNext: false
         };
-      case 65:
-        result = _t19;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 69;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
+      case 44:
+        result = _t13;
+        _context10.n = 49;
+        break;
+      case 45:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 67;
+          _context10.n = 47;
           break;
         }
-        _context10.n = 66;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 66:
-        _t20 = _context10.v;
-        _context10.n = 68;
+        _context10.n = 46;
+        return call(messageQuery.loadPrevious);
+      case 46:
+        _t14 = _context10.v;
+        _context10.n = 48;
         break;
-      case 67:
-        _t20 = {
+      case 47:
+        _t14 = {
           messages: [],
           hasNext: false
         };
-      case 68:
-        _secondResult4 = _t20;
-        result.messages = [].concat(_secondResult4.messages, result.messages);
-        result.hasNext = _secondResult4.hasNext;
-      case 69:
+      case 48:
+        result = _t14;
+      case 49:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -20614,70 +20617,73 @@ function getMessagesQuery(action) {
           updateMessageOnAllMessages(msg.id, updatedMessage || msg);
           updatedMessages.push(updatedMessage || msg);
         });
-        _context10.n = 70;
-        return call(updateMessages, channel, updatedMessages);
-      case 70:
-        _context10.n = 71;
+        messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
+        _context10.n = 50;
+        return call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
+      case 50:
+        _context10.n = 51;
         return put(setMessagesHasPrevAC(true));
-      case 71:
-        _context10.n = 72;
+      case 51:
+        _context10.n = 52;
         return put(setMessagesHasNextAC(false));
-      case 72:
-        pendingMessages = getPendingMessages(channel.id);
-        if (!(pendingMessages && pendingMessages.length)) {
-          _context10.n = 73;
-          break;
-        }
-        _messagesMap = {};
-        result.messages.forEach(function (msg) {
-          _messagesMap[msg.tid || ''] = msg;
-        });
-        filteredPendingMessages = pendingMessages.filter(function (msg) {
-          return !_messagesMap[msg.tid || ''];
-        });
-        _context10.n = 73;
+      case 52:
+        filteredPendingMessages = getFilteredPendingMessages(result.messages);
+        _context10.n = 53;
         return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 73:
+      case 53:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 75;
+          _context10.n = 55;
           break;
         }
-        _context10.n = 74;
+        _context10.n = 54;
         return put(setWaitToSendPendingMessagesAC(false));
-      case 74:
-        _context10.n = 75;
+      case 54:
+        _context10.n = 55;
         return spawn(sendPendingMessages, connectionState);
-      case 75:
-        _context10.n = 77;
+      case 55:
+        _context10.n = 56;
+        return call(SceytChatClient.getChannel, channel.id, true);
+      case 56:
+        updatedChannel = _context10.v;
+        if (!updatedChannel) {
+          _context10.n = 58;
+          break;
+        }
+        _context10.n = 57;
+        return put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
+      case 57:
+        updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
+      case 58:
+        _context10.n = 60;
         break;
-      case 76:
+      case 59:
         if (!channel.isMockChannel) {
-          _context10.n = 77;
+          _context10.n = 60;
           break;
         }
-        _context10.n = 77;
+        _context10.n = 60;
         return put(setMessagesAC([]));
-      case 77:
-        _context10.n = 79;
+      case 60:
+        _context10.n = 62;
         break;
-      case 78:
-        _context10.p = 78;
-        _t21 = _context10.v;
-        log.error('error in message query', _t21);
-      case 79:
-        _context10.p = 79;
-        _context10.n = 80;
+      case 61:
+        _context10.p = 61;
+        _t15 = _context10.v;
+        log.error('error in message query', _t15);
+      case 62:
+        _context10.p = 62;
+        _context10.n = 63;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 80:
-        return _context10.f(79);
-      case 81:
+      case 63:
+        return _context10.f(62);
+      case 64:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 78, 79, 81]]);
+  }, _marked7$1, null, [[0, 61, 62, 64]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t22;
+  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t16;
   return _regenerator().w(function (_context11) {
     while (1) switch (_context11.p = _context11.n) {
       case 0:
@@ -20727,15 +20733,15 @@ function getMessageQuery(action) {
         break;
       case 7:
         _context11.p = 7;
-        _t22 = _context11.v;
-        log.error('error in message query', _t22);
+        _t16 = _context11.v;
+        log.error('error in message query', _t16);
       case 8:
         return _context11.a(2);
     }
   }, _marked8$1, null, [[0, 7]]);
 }
 function loadMoreMessages(action) {
-  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t23;
+  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _result$messages$4, _result$messages4, _result$messages$5, _result$messages5, _t17;
   return _regenerator().w(function (_context12) {
     while (1) switch (_context12.p = _context12.n) {
       case 0:
@@ -20779,7 +20785,7 @@ function loadMoreMessages(action) {
         result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.PREV);
-          setMessagesToMap(channelId, result.messages);
+          setMessagesToMap(channelId, result.messages, (_result$messages$4 = result.messages[0]) === null || _result$messages$4 === void 0 ? void 0 : _result$messages$4.id, (_result$messages4 = result.messages[result.messages.length - 1]) === null || _result$messages4 === void 0 ? void 0 : _result$messages4.id);
         }
         _context12.n = 5;
         return put(setMessagesHasPrevAC(result.hasNext));
@@ -20807,7 +20813,7 @@ function loadMoreMessages(action) {
         result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.NEXT);
-          setMessagesToMap(channelId, result.messages);
+          setMessagesToMap(channelId, result.messages, (_result$messages$5 = result.messages[0]) === null || _result$messages$5 === void 0 ? void 0 : _result$messages$5.id, (_result$messages5 = result.messages[result.messages.length - 1]) === null || _result$messages5 === void 0 ? void 0 : _result$messages5.id);
         }
         _context12.n = 9;
         return put(setMessagesHasNextAC(result.hasNext));
@@ -20848,15 +20854,15 @@ function loadMoreMessages(action) {
         break;
       case 18:
         _context12.p = 18;
-        _t23 = _context12.v;
-        log.error('error in load more messages', _t23);
+        _t17 = _context12.v;
+        log.error('error in load more messages', _t17);
       case 19:
         return _context12.a(2);
     }
   }, _marked9$1, null, [[0, 18]]);
 }
 function addReaction(action) {
-  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t24;
+  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t18;
   return _regenerator().w(function (_context13) {
     while (1) switch (_context13.p = _context13.n) {
       case 0:
@@ -20909,15 +20915,15 @@ function addReaction(action) {
         break;
       case 8:
         _context13.p = 8;
-        _t24 = _context13.v;
-        log.error('ERROR in add reaction', _t24.message);
+        _t18 = _context13.v;
+        log.error('ERROR in add reaction', _t18.message);
       case 9:
         return _context13.a(2);
     }
   }, _marked0$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
-  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t25;
+  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t19;
   return _regenerator().w(function (_context14) {
     while (1) switch (_context14.p = _context14.n) {
       case 0:
@@ -20965,15 +20971,15 @@ function deleteReaction(action) {
         break;
       case 7:
         _context14.p = 7;
-        _t25 = _context14.v;
-        log.error('ERROR in delete reaction', _t25.message);
+        _t19 = _context14.v;
+        log.error('ERROR in delete reaction', _t19.message);
       case 8:
         return _context14.a(2);
     }
   }, _marked1$1, null, [[0, 7]]);
 }
 function getReactions(action) {
-  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t26;
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t20;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -21008,15 +21014,15 @@ function getReactions(action) {
         break;
       case 6:
         _context15.p = 6;
-        _t26 = _context15.v;
-        log.error('ERROR in get reactions', _t26.message);
+        _t20 = _context15.v;
+        log.error('ERROR in get reactions', _t20.message);
       case 7:
         return _context15.a(2);
     }
   }, _marked10$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
-  var payload, limit, ReactionQuery, result, _t27;
+  var payload, limit, ReactionQuery, result, _t21;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.p = _context16.n) {
       case 0:
@@ -21044,15 +21050,15 @@ function loadMoreReactions(action) {
         break;
       case 5:
         _context16.p = 5;
-        _t27 = _context16.v;
-        log.error('ERROR in load more reactions', _t27.message);
+        _t21 = _context16.v;
+        log.error('ERROR in load more reactions', _t21.message);
       case 6:
         return _context16.a(2);
     }
   }, _marked11$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t28;
+  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t22;
   return _regenerator().w(function (_context17) {
     while (1) switch (_context17.p = _context17.n) {
       case 0:
@@ -21130,15 +21136,15 @@ function getMessageAttachments(action) {
         break;
       case 13:
         _context17.p = 13;
-        _t28 = _context17.v;
-        log.error('error in message attachment query', _t28);
+        _t22 = _context17.v;
+        log.error('error in message attachment query', _t22);
       case 14:
         return _context17.a(2);
     }
   }, _marked12$1, null, [[0, 13]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t29;
+  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t23;
   return _regenerator().w(function (_context18) {
     while (1) switch (_context18.p = _context18.n) {
       case 0:
@@ -21182,15 +21188,15 @@ function loadMoreMessageAttachments(action) {
         break;
       case 8:
         _context18.p = 8;
-        _t29 = _context18.v;
-        log.error('error in message attachment query', _t29);
+        _t23 = _context18.v;
+        log.error('error in message attachment query', _t23);
       case 9:
         return _context18.a(2);
     }
   }, _marked13$1, null, [[0, 8]]);
 }
 function pauseAttachmentUploading(action) {
-  var attachmentId, isPaused, _t30;
+  var attachmentId, isPaused, _t24;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -21212,15 +21218,15 @@ function pauseAttachmentUploading(action) {
         break;
       case 2:
         _context19.p = 2;
-        _t30 = _context19.v;
-        log.error('error in pause attachment uploading', _t30);
+        _t24 = _context19.v;
+        log.error('error in pause attachment uploading', _t24);
       case 3:
         return _context19.a(2);
     }
   }, _marked14$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t31;
+  var attachmentId, isResumed, _t25;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.p = _context20.n) {
       case 0:
@@ -21243,15 +21249,15 @@ function resumeAttachmentUploading(action) {
         break;
       case 2:
         _context20.p = 2;
-        _t31 = _context20.v;
-        log.error('error in resume attachment uploading', _t31);
+        _t25 = _context20.v;
+        log.error('error in resume attachment uploading', _t25);
       case 3:
         return _context20.a(2);
     }
   }, _marked15$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
-  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t32;
+  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t26;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
@@ -21281,8 +21287,8 @@ function getMessageMarkers(action) {
         break;
       case 5:
         _context21.p = 5;
-        _t32 = _context21.v;
-        log.error('error in get message markers', _t32);
+        _t26 = _context21.v;
+        log.error('error in get message markers', _t26);
       case 6:
         _context21.p = 6;
         _context21.n = 7;
@@ -21420,7 +21426,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values2, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t33;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t27;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
@@ -21479,7 +21485,7 @@ function addPollVote(action) {
           _context24.n = 3;
           break;
         }
-        currentMessage = ((_Object$values2 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values2 === void 0 ? void 0 : _Object$values2.find(function (msg) {
+        currentMessage = ((_Object$values = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values === void 0 ? void 0 : _Object$values.find(function (msg) {
           return msg.id === message.id || msg.tid === message.id;
         })) || message;
         hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[pollId]) || false;
@@ -21519,8 +21525,8 @@ function addPollVote(action) {
         break;
       case 8:
         _context24.p = 8;
-        _t33 = _context24.v;
-        log.error('error in add poll vote', _t33);
+        _t27 = _context24.v;
+        log.error('error in add poll vote', _t27);
       case 9:
         return _context24.a(2);
     }
@@ -21621,7 +21627,7 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, connectionState, vote, pendingAction, conflictCheck, channel, _Object$values3, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t34;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, connectionState, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t28;
   return _regenerator().w(function (_context27) {
     while (1) switch (_context27.p = _context27.n) {
       case 0:
@@ -21667,7 +21673,7 @@ function deletePollVote(action) {
           _context27.n = 4;
           break;
         }
-        currentMessage = ((_Object$values3 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values3 === void 0 ? void 0 : _Object$values3.find(function (msg) {
+        currentMessage = ((_Object$values2 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values2 === void 0 ? void 0 : _Object$values2.find(function (msg) {
           return msg.id === message.id || msg.tid === message.id;
         })) || message;
         _context27.n = 3;
@@ -21706,8 +21712,8 @@ function deletePollVote(action) {
         break;
       case 9:
         _context27.p = 9;
-        _t34 = _context27.v;
-        log.error('error in delete poll vote', _t34);
+        _t28 = _context27.v;
+        log.error('error in delete poll vote', _t28);
       case 10:
         return _context27.a(2);
     }
@@ -21785,7 +21791,7 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
   }, _marked24$1);
 }
 function closePoll(action) {
-  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t35;
+  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t29;
   return _regenerator().w(function (_context30) {
     while (1) switch (_context30.p = _context30.n) {
       case 0:
@@ -21818,8 +21824,8 @@ function closePoll(action) {
         break;
       case 4:
         _context30.p = 4;
-        _t35 = _context30.v;
-        log.error('error in close poll', _t35);
+        _t29 = _context30.v;
+        log.error('error in close poll', _t29);
       case 5:
         return _context30.a(2);
     }
@@ -21908,7 +21914,7 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator5, _step5, _message$pollDetails12, _message$pollDetails13, vote, _t36;
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator5, _step5, _message$pollDetails12, _message$pollDetails13, vote, _t30;
   return _regenerator().w(function (_context33) {
     while (1) switch (_context33.p = _context33.n) {
       case 0:
@@ -21950,15 +21956,15 @@ function retractPollVote(action) {
         break;
       case 4:
         _context33.p = 4;
-        _t36 = _context33.v;
-        log.error('error in retract poll vote', _t36);
+        _t30 = _context33.v;
+        log.error('error in retract poll vote', _t30);
       case 5:
         return _context33.a(2);
     }
   }, _marked28$1, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
-  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t37;
+  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t31;
   return _regenerator().w(function (_context34) {
     while (1) switch (_context34.p = _context34.n) {
       case 0:
@@ -21974,13 +21980,6 @@ function resendPendingPollActions(action) {
       case 1:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         pendingPollActionsMapCopy = JSON.parse(JSON.stringify(pendingPollActionsMap));
-        _context34.n = 2;
-        return call(function () {
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 1000);
-          });
-        });
-      case 2:
         Object.keys(pendingPollActionsMapCopy).forEach(function (messageId) {
           pendingPollActionsMapCopy[messageId].forEach(function (pendingAction) {
             var type = pendingAction.type,
@@ -22010,19 +22009,19 @@ function resendPendingPollActions(action) {
             }
           });
         });
-        _context34.n = 4;
+        _context34.n = 3;
         break;
+      case 2:
+        _context34.p = 2;
+        _t31 = _context34.v;
+        log.error('error in resend pending poll actions', _t31);
       case 3:
-        _context34.p = 3;
-        _t37 = _context34.v;
-        log.error('error in resend pending poll actions', _t37);
-      case 4:
         return _context34.a(2);
     }
-  }, _marked29$1, null, [[0, 3]]);
+  }, _marked29$1, null, [[0, 2]]);
 }
 function getPollVotes(action) {
-  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t38;
+  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t32;
   return _regenerator().w(function (_context35) {
     while (1) switch (_context35.p = _context35.n) {
       case 0:
@@ -22088,8 +22087,8 @@ function getPollVotes(action) {
         break;
       case 7:
         _context35.p = 7;
-        _t38 = _context35.v;
-        log.error('ERROR in get poll votes', _t38);
+        _t32 = _context35.v;
+        log.error('ERROR in get poll votes', _t32);
         _context35.n = 8;
         return put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
@@ -22098,7 +22097,7 @@ function getPollVotes(action) {
   }, _marked30$1, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
-  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t39;
+  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t33;
   return _regenerator().w(function (_context36) {
     while (1) switch (_context36.p = _context36.n) {
       case 0:
@@ -22156,8 +22155,8 @@ function loadMorePollVotes(action) {
         break;
       case 6:
         _context36.p = 6;
-        _t39 = _context36.v;
-        log.error('ERROR in load more poll votes', _t39);
+        _t33 = _context36.v;
+        log.error('ERROR in load more poll votes', _t33);
         _context36.n = 7;
         return put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
@@ -37446,16 +37445,7 @@ var Message$1 = function Message(_ref) {
     setMessageActionsShow(false);
   };
   var handleResendMessage = function handleResendMessage() {
-    var messageToResend = _extends({}, message);
-    if (message.attachments && message.attachments.length) {
-      messageToResend.attachments = message.attachments.map(function (att) {
-        var pendingAttachment = getPendingAttachment(att.tid);
-        return _extends({}, att, {
-          data: new File([pendingAttachment.file], att.data.name)
-        });
-      });
-    }
-    dispatch(resendMessageAC(messageToResend, channel.id, connectionStatus));
+    dispatch(resendMessageAC(message, channel.id, connectionStatus));
     setMessageActionsShow(false);
   };
   var handleCopyMessage = function handleCopyMessage() {
@@ -37513,12 +37503,12 @@ var Message$1 = function Message(_ref) {
     setFrequentlyEmojisOpen(false);
   };
   var handleSendReadMarker = function handleSendReadMarker() {
-    if (!message.userMarkers.find(function (marker) {
+    if (message.incoming && !message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.DELIVERED;
     })) {
       if (message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
         return marker.name === MESSAGE_DELIVERY_STATUS.READ;
-      }) && message.incoming && !unreadScrollTo) {
+      }) && !unreadScrollTo) {
         dispatch(markMessagesAsDeliveredAC(channel.id, [message.id]));
       }
     }
@@ -37676,7 +37666,8 @@ var Message$1 = function Message(_ref) {
     withAvatar: !(channel.type === DEFAULT_CHANNEL_TYPE.DIRECT && !showSenderNameOnDirectChannel) && !(!message.incoming && !showOwnAvatar),
     className: 'messageContent'
   }, message.state === MESSAGE_STATUS.FAILED && (/*#__PURE__*/React__default.createElement(FailedMessageIcon, {
-    rtl: ownMessageOnRightSide && !message.incoming
+    rtl: ownMessageOnRightSide && !message.incoming,
+    onClick: handleResendMessage
   }, /*#__PURE__*/React__default.createElement(ErrorIconWrapper, null))), CustomMessageItem ? (/*#__PURE__*/React__default.createElement(CustomMessageItem, {
     key: message.id || message.tid,
     channel: channel,
@@ -37981,7 +37972,7 @@ var MessageReaction = styled.span(_templateObject3$y || (_templateObject3$y = _t
 var ThreadMessageCountContainer = styled.div(_templateObject4$t || (_templateObject4$t = _taggedTemplateLiteralLoose(["\n  position: relative;\n  color: ", ";\n  font-weight: 500;\n  font-size: 13px;\n  line-height: 15px;\n  margin: 12px;\n  cursor: pointer;\n\n  &::before {\n    content: '';\n    position: absolute;\n    left: -25px;\n    top: -21px;\n    width: 16px;\n    height: 26px;\n    border-left: 2px solid #cdcdcf;\n    border-bottom: 2px solid #cdcdcf;\n    border-radius: 0 0 0 14px;\n  }\n"])), function (props) {
   return props.color;
 });
-var FailedMessageIcon = styled.div(_templateObject5$o || (_templateObject5$o = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  top: -6px;\n  left: ", ";\n  right: ", ";\n  width: 20px;\n  height: 20px;\n"])), function (props) {
+var FailedMessageIcon = styled.div(_templateObject5$o || (_templateObject5$o = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  top: -6px;\n  left: ", ";\n  right: ", ";\n  width: 20px;\n  height: 20px;\n  cursor: pointer;\n"])), function (props) {
   return !props.rtl && '-24px';
 }, function (props) {
   return props.rtl && '-24px';
@@ -38360,7 +38351,8 @@ var MessageList = function MessageList(_ref2) {
   var handleMessagesListScroll = useCallback(function () {
     try {
       var target = scrollRef.current;
-      if (!target) return Promise.resolve();
+      var messageBox = document.getElementById('messageBox');
+      if (!target || !messageBox) return Promise.resolve();
       if (scrollToMentionedMessage) {
         if (target.scrollTop <= -50 || channel.lastMessage.id !== messages[messages.length - 1].id) {
           dispatch(showScrollToNewMessageButtonAC(true));
@@ -38373,9 +38365,12 @@ var MessageList = function MessageList(_ref2) {
       clearTimeout(hideTopDateTimeout.current);
       renderTopDate();
       var forceLoadPrevMessages = false;
-      if (-target.scrollTop + target.offsetHeight + 30 > target.scrollHeight) {
+      if (-target.scrollTop + target.offsetHeight + 100 > messageBox.scrollHeight) {
         forceLoadPrevMessages = true;
       }
+      if (unreadScrollTo) {
+        return Promise.resolve();
+      }
       if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING) {
         dispatch(getMessagesAC(channel, true));
       }
@@ -38390,7 +38385,7 @@ var MessageList = function MessageList(_ref2) {
       }
       var currentIndex = messagesIndexMapRef.current[lastVisibleMessageId];
       var hasIndex = typeof currentIndex === 'number';
-      if (hasIndex && currentIndex < 15 || forceLoadPrevMessages) {
+      if (hasIndex && currentIndex < 10 || forceLoadPrevMessages) {
         if (connectionStatus === CONNECTION_STATUS.CONNECTED && !scrollToNewMessage.scrollToBottom && hasPrevMessages) {
           if (loadingRef.current || messagesLoading === LOADING_STATE.LOADING || prevDisableRef.current) {
             shouldLoadMessagesRef.current = 'prev';
@@ -38407,7 +38402,7 @@ var MessageList = function MessageList(_ref2) {
           }
         }
       }
-      if (hasIndex && currentIndex >= messages.length - 15 || target.scrollTop === 0) {
+      if (hasIndex && currentIndex >= messages.length - 10 || target.scrollTop > -100) {
         if (connectionStatus === CONNECTION_STATUS.CONNECTED && !scrollToNewMessage.scrollToBottom && (hasNextMessages || getHasNextCached())) {
           if (loadingRef.current || messagesLoading === LOADING_STATE.LOADING || nextDisableRef.current) {
             shouldLoadMessagesRef.current = 'next';
@@ -38466,7 +38461,7 @@ var MessageList = function MessageList(_ref2) {
           }, 1000 + positiveValue * 0.1);
         }
       } else {
-        dispatch(getMessagesAC(channel, undefined, messageId));
+        dispatch(getMessagesAC(channel, undefined, messageId, undefined, undefined, true, 'smooth', true));
       }
       return Promise.resolve();
     } catch (e) {
@@ -38833,7 +38828,18 @@ var MessageList = function MessageList(_ref2) {
         scrollElement.style.scrollBehavior = 'inherit';
       }
       setScrollIntoView(true);
-      var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId);
+      var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId) || null;
+      var newLastDisplayedMessageId = channel.lastDisplayedMessageId;
+      if (!lastReadMessageNode) {
+        for (var index = 0; index < messages.length; index++) {
+          var message = messages[index];
+          if (channel.lastDisplayedMessageId >= message.id && (messages.length < index + 2 || channel.lastDisplayedMessageId <= messages[index + 1].id)) {
+            newLastDisplayedMessageId = message.id;
+            lastReadMessageNode = document.getElementById(newLastDisplayedMessageId);
+            break;
+          }
+        }
+      }
       if (lastReadMessageNode && scrollElement) {
         dispatch(scrollToNewMessageAC(false));
         scrollElement.scrollTo({
@@ -38918,7 +38924,8 @@ var MessageList = function MessageList(_ref2) {
     enableResetScrollToCoords: false,
     replyMessage: messageForReply && messageForReply.id,
     attachmentsSelected: attachmentsSelected,
-    className: 'messageBox'
+    className: 'messageBox',
+    id: 'messageBox'
   }, messages.map(function (message, index) {
     var prevMessage = messages[index - 1];
     var nextMessage = messages[index + 1];
@@ -42554,7 +42561,13 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     nodes: [MentionNode],
     onError: onError
   };
-  var handleSendTypingState = function handleSendTypingState(typingState) {
+  var handleSendTypingState = function handleSendTypingState(typingState, code) {
+    if (code) {
+      var isTypeKeyPressed = checkIsTypeKeyPressed(code);
+      if (!isTypeKeyPressed) {
+        return;
+      }
+    }
     if (typingState) {
       setInTypingStateTimout(setTimeout(function () {
         setInTypingStateTimout(0);
@@ -42691,11 +42704,11 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     } else {
       if (typingTimout) {
         if (!inTypingStateTimout) {
-          handleSendTypingState(true);
+          handleSendTypingState(true, code);
         }
         clearTimeout(typingTimout);
       } else {
-        handleSendTypingState(true);
+        handleSendTypingState(true, code);
       }
       setTypingTimout(setTimeout(function () {
         setTypingTimout(0);
@@ -44962,7 +44975,8 @@ var Actions = function Actions(_ref) {
     iconColor: iconPrimary,
     color: textPrimary,
     hoverColor: textPrimary,
-    fontSize: actionItemsFontSize
+    fontSize: actionItemsFontSize,
+    flexWrap: 'wrap'
   }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(DefaultWatchIcon, {
     "$isLightMode": backgroundColor === '#FFFFFF'
   }), "Disappearing messages", /*#__PURE__*/React__default.createElement(DisappearingMessagesStatusWrapper, null, /*#__PURE__*/React__default.createElement(DisappearingMessagesStatus, {
@@ -45166,7 +45180,7 @@ var DefaultMarkAsReadIcon = styled(SvgLeave)(_templateObject15$3 || (_templateOb
 var DefaultWatchIcon = styled(SvgWatch)(_templateObject16$3 || (_templateObject16$3 = _taggedTemplateLiteralLoose(["\n  width: 24px;\n  height: 24px;\n\n  path.watch-ticks,\n  path:nth-child(2) {\n    fill: ", " !important;\n  }\n"])), function (props) {
   return props.$isLightMode ? '#FFFFFF' : '#000000';
 });
-var ActionItem = styled.li(_templateObject17$3 || (_templateObject17$3 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  padding: 10px 0;\n  font-size: ", ";\n  color: ", ";\n  cursor: pointer;\n  order: ", ";\n  pointer-events: ", ";\n\n  & > div {\n    margin-left: auto;\n  }\n\n  & > svg {\n    margin-right: 16px;\n    color: ", ";\n    width: 24px;\n    height: 24px;\n  }\n\n  &:hover {\n    color: ", ";\n  }\n\n  &:last-child {\n    //margin-bottom: 0;\n  }\n"])), function (props) {
+var ActionItem = styled.li(_templateObject17$3 || (_templateObject17$3 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  padding: 10px 0;\n  font-size: ", ";\n  color: ", ";\n  cursor: pointer;\n  order: ", ";\n  pointer-events: ", ";\n  ", "\n  & > div {\n    margin-left: auto;\n  }\n\n  & > svg {\n    margin-right: 16px;\n    color: ", ";\n    width: 24px;\n    height: 24px;\n  }\n\n  &:hover {\n    color: ", ";\n  }\n\n  &:last-child {\n    //margin-bottom: 0;\n  }\n"])), function (props) {
   return props.fontSize || '15px';
 }, function (props) {
   return props.color;
@@ -45174,6 +45188,8 @@ var ActionItem = styled.li(_templateObject17$3 || (_templateObject17$3 = _tagged
   return props.order;
 }, function (props) {
   return props.disableEvent && 'none';
+}, function (props) {
+  return props.flexWrap && "flex-wrap: " + props.flexWrap + ";";
 }, function (props) {
   return props.iconColor;
 }, function (props) {