sceyt-chat-react-uikit 1.7.6-beta.15 → 1.7.6-beta.17

package/index.js

@@ -10057,7 +10057,10 @@ var queryDirection = {
   NEAR: 'near'
 };
 
-function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSeparateMessage, isResend) {
+function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSeparateMessage, isResend, isAddToPendingMessagesMap) {
+  if (isAddToPendingMessagesMap === void 0) {
+    isAddToPendingMessagesMap = true;
+  }
   return {
     type: SEND_MESSAGE,
     payload: {
@@ -10065,17 +10068,22 @@ function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSep
       channelId: channelId,
       connectionState: connectionState,
       sendAttachmentsAsSeparateMessage: sendAttachmentsAsSeparateMessage,
-      isResend: isResend
+      isResend: isResend,
+      isAddToPendingMessagesMap: isAddToPendingMessagesMap
     }
   };
 }
-function sendTextMessageAC(message, channelId, connectionState) {
+function sendTextMessageAC(message, channelId, connectionState, isAddToPendingMessagesMap) {
+  if (isAddToPendingMessagesMap === void 0) {
+    isAddToPendingMessagesMap = true;
+  }
   return {
     type: SEND_TEXT_MESSAGE,
     payload: {
       message: message,
       channelId: channelId,
-      connectionState: connectionState
+      connectionState: connectionState,
+      isAddToPendingMessagesMap: isAddToPendingMessagesMap
     }
   };
 }
@@ -10089,17 +10097,21 @@ function resendMessageAC(message, channelId, connectionState) {
     }
   };
 }
-function forwardMessageAC(message, channelId, connectionState, isForward) {
+function forwardMessageAC(message, channelId, connectionState, isForward, isAddToPendingMessagesMap) {
   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
+      isForward: isForward,
+      isAddToPendingMessagesMap: isAddToPendingMessagesMap
     }
   };
 }
@@ -10816,17 +10828,20 @@ function setMessagesToMap(channelId, messages) {
     messagesMap[channelId] = {};
   }
   messages.forEach(function (msg) {
-    messagesMap[channelId][msg.id] = msg;
+    if (msg.tid && messagesMap[channelId][msg.tid]) {
+      delete messagesMap[channelId][msg.tid];
+    }
+    messagesMap[channelId][msg.id || msg.tid] = msg;
   });
 }
 function addMessageToMap(channelId, message) {
   if (!messagesMap[channelId]) {
     messagesMap[channelId] = {};
   }
-  messagesMap[channelId][message.id] = message;
-  if (message.deliveryStatus === MESSAGE_DELIVERY_STATUS.PENDING) {
-    setPendingMessage(channelId, message);
+  if (message.tid && messagesMap[channelId][message.tid]) {
+    delete messagesMap[channelId][message.tid];
   }
+  messagesMap[channelId][message.id || message.tid] = message;
 }
 function updateMessageOnMap(channelId, updatedMessage, voteDetails) {
   var pendingMessagesMap = store.getState().MessageReducer.pendingMessagesMap;
@@ -10877,7 +10892,10 @@ function updateMessageOnMap(channelId, updatedMessage, voteDetails) {
       if (!messagesMap[channelId]) {
         messagesMap[channelId] = {};
       }
-      messagesMap[channelId][msg.id] = msg;
+      if (msg.tid && messagesMap[channelId][msg.tid]) {
+        delete messagesMap[channelId][msg.tid];
+      }
+      messagesMap[channelId][msg.id || msg.tid] = msg;
     });
   }
   return updatedMessageData;
@@ -10893,7 +10911,10 @@ function addReactionToMessageOnMap(channelId, message, reaction, isSelf) {
         slfReactions = [reaction];
       }
     }
-    messagesMap[channelId][message.id] = _extends({}, messageShouldBeUpdated, {
+    if (message.tid && messagesMap[channelId][message.tid]) {
+      delete messagesMap[channelId][message.tid];
+    }
+    messagesMap[channelId][message.id || message.tid] = _extends({}, messageShouldBeUpdated, {
       userReactions: slfReactions,
       reactionTotals: message.reactionTotals
     });
@@ -10927,7 +10948,10 @@ function removeReactionToMessageOnMap(channelId, message, reaction, isSelf) {
         return selfReaction.key !== reaction.key;
       });
     }
-    messagesMap[channelId][message.id] = _extends({}, messageShouldBeUpdated, {
+    if (message.tid && messagesMap[channelId][message.tid]) {
+      delete messagesMap[channelId][message.tid];
+    }
+    messagesMap[channelId][message.id || message.tid] = _extends({}, messageShouldBeUpdated, {
       reactionTotals: message.reactionTotals,
       userReactions: userReactions
     });
@@ -10962,6 +10986,9 @@ function updateMessageStatusOnMap(channelId, newMarkers) {
       var messageShouldBeUpdated = messagesMap[channelId][messageId];
       if (messageShouldBeUpdated) {
         var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(messageShouldBeUpdated, newMarkers.name);
+        if (messageShouldBeUpdated.tid && messagesMap[channelId][messageShouldBeUpdated.tid]) {
+          delete messagesMap[channelId][messageShouldBeUpdated.tid];
+        }
         messagesMap[channelId][messageId] = _extends({}, messageShouldBeUpdated, statusUpdatedMessage);
       }
     });
@@ -10995,13 +11022,6 @@ function clearMessagesMap() {
 function checkChannelExistsOnMessagesMap(channelId) {
   return !!messagesMap[channelId];
 }
-var pendingVideoAttachmentsThumbs = {};
-var getVideoThumb = function getVideoThumb(attachmentId) {
-  return pendingVideoAttachmentsThumbs[attachmentId];
-};
-var deleteVideoThumb = function deleteVideoThumb(attachmentId) {
-  delete pendingVideoAttachmentsThumbs[attachmentId];
-};
 var setPendingAttachment = function setPendingAttachment(attachmentId, data) {
   pendingAttachments[attachmentId] = _extends({}, pendingAttachments[attachmentId], data);
 };
@@ -14091,7 +14111,10 @@ function watchForEvents() {
         SceytChatClient = getClient();
         channelListener = new SceytChatClient.ChannelListener();
         connectionListener = new SceytChatClient.ConnectionListener();
-        usersTimeout = {};
+        usersTimeout = {
+          recordingTimeout: {},
+          typingTimeout: {}
+        };
         chan = createSagaMiddleware.eventChannel(function (emitter) {
           var shouldSkip = function shouldSkip(channel) {
             var channelTypesFilter = getChannelTypesFilter();
@@ -14497,7 +14520,7 @@ function watchForEvents() {
                 type = _yield$take.type;
                 args = _yield$take.args;
                 _t = type;
-                _context.n = _t === CHANNEL_EVENT_TYPES.CREATE ? 2 : _t === CHANNEL_EVENT_TYPES.JOIN ? 7 : _t === CHANNEL_EVENT_TYPES.LEAVE ? 9 : _t === CHANNEL_EVENT_TYPES.BLOCK ? 22 : _t === CHANNEL_EVENT_TYPES.UNBLOCK ? 24 : _t === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 25 : _t === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 36 : _t === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 46 : _t === CHANNEL_EVENT_TYPES.MESSAGE ? 51 : _t === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 68 : _t === CHANNEL_EVENT_TYPES.DELETE ? 81 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 83 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 88 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 93 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 101 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 111 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 119 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 127 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 131 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 136 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 139 : _t === CHANNEL_EVENT_TYPES.MUTE ? 145 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 147 : _t === CHANNEL_EVENT_TYPES.PINED ? 149 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 151 : _t === CHANNEL_EVENT_TYPES.HIDE ? 153 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 155 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 157 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 160 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 163 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 170 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 171 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 172 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 181 : 184;
+                _context.n = _t === CHANNEL_EVENT_TYPES.CREATE ? 2 : _t === CHANNEL_EVENT_TYPES.JOIN ? 7 : _t === CHANNEL_EVENT_TYPES.LEAVE ? 9 : _t === CHANNEL_EVENT_TYPES.BLOCK ? 22 : _t === CHANNEL_EVENT_TYPES.UNBLOCK ? 24 : _t === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 25 : _t === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 36 : _t === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 46 : _t === CHANNEL_EVENT_TYPES.MESSAGE ? 51 : _t === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 66 : _t === CHANNEL_EVENT_TYPES.DELETE ? 79 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 81 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 86 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 91 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 99 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 109 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 117 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 125 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 129 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 134 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 137 : _t === CHANNEL_EVENT_TYPES.MUTE ? 143 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 145 : _t === CHANNEL_EVENT_TYPES.PINED ? 147 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 149 : _t === CHANNEL_EVENT_TYPES.HIDE ? 151 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 153 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 155 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 158 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 161 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 168 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 169 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 170 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 179 : 182;
                 break;
               case 2:
                 createdChannel = args.createdChannel;
@@ -14531,7 +14554,7 @@ function watchForEvents() {
                   addChannelToAllChannels(createdChannel);
                 }
               case 6:
-                return _context.a(3, 185);
+                return _context.a(3, 183);
               case 7:
                 channel = args.channel;
                 log.info('channel JOIN ... . ', channel);
@@ -14542,7 +14565,7 @@ function watchForEvents() {
                 if (!_chan2) {
                   addChannelToAllChannels(channel);
                 }
-                return _context.a(3, 185);
+                return _context.a(3, 183);
               case 9:
                 _channel = args.channel, member = args.member;
                 log.info('channel LEAVE ... ', _channel, member);
@@ -14610,7 +14633,7 @@ function watchForEvents() {
                   mutedTill: _channel.mutedTill
                 });
               case 21:
-                return _context.a(3, 185);
+                return _context.a(3, 183);
               case 22:
                 log.info('channel BLOCK ... ');
                 _channel2 = args.channel;
@@ -14622,10 +14645,10 @@ function watchForEvents() {
                 _context.n = 23;
                 return effects.put(removeChannelAC(_channel2.id));
               case 23:
-                return _context.a(3, 185);
+                return _context.a(3, 183);
               case 24:
                 log.info('channel UNBLOCK ... ');
-                return _context.a(3, 185);
+                return _context.a(3, 183);
               case 25:
                 _channel3 = args.channel, removedMembers = args.removedMembers;
                 log.info('channel KICK_MEMBERS ... ', removedMembers);
@@ -14695,7 +14718,7 @@ function watchForEvents() {
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 });
-                return _context.a(3, 185);
+                return _context.a(3, 183);
               case 36:
                 _channel4 = args.channel, addedMembers = args.addedMembers;
                 log.info('channel ADD_MEMBERS ... ', addedMembers);
@@ -14750,7 +14773,7 @@ function watchForEvents() {
                   muted: _channel4.muted,
                   mutedTill: _channel4.mutedTill
                 });
-                return _context.a(3, 185);
+                return _context.a(3, 183);
               case 46:
                 log.info('channel UPDATE_CHANNEL ... ');
                 updatedChannel = args.updatedChannel;
@@ -14797,65 +14820,60 @@ function watchForEvents() {
                   mutedTill: mutedTill,
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 });
-                return _context.a(3, 185);
+                return _context.a(3, 183);
               case 51:
                 _channel5 = args.channel, message = args.message;
                 log.info('channel MESSAGE ... id : ', message.id, ', channel.id: ', _channel5.id);
                 messageToHandle = handleNewMessages ? handleNewMessages(message, _channel5) : message;
                 _channelFilterTypes = getChannelTypesFilter();
                 if (!(messageToHandle && _channel5 && (_channelFilterTypes !== null && _channelFilterTypes !== void 0 && _channelFilterTypes.length ? _channelFilterTypes.includes(_channel5.type) : true))) {
-                  _context.n = 67;
+                  _context.n = 65;
                   break;
                 }
                 _channel5.metadata = isJSON(_channel5.metadata) ? JSON.parse(_channel5.metadata) : _channel5.metadata;
-                _context.n = 52;
-                return effects.call(getActiveChannelId);
-              case 52:
-                _activeChannelId5 = _context.v;
+                _activeChannelId5 = getActiveChannelId();
                 _channelExists6 = checkChannelExists(_channel5.id);
                 channelForAdd = JSON.parse(JSON.stringify(_channel5));
-                _context.n = 53;
+                _context.n = 52;
                 return effects.put(addChannelAC(channelForAdd));
-              case 53:
+              case 52:
                 if (_channelExists6) {
-                  _context.n = 55;
+                  _context.n = 53;
                   break;
                 }
+                setChannelInMap(_channel5);
                 _context.n = 54;
-                return effects.call(setChannelInMap, _channel5);
-              case 54:
-                _context.n = 56;
                 break;
-              case 55:
+              case 53:
                 if (message.repliedInThread) {
-                  _context.n = 56;
+                  _context.n = 54;
                   break;
                 }
-                _context.n = 56;
+                _context.n = 54;
                 return effects.put(updateChannelLastMessageAC(message, channelForAdd));
-              case 56:
+              case 54:
                 if (!(_channel5.id === _activeChannelId5)) {
-                  _context.n = 58;
+                  _context.n = 56;
                   break;
                 }
                 if (getHasNextCached()) {
-                  _context.n = 57;
+                  _context.n = 55;
                   break;
                 }
-                _context.n = 57;
+                _context.n = 55;
                 return effects.put(addMessageAC(message));
-              case 57:
+              case 55:
                 addAllMessages([message], MESSAGE_LOAD_DIRECTION.NEXT);
                 hasNextMessage = store.getState().MessageReducer.messagesHasNext;
                 if (!(!getHasNextCached() && !hasNextMessage)) {
-                  _context.n = 58;
+                  _context.n = 56;
                   break;
                 }
-                _context.n = 58;
+                _context.n = 56;
                 return effects.put(scrollToNewMessageAC(true, false, true));
-              case 58:
+              case 56:
                 addMessageToMap(_channel5.id, message);
-                _context.n = 59;
+                _context.n = 57;
                 return effects.put(updateChannelDataAC(_channel5.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
@@ -14871,9 +14889,9 @@ function watchForEvents() {
                   userMessageReactions: [],
                   lastReactedMessage: null
                 }));
-              case 59:
+              case 57:
                 _groupName4 = getChannelGroupName(_channel5);
-                _context.n = 60;
+                _context.n = 58;
                 return effects.put(updateSearchedChannelDataAC(_channel5.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
@@ -14889,27 +14907,27 @@ function watchForEvents() {
                   userMessageReactions: [],
                   lastReactedMessage: null
                 }, _groupName4));
-              case 60:
+              case 58:
                 showNotifications = getShowNotifications();
                 if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel5.muted)) {
-                  _context.n = 63;
+                  _context.n = 61;
                   break;
                 }
                 if (!(Notification.permission === 'granted')) {
-                  _context.n = 63;
+                  _context.n = 61;
                   break;
                 }
-                _context.n = 61;
+                _context.n = 59;
                 return effects.select(browserTabIsActiveSelector);
-              case 61:
+              case 59:
                 tabIsActive = _context.v;
                 if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel5.id !== _activeChannelId5)) {
-                  _context.n = 63;
+                  _context.n = 61;
                   break;
                 }
-                _context.n = 62;
+                _context.n = 60;
                 return effects.select(contactsMapSelector);
-              case 62:
+              case 60:
                 contactsMap = _context.v;
                 _getFromContacts = getShowOnlyContactUsers();
                 state = store.getState();
@@ -14929,20 +14947,20 @@ function watchForEvents() {
                 setNotification(messageBody, message.user, _channel5, undefined, message.attachments && message.attachments.length ? message.attachments.find(function (att) {
                   return att.type !== attachmentTypes.link;
                 }) : undefined);
-              case 63:
+              case 61:
                 if (!(message.repliedInThread && message.parentMessage.id)) {
-                  _context.n = 65;
+                  _context.n = 63;
                   break;
                 }
-                _context.n = 64;
+                _context.n = 62;
                 return effects.put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-              case 64:
-                _context.n = 66;
+              case 62:
+                _context.n = 64;
                 break;
-              case 65:
-                _context.n = 66;
+              case 63:
+                _context.n = 64;
                 return effects.put(markMessagesAsDeliveredAC(_channel5.id, [message.id]));
-              case 66:
+              case 64:
                 updateChannelOnAllChannels(_channel5.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
@@ -14959,50 +14977,50 @@ function watchForEvents() {
                   userMessageReactions: _channel5.userMessageReactions
                 });
                 updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
-              case 67:
-                return _context.a(3, 185);
-              case 68:
+              case 65:
+                return _context.a(3, 183);
+              case 66:
                 channelId = args.channelId, markerList = args.markerList;
-                _context.n = 69;
+                _context.n = 67;
                 return effects.call(getChannelFromMap, channelId);
-              case 69:
+              case 67:
                 _channel6 = _context.v;
                 log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel6, 'markers list: ', markerList);
                 if (!_channel6) {
-                  _context.n = 80;
+                  _context.n = 78;
                   break;
                 }
-                _context.n = 70;
+                _context.n = 68;
                 return effects.call(getActiveChannelId);
-              case 70:
+              case 68:
                 _activeChannelId6 = _context.v;
                 updateLastMessage = false;
                 markersMap = {};
                 activeChannelMessages = getMessagesFromMap(_activeChannelId6);
                 _iterator = _createForOfIteratorHelperLoose(markerList.messageIds);
-              case 71:
+              case 69:
                 if ((_step = _iterator()).done) {
-                  _context.n = 76;
+                  _context.n = 74;
                   break;
                 }
                 messageId = _step.value;
                 if (!(activeChannelMessages !== null && activeChannelMessages !== void 0 && activeChannelMessages[messageId])) {
-                  _context.n = 73;
+                  _context.n = 71;
                   break;
                 }
-                _context.n = 72;
+                _context.n = 70;
                 return effects.put(removePendingMessageAC(channelId, messageId));
-              case 72:
-                _context.n = 74;
+              case 70:
+                _context.n = 72;
                 break;
-              case 73:
+              case 71:
                 isPendingMessage = getMessageFromPendingMessagesMap(_activeChannelId6, messageId);
                 if (isPendingMessage) {
                   updatePendingMessageOnMap(_activeChannelId6, messageId, {
                     deliveryStatus: markerList.name
                   });
                 }
-              case 74:
+              case 72:
                 markersMap[messageId] = true;
                 if (_channel6) {
                   if (_channel6.lastMessage && messageId === _channel6.lastMessage.id) {
@@ -15013,102 +15031,102 @@ function watchForEvents() {
                   id: messageId,
                   deliveryStatus: markerList.name
                 });
-              case 75:
-                _context.n = 71;
+              case 73:
+                _context.n = 69;
                 break;
-              case 76:
+              case 74:
                 if (!updateLastMessage) {
-                  _context.n = 77;
+                  _context.n = 75;
                   break;
                 }
                 lastMessage = _extends({}, _channel6.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel6.lastMessage, markerList.name));
                 updateChannelLastMessageOnAllChannels(_channel6.id, lastMessage);
-                _context.n = 77;
+                _context.n = 75;
                 return effects.put(updateChannelLastMessageStatusAC(lastMessage, _channel6));
-              case 77:
+              case 75:
                 if (!(_activeChannelId6 === channelId)) {
-                  _context.n = 79;
+                  _context.n = 77;
                   break;
                 }
-                _context.n = 78;
+                _context.n = 76;
                 return effects.put(updateMessagesStatusAC(markerList.name, markersMap));
-              case 78:
+              case 76:
                 updateMarkersOnAllMessages(markersMap, markerList.name);
-              case 79:
+              case 77:
                 updateMessageStatusOnMap(_channel6.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
                 updateMessageStatusOnAllMessages(markerList.name, markersMap);
-                _context.n = 80;
+                _context.n = 78;
                 return effects.put(updateMessagesMarkersAC(channelId, markerList.name, markerList));
-              case 80:
-                return _context.a(3, 185);
-              case 81:
+              case 78:
+                return _context.a(3, 183);
+              case 79:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
                 _channel7 = getChannelFromMap(_channelId);
-                _context.n = 82;
+                _context.n = 80;
                 return effects.put(setChannelToRemoveAC(_channel7));
-              case 82:
+              case 80:
                 deleteChannelFromAllChannels(_channelId);
-                return _context.a(3, 185);
-              case 83:
+                return _context.a(3, 183);
+              case 81:
                 _channel8 = args.channel, deletedMessage = args.deletedMessage;
-                _context.n = 84;
+                _context.n = 82;
                 return effects.call(getActiveChannelId);
-              case 84:
+              case 82:
                 _activeChannelId7 = _context.v;
                 log.info('channel DELETE_MESSAGE ... ');
                 _channelExists7 = checkChannelExists(_channel8.id);
                 if (!(_channel8.id === _activeChannelId7)) {
-                  _context.n = 85;
+                  _context.n = 83;
                   break;
                 }
                 updateMessageOnAllMessages(deletedMessage.id, deletedMessage);
-                _context.n = 85;
+                _context.n = 83;
                 return effects.put(updateMessageAC(deletedMessage.id, deletedMessage));
-              case 85:
+              case 83:
                 updateMessageOnMap(_channel8.id, {
                   messageId: deletedMessage.id,
                   params: deletedMessage
                 });
                 if (!_channelExists7) {
-                  _context.n = 87;
+                  _context.n = 85;
                   break;
                 }
-                _context.n = 86;
+                _context.n = 84;
                 return effects.put(updateChannelDataAC(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }));
-              case 86:
+              case 84:
                 if (!(_channel8.lastMessage.id === deletedMessage.id)) {
-                  _context.n = 87;
+                  _context.n = 85;
                   break;
                 }
-                _context.n = 87;
+                _context.n = 85;
                 return effects.put(updateChannelLastMessageAC(deletedMessage, _channel8));
-              case 87:
+              case 85:
                 updateChannelOnAllChannels(_channel8.id, {
                   newMessageCount: _channel8.newMessageCount,
                   muted: _channel8.muted,
                   mutedTill: _channel8.mutedTill
                 }, deletedMessage);
-                return _context.a(3, 185);
-              case 88:
+                return _context.a(3, 183);
+              case 86:
                 _channel9 = args.channel, _message = args.message;
-                _context.n = 89;
+                _context.n = 87;
                 return effects.call(getActiveChannelId);
-              case 89:
+              case 87:
                 _activeChannelId8 = _context.v;
                 _channelExists8 = checkChannelExists(_channel9.id);
                 if (!(_channel9.id === _activeChannelId8)) {
-                  _context.n = 91;
+                  _context.n = 89;
                   break;
                 }
-                _context.n = 90;
+                _context.n = 88;
                 return effects.put(updateMessageAC(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -15117,7 +15135,7 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 }));
-              case 90:
+              case 88:
                 updateMessageOnAllMessages(_message.id, {
                   body: _message.body,
                   state: _message.state,
@@ -15126,18 +15144,18 @@ function watchForEvents() {
                   mentionedUsers: _message.mentionedUsers,
                   updatedAt: _message.updatedAt
                 });
-              case 91:
+              case 89:
                 if (!_channelExists8) {
-                  _context.n = 92;
+                  _context.n = 90;
                   break;
                 }
                 if (!(_channel9.lastMessage.id === _message.id)) {
-                  _context.n = 92;
+                  _context.n = 90;
                   break;
                 }
-                _context.n = 92;
+                _context.n = 90;
                 return effects.put(updateChannelLastMessageAC(_message, _channel9));
-              case 92:
+              case 90:
                 if (checkChannelExistsOnMessagesMap(_channel9.id)) {
                   updateMessageOnMap(_channel9.id, {
                     messageId: _message.id,
@@ -15145,38 +15163,38 @@ function watchForEvents() {
                   });
                 }
                 updateChannelOnAllChannels(_channel9.id, {}, _message);
-                return _context.a(3, 185);
-              case 93:
+                return _context.a(3, 183);
+              case 91:
                 _channel0 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
                 isSelf = user.id === SceytChatClient.user.id;
-                _context.n = 94;
+                _context.n = 92;
                 return effects.call(getActiveChannelId);
-              case 94:
+              case 92:
                 _activeChannelId9 = _context.v;
                 if (!(_channel0.id === _activeChannelId9)) {
-                  _context.n = 96;
+                  _context.n = 94;
                   break;
                 }
-                _context.n = 95;
+                _context.n = 93;
                 return effects.put(addReactionToMessageAC(_message2, reaction, isSelf));
-              case 95:
+              case 93:
                 addReactionOnAllMessages(_message2, reaction, true);
-              case 96:
+              case 94:
                 if (!(_message2.user.id === SceytChatClient.user.id)) {
-                  _context.n = 100;
+                  _context.n = 98;
                   break;
                 }
                 if (!(!isSelf && Notification.permission === 'granted')) {
-                  _context.n = 98;
+                  _context.n = 96;
                   break;
                 }
                 if (!(document.visibilityState !== 'visible' || _channel0.id !== _activeChannelId9)) {
-                  _context.n = 98;
+                  _context.n = 96;
                   break;
                 }
-                _context.n = 97;
+                _context.n = 95;
                 return effects.select(contactsMapSelector);
-              case 97:
+              case 95:
                 _contactsMap = _context.v;
                 _getFromContacts2 = getShowOnlyContactUsers();
                 _state = store.getState();
@@ -15196,9 +15214,9 @@ function watchForEvents() {
                 setNotification(_messageBody, reaction.user, _channel0, reaction.key, _message2.attachments && _message2.attachments.length ? _message2.attachments.find(function (att) {
                   return att.type !== attachmentTypes.link;
                 }) : undefined);
-              case 98:
+              case 96:
                 if (!(_channel0.newReactions && _channel0.newReactions.length)) {
-                  _context.n = 99;
+                  _context.n = 97;
                   break;
                 }
                 channelUpdateParams = {
@@ -15208,9 +15226,9 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 };
-                _context.n = 99;
+                _context.n = 97;
                 return effects.put(updateChannelDataAC(_channel0.id, channelUpdateParams));
-              case 99:
+              case 97:
                 updateChannelOnAllChannels(_channel0.id, {
                   userMessageReactions: _channel0.newReactions,
                   lastReactedMessage: _message2,
@@ -15218,17 +15236,17 @@ function watchForEvents() {
                   muted: _channel0.muted,
                   mutedTill: _channel0.mutedTill
                 });
-              case 100:
+              case 98:
                 if (checkChannelExistsOnMessagesMap(_channel0.id)) {
                   addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
                 }
-                return _context.a(3, 185);
-              case 101:
+                return _context.a(3, 183);
+              case 99:
                 _channel1 = args.channel, pollDetails = args.pollDetails, _messageId = args.messageId;
                 pollDetailsData = pollDetails;
-                _context.n = 102;
+                _context.n = 100;
                 return effects.call(getActiveChannelId);
-              case 102:
+              case 100:
                 _activeChannelId0 = _context.v;
                 addedVotes = (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan = pollDetailsData.changedVotes) === null || _pollDetailsData$chan === void 0 ? void 0 : _pollDetailsData$chan.addedVotes) || [];
                 deletedVotes = (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan2 = pollDetailsData.changedVotes) === null || _pollDetailsData$chan2 === void 0 ? void 0 : _pollDetailsData$chan2.removedVotes) || [];
@@ -15250,39 +15268,39 @@ function watchForEvents() {
                   });
                 }
                 _i = 0, _objs = objs;
-              case 103:
+              case 101:
                 if (!(_i < _objs.length)) {
-                  _context.n = 107;
+                  _context.n = 105;
                   break;
                 }
                 obj = _objs[_i];
                 if (!(pollDetailsData !== null && pollDetailsData !== void 0 && pollDetailsData.id && obj.vote)) {
-                  _context.n = 106;
+                  _context.n = 104;
                   break;
                 }
                 key = pollDetailsData.id + "_" + obj.vote.optionId;
                 hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[key]) || false;
                 if (!(obj.type === 'addOwn')) {
-                  _context.n = 105;
+                  _context.n = 103;
                   break;
                 }
-                _context.n = 104;
+                _context.n = 102;
                 return effects.put(addPollVotesToListAC(pollDetailsData.id, obj.vote.optionId, [obj.vote], hasNext, undefined));
-              case 104:
-                _context.n = 106;
+              case 102:
+                _context.n = 104;
                 break;
-              case 105:
-                _context.n = 106;
+              case 103:
+                _context.n = 104;
                 return effects.put(deletePollVotesFromListAC(pollDetailsData.id, obj.vote.optionId, [obj.vote], _messageId));
-              case 106:
+              case 104:
                 _i++;
-                _context.n = 103;
+                _context.n = 101;
                 break;
-              case 107:
+              case 105:
                 _i2 = 0, _objs2 = objs;
-              case 108:
+              case 106:
                 if (!(_i2 < _objs2.length)) {
-                  _context.n = 110;
+                  _context.n = 108;
                   break;
                 }
                 _obj = _objs2[_i2];
@@ -15295,24 +15313,24 @@ function watchForEvents() {
                   incrementVotesPerOptionCount: _obj.incrementVotesPerOptionCount
                 });
                 if (!(_channel1.id === _activeChannelId0)) {
-                  _context.n = 109;
+                  _context.n = 107;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId, {}, _obj);
-                _context.n = 109;
+                _context.n = 107;
                 return effects.put(updateMessageAC(_messageId, {}, undefined, _obj));
-              case 109:
+              case 107:
                 _i2++;
-                _context.n = 108;
+                _context.n = 106;
                 break;
-              case 110:
-                return _context.a(3, 185);
-              case 111:
+              case 108:
+                return _context.a(3, 183);
+              case 109:
                 _channel10 = args.channel, _pollDetails = args.pollDetails, _messageId2 = args.messageId;
                 _pollDetailsData = _pollDetails;
-                _context.n = 112;
+                _context.n = 110;
                 return effects.call(getActiveChannelId);
-              case 112:
+              case 110:
                 _activeChannelId1 = _context.v;
                 _deletedVotes = (_pollDetailsData === null || _pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan3 = _pollDetailsData.changedVotes) === null || _pollDetailsData$chan3 === void 0 ? void 0 : _pollDetailsData$chan3.removedVotes) || [];
                 _objs3 = [];
@@ -15325,27 +15343,27 @@ function watchForEvents() {
                   });
                 }
                 _i3 = 0, _objs4 = _objs3;
-              case 113:
+              case 111:
                 if (!(_i3 < _objs4.length)) {
-                  _context.n = 115;
+                  _context.n = 113;
                   break;
                 }
                 _obj2 = _objs4[_i3];
                 if (!(_pollDetailsData !== null && _pollDetailsData !== void 0 && _pollDetailsData.id && _obj2.vote)) {
-                  _context.n = 114;
+                  _context.n = 112;
                   break;
                 }
-                _context.n = 114;
+                _context.n = 112;
                 return effects.put(deletePollVotesFromListAC(_pollDetailsData.id, _obj2.vote.optionId, [_obj2.vote], _messageId2));
-              case 114:
+              case 112:
                 _i3++;
-                _context.n = 113;
+                _context.n = 111;
                 break;
-              case 115:
+              case 113:
                 _i4 = 0, _objs5 = _objs3;
-              case 116:
+              case 114:
                 if (!(_i4 < _objs5.length)) {
-                  _context.n = 118;
+                  _context.n = 116;
                   break;
                 }
                 _obj3 = _objs5[_i4];
@@ -15354,23 +15372,23 @@ function watchForEvents() {
                   params: {}
                 }, _obj3);
                 if (!(_channel10.id === _activeChannelId1)) {
-                  _context.n = 117;
+                  _context.n = 115;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId2, {}, _obj3);
-                _context.n = 117;
+                _context.n = 115;
                 return effects.put(updateMessageAC(_messageId2, {}, undefined, _obj3));
-              case 117:
+              case 115:
                 _i4++;
-                _context.n = 116;
+                _context.n = 114;
                 break;
-              case 118:
-                return _context.a(3, 185);
-              case 119:
+              case 116:
+                return _context.a(3, 183);
+              case 117:
                 _channel11 = args.channel, _pollDetails2 = args.pollDetails, _messageId3 = args.messageId;
-                _context.n = 120;
+                _context.n = 118;
                 return effects.call(getActiveChannelId);
-              case 120:
+              case 118:
                 _activeChannelId10 = _context.v;
                 _pollDetailsData2 = _pollDetails2;
                 retractedVotes = (_pollDetailsData2 === null || _pollDetailsData2 === void 0 ? void 0 : (_pollDetailsData2$cha = _pollDetailsData2.changedVotes) === null || _pollDetailsData2$cha === void 0 ? void 0 : _pollDetailsData2$cha.removedVotes) || [];
@@ -15384,9 +15402,9 @@ function watchForEvents() {
                   });
                 }
                 _i5 = 0, _objs7 = _objs6;
-              case 121:
+              case 119:
                 if (!(_i5 < _objs7.length)) {
-                  _context.n = 126;
+                  _context.n = 124;
                   break;
                 }
                 _obj4 = _objs7[_i5];
@@ -15395,40 +15413,40 @@ function watchForEvents() {
                   params: {}
                 }, _obj4);
                 if (!(_pollDetailsData2 !== null && _pollDetailsData2 !== void 0 && _pollDetailsData2.id && retractedVotes.length > 0)) {
-                  _context.n = 124;
+                  _context.n = 122;
                   break;
                 }
                 _iterator6 = _createForOfIteratorHelperLoose(retractedVotes);
-              case 122:
+              case 120:
                 if ((_step6 = _iterator6()).done) {
-                  _context.n = 124;
+                  _context.n = 122;
                   break;
                 }
                 _vote3 = _step6.value;
-                _context.n = 123;
+                _context.n = 121;
                 return effects.put(deletePollVotesFromListAC(_pollDetailsData2.id, _vote3.optionId, [_vote3], _messageId3));
-              case 123:
-                _context.n = 122;
+              case 121:
+                _context.n = 120;
                 break;
-              case 124:
+              case 122:
                 if (!(_channel11.id === _activeChannelId10)) {
-                  _context.n = 125;
+                  _context.n = 123;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId3, {}, _obj4);
-                _context.n = 125;
+                _context.n = 123;
                 return effects.put(updateMessageAC(_messageId3, {}, undefined, _obj4));
-              case 125:
+              case 123:
                 _i5++;
-                _context.n = 121;
+                _context.n = 119;
                 break;
-              case 126:
-                return _context.a(3, 185);
-              case 127:
+              case 124:
+                return _context.a(3, 183);
+              case 125:
                 _channel12 = args.channel, _messageId4 = args.messageId;
-                _context.n = 128;
+                _context.n = 126;
                 return effects.call(getActiveChannelId);
-              case 128:
+              case 126:
                 _activeChannelId11 = _context.v;
                 _obj5 = {
                   type: 'close',
@@ -15439,54 +15457,54 @@ function watchForEvents() {
                   params: {}
                 }, _obj5);
                 if (!(_channel12.id === _activeChannelId11)) {
-                  _context.n = 130;
+                  _context.n = 128;
                   break;
                 }
                 updateMessageOnAllMessages(_messageId4, {}, _obj5);
-                _context.n = 129;
+                _context.n = 127;
                 return effects.put(updateMessageAC(_messageId4, {}, undefined, _obj5));
+              case 127:
+                return _context.a(3, 183);
+              case 128:
+                return _context.a(3, 183);
               case 129:
-                return _context.a(3, 185);
-              case 130:
-                return _context.a(3, 185);
-              case 131:
                 _channel13 = args.channel, _user = args.user, _message3 = args.message, _reaction = args.reaction;
                 log.info('channel REACTION_DELETED ... ', _channel13);
                 channelFromMap = getChannelFromMap(_channel13.id);
                 _isSelf = _user.id === SceytChatClient.user.id;
-                _context.n = 132;
+                _context.n = 130;
                 return effects.call(getActiveChannelId);
-              case 132:
+              case 130:
                 _activeChannelId12 = _context.v;
                 if (!(_channel13.id === _activeChannelId12)) {
-                  _context.n = 134;
+                  _context.n = 132;
                   break;
                 }
-                _context.n = 133;
+                _context.n = 131;
                 return effects.put(deleteReactionFromMessageAC(_message3, _reaction, _isSelf));
-              case 133:
+              case 131:
                 removeReactionOnAllMessages(_message3, _reaction, true);
-              case 134:
+              case 132:
                 _channelUpdateParams = JSON.parse(JSON.stringify(_channel13));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
-                _context.n = 135;
+                _context.n = 133;
                 return effects.put(updateChannelDataAC(_channel13.id, _channelUpdateParams));
-              case 135:
+              case 133:
                 updateChannelOnAllChannels(_channel13.id, _channelUpdateParams);
                 if (checkChannelExistsOnMessagesMap(_channel13.id)) {
                   removeReactionToMessageOnMap(_channel13.id, _message3, _reaction, true);
                 }
-                return _context.a(3, 185);
-              case 136:
+                return _context.a(3, 183);
+              case 134:
                 _channel14 = args.channel;
                 if (!_channel14) {
-                  _context.n = 138;
+                  _context.n = 136;
                   break;
                 }
                 _updatedChannel = JSON.parse(JSON.stringify(_channel14));
-                _context.n = 137;
+                _context.n = 135;
                 return effects.put(updateChannelDataAC(_channel14.id, {
                   lastMessage: _channel14.lastMessage,
                   newMessageCount: _channel14.newMessageCount,
@@ -15499,36 +15517,36 @@ function watchForEvents() {
                   lastDisplayedMessageId: _channel14.lastDisplayedMessageId,
                   messageRetentionPeriod: _channel14.messageRetentionPeriod
                 }));
-              case 137:
+              case 135:
                 updateChannelOnAllChannels(_channel14.id, _updatedChannel);
-              case 138:
-                return _context.a(3, 185);
-              case 139:
+              case 136:
+                return _context.a(3, 183);
+              case 137:
                 _channel15 = args.channel;
                 log.info('CLEAR_HISTORY: ', _channel15);
-                _context.n = 140;
+                _context.n = 138;
                 return effects.call(getActiveChannelId);
-              case 140:
+              case 138:
                 _activeChannelId13 = _context.v;
-                _context.n = 141;
+                _context.n = 139;
                 return effects.call(checkChannelExists, _channel15.id);
-              case 141:
+              case 139:
                 channelExist = _context.v;
                 if (!(_channel15.id === _activeChannelId13)) {
-                  _context.n = 143;
+                  _context.n = 141;
                   break;
                 }
-                _context.n = 142;
+                _context.n = 140;
                 return effects.put(clearMessagesAC());
-              case 142:
+              case 140:
                 removeAllMessages();
-              case 143:
+              case 141:
                 removeMessagesFromMap(_channel15.id);
                 if (!channelExist) {
-                  _context.n = 144;
+                  _context.n = 142;
                   break;
                 }
-                _context.n = 144;
+                _context.n = 142;
                 return effects.put(updateChannelDataAC(_channel15.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -15536,7 +15554,7 @@ function watchForEvents() {
                   muted: _channel15.muted,
                   mutedTill: _channel15.mutedTill
                 }));
-              case 144:
+              case 142:
                 updateChannelOnAllChannels(_channel15.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -15544,260 +15562,260 @@ function watchForEvents() {
                   muted: _channel15.muted,
                   mutedTill: _channel15.mutedTill
                 });
-                return _context.a(3, 185);
-              case 145:
+                return _context.a(3, 183);
+              case 143:
                 _channel16 = args.channel;
                 log.info('channel MUTE ... ');
-                _context.n = 146;
+                _context.n = 144;
                 return effects.put(updateChannelDataAC(_channel16.id, {
                   muted: _channel16.muted,
                   mutedTill: _channel16.mutedTill
                 }));
-              case 146:
+              case 144:
                 updateChannelOnAllChannels(_channel16.id, {
                   muted: _channel16.muted,
                   mutedTill: _channel16.mutedTill
                 });
-                return _context.a(3, 185);
-              case 147:
+                return _context.a(3, 183);
+              case 145:
                 _channel17 = args.channel;
                 log.info('channel UNMUTE ... ');
-                _context.n = 148;
+                _context.n = 146;
                 return effects.put(updateChannelDataAC(_channel17.id, {
                   muted: _channel17.muted,
                   mutedTill: _channel17.mutedTill
                 }));
-              case 148:
+              case 146:
                 updateChannelOnAllChannels(_channel17.id, {
                   muted: _channel17.muted,
                   mutedTill: _channel17.mutedTill
                 });
-                return _context.a(3, 185);
-              case 149:
+                return _context.a(3, 183);
+              case 147:
                 _channel18 = args.channel;
                 log.info('channel PINED ... ');
-                _context.n = 150;
+                _context.n = 148;
                 return effects.put(updateChannelDataAC(_channel18.id, {
                   pinnedAt: _channel18.pinnedAt
                 }, true));
-              case 150:
+              case 148:
                 updateChannelOnAllChannels(_channel18.id, {
                   pinnedAt: _channel18.pinnedAt
                 });
-                return _context.a(3, 185);
-              case 151:
+                return _context.a(3, 183);
+              case 149:
                 _channel19 = args.channel;
                 log.info('channel UNPINED ... ');
-                _context.n = 152;
+                _context.n = 150;
                 return effects.put(updateChannelDataAC(_channel19.id, {
                   pinnedAt: _channel19.pinnedAt
                 }, false, true));
-              case 152:
+              case 150:
                 updateChannelOnAllChannels(_channel19.id, {
                   pinnedAt: _channel19.pinnedAt
                 });
-                return _context.a(3, 185);
-              case 153:
+                return _context.a(3, 183);
+              case 151:
                 _channel20 = args.channel;
                 log.info('channel HIDE ... ');
-                _context.n = 154;
+                _context.n = 152;
                 return effects.put(setChannelToHideAC(_channel20));
-              case 154:
-                return _context.a(3, 185);
-              case 155:
+              case 152:
+                return _context.a(3, 183);
+              case 153:
                 _channel21 = args.channel;
                 log.info('channel UNHIDE ... ');
-                _context.n = 156;
+                _context.n = 154;
                 return effects.put(setChannelToUnHideAC(_channel21));
-              case 156:
-                return _context.a(3, 185);
-              case 157:
+              case 154:
+                return _context.a(3, 183);
+              case 155:
                 _channel22 = args.channel;
-                _context.n = 158;
+                _context.n = 156;
                 return effects.put(updateChannelDataAC(_channel22.id, {
                   unread: _channel22.unread,
                   muted: _channel22.muted,
                   mutedTill: _channel22.mutedTill
                 }));
-              case 158:
+              case 156:
                 _groupName5 = getChannelGroupName(_channel22);
-                _context.n = 159;
+                _context.n = 157;
                 return effects.put(updateSearchedChannelDataAC(_channel22.id, {
                   unread: _channel22.unread
                 }, _groupName5));
-              case 159:
+              case 157:
                 updateChannelOnAllChannels(_channel22.id, {
                   unread: _channel22.unread
                 });
-                return _context.a(3, 185);
-              case 160:
+                return _context.a(3, 183);
+              case 158:
                 _channel23 = args.channel;
-                _context.n = 161;
+                _context.n = 159;
                 return effects.put(updateChannelDataAC(_channel23.id, {
                   unread: _channel23.unread,
                   muted: _channel23.muted,
                   mutedTill: _channel23.mutedTill
                 }));
-              case 161:
+              case 159:
                 _groupName6 = getChannelGroupName(_channel23);
-                _context.n = 162;
+                _context.n = 160;
                 return effects.put(updateSearchedChannelDataAC(_channel23.id, {
                   unread: _channel23.unread
                 }, _groupName6));
-              case 162:
+              case 160:
                 updateChannelOnAllChannels(_channel23.id, {
                   unread: _channel23.unread
                 });
-                return _context.a(3, 185);
-              case 163:
+                return _context.a(3, 183);
+              case 161:
                 _channel24 = args.channel, members = args.members;
                 log.info('channel CHANGE_ROLE  channel ... ', _channel24);
                 log.info('channel CHANGE_ROLE  member ... ', members);
-                _context.n = 164;
+                _context.n = 162;
                 return effects.call(getActiveChannelId);
-              case 164:
+              case 162:
                 _activeChannelId14 = _context.v;
                 if (!(_channel24.id === _activeChannelId14)) {
-                  _context.n = 165;
+                  _context.n = 163;
                   break;
                 }
-                _context.n = 165;
+                _context.n = 163;
                 return effects.put(updateMembersAC(members));
-              case 165:
+              case 163:
                 i = 0;
-              case 166:
+              case 164:
                 if (!(i < members.length)) {
-                  _context.n = 169;
+                  _context.n = 167;
                   break;
                 }
                 if (!(members[i].id === SceytChatClient.user.id)) {
-                  _context.n = 168;
+                  _context.n = 166;
                   break;
                 }
-                _context.n = 167;
+                _context.n = 165;
                 return effects.put(updateChannelDataAC(_channel24.id, {
                   userRole: members[i].role,
                   muted: _channel24.muted,
                   mutedTill: _channel24.mutedTill
                 }));
-              case 167:
+              case 165:
                 updateChannelOnAllChannels(_channel24.id, {
                   userRole: members[i].role,
                   muted: _channel24.muted,
                   mutedTill: _channel24.mutedTill
                 });
-              case 168:
+              case 166:
                 i++;
-                _context.n = 166;
+                _context.n = 164;
                 break;
-              case 169:
-                return _context.a(3, 185);
-              case 170:
+              case 167:
+                return _context.a(3, 183);
+              case 168:
                 _channel25 = args.channel;
                 log.info('channel frozen  channel ... ', _channel25);
-                return _context.a(3, 185);
-              case 171:
+                return _context.a(3, 183);
+              case 169:
                 _channel26 = args.channel;
                 log.info('channel unfrozen  channel ... ', _channel26);
-                return _context.a(3, 185);
-              case 172:
+                return _context.a(3, 183);
+              case 170:
                 _channelId2 = args.channelId, from = args.from, name = args.name;
                 log.info('channel event received >>>... . . . . . ', args);
                 if (!(from.id === SceytChatClient.user.id)) {
-                  _context.n = 173;
+                  _context.n = 171;
                   break;
                 }
-                return _context.a(3, 185);
-              case 173:
+                return _context.a(3, 183);
+              case 171:
                 if (!(name === 'start_typing')) {
-                  _context.n = 175;
+                  _context.n = 173;
                   break;
                 }
-                if (!usersTimeout[_channelId2]) {
-                  usersTimeout[_channelId2] = {};
+                if (!usersTimeout.typingTimeout[_channelId2]) {
+                  usersTimeout.typingTimeout[_channelId2] = {};
                 }
-                if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
-                  clearTimeout(usersTimeout[_channelId2][from.id]);
+                if (usersTimeout.typingTimeout[_channelId2] && usersTimeout.typingTimeout[_channelId2][from.id]) {
+                  clearTimeout(usersTimeout.typingTimeout[_channelId2][from.id]);
                 }
-                usersTimeout[_channelId2][from.id] = setTimeout(function () {
+                usersTimeout.typingTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_typing');
                 }, 5000);
-                _context.n = 174;
+                _context.n = 172;
                 return effects.put(switchTypingIndicatorAC(true, _channelId2, from));
-              case 174:
-                _context.n = 180;
+              case 172:
+                _context.n = 178;
                 break;
-              case 175:
+              case 173:
                 if (!(name === 'stop_typing')) {
-                  _context.n = 177;
+                  _context.n = 175;
                   break;
                 }
-                if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
-                  clearTimeout(usersTimeout[_channelId2][from.id]);
+                if (usersTimeout.typingTimeout[_channelId2] && usersTimeout.typingTimeout[_channelId2][from.id]) {
+                  clearTimeout(usersTimeout.typingTimeout[_channelId2][from.id]);
                 }
-                _context.n = 176;
+                _context.n = 174;
                 return effects.put(switchTypingIndicatorAC(false, _channelId2, from));
-              case 176:
-                _context.n = 180;
+              case 174:
+                _context.n = 178;
                 break;
-              case 177:
+              case 175:
                 if (!(name === 'start_recording')) {
-                  _context.n = 179;
+                  _context.n = 177;
                   break;
                 }
-                if (!usersTimeout[_channelId2]) {
-                  usersTimeout[_channelId2] = {};
+                if (!usersTimeout.recordingTimeout[_channelId2]) {
+                  usersTimeout.recordingTimeout[_channelId2] = {};
                 }
-                if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
-                  clearTimeout(usersTimeout[_channelId2][from.id]);
+                if (usersTimeout.recordingTimeout[_channelId2] && usersTimeout.recordingTimeout[_channelId2][from.id]) {
+                  clearTimeout(usersTimeout.recordingTimeout[_channelId2][from.id]);
                 }
-                usersTimeout[_channelId2][from.id] = setTimeout(function () {
+                usersTimeout.recordingTimeout[_channelId2][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId2, from, 'stop_recording');
                 }, 5000);
-                _context.n = 178;
+                _context.n = 176;
                 return effects.put(switchRecordingIndicatorAC(true, _channelId2, from));
-              case 178:
-                _context.n = 180;
+              case 176:
+                _context.n = 178;
                 break;
-              case 179:
+              case 177:
                 if (!(name === 'stop_recording')) {
-                  _context.n = 180;
+                  _context.n = 178;
                   break;
                 }
-                if (usersTimeout[_channelId2] && usersTimeout[_channelId2][from.id]) {
-                  clearTimeout(usersTimeout[_channelId2][from.id]);
+                if (usersTimeout.recordingTimeout[_channelId2] && usersTimeout.recordingTimeout[_channelId2][from.id]) {
+                  clearTimeout(usersTimeout.recordingTimeout[_channelId2][from.id]);
                 }
-                _context.n = 180;
+                _context.n = 178;
                 return effects.put(switchRecordingIndicatorAC(false, _channelId2, from));
-              case 180:
-                return _context.a(3, 185);
-              case 181:
+              case 178:
+                return _context.a(3, 183);
+              case 179:
                 status = args.status;
                 log.info('connection status changed . . . . . ', status);
-                _context.n = 182;
+                _context.n = 180;
                 return effects.put(setConnectionStatusAC(status));
-              case 182:
+              case 180:
                 if (!(status === CONNECTION_STATUS.CONNECTED)) {
-                  _context.n = 183;
+                  _context.n = 181;
                   break;
                 }
-                _context.n = 183;
+                _context.n = 181;
                 return effects.put(getRolesAC());
-              case 183:
-                return _context.a(3, 185);
-              case 184:
+              case 181:
+                return _context.a(3, 183);
+              case 182:
                 log.warn('UNHANDLED EVENT FROM REDUX-SAGA EVENT-CHANNEL');
-              case 185:
-                _context.n = 187;
+              case 183:
+                _context.n = 185;
                 break;
-              case 186:
-                _context.p = 186;
+              case 184:
+                _context.p = 184;
                 _t2 = _context.v;
                 log.error('Error in watchForEvents:', _t2);
-              case 187:
+              case 185:
                 return _context.a(2);
             }
-          }, _callee, null, [[0, 186]]);
+          }, _callee, null, [[0, 184]]);
         });
       case 1:
         return _context2.d(_regeneratorValues(_loop()), 2);
@@ -16206,7 +16224,7 @@ function getChannels(action) {
       case 23:
         _context2.p = 23;
         _t4 = _context2.v;
-        log.error(_t4, 'Error on get channels');
+        log.error(JSON.stringify(_t4), 'Error on get channels');
       case 24:
         return _context2.a(2);
     }
@@ -18382,7 +18400,7 @@ var base64ToBinary = function base64ToBinary(base64) {
 var binaryThumbHashToDataURL = function binaryThumbHashToDataURL(binaryThumbHash) {
   return thumbHashToDataURL(binaryThumbHash);
 };
-var base64ToToDataURL = function base64ToToDataURL(base64) {
+var base64ToDataURL = function base64ToDataURL(base64) {
   try {
     var thumbHashFromBase64 = base64ToBinary(base64);
     if (thumbHashFromBase64.length === 0) {
@@ -18456,106 +18474,6 @@ function calculateSize(width, height, maxWidth, maxHeight) {
   return [width, height];
 }
 
-var activeChannelMessagesSelector = function activeChannelMessagesSelector(store) {
-  return store.MessageReducer.activeChannelMessages;
-};
-var messagesLoadingState = function messagesLoadingState(store) {
-  return store.MessageReducer.messagesLoadingState;
-};
-var messagesHasNextSelector = function messagesHasNextSelector(store) {
-  return store.MessageReducer.messagesHasNext;
-};
-var messagesHasPrevSelector = function messagesHasPrevSelector(store) {
-  return store.MessageReducer.messagesHasPrev;
-};
-var attachmentCompilationStateSelector = function attachmentCompilationStateSelector(store) {
-  return store.MessageReducer.attachmentsUploadingState;
-};
-var attachmentsUploadProgressSelector = function attachmentsUploadProgressSelector(store) {
-  return store.MessageReducer.attachmentsUploadingProgress;
-};
-var activeTabAttachmentsSelector = function activeTabAttachmentsSelector(store) {
-  return store.MessageReducer.activeTabAttachments;
-};
-var activeTabAttachmentsHasNextSelector = function activeTabAttachmentsHasNextSelector(store) {
-  return store.MessageReducer.attachmentHasNext;
-};
-var attachmentsForPopupSelector = function attachmentsForPopupSelector(store) {
-  return store.MessageReducer.attachmentsForPopup;
-};
-var messageForReplySelector = function messageForReplySelector(store) {
-  return store.MessageReducer.messageForReply;
-};
-var messageToEditSelector = function messageToEditSelector(store) {
-  return store.MessageReducer.messageToEdit;
-};
-var scrollToNewMessageSelector = function scrollToNewMessageSelector(store) {
-  return store.MessageReducer.scrollToNewMessage;
-};
-var scrollToMentionedMessageSelector = function scrollToMentionedMessageSelector(store) {
-  return store.MessageReducer.scrollToMentionedMessage;
-};
-var showScrollToNewMessageButtonSelector = function showScrollToNewMessageButtonSelector(store) {
-  return store.MessageReducer.showScrollToNewMessageButton;
-};
-var sendMessageInputHeightSelector = function sendMessageInputHeightSelector(store) {
-  return store.MessageReducer.sendMessageInputHeight;
-};
-var scrollToMessageSelector = function scrollToMessageSelector(store) {
-  return store.MessageReducer.scrollToMessage;
-};
-var scrollToMessageHighlightSelector = function scrollToMessageHighlightSelector(store) {
-  return store.MessageReducer.scrollToMessageHighlight;
-};
-var scrollToMessageBehaviorSelector = function scrollToMessageBehaviorSelector(store) {
-  return store.MessageReducer.scrollToMessageBehavior;
-};
-var reactionsListSelector = function reactionsListSelector(store) {
-  return store.MessageReducer.reactionsList;
-};
-var reactionsHasNextSelector = function reactionsHasNextSelector(store) {
-  return store.MessageReducer.reactionsHasNext;
-};
-var reactionsLoadingStateSelector = function reactionsLoadingStateSelector(store) {
-  return store.MessageReducer.reactionsLoadingState;
-};
-var openedMessageMenuSelector = function openedMessageMenuSelector(store) {
-  return store.MessageReducer.openedMessageMenu;
-};
-var playingAudioIdSelector = function playingAudioIdSelector(store) {
-  return store.MessageReducer.playingAudioId;
-};
-var selectedMessagesMapSelector = function selectedMessagesMapSelector(store) {
-  return store.MessageReducer.selectedMessagesMap;
-};
-var attachmentUpdatedMapSelector = function attachmentUpdatedMapSelector(store) {
-  return store.MessageReducer.attachmentUpdatedMap;
-};
-var messageMarkersSelector = function messageMarkersSelector(store) {
-  return store.MessageReducer.messageMarkers;
-};
-var messagesMarkersLoadingStateSelector = function messagesMarkersLoadingStateSelector(store) {
-  return store.MessageReducer.messagesMarkersLoadingState;
-};
-var pollVotesListSelector = function pollVotesListSelector(store) {
-  return store.MessageReducer.pollVotesList;
-};
-var pollVotesHasMoreSelector = function pollVotesHasMoreSelector(store) {
-  return store.MessageReducer.pollVotesHasMore;
-};
-var pollVotesLoadingStateSelector = function pollVotesLoadingStateSelector(store) {
-  return store.MessageReducer.pollVotesLoadingState;
-};
-var pendingPollActionsSelector = function pendingPollActionsSelector(store) {
-  return store.MessageReducer.pendingPollActions;
-};
-var pendingMessagesMapSelector = function pendingMessagesMapSelector(store) {
-  return store.MessageReducer.pendingMessagesMap;
-};
-var unreadScrollToSelector = function unreadScrollToSelector(store) {
-  return store.MessageReducer.unreadScrollTo;
-};
-
 var getFrame = function getFrame(videoSrc, time) {
   try {
     var video = document.createElement('video');
@@ -18725,28 +18643,43 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
 };
 var addPendingMessage = function addPendingMessage(message, messageCopy, channel) {
   try {
-    var messageToAdd = JSON.parse(JSON.stringify(_extends({}, messageCopy, {
+    var messageToAdd = _extends({}, messageCopy, {
       createdAt: new Date(Date.now()),
       mentionedUsers: message.mentionedUsers,
       parentMessage: message.parentMessage
-    })));
+    });
     addMessageToMap(channel.id, messageToAdd);
-    addAllMessages([messageToAdd], MESSAGE_LOAD_DIRECTION.NEXT);
+    var activeChannelId = getActiveChannelId();
+    if (activeChannelId === channel.id) {
+      addAllMessages([messageToAdd], MESSAGE_LOAD_DIRECTION.NEXT);
+    }
     setPendingMessage(channel.id, messageToAdd);
     store.dispatch(scrollToNewMessageAC(true));
-    store.dispatch(addMessageAC(messageToAdd));
+    if (activeChannelId === channel.id) {
+      store.dispatch(addMessageAC(messageToAdd));
+    }
     return Promise.resolve();
   } catch (e) {
     return Promise.reject(e);
   }
 };
+var updatePendingMessage$1 = function updatePendingMessage(message, channel, updatedMessage) {
+  var messageToUpdate = _extends({}, message, updatedMessage);
+  updateMessageOnMap(channel.id, {
+    messageId: message.tid,
+    params: messageToUpdate
+  });
+  updateMessageOnAllMessages(message.tid, messageToUpdate);
+  updatePendingMessageOnMap(channel.id, message.tid, messageToUpdate);
+  store.dispatch(updateMessageAC(message.tid, messageToUpdate, false));
+};
 function sendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, messageCopy, _loop2, _i, _t2;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, messageCopy, _loop2, _i, _t2;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, sendAttachmentsAsSeparateMessage = payload.sendAttachmentsAsSeparateMessage;
+        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, sendAttachmentsAsSeparateMessage = payload.sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
         _context3.p = 1;
         _context3.n = 2;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
@@ -18790,7 +18723,7 @@ function sendMessage(action) {
         }) : [];
         customUploader = getCustomUploader();
         if (!(message.attachments && message.attachments.length)) {
-          _context3.n = 17;
+          _context3.n = 22;
           break;
         }
         linkAttachment = null;
@@ -18803,7 +18736,7 @@ function sendMessage(action) {
           return att.type !== attachmentTypes.link;
         });
         if (!(mediaAttachments && mediaAttachments.length)) {
-          _context3.n = 14;
+          _context3.n = 18;
           break;
         }
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
@@ -18844,7 +18777,9 @@ function sendMessage(action) {
                     }
                   };
                 } else if (customUploader && attachment) {
-                  attachment.url = attachment.data;
+                  attachment = _extends({}, attachment, {
+                    url: attachment.data
+                  });
                 }
                 messageAttachment.tid = attachment.tid;
                 messageAttachment.attachmentUrl = attachment.attachmentUrl;
@@ -18852,7 +18787,7 @@ function sendMessage(action) {
                   messageAttachment.url = attachment.data;
                 }
                 if (!sendAttachmentsAsSeparateMessage) {
-                  _context.n = 2;
+                  _context.n = 4;
                   break;
                 }
                 _messageBuilder = channel.createMessageBuilder();
@@ -18872,22 +18807,34 @@ function sendMessage(action) {
                   attachments: [messageAttachment]
                 });
                 messagesToSend.push(messageForSend);
-                messageForSendCopy = JSON.parse(JSON.stringify(messageForSend));
+                messageForSendCopy = messageForSend;
+                if (!isAddToPendingMessagesMap) {
+                  _context.n = 2;
+                  break;
+                }
                 _context.n = 1;
-                return effects.call(addPendingMessage, message, messageForSendCopy, channel);
+                return effects.call(addPendingMessage, message, _extends({}, messageForSendCopy, {
+                  attachments: [attachment]
+                }), channel);
               case 1:
                 _context.n = 3;
                 break;
               case 2:
-                attachmentsToSend.push(messageAttachment);
+                _context.n = 3;
+                return effects.call(updatePendingMessage$1, message, channel, messageForSendCopy);
               case 3:
+                _context.n = 5;
+                break;
+              case 4:
+                attachmentsToSend.push(messageAttachment);
+              case 5:
                 if (!(!messageAttachment.cachedUrl && customUploader)) {
-                  _context.n = 4;
+                  _context.n = 6;
                   break;
                 }
-                _context.n = 4;
+                _context.n = 6;
                 return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, messageAttachment.tid));
-              case 4:
+              case 6:
                 return _context.a(2);
             }
           }, _callee);
@@ -18905,7 +18852,7 @@ function sendMessage(action) {
         break;
       case 10:
         if (sendAttachmentsAsSeparateMessage) {
-          _context3.n = 14;
+          _context3.n = 18;
           break;
         }
         messageBuilder = channel.createMessageBuilder();
@@ -18917,27 +18864,53 @@ function sendMessage(action) {
           messageBuilder.setReplyInThread();
         }
         messageToSend = messageBuilder.create();
-        messageCopy = JSON.parse(JSON.stringify(messageToSend));
+        messageCopy = messageToSend;
         if (!customUploader) {
-          _context3.n = 12;
+          _context3.n = 14;
           break;
         }
         if (sendAttachmentsAsSeparateMessage) {
-          _context3.n = 11;
+          _context3.n = 13;
+          break;
+        }
+        if (!isAddToPendingMessagesMap) {
+          _context3.n = 12;
           break;
         }
         _context3.n = 11;
-        return effects.call(addPendingMessage, message, messageCopy, channel);
+        return effects.call(addPendingMessage, message, _extends({}, messageCopy, {
+          attachments: message.attachments
+        }), channel);
       case 11:
         _context3.n = 13;
         break;
       case 12:
-        _context3.n = 13;
-        return effects.call(addPendingMessage, message, messageCopy, channel);
+        updatePendingMessage$1(message, channel, messageCopy);
       case 13:
+        _context3.n = 17;
+        break;
+      case 14:
+        if (!isAddToPendingMessagesMap) {
+          _context3.n = 16;
+          break;
+        }
+        _context3.n = 15;
+        return effects.call(addPendingMessage, message, messageCopy, channel);
+      case 15:
+        _context3.n = 17;
+        break;
+      case 16:
+        updatePendingMessage$1(message, channel, messageCopy);
+      case 17:
         messageToSend.attachments = attachmentsToSend;
         messagesToSend.push(messageToSend);
-      case 14:
+      case 18:
+        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
+          _context3.n = 19;
+          break;
+        }
+        throw new Error('Connection is required to send message');
+      case 19:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee2() {
           var messageAttachment, messageToSend, _messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, _t;
           return _regenerator().w(function (_context2) {
@@ -19005,6 +18978,9 @@ function sendMessage(action) {
                 _context2.n = 5;
                 break;
               case 8:
+                if (!isAddToPendingMessagesMap) {
+                  store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
+                }
                 attachmentsToUpdate = [];
                 if (messageResponse.attachments && messageResponse.attachments.length > 0) {
                   currentAttachmentsMap = {};
@@ -19099,35 +19075,35 @@ function sendMessage(action) {
           }, _callee2, null, [[1, 14]]);
         });
         _i = 0;
-      case 15:
+      case 20:
         if (!(_i < messagesToSend.length)) {
-          _context3.n = 17;
+          _context3.n = 22;
           break;
         }
-        return _context3.d(_regeneratorValues(_loop2()), 16);
-      case 16:
+        return _context3.d(_regeneratorValues(_loop2()), 21);
+      case 21:
         _i++;
-        _context3.n = 15;
+        _context3.n = 20;
         break;
-      case 17:
-        _context3.n = 19;
+      case 22:
+        _context3.n = 24;
         break;
-      case 18:
-        _context3.p = 18;
+      case 23:
+        _context3.p = 23;
         _t2 = _context3.v;
         log.error('error on send message ... ', _t2);
-      case 19:
+      case 24:
         return _context3.a(2);
     }
-  }, _marked$3, null, [[1, 18]]);
+  }, _marked$3, null, [[1, 23]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
+  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
   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;
+        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
         _context4.n = 1;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
@@ -19195,32 +19171,41 @@ function sendTextMessage(action) {
           pendingMessage.metadata = JSON.parse(pendingMessage.metadata);
         }
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 8;
+          _context4.n = 10;
+          break;
+        }
+        if (!isAddToPendingMessagesMap) {
+          _context4.n = 9;
           break;
         }
         _context4.n = 8;
         return effects.call(addPendingMessage, message, pendingMessage, channel);
       case 8:
+        _context4.n = 10;
+        break;
+      case 9:
+        updatePendingMessage$1(message, channel, pendingMessage);
+      case 10:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context4.n = 16;
+          _context4.n = 18;
           break;
         }
         if (!sendMessageHandler) {
-          _context4.n = 10;
+          _context4.n = 12;
           break;
         }
-        _context4.n = 9;
+        _context4.n = 11;
         return effects.call(sendMessageHandler, messageToSend, channel.id);
-      case 9:
+      case 11:
         messageResponse = _context4.v;
-        _context4.n = 12;
+        _context4.n = 14;
         break;
-      case 10:
-        _context4.n = 11;
+      case 12:
+        _context4.n = 13;
         return effects.call(channel.sendMessage, messageToSend);
-      case 11:
+      case 13:
         messageResponse = _context4.v;
-      case 12:
+      case 14:
         messageUpdateData = {
           id: messageResponse.id,
           body: messageResponse.body,
@@ -19239,12 +19224,12 @@ function sendTextMessage(action) {
           channelId: channel.id
         };
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 13;
+          _context4.n = 15;
           break;
         }
-        _context4.n = 13;
+        _context4.n = 15;
         return effects.put(updateMessageAC(messageToSend.tid, messageUpdateData));
-      case 13:
+      case 15:
         updateMessageOnMap(channel.id, {
           messageId: messageToSend.tid,
           params: messageUpdateData
@@ -19258,30 +19243,33 @@ function sendTextMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context4.n = 14;
+        _context4.n = 16;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 14:
+      case 16:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context4.n = 15;
+          _context4.n = 17;
           break;
         }
-        _context4.n = 15;
+        _context4.n = 17;
         return effects.put(markChannelAsReadAC(channel.id));
-      case 15:
+      case 17:
         channel.lastMessage = messageToUpdate;
-        _context4.n = 17;
+        if (!isAddToPendingMessagesMap) {
+          store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
+        }
+        _context4.n = 19;
         break;
-      case 16:
+      case 18:
         throw new Error('Connection required to send message');
-      case 17:
-        _context4.n = 18;
+      case 19:
+        _context4.n = 20;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 18:
-        _context4.n = 21;
+      case 20:
+        _context4.n = 23;
         break;
-      case 19:
-        _context4.p = 19;
+      case 21:
+        _context4.p = 21;
         _t3 = _context4.v;
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
@@ -19291,32 +19279,32 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 20;
+          _context4.n = 22;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 20;
+        _context4.n = 22;
         return effects.put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 20:
-        _context4.n = 21;
+      case 22:
+        _context4.n = 23;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 21:
+      case 23:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 19]]);
+  }, _marked2$2, null, [[3, 21]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
+  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, pendingMessage, activeChannelId, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
         _context5.p = 0;
         payload = action.payload;
-        message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward;
+        message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
         _context5.n = 1;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
@@ -19351,7 +19339,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')) {
-          _context5.n = 19;
+          _context5.n = 16;
           break;
         }
         if (message.attachments && message.attachments.length) {
@@ -19379,9 +19367,9 @@ function forwardMessage(action) {
         }
         messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisableMentionsCount(getDisableFrowardMentionsCount()).setMetadata(message.metadata ? JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id).setPollDetails(pollDetails);
         messageToSend = messageBuilder.create();
-        pendingMessage = JSON.parse(JSON.stringify(_extends({}, messageToSend, {
+        pendingMessage = _extends({}, messageToSend, {
           createdAt: new Date(Date.now())
-        })));
+        });
         if (isForward) {
           if (message.forwardingDetails) {
             pendingMessage.forwardingDetails.user = message.forwardingDetails.user;
@@ -19393,50 +19381,42 @@ function forwardMessage(action) {
           pendingMessage.forwardingDetails.hops = message.forwardingDetails ? message.forwardingDetails.hops : 1;
         }
         activeChannelId = getActiveChannelId();
-        isCachedChannel = checkChannelExistsOnMessagesMap(channelId);
         if (!(channelId === activeChannelId)) {
-          _context5.n = 11;
+          _context5.n = 7;
           break;
         }
         hasNextMessages = store.getState().MessageReducer.messagesHasNext;
         if (getHasNextCached()) {
-          _context5.n = 9;
+          _context5.n = 7;
           break;
         }
         if (!hasNextMessages) {
-          _context5.n = 8;
+          _context5.n = 7;
           break;
         }
         _context5.n = 7;
         return effects.put(getMessagesAC(channel));
       case 7:
-        _context5.n = 9;
-        break;
+        if (!isAddToPendingMessagesMap) {
+          _context5.n = 9;
+          break;
+        }
+        _context5.n = 8;
+        return effects.call(addPendingMessage, message, pendingMessage, channel);
       case 8:
-        _context5.n = 9;
-        return effects.put(addMessageAC(JSON.parse(JSON.stringify(pendingMessage))));
+        _context5.n = 10;
+        break;
       case 9:
-        addMessageToMap(channelId, pendingMessage);
-        addAllMessages([pendingMessage], MESSAGE_LOAD_DIRECTION.NEXT);
         _context5.n = 10;
-        return effects.put(scrollToNewMessageAC(true, true));
+        return effects.call(updatePendingMessage$1, message, channel, pendingMessage);
       case 10:
-        _context5.n = 12;
-        break;
-      case 11:
-        if (isCachedChannel) {
-          addMessageToMap(channelId, pendingMessage);
-        } else {
-          setPendingMessage(channelId, pendingMessage);
-        }
-      case 12:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context5.n = 19;
+          _context5.n = 16;
           break;
         }
-        _context5.n = 13;
+        _context5.n = 11;
         return effects.call(channel.sendMessage, messageToSend);
-      case 13:
+      case 11:
         messageResponse = _context5.v;
         messageUpdateData = {
           id: messageResponse.id,
@@ -19453,409 +19433,75 @@ function forwardMessage(action) {
           channelId: channel.id
         };
         if (!(channelId === activeChannelId)) {
-          _context5.n = 15;
+          _context5.n = 13;
           break;
         }
-        _context5.n = 14;
+        _context5.n = 12;
         return effects.put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData))));
-      case 14:
-        updateMessageOnMap(channel.id, {
-          messageId: messageToSend.tid,
-          params: messageUpdateData
-        });
+      case 12:
         updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
-        _context5.n = 17;
-        break;
-      case 15:
-        if (!isCachedChannel) {
-          _context5.n = 16;
-          break;
-        }
+      case 13:
+        _context5.n = 14;
+        return effects.put(removePendingMessageAC(channel.id, messageToSend.tid || messageToSend.id));
+      case 14:
         updateMessageOnMap(channel.id, {
           messageId: messageToSend.tid,
           params: messageUpdateData
         });
-        _context5.n = 17;
-        break;
-      case 16:
-        _context5.n = 17;
-        return effects.put(removePendingMessageAC(channelId, messageToSend.tid || messageToSend.id));
-      case 17:
         messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
         updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
         channelUpdateParam = {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context5.n = 18;
+        _context5.n = 15;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 18:
+      case 15:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context5.n = 19;
+          _context5.n = 16;
           break;
         }
-        _context5.n = 19;
+        _context5.n = 16;
         return effects.put(markChannelAsReadAC(channel.id));
-      case 19:
-        _context5.n = 21;
+      case 16:
+        _context5.n = 18;
         break;
-      case 20:
-        _context5.p = 20;
+      case 17:
+        _context5.p = 17;
         _t4 = _context5.v;
         log.error('error on forward message ... ', _t4);
-      case 21:
-        _context5.n = 22;
+      case 18:
+        _context5.n = 19;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 22:
+      case 19:
         return _context5.a(2);
     }
-  }, _marked3$1, null, [[0, 20]]);
+  }, _marked3$1, null, [[0, 17]]);
 }
 function resendMessage(action) {
-  var payload, message, connectionState, channelId, channel, customUploader, attachmentCompilation, messageAttachment, messageCopy, handleUploadProgress, uri, filePath, handleUpdateLocalPath, pendingAttachment, thumbnailMetas, fileSize, meta, attachmentMeta, attachmentBuilder, attachmentToSend, messageResponse, messageUpdateData, fileType, messageToUpdate, _messageCopy2, _messageResponse2, _messageUpdateData, isInActiveChannel, activeChannelId, _messageToUpdate, _t5, _t6;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isVoiceMessage;
   return _regenerator().w(function (_context6) {
-    while (1) switch (_context6.p = _context6.n) {
+    while (1) switch (_context6.n) {
       case 0:
         payload = action.payload;
         message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
-        _context6.n = 1;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
-      case 1:
-        _context6.n = 2;
-        return effects.call(getChannelFromMap, channelId);
-      case 2:
-        channel = _context6.v;
-        _context6.p = 3;
-        if (!channel) {
-          channel = getChannelFromAllChannels(channelId);
-          if (channel) {
-            setChannelInMap(channel);
-          }
-        }
-        _context6.n = 4;
-        return effects.put(addChannelAC(JSON.parse(JSON.stringify(channel))));
-      case 4:
-        customUploader = getCustomUploader();
-        _context6.n = 5;
-        return effects.put(updateMessageAC(message.tid, {
-          state: MESSAGE_STATUS.UNMODIFIED
-        }));
-      case 5:
-        updateMessageOnMap(channel.id, {
-          messageId: message.tid,
-          params: {
-            state: MESSAGE_STATUS.UNMODIFIED
-          }
-        });
-        updateMessageOnAllMessages(message.tid, {
-          state: MESSAGE_STATUS.UNMODIFIED
-        });
-        if (!(message.attachments && message.attachments.length && message.state === MESSAGE_STATUS.FAILED)) {
-          _context6.n = 26;
-          break;
-        }
-        _context6.n = 6;
-        return effects.select(attachmentCompilationStateSelector);
-      case 6:
-        attachmentCompilation = _context6.v;
-        messageAttachment = _extends({}, message.attachments[0]);
-        messageCopy = _extends({}, message, {
-          attachments: [messageAttachment]
-        });
-        log.info('attachmentCompilation. .. . .', attachmentCompilation);
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED && attachmentCompilation[messageAttachment.tid] && attachmentCompilation[messageAttachment.tid] === UPLOAD_STATE.FAIL)) {
-          _context6.n = 25;
-          break;
-        }
-        _context6.n = 7;
-        return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, messageAttachment.tid));
-      case 7:
-        if (!customUploader) {
-          _context6.n = 25;
-          break;
-        }
-        handleUploadProgress = function handleUploadProgress(_ref2) {
-          var loaded = _ref2.loaded,
-            total = _ref2.total;
-          log.info('progress ... ', loaded / total);
-        };
-        _context6.p = 8;
-        handleUpdateLocalPath = function handleUpdateLocalPath(updatedLink) {
-          filePath = updatedLink;
-          thumbnailMetas = getVideoThumb(messageAttachment.tid);
-          messageCopy.attachments[0] = _extends({}, messageCopy.attachments[0], {
-            attachmentUrl: updatedLink
-          });
-          var updateAttachmentPath = {
-            attachments: [_extends({}, messageCopy.attachments[0], {
-              attachmentUrl: updatedLink
-            })]
-          };
-          store.dispatch(updateMessageAC(message.tid, updateAttachmentPath));
-        };
-        pendingAttachment = getPendingAttachment(message.attachments[0].tid);
-        log.info('pendingAttachment ... ', pendingAttachment);
-        if (!messageAttachment.cachedUrl) {
-          _context6.n = 9;
-          break;
-        }
-        uri = pendingAttachment.file;
-        _context6.n = 11;
-        break;
-      case 9:
-        messageAttachment.data = pendingAttachment.file;
-        messageAttachment.url = pendingAttachment.file;
-        _context6.n = 10;
-        return effects.call(customUpload, messageAttachment, handleUploadProgress, message.type, handleUpdateLocalPath);
-      case 10:
-        uri = _context6.v;
-      case 11:
-        log.info('messageAttachment ... ', messageAttachment);
-        _context6.n = 12;
-        return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.SUCCESS, messageAttachment.tid));
-      case 12:
-        delete messageCopy.createdAt;
-        thumbnailMetas = {};
-        fileSize = messageAttachment.cachedUrl ? messageAttachment.size : pendingAttachment.file.size;
-        log.info('uri ... ', uri);
-        if (!(!messageAttachment.cachedUrl && messageAttachment.url.type.split('/')[0] === 'image')) {
-          _context6.n = 15;
-          break;
-        }
-        _context6.n = 13;
-        return effects.call(getImageSize, filePath);
-      case 13:
-        fileSize = _context6.v;
-        _context6.n = 14;
-        return effects.call(createImageThumbnail, null, filePath, messageAttachment.type === 'file' ? 50 : undefined, messageAttachment.type === 'file' ? 50 : undefined);
-      case 14:
-        thumbnailMetas = _context6.v;
-        _context6.n = 17;
-        break;
-      case 15:
-        if (!(!messageAttachment.cachedUrl && messageAttachment.url.type.split('/')[0] === 'video')) {
-          _context6.n = 17;
-          break;
-        }
-        if (!filePath) {
-          _context6.n = 17;
-          break;
-        }
-        _context6.n = 16;
-        return effects.call(getFrame, filePath);
-      case 16:
-        meta = _context6.v;
-        thumbnailMetas = {
-          thumbnail: meta.thumb,
-          imageWidth: meta.width,
-          imageHeight: meta.height,
-          duration: meta.duration
-        };
-      case 17:
-        if (messageAttachment.cachedUrl) {
-          attachmentMeta = messageAttachment.metadata;
+        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 {
-          attachmentMeta = JSON.stringify(_extends({}, messageAttachment.metadata ? typeof messageAttachment.metadata === 'string' ? JSON.parse(messageAttachment.metadata) : messageAttachment.metadata : {}, thumbnailMetas && thumbnailMetas.thumbnail && _extends({
-            tmb: thumbnailMetas.thumbnail,
-            szw: thumbnailMetas.imageWidth,
-            szh: thumbnailMetas.imageHeight
-          }, thumbnailMetas.duration ? {
-            dur: thumbnailMetas.duration
-          } : {})));
-        }
-        log.info('attachmentMeta ... ', attachmentMeta);
-        attachmentBuilder = channel.createAttachmentBuilder(uri, messageAttachment.type);
-        attachmentToSend = attachmentBuilder.setName(messageAttachment.name).setMetadata(attachmentMeta).setFileSize(fileSize).setUpload(false).create();
-        log.info('attachmentToSend ... ', attachmentToSend);
-        attachmentToSend.tid = messageAttachment.tid;
-        attachmentToSend.attachmentUrl = messageAttachment.attachmentUrl;
-        _context6.n = 18;
-        return effects.put(updateMessageAC(messageCopy.tid, JSON.parse(JSON.stringify(_extends({}, messageCopy, {
-          attachments: [attachmentToSend]
-        })))));
-      case 18:
-        messageCopy.attachments = [attachmentToSend];
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context6.n = 22;
-          break;
-        }
-        _context6.n = 19;
-        return effects.call(channel.sendMessage, messageCopy);
-      case 19:
-        messageResponse = _context6.v;
-        deletePendingAttachment(messageAttachment.tid);
-        messageUpdateData = {
-          id: messageResponse.id,
-          body: messageResponse.body,
-          type: messageResponse.type,
-          state: messageResponse.state,
-          displayCount: messageResponse.displayCount,
-          deliveryStatus: messageResponse.deliveryStatus,
-          attachments: [_extends({}, messageResponse.attachments[0], {
-            attachmentUrl: attachmentToSend.attachmentUrl,
-            tid: attachmentToSend.tid
-          })],
-          mentionedUsers: messageResponse.mentionedUsers,
-          metadata: messageResponse.metadata,
-          parentMessage: messageResponse.parentMessage,
-          repliedInThread: messageResponse.repliedInThread,
-          bodyAttributes: messageResponse.bodyAttributes,
-          createdAt: messageResponse.createdAt,
-          channelId: channel.id
-        };
-        _context6.n = 20;
-        return effects.put(removePendingMessageAC(channel.id, messageCopy.tid || messageCopy.id));
-      case 20:
-        _context6.n = 21;
-        return effects.put(updateMessageAC(messageCopy.tid, JSON.parse(JSON.stringify(messageUpdateData))));
-      case 21:
-        fileType = messageAttachment.data && messageAttachment.data.type ? messageAttachment.data.type.split('/')[0] : messageAttachment.type;
-        if (fileType === 'video') {
-          deleteVideoThumb(messageAttachment.tid);
-        }
-        updateMessageOnMap(channel.id, {
-          messageId: messageCopy.tid,
-          params: messageUpdateData
-        });
-        updateMessageOnAllMessages(messageCopy.tid, messageUpdateData);
-        messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
-        updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
-        _context6.n = 22;
-        return effects.put(updateChannelLastMessageAC(messageToUpdate, {
-          id: channel.id
-        }));
-      case 22:
-        _context6.n = 25;
-        break;
-      case 23:
-        _context6.p = 23;
-        _t5 = _context6.v;
-        log.error('fail upload attachment on resend message ... ', _t5);
-        _context6.n = 24;
-        return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.FAIL, messageAttachment.tid));
-      case 24:
-        updateMessageOnMap(channel.id, {
-          messageId: messageCopy.tid,
-          params: {
-            state: MESSAGE_STATUS.FAILED
-          }
-        });
-        updateMessageOnAllMessages(messageCopy.tid, {
-          state: MESSAGE_STATUS.FAILED
-        });
-        _context6.n = 25;
-        return effects.put(updateMessageAC(messageCopy.tid, {
-          state: MESSAGE_STATUS.FAILED
-        }));
-      case 25:
-        _context6.n = 33;
-        break;
-      case 26:
-        if (!(message.state === MESSAGE_STATUS.FAILED)) {
-          _context6.n = 33;
-          break;
-        }
-        log.info('send failed message ...');
-        _messageCopy2 = _extends({}, message);
-        delete _messageCopy2.createdAt;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context6.n = 33;
-          break;
-        }
-        _context6.n = 27;
-        return effects.call(channel.sendMessage, _messageCopy2);
-      case 27:
-        _messageResponse2 = _context6.v;
-        _context6.n = 28;
-        return effects.put(removePendingMessageAC(channel.id, _messageCopy2.tid || _messageCopy2.id));
-      case 28:
-        _messageUpdateData = {
-          id: _messageResponse2.id,
-          body: _messageResponse2.body,
-          type: _messageResponse2.type,
-          state: _messageResponse2.state,
-          displayCount: _messageResponse2.displayCount,
-          deliveryStatus: _messageResponse2.deliveryStatus,
-          attachments: [],
-          mentionedUsers: _messageResponse2.mentionedUsers,
-          metadata: _messageResponse2.metadata,
-          parentMessage: _messageResponse2.parentMessage,
-          repliedInThread: _messageResponse2.repliedInThread,
-          bodyAttributes: _messageResponse2.bodyAttributes,
-          createdAt: _messageResponse2.createdAt,
-          channelId: channel.id
-        };
-        isInActiveChannel = getMessagesFromMap(channelId)[_messageCopy2.tid];
-        if (!isInActiveChannel) {
-          _context6.n = 29;
-          break;
+          store.dispatch(sendTextMessageAC(message, channelId, connectionState, false));
         }
-        _context6.n = 29;
-        return effects.put(removePendingMessageAC(channel.id, _messageCopy2.tid || _messageCopy2.id));
-      case 29:
-        _context6.n = 30;
-        return effects.put(updateMessageAC(_messageCopy2.tid, _messageUpdateData));
-      case 30:
-        updateMessageOnMap(channel.id, {
-          messageId: _messageCopy2.tid,
-          params: _messageUpdateData
-        });
-        activeChannelId = getActiveChannelId();
-        if (!(channelId === activeChannelId)) {
-          _context6.n = 32;
-          break;
-        }
-        _context6.n = 31;
-        return effects.put(updateMessageAC(_messageCopy2.tid, JSON.parse(JSON.stringify(_messageResponse2))));
-      case 31:
-        updateMessageOnMap(channel.id, {
-          messageId: _messageCopy2.tid,
-          params: _messageUpdateData
-        });
-        updateMessageOnAllMessages(_messageCopy2.tid, _messageUpdateData);
-      case 32:
-        updateChannelOnAllChannels(channel.id, channel);
-        _messageToUpdate = JSON.parse(JSON.stringify(_messageResponse2));
-        updateChannelLastMessageOnAllChannels(channel.id, _messageToUpdate);
-        _context6.n = 33;
-        return effects.put(updateChannelLastMessageAC(_messageToUpdate, {
-          id: channel.id
-        }));
-      case 33:
-        _context6.n = 34;
-        return effects.put(scrollToNewMessageAC(true));
-      case 34:
-        _context6.n = 37;
-        break;
-      case 35:
-        _context6.p = 35;
-        _t6 = _context6.v;
-        log.error('ERROR in resend message', _t6.message, 'channel.. . ', channel);
-        _context6.n = 36;
-        return effects.put(updateMessageAC(message.tid, {
-          state: MESSAGE_STATUS.FAILED
-        }));
-      case 36:
-        updateMessageOnMap(channel.id, {
-          messageId: message.tid,
-          params: {
-            state: MESSAGE_STATUS.FAILED
-          }
-        });
-        updateMessageOnAllMessages(message.tid, {
-          state: MESSAGE_STATUS.FAILED
-        });
-      case 37:
-        _context6.n = 38;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 38:
+      case 1:
         return _context6.a(2);
     }
-  }, _marked4$1, null, [[8, 23], [3, 35]]);
+  }, _marked4$1);
 }
 function deleteMessage(action) {
-  var payload, messageId, channelId, deleteOption, channel, deletedMessage, messageToUpdate, _t7;
+  var payload, messageId, channelId, deleteOption, channel, deletedMessage, messageToUpdate, _t5;
   return _regenerator().w(function (_context7) {
     while (1) switch (_context7.p = _context7.n) {
       case 0:
@@ -19897,21 +19543,21 @@ function deleteMessage(action) {
         break;
       case 5:
         _context7.p = 5;
-        _t7 = _context7.v;
-        log.error('ERROR in delete message', _t7.message);
+        _t5 = _context7.v;
+        log.error('ERROR in delete message', _t5.message);
       case 6:
         return _context7.a(2);
     }
   }, _marked5$1, null, [[0, 5]]);
 }
 function editMessage(action) {
-  var payload, _message, channelId, channel, linkAttachments, anotherAttachments, linkAttachmentsToSend, editedMessage, messageToUpdate, _t8;
+  var payload, message, channelId, channel, linkAttachments, anotherAttachments, linkAttachmentsToSend, editedMessage, messageToUpdate, _t6;
   return _regenerator().w(function (_context8) {
     while (1) switch (_context8.p = _context8.n) {
       case 0:
         _context8.p = 0;
         payload = action.payload;
-        _message = payload.message, channelId = payload.channelId;
+        message = payload.message, channelId = payload.channelId;
         _context8.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
@@ -19922,11 +19568,11 @@ function editMessage(action) {
             setChannelInMap(channel);
           }
         }
-        if (_message.attachments.length > 0) {
-          linkAttachments = _message.attachments.filter(function (att) {
+        if (message.attachments.length > 0) {
+          linkAttachments = message.attachments.filter(function (att) {
             return att.type === attachmentTypes.link;
           });
-          anotherAttachments = _message.attachments.filter(function (att) {
+          anotherAttachments = message.attachments.filter(function (att) {
             return att.type !== attachmentTypes.link;
           });
           linkAttachmentsToSend = [];
@@ -19935,12 +19581,12 @@ function editMessage(action) {
             var linkAttachmentToSend = linkAttachmentBuilder.setName(linkAttachment.name).setUpload(linkAttachment.upload).create();
             linkAttachmentsToSend.push(linkAttachmentToSend);
           });
-          _message.attachments = [].concat(anotherAttachments, linkAttachmentsToSend);
+          message.attachments = [].concat(anotherAttachments, linkAttachmentsToSend);
         }
         _context8.n = 2;
-        return effects.call(channel.editMessage, _extends({}, _message, {
-          metadata: isJSON(_message.metadata) ? _message.metadata : JSON.stringify(_message.metadata),
-          attachments: _message.attachments.map(function (att) {
+        return effects.call(channel.editMessage, _extends({}, message, {
+          metadata: isJSON(message.metadata) ? message.metadata : JSON.stringify(message.metadata),
+          attachments: message.attachments.map(function (att) {
             return _extends({}, att, {
               metadata: isJSON(att.metadata) ? att.metadata : JSON.stringify(att.metadata)
             });
@@ -19955,8 +19601,8 @@ function editMessage(action) {
           messageId: editedMessage.id,
           params: editedMessage
         });
-        updateMessageOnAllMessages(_message.id, editedMessage);
-        if (!(channel.lastMessage.id === _message.id)) {
+        updateMessageOnAllMessages(message.id, editedMessage);
+        if (!(channel.lastMessage.id === message.id)) {
           _context8.n = 4;
           break;
         }
@@ -19969,15 +19615,15 @@ function editMessage(action) {
         break;
       case 5:
         _context8.p = 5;
-        _t8 = _context8.v;
-        log.error('ERROR in edit message', _t8.message);
+        _t6 = _context8.v;
+        log.error('ERROR in edit message', _t6.message);
       case 6:
         return _context8.a(2);
     }
   }, _marked6$1, null, [[0, 5]]);
 }
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, _t7;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
@@ -20318,8 +19964,8 @@ function getMessagesQuery(action) {
         break;
       case 50:
         _context9.p = 50;
-        _t9 = _context9.v;
-        log.error('error in message query', _t9);
+        _t7 = _context9.v;
+        log.error('error in message query', _t7);
       case 51:
         _context9.p = 51;
         _context9.n = 52;
@@ -20332,7 +19978,7 @@ function getMessagesQuery(action) {
   }, _marked7$1, null, [[0, 50, 51, 53]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, messages, fetchedMessage, _t0;
+  var payload, channelId, messageId, channel, messages, fetchedMessage, _t8;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
@@ -20381,15 +20027,15 @@ function getMessageQuery(action) {
         break;
       case 7:
         _context0.p = 7;
-        _t0 = _context0.v;
-        log.error('error in message query', _t0);
+        _t8 = _context0.v;
+        log.error('error in message query', _t8);
       case 8:
         return _context0.a(2);
     }
   }, _marked8$1, null, [[0, 7]]);
 }
 function loadMoreMessages(action) {
-  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t1;
+  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t9;
   return _regenerator().w(function (_context1) {
     while (1) switch (_context1.p = _context1.n) {
       case 0:
@@ -20502,15 +20148,15 @@ function loadMoreMessages(action) {
         break;
       case 18:
         _context1.p = 18;
-        _t1 = _context1.v;
-        log.error('error in load more messages', _t1);
+        _t9 = _context1.v;
+        log.error('error in load more messages', _t9);
       case 19:
         return _context1.a(2);
     }
   }, _marked9$1, null, [[0, 18]]);
 }
 function addReaction(action) {
-  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, _message2, reaction, channelUpdateParam, _t10;
+  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t0;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -20532,15 +20178,15 @@ function addReaction(action) {
         return effects.call(channel.addReaction, messageId, key, score, reason, enforceUnique);
       case 2:
         _yield$call = _context10.v;
-        _message2 = _yield$call.message;
+        message = _yield$call.message;
         reaction = _yield$call.reaction;
-        if (!(user.id === _message2.user.id)) {
+        if (!(user.id === message.user.id)) {
           _context10.n = 4;
           break;
         }
         channelUpdateParam = {
           userMessageReactions: [reaction],
-          lastReactedMessage: _message2,
+          lastReactedMessage: message,
           newReactions: [reaction]
         };
         _context10.n = 3;
@@ -20555,23 +20201,23 @@ function addReaction(action) {
         return effects.put(addReactionToListAC(reaction));
       case 6:
         _context10.n = 7;
-        return effects.put(addReactionToMessageAC(_message2, reaction, true));
+        return effects.put(addReactionToMessageAC(message, reaction, true));
       case 7:
-        addReactionToMessageOnMap(channelId, _message2, reaction, true);
-        addReactionOnAllMessages(_message2, reaction, true);
+        addReactionToMessageOnMap(channelId, message, reaction, true);
+        addReactionOnAllMessages(message, reaction, true);
         _context10.n = 9;
         break;
       case 8:
         _context10.p = 8;
-        _t10 = _context10.v;
-        log.error('ERROR in add reaction', _t10.message);
+        _t0 = _context10.v;
+        log.error('ERROR in add reaction', _t0.message);
       case 9:
         return _context10.a(2);
     }
   }, _marked0$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
-  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, _message3, reaction, channelUpdateParam, _t11;
+  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t1;
   return _regenerator().w(function (_context11) {
     while (1) switch (_context11.p = _context11.n) {
       case 0:
@@ -20592,7 +20238,7 @@ function deleteReaction(action) {
         return effects.call(channel.deleteReaction, messageId, key);
       case 2:
         _yield$call2 = _context11.v;
-        _message3 = _yield$call2.message;
+        message = _yield$call2.message;
         reaction = _yield$call2.reaction;
         if (!isLastReaction) {
           _context11.n = 4;
@@ -20611,23 +20257,23 @@ function deleteReaction(action) {
         return effects.put(deleteReactionFromListAC(reaction));
       case 5:
         _context11.n = 6;
-        return effects.put(deleteReactionFromMessageAC(_message3, reaction, true));
+        return effects.put(deleteReactionFromMessageAC(message, reaction, true));
       case 6:
-        removeReactionToMessageOnMap(channelId, _message3, reaction, true);
-        removeReactionOnAllMessages(_message3, reaction, true);
+        removeReactionToMessageOnMap(channelId, message, reaction, true);
+        removeReactionOnAllMessages(message, reaction, true);
         _context11.n = 8;
         break;
       case 7:
         _context11.p = 7;
-        _t11 = _context11.v;
-        log.error('ERROR in delete reaction', _t11.message);
+        _t1 = _context11.v;
+        log.error('ERROR in delete reaction', _t1.message);
       case 8:
         return _context11.a(2);
     }
   }, _marked1$1, null, [[0, 7]]);
 }
 function getReactions(action) {
-  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t12;
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t10;
   return _regenerator().w(function (_context12) {
     while (1) switch (_context12.p = _context12.n) {
       case 0:
@@ -20662,15 +20308,15 @@ function getReactions(action) {
         break;
       case 6:
         _context12.p = 6;
-        _t12 = _context12.v;
-        log.error('ERROR in get reactions', _t12.message);
+        _t10 = _context12.v;
+        log.error('ERROR in get reactions', _t10.message);
       case 7:
         return _context12.a(2);
     }
   }, _marked10$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
-  var payload, limit, ReactionQuery, result, _t13;
+  var payload, limit, ReactionQuery, result, _t11;
   return _regenerator().w(function (_context13) {
     while (1) switch (_context13.p = _context13.n) {
       case 0:
@@ -20698,15 +20344,15 @@ function loadMoreReactions(action) {
         break;
       case 5:
         _context13.p = 5;
-        _t13 = _context13.v;
-        log.error('ERROR in load more reactions', _t13.message);
+        _t11 = _context13.v;
+        log.error('ERROR in load more reactions', _t11.message);
       case 6:
         return _context13.a(2);
     }
   }, _marked11$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t14;
+  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t12;
   return _regenerator().w(function (_context14) {
     while (1) switch (_context14.p = _context14.n) {
       case 0:
@@ -20784,15 +20430,15 @@ function getMessageAttachments(action) {
         break;
       case 13:
         _context14.p = 13;
-        _t14 = _context14.v;
-        log.error('error in message attachment query', _t14);
+        _t12 = _context14.v;
+        log.error('error in message attachment query', _t12);
       case 14:
         return _context14.a(2);
     }
   }, _marked12$1, null, [[0, 13]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t15;
+  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t13;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -20836,15 +20482,15 @@ function loadMoreMessageAttachments(action) {
         break;
       case 8:
         _context15.p = 8;
-        _t15 = _context15.v;
-        log.error('error in message attachment query', _t15);
+        _t13 = _context15.v;
+        log.error('error in message attachment query', _t13);
       case 9:
         return _context15.a(2);
     }
   }, _marked13$1, null, [[0, 8]]);
 }
 function pauseAttachmentUploading(action) {
-  var attachmentId, isPaused, _t16;
+  var attachmentId, isPaused, _t14;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.p = _context16.n) {
       case 0:
@@ -20866,15 +20512,15 @@ function pauseAttachmentUploading(action) {
         break;
       case 2:
         _context16.p = 2;
-        _t16 = _context16.v;
-        log.error('error in pause attachment uploading', _t16);
+        _t14 = _context16.v;
+        log.error('error in pause attachment uploading', _t14);
       case 3:
         return _context16.a(2);
     }
   }, _marked14$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t17;
+  var attachmentId, isResumed, _t15;
   return _regenerator().w(function (_context17) {
     while (1) switch (_context17.p = _context17.n) {
       case 0:
@@ -20897,15 +20543,15 @@ function resumeAttachmentUploading(action) {
         break;
       case 2:
         _context17.p = 2;
-        _t17 = _context17.v;
-        log.error('error in resume attachment uploading', _t17);
+        _t15 = _context17.v;
+        log.error('error in resume attachment uploading', _t15);
       case 3:
         return _context17.a(2);
     }
   }, _marked15$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
-  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t18;
+  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t16;
   return _regenerator().w(function (_context18) {
     while (1) switch (_context18.p = _context18.n) {
       case 0:
@@ -20935,8 +20581,8 @@ function getMessageMarkers(action) {
         break;
       case 5:
         _context18.p = 5;
-        _t18 = _context18.v;
-        log.error('error in get message markers', _t18);
+        _t16 = _context18.v;
+        log.error('error in get message markers', _t16);
       case 6:
         _context18.p = 6;
         _context18.n = 7;
@@ -21074,13 +20720,13 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, _message4, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values2, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t19;
+  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, _t17;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
         _context21.p = 0;
         payload = action.payload;
-        channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, _message4 = payload.message, isResend = payload.isResend;
+        channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
           _context21.n = 7;
@@ -21118,7 +20764,7 @@ function addPollVote(action) {
           channelId: channelId,
           pollId: pollId,
           optionId: optionId,
-          message: _message4
+          message: message
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && !conflictCheck.shouldSkip)) {
@@ -21134,11 +20780,11 @@ function addPollVote(action) {
           break;
         }
         currentMessage = ((_Object$values2 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values2 === void 0 ? void 0 : _Object$values2.find(function (msg) {
-          return msg.id === _message4.id || msg.tid === _message4.id;
-        })) || _message4;
+          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;
         _context21.n = 2;
-        return effects.put(addPollVotesToListAC(pollId, optionId, [(_currentMessage$pollD = currentMessage.pollDetails) === null || _currentMessage$pollD === void 0 ? void 0 : (_currentMessage$pollD2 = _currentMessage$pollD.voteDetails) === null || _currentMessage$pollD2 === void 0 ? void 0 : (_currentMessage$pollD3 = _currentMessage$pollD2.ownVotes) === null || _currentMessage$pollD3 === void 0 ? void 0 : _currentMessage$pollD3[0]], hasNext, _message4.id));
+        return effects.put(addPollVotesToListAC(pollId, optionId, [(_currentMessage$pollD = currentMessage.pollDetails) === null || _currentMessage$pollD === void 0 ? void 0 : (_currentMessage$pollD2 = _currentMessage$pollD.voteDetails) === null || _currentMessage$pollD2 === void 0 ? void 0 : (_currentMessage$pollD3 = _currentMessage$pollD2.ownVotes) === null || _currentMessage$pollD3 === void 0 ? void 0 : _currentMessage$pollD3[0]], hasNext, message.id));
       case 2:
         obj = {
           type: 'addOwn',
@@ -21146,12 +20792,12 @@ function addPollVote(action) {
           incrementVotesPerOptionCount: 1
         };
         updateMessageOnMap(channel.id, {
-          messageId: _message4.id,
+          messageId: message.id,
           params: {}
         }, obj);
-        updateMessageOnAllMessages(_message4.id, {}, obj);
+        updateMessageOnAllMessages(message.id, {}, obj);
         _context21.n = 3;
-        return effects.put(updateMessageAC(_message4.id, {}, undefined, obj));
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 3:
         _context21.n = 5;
         break;
@@ -21160,21 +20806,21 @@ function addPollVote(action) {
           _context21.n = 5;
           break;
         }
-        return _context21.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, _message4, vote)), 5);
+        return _context21.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, message, vote)), 5);
       case 5:
         if (!conflictCheck.shouldSkip) {
           setPendingPollAction(pendingAction);
         }
         return _context21.a(2);
       case 6:
-        return _context21.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, _message4, isResend)), 7);
+        return _context21.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message, isResend)), 7);
       case 7:
         _context21.n = 9;
         break;
       case 8:
         _context21.p = 8;
-        _t19 = _context21.v;
-        log.error('error in add poll vote', _t19);
+        _t17 = _context21.v;
+        log.error('error in add poll vote', _t17);
       case 9:
         return _context21.a(2);
     }
@@ -21275,20 +20921,20 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, _message5, isResend, sceytChatClient, _message5$pollDetails, _message5$pollDetails2, _message5$pollDetails3, connectionState, vote, pendingAction, conflictCheck, channel, _Object$values3, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t20;
+  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, _t18;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
         _context24.p = 0;
         payload = action.payload;
-        channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, _message5 = payload.message, isResend = payload.isResend;
+        channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
           _context24.n = 8;
           break;
         }
         connectionState = sceytChatClient.connectionState;
-        vote = (_message5$pollDetails = _message5.pollDetails) === null || _message5$pollDetails === void 0 ? void 0 : (_message5$pollDetails2 = _message5$pollDetails.voteDetails) === null || _message5$pollDetails2 === void 0 ? void 0 : (_message5$pollDetails3 = _message5$pollDetails2.ownVotes) === null || _message5$pollDetails3 === void 0 ? void 0 : _message5$pollDetails3.find(function (vote) {
+        vote = (_message$pollDetails1 = message.pollDetails) === null || _message$pollDetails1 === void 0 ? void 0 : (_message$pollDetails10 = _message$pollDetails1.voteDetails) === null || _message$pollDetails10 === void 0 ? void 0 : (_message$pollDetails11 = _message$pollDetails10.ownVotes) === null || _message$pollDetails11 === void 0 ? void 0 : _message$pollDetails11.find(function (vote) {
           return vote.optionId === optionId;
         });
         if (vote) {
@@ -21306,7 +20952,7 @@ function deletePollVote(action) {
           channelId: channelId,
           pollId: pollId,
           optionId: optionId,
-          message: _message5
+          message: message
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && conflictCheck.shouldSkip)) {
@@ -21322,10 +20968,10 @@ function deletePollVote(action) {
           break;
         }
         currentMessage = ((_Object$values3 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values3 === void 0 ? void 0 : _Object$values3.find(function (msg) {
-          return msg.id === _message5.id || msg.tid === _message5.id;
-        })) || _message5;
+          return msg.id === message.id || msg.tid === message.id;
+        })) || message;
         _context24.n = 3;
-        return effects.put(deletePollVotesFromListAC(pollId, optionId, [(_currentMessage$pollD4 = currentMessage.pollDetails) === null || _currentMessage$pollD4 === void 0 ? void 0 : (_currentMessage$pollD5 = _currentMessage$pollD4.voteDetails) === null || _currentMessage$pollD5 === void 0 ? void 0 : (_currentMessage$pollD6 = _currentMessage$pollD5.ownVotes) === null || _currentMessage$pollD6 === void 0 ? void 0 : _currentMessage$pollD6[0]], _message5.id));
+        return effects.put(deletePollVotesFromListAC(pollId, optionId, [(_currentMessage$pollD4 = currentMessage.pollDetails) === null || _currentMessage$pollD4 === void 0 ? void 0 : (_currentMessage$pollD5 = _currentMessage$pollD4.voteDetails) === null || _currentMessage$pollD5 === void 0 ? void 0 : (_currentMessage$pollD6 = _currentMessage$pollD5.ownVotes) === null || _currentMessage$pollD6 === void 0 ? void 0 : _currentMessage$pollD6[0]], message.id));
       case 3:
         obj = {
           type: 'deleteOwn',
@@ -21333,12 +20979,12 @@ function deletePollVote(action) {
           incrementVotesPerOptionCount: -1
         };
         updateMessageOnMap(channel.id, {
-          messageId: _message5.id,
+          messageId: message.id,
           params: {}
         }, obj);
-        updateMessageOnAllMessages(_message5.id, {}, obj);
+        updateMessageOnAllMessages(message.id, {}, obj);
         _context24.n = 4;
-        return effects.put(updateMessageAC(_message5.id, {}, undefined, obj));
+        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
         _context24.n = 6;
         break;
@@ -21347,21 +20993,21 @@ function deletePollVote(action) {
           _context24.n = 6;
           break;
         }
-        return _context24.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, _message5, vote)), 6);
+        return _context24.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)), 6);
       case 6:
         if (!conflictCheck.shouldSkip) {
           setPendingPollAction(pendingAction);
         }
         return _context24.a(2);
       case 7:
-        return _context24.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, _message5, isResend)), 8);
+        return _context24.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message, isResend)), 8);
       case 8:
         _context24.n = 10;
         break;
       case 9:
         _context24.p = 9;
-        _t20 = _context24.v;
-        log.error('error in delete poll vote', _t20);
+        _t18 = _context24.v;
+        log.error('error in delete poll vote', _t18);
       case 10:
         return _context24.a(2);
     }
@@ -21439,13 +21085,13 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
   }, _marked24$1);
 }
 function closePoll(action) {
-  var payload, channelId, pollId, _message6, sceytChatClient, connectionState, _t21;
+  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t19;
   return _regenerator().w(function (_context27) {
     while (1) switch (_context27.p = _context27.n) {
       case 0:
         _context27.p = 0;
         payload = action.payload;
-        channelId = payload.channelId, pollId = payload.pollId, _message6 = payload.message;
+        channelId = payload.channelId, pollId = payload.pollId, message = payload.message;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
           _context27.n = 3;
@@ -21456,24 +21102,24 @@ function closePoll(action) {
           _context27.n = 2;
           break;
         }
-        return _context27.d(_regeneratorValues(updateMessageOptimisticallyForClosePoll(channelId, _message6)), 1);
+        return _context27.d(_regeneratorValues(updateMessageOptimisticallyForClosePoll(channelId, message)), 1);
       case 1:
         setPendingPollAction({
           type: 'CLOSE_POLL',
           channelId: channelId,
           pollId: pollId,
-          message: _message6
+          message: message
         });
         return _context27.a(2);
       case 2:
-        return _context27.d(_regeneratorValues(executeClosePoll(channelId, pollId, _message6)), 3);
+        return _context27.d(_regeneratorValues(executeClosePoll(channelId, pollId, message)), 3);
       case 3:
         _context27.n = 5;
         break;
       case 4:
         _context27.p = 4;
-        _t21 = _context27.v;
-        log.error('error in close poll', _t21);
+        _t19 = _context27.v;
+        log.error('error in close poll', _t19);
       case 5:
         return _context27.a(2);
     }
@@ -21562,13 +21208,13 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, _message7, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message7$pollDetails, _message7$pollDetails2, vote, _t22;
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message$pollDetails12, _message$pollDetails13, vote, _t20;
   return _regenerator().w(function (_context30) {
     while (1) switch (_context30.p = _context30.n) {
       case 0:
         _context30.p = 0;
         payload = action.payload;
-        channelId = payload.channelId, pollId = payload.pollId, _message7 = payload.message, isResend = payload.isResend;
+        channelId = payload.channelId, pollId = payload.pollId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
           _context30.n = 3;
@@ -21576,7 +21222,7 @@ function retractPollVote(action) {
         }
         connectionState = sceytChatClient.connectionState;
         objs = [];
-        for (_iterator4 = _createForOfIteratorHelperLoose(((_message7$pollDetails = _message7.pollDetails) === null || _message7$pollDetails === void 0 ? void 0 : (_message7$pollDetails2 = _message7$pollDetails.voteDetails) === null || _message7$pollDetails2 === void 0 ? void 0 : _message7$pollDetails2.ownVotes) || []); !(_step4 = _iterator4()).done;) {
+        for (_iterator4 = _createForOfIteratorHelperLoose(((_message$pollDetails12 = message.pollDetails) === null || _message$pollDetails12 === void 0 ? void 0 : (_message$pollDetails13 = _message$pollDetails12.voteDetails) === null || _message$pollDetails13 === void 0 ? void 0 : _message$pollDetails13.ownVotes) || []); !(_step4 = _iterator4()).done;) {
           vote = _step4.value;
           objs.push({
             type: 'deleteOwn',
@@ -21588,31 +21234,31 @@ function retractPollVote(action) {
           _context30.n = 2;
           break;
         }
-        return _context30.d(_regeneratorValues(updateMessageOptimisticallyForRetractPollVote(channelId, _message7, objs)), 1);
+        return _context30.d(_regeneratorValues(updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)), 1);
       case 1:
         setPendingPollAction({
           type: 'RETRACT_POLL_VOTE',
           channelId: channelId,
           pollId: pollId,
-          message: _message7
+          message: message
         });
         return _context30.a(2);
       case 2:
-        return _context30.d(_regeneratorValues(executeRetractPollVote(channelId, pollId, _message7, objs, isResend)), 3);
+        return _context30.d(_regeneratorValues(executeRetractPollVote(channelId, pollId, message, objs, isResend)), 3);
       case 3:
         _context30.n = 5;
         break;
       case 4:
         _context30.p = 4;
-        _t22 = _context30.v;
-        log.error('error in retract poll vote', _t22);
+        _t20 = _context30.v;
+        log.error('error in retract poll vote', _t20);
       case 5:
         return _context30.a(2);
     }
   }, _marked28$1, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
-  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t23;
+  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t21;
   return _regenerator().w(function (_context31) {
     while (1) switch (_context31.p = _context31.n) {
       case 0:
@@ -21668,15 +21314,15 @@ function resendPendingPollActions(action) {
         break;
       case 3:
         _context31.p = 3;
-        _t23 = _context31.v;
-        log.error('error in resend pending poll actions', _t23);
+        _t21 = _context31.v;
+        log.error('error in resend pending poll actions', _t21);
       case 4:
         return _context31.a(2);
     }
   }, _marked29$1, null, [[0, 3]]);
 }
 function getPollVotes(action) {
-  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t24;
+  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t22;
   return _regenerator().w(function (_context32) {
     while (1) switch (_context32.p = _context32.n) {
       case 0:
@@ -21742,8 +21388,8 @@ function getPollVotes(action) {
         break;
       case 7:
         _context32.p = 7;
-        _t24 = _context32.v;
-        log.error('ERROR in get poll votes', _t24);
+        _t22 = _context32.v;
+        log.error('ERROR in get poll votes', _t22);
         _context32.n = 8;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
@@ -21752,7 +21398,7 @@ function getPollVotes(action) {
   }, _marked30$1, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
-  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t25;
+  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t23;
   return _regenerator().w(function (_context33) {
     while (1) switch (_context33.p = _context33.n) {
       case 0:
@@ -21810,8 +21456,8 @@ function loadMorePollVotes(action) {
         break;
       case 6:
         _context33.p = 6;
-        _t25 = _context33.v;
-        log.error('ERROR in load more poll votes', _t25);
+        _t23 = _context33.v;
+        log.error('ERROR in load more poll votes', _t23);
         _context33.n = 7;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
@@ -27246,6 +26892,106 @@ var MobileBackButtonWrapper = styled__default.span(_templateObject8$6 || (_templ
 var DefaultInfoIcon = styled__default(SvgInfo)(_templateObject9$5 || (_templateObject9$5 = _taggedTemplateLiteralLoose([""])));
 var WrapArrowLeftIcon = styled__default(SvgArrowLeft)(_templateObject0$4 || (_templateObject0$4 = _taggedTemplateLiteralLoose([""])));
 
+var activeChannelMessagesSelector = function activeChannelMessagesSelector(store) {
+  return store.MessageReducer.activeChannelMessages;
+};
+var messagesLoadingState = function messagesLoadingState(store) {
+  return store.MessageReducer.messagesLoadingState;
+};
+var messagesHasNextSelector = function messagesHasNextSelector(store) {
+  return store.MessageReducer.messagesHasNext;
+};
+var messagesHasPrevSelector = function messagesHasPrevSelector(store) {
+  return store.MessageReducer.messagesHasPrev;
+};
+var attachmentCompilationStateSelector = function attachmentCompilationStateSelector(store) {
+  return store.MessageReducer.attachmentsUploadingState;
+};
+var attachmentsUploadProgressSelector = function attachmentsUploadProgressSelector(store) {
+  return store.MessageReducer.attachmentsUploadingProgress;
+};
+var activeTabAttachmentsSelector = function activeTabAttachmentsSelector(store) {
+  return store.MessageReducer.activeTabAttachments;
+};
+var activeTabAttachmentsHasNextSelector = function activeTabAttachmentsHasNextSelector(store) {
+  return store.MessageReducer.attachmentHasNext;
+};
+var attachmentsForPopupSelector = function attachmentsForPopupSelector(store) {
+  return store.MessageReducer.attachmentsForPopup;
+};
+var messageForReplySelector = function messageForReplySelector(store) {
+  return store.MessageReducer.messageForReply;
+};
+var messageToEditSelector = function messageToEditSelector(store) {
+  return store.MessageReducer.messageToEdit;
+};
+var scrollToNewMessageSelector = function scrollToNewMessageSelector(store) {
+  return store.MessageReducer.scrollToNewMessage;
+};
+var scrollToMentionedMessageSelector = function scrollToMentionedMessageSelector(store) {
+  return store.MessageReducer.scrollToMentionedMessage;
+};
+var showScrollToNewMessageButtonSelector = function showScrollToNewMessageButtonSelector(store) {
+  return store.MessageReducer.showScrollToNewMessageButton;
+};
+var sendMessageInputHeightSelector = function sendMessageInputHeightSelector(store) {
+  return store.MessageReducer.sendMessageInputHeight;
+};
+var scrollToMessageSelector = function scrollToMessageSelector(store) {
+  return store.MessageReducer.scrollToMessage;
+};
+var scrollToMessageHighlightSelector = function scrollToMessageHighlightSelector(store) {
+  return store.MessageReducer.scrollToMessageHighlight;
+};
+var scrollToMessageBehaviorSelector = function scrollToMessageBehaviorSelector(store) {
+  return store.MessageReducer.scrollToMessageBehavior;
+};
+var reactionsListSelector = function reactionsListSelector(store) {
+  return store.MessageReducer.reactionsList;
+};
+var reactionsHasNextSelector = function reactionsHasNextSelector(store) {
+  return store.MessageReducer.reactionsHasNext;
+};
+var reactionsLoadingStateSelector = function reactionsLoadingStateSelector(store) {
+  return store.MessageReducer.reactionsLoadingState;
+};
+var openedMessageMenuSelector = function openedMessageMenuSelector(store) {
+  return store.MessageReducer.openedMessageMenu;
+};
+var playingAudioIdSelector = function playingAudioIdSelector(store) {
+  return store.MessageReducer.playingAudioId;
+};
+var selectedMessagesMapSelector = function selectedMessagesMapSelector(store) {
+  return store.MessageReducer.selectedMessagesMap;
+};
+var attachmentUpdatedMapSelector = function attachmentUpdatedMapSelector(store) {
+  return store.MessageReducer.attachmentUpdatedMap;
+};
+var messageMarkersSelector = function messageMarkersSelector(store) {
+  return store.MessageReducer.messageMarkers;
+};
+var messagesMarkersLoadingStateSelector = function messagesMarkersLoadingStateSelector(store) {
+  return store.MessageReducer.messagesMarkersLoadingState;
+};
+var pollVotesListSelector = function pollVotesListSelector(store) {
+  return store.MessageReducer.pollVotesList;
+};
+var pollVotesHasMoreSelector = function pollVotesHasMoreSelector(store) {
+  return store.MessageReducer.pollVotesHasMore;
+};
+var pollVotesLoadingStateSelector = function pollVotesLoadingStateSelector(store) {
+  return store.MessageReducer.pollVotesLoadingState;
+};
+var pendingPollActionsSelector = function pendingPollActionsSelector(store) {
+  return store.MessageReducer.pendingPollActions;
+};
+var pendingMessagesMapSelector = function pendingMessagesMapSelector(store) {
+  return store.MessageReducer.pendingMessagesMap;
+};
+var unreadScrollToSelector = function unreadScrollToSelector(store) {
+  return store.MessageReducer.unreadScrollTo;
+};
+
 var _path$u;
 function _extends$v() {
   return _extends$v = Object.assign ? Object.assign.bind() : function (n) {
@@ -30172,7 +29918,7 @@ var VideoPreview = /*#__PURE__*/React.memo(function VideoPreview(_ref) {
   var withPrefix = true;
   if (file.metadata && file.metadata.tmb) {
     if (file.metadata.tmb.length < 70) {
-      attachmentThumb = base64ToToDataURL(file.metadata.tmb);
+      attachmentThumb = base64ToDataURL(file.metadata.tmb);
       withPrefix = false;
     } else {
       attachmentThumb = file.metadata && file.metadata.tmb;
@@ -32430,7 +32176,6 @@ var AudioPlayer = function AudioPlayer(_ref) {
       return clearInterval(recordingInterval);
     };
   }, [recording.initRecording]);
-  console.log('file', file === null || file === void 0 ? void 0 : file.metadata);
   React.useEffect(function () {
     if (url) {
       if (url !== '_' && !isRendered && wavesurfer && wavesurfer.current) {
@@ -32664,7 +32409,7 @@ var Attachment = function Attachment(_ref) {
   if (attachment.type !== attachmentTypes.voice && attachment.type !== attachmentTypes.link && attachmentMetadata && attachmentMetadata.tmb) {
     try {
       if (attachmentMetadata.tmb.length < 70) {
-        attachmentThumb = base64ToToDataURL(attachmentMetadata.tmb);
+        attachmentThumb = base64ToDataURL(attachmentMetadata.tmb);
         withPrefix = false;
       } else {
         attachmentThumb = attachmentMetadata && attachmentMetadata.tmb;
@@ -34901,8 +34646,12 @@ var validateUrl = function validateUrl(url) {
     return false;
   }
 };
+var isDescriptionOnlySymbol = function isDescriptionOnlySymbol(description) {
+  var trimmed = description === null || description === void 0 ? void 0 : description.trim();
+  return !!trimmed && !/[a-zA-Z0-9]/.test(trimmed);
+};
 var OGMetadata = function OGMetadata(_ref) {
-  var _metadata$og0, _metadata$og0$image, _metadata$og0$image$, _metadata$og10, _metadata$og10$favico, _metadata$og16, _metadata$og17, _metadata$og18;
+  var _metadata$og0, _metadata$og0$image, _metadata$og0$image$, _metadata$og10, _metadata$og10$favico, _metadata$og18, _metadata$og19, _metadata$og20;
   var attachments = _ref.attachments,
     state = _ref.state,
     incoming = _ref.incoming,
@@ -35146,7 +34895,7 @@ var OGMetadata = function OGMetadata(_ref) {
     }
   }, [metadataLoaded, oGMetadata, attachment === null || attachment === void 0 ? void 0 : attachment.url, metadata]);
   var elements = React.useMemo(function () {
-    var _resolvedOrder$image, _metadata$og11, _metadata$og11$image, _metadata$og11$image$, _resolvedOrder$title, _metadata$og12, _metadata$og13, _metadata$og13$title, _resolvedOrder$descri, _metadata$og14, _metadata$og15, _metadata$og15$descri, _resolvedOrder$link;
+    var _resolvedOrder$image, _metadata$og11, _metadata$og11$image, _metadata$og11$image$, _resolvedOrder$title, _metadata$og12, _metadata$og13, _metadata$og14, _metadata$og14$title, _resolvedOrder$descri, _metadata$og15, _metadata$og16, _metadata$og17, _metadata$og17$descri, _resolvedOrder$link;
     return [showImage ? {
       key: 'image',
       order: (_resolvedOrder$image = resolvedOrder === null || resolvedOrder === void 0 ? void 0 : resolvedOrder.image) != null ? _resolvedOrder$image : 1,
@@ -35165,21 +34914,21 @@ var OGMetadata = function OGMetadata(_ref) {
     } : null, {
       key: 'title',
       order: (_resolvedOrder$title = resolvedOrder === null || resolvedOrder === void 0 ? void 0 : resolvedOrder.title) != null ? _resolvedOrder$title : 2,
-      render: ogShowTitle && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og12 = metadata.og) === null || _metadata$og12 === void 0 ? void 0 : _metadata$og12.title) && (/*#__PURE__*/React__default.createElement(Title$3, {
+      render: ogShowTitle && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og12 = metadata.og) === null || _metadata$og12 === void 0 ? void 0 : _metadata$og12.title) && !isDescriptionOnlySymbol(metadata === null || metadata === void 0 ? void 0 : (_metadata$og13 = metadata.og) === null || _metadata$og13 === void 0 ? void 0 : _metadata$og13.description) && (/*#__PURE__*/React__default.createElement(Title$3, {
         maxWidth: maxWidth,
         shouldAnimate: shouldAnimate,
         padding: infoPadding,
         color: textPrimary
-      }, /*#__PURE__*/React__default.createElement("span", null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og13 = metadata.og) === null || _metadata$og13 === void 0 ? void 0 : (_metadata$og13$title = _metadata$og13.title) === null || _metadata$og13$title === void 0 ? void 0 : _metadata$og13$title.trim())))
+      }, /*#__PURE__*/React__default.createElement("span", null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og14 = metadata.og) === null || _metadata$og14 === void 0 ? void 0 : (_metadata$og14$title = _metadata$og14.title) === null || _metadata$og14$title === void 0 ? void 0 : _metadata$og14$title.trim())))
     }, {
       key: 'description',
       order: (_resolvedOrder$descri = resolvedOrder === null || resolvedOrder === void 0 ? void 0 : resolvedOrder.description) != null ? _resolvedOrder$descri : 3,
-      render: ogShowDescription && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og14 = metadata.og) === null || _metadata$og14 === void 0 ? void 0 : _metadata$og14.description) && (/*#__PURE__*/React__default.createElement(Desc, {
+      render: ogShowDescription && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og15 = metadata.og) === null || _metadata$og15 === void 0 ? void 0 : _metadata$og15.description) && !isDescriptionOnlySymbol(metadata === null || metadata === void 0 ? void 0 : (_metadata$og16 = metadata.og) === null || _metadata$og16 === void 0 ? void 0 : _metadata$og16.description) && (/*#__PURE__*/React__default.createElement(Desc, {
         maxWidth: maxWidth,
         shouldAnimate: shouldAnimate,
         color: textSecondary,
         padding: infoPadding
-      }, metadata === null || metadata === void 0 ? void 0 : (_metadata$og15 = metadata.og) === null || _metadata$og15 === void 0 ? void 0 : (_metadata$og15$descri = _metadata$og15.description) === null || _metadata$og15$descri === void 0 ? void 0 : _metadata$og15$descri.trim()))
+      }, metadata === null || metadata === void 0 ? void 0 : (_metadata$og17 = metadata.og) === null || _metadata$og17 === void 0 ? void 0 : (_metadata$og17$descri = _metadata$og17.description) === null || _metadata$og17$descri === void 0 ? void 0 : _metadata$og17$descri.trim()))
     }, {
       key: 'link',
       order: (_resolvedOrder$link = resolvedOrder === null || resolvedOrder === void 0 ? void 0 : resolvedOrder.link) != null ? _resolvedOrder$link : 4,
@@ -35194,7 +34943,7 @@ var OGMetadata = function OGMetadata(_ref) {
       var _a$order, _b$order;
       return ((_a$order = a.order) != null ? _a$order : 0) - ((_b$order = b.order) != null ? _b$order : 0);
     });
-  }, [hasImage, resolvedOrder, showOGMetadata, maxWidth, calculatedImageHeight, maxHeight, metadata === null || metadata === void 0 ? void 0 : (_metadata$og16 = metadata.og) === null || _metadata$og16 === void 0 ? void 0 : _metadata$og16.image, shouldAnimate, ogShowTitle, metadata === null || metadata === void 0 ? void 0 : (_metadata$og17 = metadata.og) === null || _metadata$og17 === void 0 ? void 0 : _metadata$og17.title, infoPadding, ogShowDescription, metadata === null || metadata === void 0 ? void 0 : (_metadata$og18 = metadata.og) === null || _metadata$og18 === void 0 ? void 0 : _metadata$og18.description, textSecondary, ogShowUrl, ogUrl]);
+  }, [hasImage, resolvedOrder, showOGMetadata, maxWidth, calculatedImageHeight, maxHeight, metadata === null || metadata === void 0 ? void 0 : (_metadata$og18 = metadata.og) === null || _metadata$og18 === void 0 ? void 0 : _metadata$og18.image, shouldAnimate, ogShowTitle, metadata === null || metadata === void 0 ? void 0 : (_metadata$og19 = metadata.og) === null || _metadata$og19 === void 0 ? void 0 : _metadata$og19.title, infoPadding, ogShowDescription, metadata === null || metadata === void 0 ? void 0 : (_metadata$og20 = metadata.og) === null || _metadata$og20 === void 0 ? void 0 : _metadata$og20.description, textSecondary, ogShowUrl, ogUrl]);
   var textContent = React.useMemo(function () {
     return /*#__PURE__*/React__default.createElement(OGText, {
       shouldAnimate: shouldAnimate,
@@ -35293,7 +35042,7 @@ var OGText = styled__default.div(_templateObject3$v || (_templateObject3$v = _ta
   var margin = _ref10.margin;
   return margin ? '12px' : '0';
 });
-var Title$3 = styled__default.p(_templateObject4$q || (_templateObject4$q = _taggedTemplateLiteralLoose(["\n  ", "\n  // font-family: Inter;\n  font-weight: 500;\n  font-size: 14px;\n  line-height: 18px;\n  letter-spacing: 0px;\n  color: ", ";\n  margin: 4px 0 0 0;\n  padding: ", ";\n  box-sizing: border-box;\n  ", "\n  ", "\n"])), sharedKeyframes, function (_ref11) {
+var Title$3 = styled__default.p(_templateObject4$q || (_templateObject4$q = _taggedTemplateLiteralLoose(["\n  ", "\n  font-weight: bold;\n  font-size: 14px;\n  line-height: 18px;\n  letter-spacing: 0px;\n  color: ", ";\n  margin: 4px 0 0 0;\n  padding: ", ";\n  box-sizing: border-box;\n  ", "\n  ", "\n"])), sharedKeyframes, function (_ref11) {
   var color = _ref11.color;
   return color;
 }, function (_ref12) {
@@ -42052,7 +41801,6 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var updatedAttachments = attachmentsUpdate.filter(function (item) {
         return item.tid !== attachmentId;
       });
-      deleteVideoThumb(attachmentId);
       setAttachments(updatedAttachments);
       attachmentsUpdate = updatedAttachments;
     } else {
@@ -45160,7 +44908,40 @@ var RoleBadge = styled__default.span(_templateObject9$m || (_templateObject9$m =
   return props.backgroundColor;
 });
 
-var _templateObject$W, _templateObject2$R;
+var _templateObject$W;
+var MonthHeader = function MonthHeader(_ref) {
+  var currentCreatedAt = _ref.currentCreatedAt,
+    previousCreatedAt = _ref.previousCreatedAt,
+    isFirst = _ref.isFirst,
+    padding = _ref.padding,
+    fullWidth = _ref.fullWidth;
+  var _useColor = useColors(),
+    textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY];
+  var monthComponent = React.useMemo(function () {
+    var shouldShowHeader = isFirst || previousCreatedAt && new Date(currentCreatedAt).getMonth() !== new Date(previousCreatedAt).getMonth();
+    if (!shouldShowHeader) {
+      return null;
+    }
+    return /*#__PURE__*/React__default.createElement(MonthHeaderContainer, {
+      color: textSecondary,
+      padding: padding,
+      fullWidth: fullWidth
+    }, new Date(currentCreatedAt).toLocaleDateString('en-US', {
+      month: 'long',
+      year: 'numeric'
+    }));
+  }, [currentCreatedAt, previousCreatedAt, isFirst, textSecondary, padding, fullWidth]);
+  return monthComponent;
+};
+var MonthHeaderContainer = styled__default.div(_templateObject$W || (_templateObject$W = _taggedTemplateLiteralLoose(["\n  padding: ", ";\n  width: ", ";\n  font-style: normal;\n  font-weight: 500;\n  font-size: 13px;\n  line-height: 16px;\n  color: ", ";\n  text-transform: uppercase;\n"])), function (props) {
+  return props.padding || '9px 12px';
+}, function (props) {
+  return props.fullWidth ? '100%' : 'auto';
+}, function (props) {
+  return props.color;
+});
+
+var _templateObject$X, _templateObject2$R;
 var Media = function Media(_ref) {
   var channel = _ref.channel;
   var _useColor = useColors(),
@@ -45177,10 +44958,16 @@ var Media = function Media(_ref) {
     dispatch(setAttachmentsAC([]));
     dispatch(getAttachmentsAC(channel.id, channelDetailsTabs.media));
   }, [channel.id]);
-  return /*#__PURE__*/React__default.createElement(Container$p, null, attachments.map(function (file) {
-    return /*#__PURE__*/React__default.createElement(MediaItem, {
+  return /*#__PURE__*/React__default.createElement(Container$p, null, attachments.map(function (file, index) {
+    return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
       key: file.id
-    }, file.type === 'image' ? (/*#__PURE__*/React__default.createElement(Attachment$1, {
+    }, /*#__PURE__*/React__default.createElement(MonthHeader, {
+      currentCreatedAt: file.createdAt,
+      previousCreatedAt: index > 0 ? attachments[index - 1].createdAt : undefined,
+      isFirst: index === 0,
+      padding: '9px 6px',
+      fullWidth: true
+    }), /*#__PURE__*/React__default.createElement(MediaItem, null, file.type === 'image' ? (/*#__PURE__*/React__default.createElement(Attachment$1, {
       attachment: _extends({}, file, {
         metadata: isJSON(file.metadata) ? JSON.parse(file.metadata) : file.metadata
       }),
@@ -45198,7 +44985,7 @@ var Media = function Media(_ref) {
       backgroundColor: background,
       borderRadius: '8px',
       isDetailsView: true
-    })));
+    }))));
   }), mediaFile && (/*#__PURE__*/React__default.createElement(SliderPopup, {
     channel: channel,
     setIsSliderOpen: setMediaFile,
@@ -45206,7 +44993,7 @@ var Media = function Media(_ref) {
     currentMediaFile: mediaFile
   })));
 };
-var Container$p = styled__default.div(_templateObject$W || (_templateObject$W = _taggedTemplateLiteralLoose(["\n  padding: 6px 4px;\n  overflow-x: hidden;\n  overflow-y: auto;\n  list-style: none;\n  transition: all 0.2s;\n  align-items: flex-start;\n  display: flex;\n  flex-wrap: wrap;\n"])));
+var Container$p = styled__default.div(_templateObject$X || (_templateObject$X = _taggedTemplateLiteralLoose(["\n  padding: 6px 4px;\n  overflow-x: hidden;\n  overflow-y: auto;\n  list-style: none;\n  transition: all 0.2s;\n  align-items: flex-start;\n  display: flex;\n  flex-wrap: wrap;\n"])));
 var MediaItem = styled__default.div(_templateObject2$R || (_templateObject2$R = _taggedTemplateLiteralLoose(["\n  width: calc(33.3333% - 4px);\n  aspect-ratio: 1/1;\n  box-sizing: border-box;\n  //border: 1px solid #ccc;\n  border: 0.5px solid rgba(0, 0, 0, 0.1);\n  border-radius: 8px;\n  overflow: hidden;\n  margin: 2px;\n"])));
 
 var _rect$3, _path$1u;
@@ -45219,13 +45006,12 @@ function _extends$1y() {
     return n;
   }, _extends$1y.apply(null, arguments);
 }
-function SvgFileIcon$1(props) {
+function SvgDocumentIcon(props) {
   return /*#__PURE__*/React.createElement("svg", _extends$1y({
     width: 40,
     height: 40,
     fill: "none",
-    xmlns: "http://www.w3.org/2000/svg",
-    color: "#5159f6"
+    xmlns: "http://www.w3.org/2000/svg"
   }, props), _rect$3 || (_rect$3 = /*#__PURE__*/React.createElement("rect", {
     width: 40,
     height: 40,
@@ -45235,7 +45021,7 @@ function SvgFileIcon$1(props) {
   })), _path$1u || (_path$1u = /*#__PURE__*/React.createElement("path", {
     fillRule: "evenodd",
     clipRule: "evenodd",
-    d: "M18.022 9.714c-2.098 0-3.023.185-3.962.687a4.685 4.685 0 00-1.944 1.944c-.502.94-.687 1.864-.687 3.962v7.386c0 2.098.184 3.023.687 3.962a4.686 4.686 0 001.944 1.944c.938.502 1.864.687 3.962.687h3.957c2.098 0 3.023-.185 3.962-.687a4.686 4.686 0 001.944-1.944c.502-.939.687-1.864.687-3.962v-5.1c0-.683-.024-.99-.105-1.34a3.097 3.097 0 00-.399-.964c-.19-.305-.391-.539-.874-1.022l-4.175-4.175c-.483-.483-.717-.683-1.022-.874a3.095 3.095 0 00-.964-.399c-.293-.068-.556-.095-1.033-.103v-.002h-1.978zm0 1.715c-2.002 0-2.587.181-3.154.484a2.971 2.971 0 00-1.24 1.24c-.304.567-.485 1.153-.485 3.154v7.386c0 2.001.181 2.587.484 3.153.288.538.704.954 1.241 1.241.566.303 1.152.485 3.154.485h3.957c2.001 0 2.587-.182 3.153-.485a2.971 2.971 0 001.241-1.24c.303-.567.484-1.153.484-3.154v-5.1c0-.117 0-.219-.002-.308h-4.712A2.143 2.143 0 0120 16.144l.001-4.712-.15-.002h-1.83zm3.784.875l-.092-.091v3.93c0 .21.152.385.352.422l.077.006 3.932.002-.093-.093-4.176-4.176zm-6.092 12.839c0-.474.384-.857.858-.857H20A.857.857 0 1120 26h-3.428a.857.857 0 01-.858-.857zm.858-4.286a.857.857 0 000 1.715h6a.857.857 0 000-1.715h-6z",
+    d: "M17.593 9.5c-2.098 0-3.023.185-3.962.687a4.685 4.685 0 00-1.944 1.944c-.502.939-.687 1.864-.687 3.962v7.386c0 2.098.185 3.023.687 3.962a4.685 4.685 0 001.944 1.944c.939.502 1.864.686 3.962.686h3.957c2.098 0 3.023-.184 3.962-.687a4.685 4.685 0 001.944-1.944c.502-.938.687-1.863.687-3.961v-5.1c0-.683-.024-.99-.105-1.34a3.094 3.094 0 00-.399-.964c-.19-.305-.39-.54-.874-1.022l-4.175-4.175c-.483-.483-.717-.684-1.022-.874a3.096 3.096 0 00-.963-.4c-.294-.067-.556-.095-1.034-.102V9.5h-1.978zm0 1.714c-2.002 0-2.587.182-3.154.485a2.971 2.971 0 00-1.24 1.24c-.303.567-.485 1.152-.485 3.154v7.386c0 2.001.182 2.587.485 3.153a2.97 2.97 0 001.24 1.24c.567.304 1.152.485 3.154.485h3.957c2.001 0 2.587-.181 3.153-.484a2.97 2.97 0 001.241-1.241c.303-.566.485-1.152.485-3.153v-5.1c0-.118-.001-.22-.003-.308h-4.712a2.143 2.143 0 01-2.143-2.142l.002-4.713-.15-.001h-1.83zm3.785.876l-.092-.091v3.93c0 .21.151.385.351.421l.077.007 3.932.002-.093-.094-4.175-4.175zm-6.092 12.839c0-.474.383-.858.857-.858h3.428a.857.857 0 010 1.715h-3.428a.857.857 0 01-.857-.857zm.857-4.286a.857.857 0 100 1.714h6a.857.857 0 000-1.714h-6z",
     fill: "currentColor"
   })));
 }
@@ -45263,7 +45049,7 @@ function SvgDownloadFile(props) {
   })));
 }
 
-var _templateObject$X, _templateObject2$S, _templateObject3$K, _templateObject4$D, _templateObject5$y, _templateObject6$u, _templateObject7$t, _templateObject8$q;
+var _templateObject$Y, _templateObject2$S, _templateObject3$K, _templateObject4$D, _templateObject5$y, _templateObject6$u, _templateObject7$t, _templateObject8$q;
 var Files = function Files(_ref) {
   var channelId = _ref.channelId,
     filePreviewIcon = _ref.filePreviewIcon,
@@ -45318,20 +45104,26 @@ var Files = function Files(_ref) {
   React.useEffect(function () {
     dispatch(getAttachmentsAC(channelId, channelDetailsTabs.file));
   }, [channelId]);
-  return /*#__PURE__*/React__default.createElement(Container$q, null, attachments.map(function (file) {
+  return /*#__PURE__*/React__default.createElement(Container$q, null, attachments.map(function (file, index) {
     var metas = file.metadata && isJSON(file.metadata) ? JSON.parse(file.metadata) : file.metadata;
     var withPrefix = true;
     var attachmentThumb = '';
     if (metas && metas.tmb) {
       if (metas.tmb.length < 70) {
-        attachmentThumb = base64ToToDataURL(metas.tmb);
+        attachmentThumb = base64ToDataURL(metas.tmb);
         withPrefix = false;
       } else {
         attachmentThumb = metas.tmb;
       }
     }
-    return /*#__PURE__*/React__default.createElement(FileItem, {
-      key: file.id,
+    return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
+      key: file.id
+    }, /*#__PURE__*/React__default.createElement(MonthHeader, {
+      currentCreatedAt: file.createdAt,
+      previousCreatedAt: index > 0 ? attachments[index - 1].createdAt : undefined,
+      isFirst: index === 0,
+      padding: '14px 14px 0'
+    }), /*#__PURE__*/React__default.createElement(FileItem, {
       hoverBackgroundColor: filePreviewHoverBackgroundColor || backgroundHovered
     }, metas && metas.tmb ? (/*#__PURE__*/React__default.createElement(FileThumb, {
       draggable: false,
@@ -45339,10 +45131,10 @@ var Files = function Files(_ref) {
     })) : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(FileIconCont, {
       iconColor: accentColor,
       fillColor: surface1
-    }, filePreviewIcon || /*#__PURE__*/React__default.createElement(SvgFileIcon$1, null)), /*#__PURE__*/React__default.createElement(FileHoverIconCont, {
+    }, filePreviewIcon || /*#__PURE__*/React__default.createElement(SvgDocumentIcon, null)), /*#__PURE__*/React__default.createElement(FileHoverIconCont, {
       iconColor: accentColor,
       fillColor: surface1
-    }, filePreviewHoverIcon || /*#__PURE__*/React__default.createElement(SvgFileIcon$1, null)))), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(AttachmentPreviewTitle, {
+    }, filePreviewHoverIcon || /*#__PURE__*/React__default.createElement(SvgDocumentIcon, null)))), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(AttachmentPreviewTitle, {
       fontSize: fileNameFontSize,
       lineHeight: fileNameLineHeight,
       color: filePreviewTitleColor || textPrimary
@@ -45376,10 +45168,10 @@ var Files = function Files(_ref) {
           transformOrigin: 'center center'
         }
       }
-    }))) : filePreviewDownloadIcon || /*#__PURE__*/React__default.createElement(SvgDownloadFile, null)));
+    }))) : filePreviewDownloadIcon || /*#__PURE__*/React__default.createElement(SvgDownloadFile, null))));
   }));
 };
-var Container$q = styled__default.ul(_templateObject$X || (_templateObject$X = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  padding: 0;\n  overflow-x: hidden;\n  overflow-y: auto;\n  list-style: none;\n  transition: all 0.2s;\n"])));
+var Container$q = styled__default.ul(_templateObject$Y || (_templateObject$Y = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  padding: 0;\n  overflow-x: hidden;\n  overflow-y: auto;\n  list-style: none;\n  transition: all 0.2s;\n"])));
 var DownloadWrapper = styled__default.a(_templateObject2$S || (_templateObject2$S = _taggedTemplateLiteralLoose(["\n  text-decoration: none;\n  visibility: ", ";\n  padding: 5px 6px;\n  position: absolute;\n  top: 25%;\n  right: 16px;\n  cursor: pointer;\n  & > svg {\n    & path {\n      fill: ", ";\n    }\n    color: ", ";\n  }\n"])), function (props) {
   return props.visible ? 'visible' : 'hidden';
 }, function (props) {
@@ -45388,12 +45180,12 @@ var DownloadWrapper = styled__default.a(_templateObject2$S || (_templateObject2$
   return props.iconColor;
 });
 var ProgressWrapper$2 = styled__default.span(_templateObject3$K || (_templateObject3$K = _taggedTemplateLiteralLoose(["\n  display: inline-block;\n  width: 20px;\n  height: 20px;\n  animation: preloader 1.5s linear infinite;\n\n  @keyframes preloader {\n    0% {\n      transform: rotate(0deg);\n    }\n    100% {\n      transform: rotate(360deg);\n    }\n  }\n"])));
-var FileIconCont = styled__default.span(_templateObject4$D || (_templateObject4$D = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n\n  & > svg {\n    width: 40px;\n    height: 40px;\n    color: ", ";\n    fill: ", ";\n  }\n"])), function (props) {
+var FileIconCont = styled__default.span(_templateObject4$D || (_templateObject4$D = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  & > svg {\n    width: 40px;\n    height: 40px;\n    color: ", ";\n    rect {\n      fill: ", ";\n    }\n  }\n"])), function (props) {
   return props.iconColor;
 }, function (props) {
   return props.fillColor;
 });
-var FileHoverIconCont = styled__default.span(_templateObject5$y || (_templateObject5$y = _taggedTemplateLiteralLoose(["\n  display: none;\n  & > svg {\n    color: ", ";\n    width: 40px;\n    height: 40px;\n    fill: ", ";\n  }\n"])), function (props) {
+var FileHoverIconCont = styled__default.span(_templateObject5$y || (_templateObject5$y = _taggedTemplateLiteralLoose(["\n  display: none;\n  & > svg {\n    width: 40px;\n    height: 40px;\n    color: ", ";\n    rect {\n      fill: ", ";\n    }\n  }\n"])), function (props) {
   return props.iconColor;
 }, function (props) {
   return props.fillColor;
@@ -45441,7 +45233,7 @@ function SvgLinkIcon(props) {
   })));
 }
 
-var _templateObject$Y, _templateObject2$T, _templateObject3$L, _templateObject4$E, _templateObject5$z;
+var _templateObject$Z, _templateObject2$T, _templateObject3$L, _templateObject4$E, _templateObject5$z;
 var LinkItem = function LinkItem(_ref) {
   var link = _ref.link,
     linkPreviewIcon = _ref.linkPreviewIcon,
@@ -45472,12 +45264,12 @@ var LinkItem = function LinkItem(_ref) {
     color: linkPreviewColor || textPrimary
   }, link))));
 };
-var LinkIconCont = styled__default.span(_templateObject$Y || (_templateObject$Y = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  > svg {\n    color: ", ";\n    fill: ", ";\n  }\n"])), function (props) {
+var LinkIconCont = styled__default.span(_templateObject$Z || (_templateObject$Z = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  > svg {\n    color: ", ";\n    rect {\n      fill: ", ";\n    }\n  }\n"])), function (props) {
   return props.iconColor;
 }, function (props) {
   return props.fillColor;
 });
-var LinkHoverIconCont = styled__default.span(_templateObject2$T || (_templateObject2$T = _taggedTemplateLiteralLoose(["\n  display: none;\n  > svg {\n    color: ", ";\n    fill: ", ";\n  }\n"])), function (props) {
+var LinkHoverIconCont = styled__default.span(_templateObject2$T || (_templateObject2$T = _taggedTemplateLiteralLoose(["\n  display: none;\n  > svg {\n    color: ", ";\n    rect {\n      fill: ", ";\n    }\n  }\n"])), function (props) {
   return props.iconColor;
 }, function (props) {
   return props.fillColor;
@@ -45490,7 +45282,7 @@ var LinkUrl = styled__default.span(_templateObject5$z || (_templateObject5$z = _
   return props.color;
 });
 
-var _templateObject$Z;
+var _templateObject$_;
 var Links = function Links(_ref) {
   var channelId = _ref.channelId,
     linkPreviewIcon = _ref.linkPreviewIcon,
@@ -45503,19 +45295,25 @@ var Links = function Links(_ref) {
   React.useEffect(function () {
     dispatch(getAttachmentsAC(channelId, channelDetailsTabs.link));
   }, [channelId]);
-  return /*#__PURE__*/React__default.createElement(Container$r, null, attachments.map(function (file) {
-    return /*#__PURE__*/React__default.createElement(LinkItem, {
-      key: file.id,
+  return /*#__PURE__*/React__default.createElement(Container$r, null, attachments.map(function (file, index) {
+    return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
+      key: file.id
+    }, /*#__PURE__*/React__default.createElement(MonthHeader, {
+      currentCreatedAt: file.createdAt,
+      previousCreatedAt: index > 0 ? attachments[index - 1].createdAt : undefined,
+      isFirst: index === 0,
+      padding: '6px 14px 0'
+    }), /*#__PURE__*/React__default.createElement(LinkItem, {
       link: file.url,
       linkPreviewColor: linkPreviewColor,
       linkPreviewHoverBackgroundColor: linkPreviewHoverBackgroundColor,
       linkPreviewHoverIcon: linkPreviewHoverIcon,
       linkPreviewTitleColor: linkPreviewTitleColor,
       linkPreviewIcon: linkPreviewIcon
-    });
+    }));
   }));
 };
-var Container$r = styled__default.ul(_templateObject$Z || (_templateObject$Z = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  padding: 11px 0 0;\n  overflow-x: hidden;\n  overflow-y: auto;\n  list-style: none;\n  transition: all 0.2s;\n"])));
+var Container$r = styled__default.ul(_templateObject$_ || (_templateObject$_ = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  padding: 11px 0 0;\n  overflow-x: hidden;\n  overflow-y: auto;\n  list-style: none;\n  transition: all 0.2s;\n"])));
 
 var _rect$5, _path$1x;
 function _extends$1B() {
@@ -45571,7 +45369,7 @@ function SvgVoicePreviewPause(props) {
   })));
 }
 
-var _templateObject$_, _templateObject2$U, _templateObject3$M, _templateObject4$F, _templateObject5$A, _templateObject6$v, _templateObject7$u, _templateObject8$r;
+var _templateObject$$, _templateObject2$U, _templateObject3$M, _templateObject4$F, _templateObject5$A, _templateObject6$v, _templateObject7$u, _templateObject8$r;
 var VoiceItem = function VoiceItem(_ref) {
   var file = _ref.file,
     voicePreviewPlayIcon = _ref.voicePreviewPlayIcon,
@@ -45696,7 +45494,7 @@ var VoiceItem = function VoiceItem(_ref) {
     type: 'audio/mpeg'
   })));
 };
-var FileIconCont$1 = styled__default.span(_templateObject$_ || (_templateObject$_ = _taggedTemplateLiteralLoose(["\n  cursor: pointer;\n  display: inline-flex;\n  fill: ", ";\n  rect {\n    fill: ", ";\n  }\n"])), function (props) {
+var FileIconCont$1 = styled__default.span(_templateObject$$ || (_templateObject$$ = _taggedTemplateLiteralLoose(["\n  cursor: pointer;\n  display: inline-flex;\n  fill: ", ";\n  rect {\n    fill: ", ";\n  }\n"])), function (props) {
   return props.fill || 'transparent';
 }, function (props) {
   return props.fill || 'transparent';
@@ -45721,7 +45519,7 @@ var AudioSendTime = styled__default.span(_templateObject7$u || (_templateObject7
 });
 var Audio = styled__default.audio(_templateObject8$r || (_templateObject8$r = _taggedTemplateLiteralLoose(["\n  display: none;\n"])));
 
-var _templateObject$$;
+var _templateObject$10;
 var Voices = function Voices(_ref) {
   var channelId = _ref.channelId,
     voicePreviewPlayIcon = _ref.voicePreviewPlayIcon,
@@ -45736,9 +45534,15 @@ var Voices = function Voices(_ref) {
   React.useEffect(function () {
     dispatch(getAttachmentsAC(channelId, channelDetailsTabs.voice));
   }, [channelId]);
-  return /*#__PURE__*/React__default.createElement(Container$s, null, attachments.map(function (file) {
-    return /*#__PURE__*/React__default.createElement(VoiceItem, {
-      key: file.id,
+  return /*#__PURE__*/React__default.createElement(Container$s, null, attachments.map(function (file, index) {
+    return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
+      key: file.id
+    }, /*#__PURE__*/React__default.createElement(MonthHeader, {
+      currentCreatedAt: file.createdAt,
+      previousCreatedAt: index > 0 ? attachments[index - 1].createdAt : undefined,
+      isFirst: index === 0,
+      padding: '7px 14px 2px'
+    }), /*#__PURE__*/React__default.createElement(VoiceItem, {
       file: _extends({}, file, {
         metadata: isJSON(file.metadata) ? JSON.parse(file.metadata) : file.metadata
       }),
@@ -45749,12 +45553,12 @@ var Voices = function Voices(_ref) {
       voicePreviewPauseIcon: voicePreviewPauseIcon,
       voicePreviewPauseHoverIcon: voicePreviewPauseHoverIcon,
       voicePreviewTitleColor: voicePreviewTitleColor
-    });
+    }));
   }));
 };
-var Container$s = styled__default.ul(_templateObject$$ || (_templateObject$$ = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  padding: 11px 0 0;\n  overflow-x: hidden;\n  overflow-y: auto;\n  list-style: none;\n  transition: all 0.2s;\n"])));
+var Container$s = styled__default.ul(_templateObject$10 || (_templateObject$10 = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  padding: 11px 0 0;\n  overflow-x: hidden;\n  overflow-y: auto;\n  list-style: none;\n  transition: all 0.2s;\n"])));
 
-var _templateObject$10, _templateObject2$V;
+var _templateObject$11, _templateObject2$V;
 var DetailsTab = function DetailsTab(_ref) {
   var channel = _ref.channel,
     theme = _ref.theme,
@@ -45905,7 +45709,7 @@ var DetailsTab = function DetailsTab(_ref) {
     voicePreviewHoverBackgroundColor: voicePreviewHoverBackgroundColor
   })));
 };
-var Container$t = styled__default.div(_templateObject$10 || (_templateObject$10 = _taggedTemplateLiteralLoose(["\n  min-height: calc(100vh - 64px);\n"])));
+var Container$t = styled__default.div(_templateObject$11 || (_templateObject$11 = _taggedTemplateLiteralLoose(["\n  min-height: calc(100vh - 64px);\n"])));
 var DetailsTabHeader = styled__default.div(_templateObject2$V || (_templateObject2$V = _taggedTemplateLiteralLoose(["\n  overflow-x: auto;\n  overflow-y: hidden;\n  border-bottom: 1px solid ", ";\n  background-color: ", ";\n  display: flex;\n  justify-content: space-between;\n  position: sticky;\n  top: 0;\n  z-index: 12;\n  /* width */\n  &::-webkit-scrollbar {\n    width: 0;\n    height: 0;\n  }\n\n  /* Track */\n  &::-webkit-scrollbar-track {\n    background: transparent;\n  }\n\n  /* Handle */\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  /* Handle on hover */\n  &::-webkit-scrollbar-thumb:hover {\n    background: transparent;\n  }\n  button {\n    position: relative;\n    border: none;\n    background: transparent;\n    outline: none;\n    height: 44px;\n    text-transform: capitalize;\n    font-style: normal;\n    font-weight: 500;\n    font-size: ", ";\n    line-height: ", ";\n    color: ", ";\n    min-width: ", ";\n    cursor: pointer;\n  }\n\n  & span {\n    position: relative;\n    display: inline-flex;\n    align-items: center;\n    height: 100%;\n  }\n\n  & .active span {\n    color: ", ";\n\n    &:after {\n      content: '';\n      width: 100%;\n      border-radius: 2px;\n      height: 2px;\n      background-color: ", ";\n      position: absolute;\n      top: calc(100% - 1px);\n      left: 0;\n    }\n  }\n"])), function (props) {
   return props.borderColor;
 }, function (props) {
@@ -45924,8 +45728,8 @@ var DetailsTabHeader = styled__default.div(_templateObject2$V || (_templateObjec
   return props.activeTabColor;
 });
 
-var _templateObject$11, _templateObject2$W, _templateObject3$N, _templateObject4$G;
-var Container$u = styled__default.div(_templateObject$11 || (_templateObject$11 = _taggedTemplateLiteralLoose(["\n  ", ";\n  height: ", ";\n  position: absolute;\n  padding: 24px 16px;\n  background-color: ", ";\n  z-index: 25;\n"])), function (props) {
+var _templateObject$12, _templateObject2$W, _templateObject3$N, _templateObject4$G;
+var Container$u = styled__default.div(_templateObject$12 || (_templateObject$12 = _taggedTemplateLiteralLoose(["\n  ", ";\n  height: ", ";\n  position: absolute;\n  padding: 24px 16px;\n  background-color: ", ";\n  z-index: 25;\n"])), function (props) {
   return props.active ? 'display: block' : 'display: none';
 }, function (props) {
   return "calc(100vh - " + (props.heightOffset ? props.heightOffset + 48 : 48) + "px)";
@@ -46189,7 +45993,7 @@ var EditChannel = function EditChannel(_ref) {
   })));
 };
 
-var _templateObject$12, _templateObject2$X, _templateObject3$O, _templateObject4$H, _templateObject5$B, _templateObject6$w, _templateObject7$v, _templateObject8$s, _templateObject9$n, _templateObject0$k, _templateObject1$h, _templateObject10$b, _templateObject11$9;
+var _templateObject$13, _templateObject2$X, _templateObject3$O, _templateObject4$H, _templateObject5$B, _templateObject6$w, _templateObject7$v, _templateObject8$s, _templateObject9$n, _templateObject0$k, _templateObject1$h, _templateObject10$b, _templateObject11$9;
 var Details = function Details(_ref) {
   var _activeChannel$member;
   var detailsTitleText = _ref.detailsTitleText,
@@ -46619,7 +46423,7 @@ var Details = function Details(_ref) {
     QRCodeIcon: QRCodeIcon
   }))));
 };
-var Container$v = styled__default.div(_templateObject$12 || (_templateObject$12 = _taggedTemplateLiteralLoose(["\n  flex: 0 0 auto;\n  width: 0;\n  border-left: 1px solid ", ";\n  //transition: all 0.1s;\n  ", "\n  background-color: ", ";\n}\n"])), function (props) {
+var Container$v = styled__default.div(_templateObject$13 || (_templateObject$13 = _taggedTemplateLiteralLoose(["\n  flex: 0 0 auto;\n  width: 0;\n  border-left: 1px solid ", ";\n  //transition: all 0.1s;\n  ", "\n  background-color: ", ";\n}\n"])), function (props) {
   return props.borderColor;
 }, function (props) {
   return props.mounted && " width: " + (props.size === 'small' ? '300px' : props.size === 'medium' ? '350px' : '400px') + ";";
@@ -46669,7 +46473,7 @@ var ChannelNameWrapper = styled__default.div(_templateObject1$h || (_templateObj
 var EditButton = styled__default.span(_templateObject10$b || (_templateObject10$b = _taggedTemplateLiteralLoose(["\n  margin-left: 6px;\n  cursor: pointer;\n  color: #b2b6be;\n"])));
 var PhoneNumberContainer = styled__default.span(_templateObject11$9 || (_templateObject11$9 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: inline-flex;\n  align-items: center;\n  cursor: pointer;\n  user-select: text;\n"])));
 
-var _templateObject$13;
+var _templateObject$14;
 var ChannelDetailsContainer = function ChannelDetailsContainer(_ref) {
   var _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'large' : _ref$size,
@@ -46900,7 +46704,7 @@ var ChannelDetailsContainer = function ChannelDetailsContainer(_ref) {
     QRCodeIcon: QRCodeIcon
   })));
 };
-var DetailsWrapper = styled__default.div(_templateObject$13 || (_templateObject$13 = _taggedTemplateLiteralLoose(["\n  user-select: text;\n"])));
+var DetailsWrapper = styled__default.div(_templateObject$14 || (_templateObject$14 = _taggedTemplateLiteralLoose(["\n  user-select: text;\n"])));
 
 var _path$1z;
 function _extends$1D() {
@@ -46924,7 +46728,7 @@ function SvgChevronDown(props) {
   })));
 }
 
-var _templateObject$14, _templateObject2$Y;
+var _templateObject$15, _templateObject2$Y;
 var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
   var buttonIcon = _ref.buttonIcon,
     buttonWidth = _ref.buttonWidth,
@@ -47007,7 +46811,7 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
     isMuted: channel.muted
   }, channel.newMessageCount ? channel.newMessageCount > 99 ? '99+' : channel.newMessageCount : '')), buttonIcon || /*#__PURE__*/React__default.createElement(SvgChevronDown, null)));
 };
-var BottomButton = styled__default.div(_templateObject$14 || (_templateObject$14 = _taggedTemplateLiteralLoose(["\n  transition: all 0.3s ease-in-out;\n  position: absolute;\n  ", ";\n\n  ", ";\n\n  ", ";\n  right: ", "px;\n\n  margin-right: 16px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  border: 0.5px solid rgba(0, 0, 0, 0.1);\n  border-radius: 50px;\n  width: 48px;\n  height: 48px;\n  cursor: pointer;\n  z-index: 14;\n  & > svg {\n    color: rgba(129, 140, 153, 1);\n  }\n\n  & > span {\n    bottom: 32px;\n    right: 0;\n  }\n"])), function (props) {
+var BottomButton = styled__default.div(_templateObject$15 || (_templateObject$15 = _taggedTemplateLiteralLoose(["\n  transition: all 0.3s ease-in-out;\n  position: absolute;\n  ", ";\n\n  ", ";\n\n  ", ";\n  right: ", "px;\n\n  margin-right: 16px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  border: 0.5px solid rgba(0, 0, 0, 0.1);\n  border-radius: 50px;\n  width: 48px;\n  height: 48px;\n  cursor: pointer;\n  z-index: 14;\n  & > svg {\n    color: rgba(129, 140, 153, 1);\n  }\n\n  & > span {\n    bottom: 32px;\n    right: 0;\n  }\n"])), function (props) {
   return props.animateFrom === 'bottom' && "bottom: " + (props.bottomOffset + (props.bottomPosition === undefined ? 45 : props.bottomPosition) - 130) + "px";
 }, function (props) {
   return props.animateFrom === 'right' && "right: " + (props.rightPosition === undefined ? 16 : props.rightPosition - 100) + "px";
@@ -47061,7 +46865,7 @@ function SvgMention(props) {
   })));
 }
 
-var _templateObject$15, _templateObject2$Z;
+var _templateObject$16, _templateObject2$Z;
 var MessagesScrollToUnreadMentionsButton = function MessagesScrollToUnreadMentionsButton(_ref) {
   var buttonIcon = _ref.buttonIcon,
     buttonWidth = _ref.buttonWidth,
@@ -47204,7 +47008,7 @@ var MessagesScrollToUnreadMentionsButton = function MessagesScrollToUnreadMentio
     isMuted: channel.muted
   }, channel.newMentionCount ? channel.newMentionCount > 99 ? '99+' : channel.newMentionCount : '')), buttonIcon || /*#__PURE__*/React__default.createElement(SvgMention, null)));
 };
-var BottomButton$1 = styled__default.div(_templateObject$15 || (_templateObject$15 = _taggedTemplateLiteralLoose(["\n  transition: all 0.3s ease-in-out;\n  position: absolute;\n  ", ";\n\n  ", ";\n\n  ", ";\n  right: ", ";\n  margin-right: 16px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  border: 0.5px solid rgba(0, 0, 0, 0.1);\n  border-radius: 50px;\n  width: 48px;\n  height: 48px;\n  cursor: pointer;\n  z-index: 14;\n\n  & > svg {\n    color: rgba(129, 140, 153, 1);\n  }\n\n  & > span {\n    bottom: 32px;\n    right: 0;\n  }\n"])), function (props) {
+var BottomButton$1 = styled__default.div(_templateObject$16 || (_templateObject$16 = _taggedTemplateLiteralLoose(["\n  transition: all 0.3s ease-in-out;\n  position: absolute;\n  ", ";\n\n  ", ";\n\n  ", ";\n  right: ", ";\n  margin-right: 16px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  border: 0.5px solid rgba(0, 0, 0, 0.1);\n  border-radius: 50px;\n  width: 48px;\n  height: 48px;\n  cursor: pointer;\n  z-index: 14;\n\n  & > svg {\n    color: rgba(129, 140, 153, 1);\n  }\n\n  & > span {\n    bottom: 32px;\n    right: 0;\n  }\n"])), function (props) {
   return props.animateFrom === 'bottom' && "bottom: " + (props.bottomOffset + (props.bottomPosition === undefined ? 45 : props.bottomPosition) + (props.showsUnreadMentionsButton ? 60 : 0) - 180) + "px";
 }, function (props) {
   return props.animateFrom === 'right' && "right: " + (props.rightPosition === undefined ? 16 : props.rightPosition - 100) + "px";