sceyt-chat-react-uikit 1.6.9-beta.16 → 1.6.9-beta.18

package/index.js

@@ -10075,18 +10075,29 @@ function updateMessageOnMap(channelId, updatedMessage) {
       }
     }
   }
+  var updatedMessageData = null;
   if (messagesMap[channelId]) {
-    messagesMap[channelId] = messagesMap[channelId].map(function (mes) {
+    messagesMap[channelId].map(function (mes) {
       if (mes.tid === updatedMessage.messageId || mes.id === updatedMessage.messageId) {
         if (updatedMessage.params.state === MESSAGE_STATUS.DELETE) {
-          return _extends({}, updatedMessage.params);
+          updatedMessageData = _extends({}, updatedMessage.params);
+          return updatedMessageData;
         } else {
-          return _extends({}, mes, updatedMessage.params);
+          var _updatedMessage$param;
+          updatedMessageData = _extends({}, mes, updatedMessage.params, {
+            attachments: [].concat(mes.attachments, ((_updatedMessage$param = updatedMessage.params) === null || _updatedMessage$param === void 0 ? void 0 : _updatedMessage$param.attachments) || []).filter(function (att, index, self) {
+              return index === self.findIndex(function (t) {
+                return t.url === att.url && t.type === att.type && t.name === att.name;
+              });
+            })
+          });
+          return updatedMessage;
         }
       }
       return mes;
     });
   }
+  return updatedMessageData;
 }
 function addReactionToMessageOnMap(channelId, message, reaction, isSelf) {
   if (messagesMap[channelId]) {
@@ -10330,7 +10341,6 @@ var messageSlice = createSlice({
   reducers: {
     addMessage: function addMessage(state, action) {
       var message = action.payload.message;
-      log.info('addMessage ... ', message);
       state.activeChannelMessages.push(message);
     },
     deleteMessageFromList: function deleteMessageFromList(state, action) {
@@ -10448,11 +10458,48 @@ var messageSlice = createSlice({
         state.activeChannelMessages.push(params);
       }
     },
-    addReactionToMessage: function addReactionToMessage(state, action) {
+    updateMessageAttachment: function updateMessageAttachment(state, action) {
       var _action$payload4 = action.payload,
-        message = _action$payload4.message,
-        reaction = _action$payload4.reaction,
-        isSelf = _action$payload4.isSelf;
+        url = _action$payload4.url,
+        messageId = _action$payload4.messageId,
+        params = _action$payload4.params;
+      state.activeChannelMessages = state.activeChannelMessages.map(function (message) {
+        if (message.id === messageId) {
+          for (var index = 0; index < message.attachments.length; index++) {
+            var attachment = message.attachments[index];
+            if (attachment.url === url) {
+              message.attachments[index] = _extends({}, attachment, params);
+            }
+          }
+        }
+        if (message.attachments.length) {
+          var detachedAttachments = message.attachments.map(function (att) {
+            var _att$user, _att$user2;
+            return _extends({}, att, {
+              user: _extends({}, att.user, {
+                metadata: _extends({}, ((_att$user = att.user) === null || _att$user === void 0 ? void 0 : _att$user.metadata) || {}),
+                presence: _extends({}, ((_att$user2 = att.user) === null || _att$user2 === void 0 ? void 0 : _att$user2.presence) || {})
+              })
+            });
+          });
+          updateMessageOnAllMessages(messageId, {
+            attachments: detachedAttachments
+          });
+          updateMessageOnMap(message.channelId, {
+            messageId: messageId,
+            params: {
+              attachments: detachedAttachments
+            }
+          });
+        }
+        return message;
+      });
+    },
+    addReactionToMessage: function addReactionToMessage(state, action) {
+      var _action$payload5 = action.payload,
+        message = _action$payload5.message,
+        reaction = _action$payload5.reaction,
+        isSelf = _action$payload5.isSelf;
       state.activeChannelMessages = state.activeChannelMessages.map(function (msg) {
         if (msg.id === message.id) {
           var slfReactions = [].concat(msg.userReactions);
@@ -10472,10 +10519,10 @@ var messageSlice = createSlice({
       });
     },
     deleteReactionFromMessage: function deleteReactionFromMessage(state, action) {
-      var _action$payload5 = action.payload,
-        reaction = _action$payload5.reaction,
-        message = _action$payload5.message,
-        isSelf = _action$payload5.isSelf;
+      var _action$payload6 = action.payload,
+        reaction = _action$payload6.reaction,
+        message = _action$payload6.message,
+        isSelf = _action$payload6.isSelf;
       state.activeChannelMessages = state.activeChannelMessages.map(function (msg) {
         if (msg.id === message.id) {
           var userReactions = msg.userReactions;
@@ -10524,9 +10571,9 @@ var messageSlice = createSlice({
       (_state$activeTabAttac = state.activeTabAttachments).push.apply(_state$activeTabAttac, action.payload.attachments);
     },
     addAttachmentsForPopup: function addAttachmentsForPopup(state, action) {
-      var _action$payload6 = action.payload,
-        attachments = _action$payload6.attachments,
-        direction = _action$payload6.direction;
+      var _action$payload7 = action.payload,
+        attachments = _action$payload7.attachments,
+        direction = _action$payload7.direction;
       if (direction === 'prev') {
         var _state$attachmentsFor;
         (_state$attachmentsFor = state.attachmentsForPopup).push.apply(_state$attachmentsFor, attachments);
@@ -10542,11 +10589,11 @@ var messageSlice = createSlice({
       state.attachmentForPopupHasNext = action.payload.hasPrev;
     },
     updateUploadProgress: function updateUploadProgress(state, action) {
-      var _action$payload7 = action.payload,
-        uploaded = _action$payload7.uploaded,
-        total = _action$payload7.total,
-        attachmentId = _action$payload7.attachmentId,
-        progress = _action$payload7.progress;
+      var _action$payload8 = action.payload,
+        uploaded = _action$payload8.uploaded,
+        total = _action$payload8.total,
+        attachmentId = _action$payload8.attachmentId,
+        progress = _action$payload8.progress;
       var updateData = {
         uploaded: uploaded,
         total: total,
@@ -10570,23 +10617,23 @@ var messageSlice = createSlice({
       state.messageForReply = action.payload.message;
     },
     uploadAttachmentCompilation: function uploadAttachmentCompilation(state, action) {
-      var _action$payload8 = action.payload,
-        attachmentUploadingState = _action$payload8.attachmentUploadingState,
-        attachmentId = _action$payload8.attachmentId;
+      var _action$payload9 = action.payload,
+        attachmentUploadingState = _action$payload9.attachmentUploadingState,
+        attachmentId = _action$payload9.attachmentId;
       state.attachmentsUploadingState[attachmentId] = attachmentUploadingState;
     },
     setReactionsList: function setReactionsList(state, action) {
-      var _action$payload9 = action.payload,
-        reactions = _action$payload9.reactions,
-        hasNext = _action$payload9.hasNext;
+      var _action$payload0 = action.payload,
+        reactions = _action$payload0.reactions,
+        hasNext = _action$payload0.hasNext;
       state.reactionsHasNext = hasNext;
       state.reactionsList = [].concat(reactions);
     },
     addReactionsToList: function addReactionsToList(state, action) {
       var _state$reactionsList;
-      var _action$payload0 = action.payload,
-        reactions = _action$payload0.reactions,
-        hasNext = _action$payload0.hasNext;
+      var _action$payload1 = action.payload,
+        reactions = _action$payload1.reactions,
+        hasNext = _action$payload1.hasNext;
       state.reactionsHasNext = hasNext;
       (_state$reactionsList = state.reactionsList).push.apply(_state$reactionsList, reactions);
     },
@@ -10647,6 +10694,7 @@ var _messageSlice$actions = messageSlice.actions,
   addMessages = _messageSlice$actions.addMessages,
   updateMessagesStatus = _messageSlice$actions.updateMessagesStatus,
   updateMessage = _messageSlice$actions.updateMessage,
+  updateMessageAttachment = _messageSlice$actions.updateMessageAttachment,
   addReactionToMessage = _messageSlice$actions.addReactionToMessage,
   deleteReactionFromMessage = _messageSlice$actions.deleteReactionFromMessage,
   setHasPrevMessages = _messageSlice$actions.setHasPrevMessages,
@@ -11738,6 +11786,13 @@ function setMessagesHasNextAC(hasNext) {
     hasNext: hasNext
   });
 }
+function setUpdateMessageAttachmentAC(url, messageId, params) {
+  return updateMessageAttachment({
+    url: url,
+    messageId: messageId,
+    params: params
+  });
+}
 function updateMessageAC(messageId, params, addIfNotExists) {
   return updateMessage({
     messageId: messageId,
@@ -17153,12 +17208,6 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
     addMessageToMap(channel.id, messageToAdd);
     addAllMessages([messageToAdd], MESSAGE_LOAD_DIRECTION.NEXT);
     setPendingMessages(channel.id, [messageToAdd]);
-    var hasNextMessages = store.getState().MessageReducer.messagesHasNext;
-    var activeChannelMessages = store.getState().MessageReducer.activeChannelMessages;
-    var isLatestMessageInChannelMessages = activeChannelMessages[activeChannelMessages.length - 1].id === channel.lastMessage.id;
-    if (hasNextMessages || !isLatestMessageInChannelMessages) {
-      store.dispatch(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
-    }
     store.dispatch(scrollToNewMessageAC(true));
     store.dispatch(addMessageAC(messageToAdd));
     return Promise.resolve();
@@ -18332,27 +18381,26 @@ function editMessage(action) {
   }, _marked6$1, null, [[0, 5]]);
 }
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, pendingMessages, _messagesMap, filteredPendingMessages, index, mes, _t9;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, pendingMessages, _messagesMap, filteredPendingMessages, index, mes, _t9;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
-        log.info('getMessagesQuery ... ');
-        _context9.p = 1;
-        _context9.n = 2;
+        _context9.p = 0;
+        _context9.n = 1;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
-      case 2:
+      case 1:
         _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight;
         if (!(channel.id && !channel.isMockChannel)) {
-          _context9.n = 49;
+          _context9.n = 48;
           break;
         }
         SceytChatClient = getClient();
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channel.id);
         messageQueryBuilder.limit(limit || MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
-        _context9.n = 3;
+        _context9.n = 2;
         return effects.call(messageQueryBuilder.build);
-      case 3:
+      case 2:
         messageQuery = _context9.v;
         query.messageQuery = messageQuery;
         cachedMessages = getMessagesFromMap(channel.id);
@@ -18361,33 +18409,33 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context9.n = 15;
+          _context9.n = 13;
           break;
         }
         allMessages = getAllMessages();
         havLastMessage = allMessages && allMessages.length && channel.lastMessage && allMessages[allMessages.length - 1] && allMessages[allMessages.length - 1].id === channel.lastMessage.id;
         if (!(channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage)) {
-          _context9.n = 10;
+          _context9.n = 8;
           break;
         }
         setHasPrevCached(false);
         setAllMessages([]);
-        _context9.n = 4;
+        _context9.n = 3;
         return effects.call(messageQuery.loadPreviousMessageId, '0');
-      case 4:
+      case 3:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 6;
+          _context9.n = 5;
           break;
         }
         messageQuery.limit = 30;
-        _context9.n = 5;
+        _context9.n = 4;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 5:
+      case 4:
         secondResult = _context9.v;
         result.messages = [].concat(secondResult.messages, result.messages);
         result.hasNext = secondResult.hasNext;
-      case 6:
+      case 5:
         sentMessages = [];
         if (withDeliveredMessages) {
           sentMessages = getFromAllMessagesByMessageId('', '', true);
@@ -18400,43 +18448,40 @@ function getMessagesQuery(action) {
           return !messagesMap[msg.tid || ''];
         });
         result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
-        _context9.n = 7;
+        _context9.n = 6;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 7:
+      case 6:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages(result.messages);
-        _context9.n = 8;
+        _context9.n = 7;
         return effects.put(setMessagesHasPrevAC(true));
+      case 7:
+        _context9.n = 10;
+        break;
       case 8:
+        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context9.n = 9;
-        return effects.put(markChannelAsReadAC(channel.id));
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 9:
-        _context9.n = 12;
-        break;
+        _context9.n = 10;
+        return effects.put(setMessagesHasPrevAC(true));
       case 10:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context9.n = 11;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 11:
-        _context9.n = 12;
-        return effects.put(setMessagesHasPrevAC(true));
-      case 12:
-        _context9.n = 13;
         return effects.put(setMessagesHasNextAC(false));
-      case 13:
+      case 11:
         setHasNextCached(false);
         if (!messageId) {
-          _context9.n = 14;
+          _context9.n = 12;
           break;
         }
-        _context9.n = 14;
+        _context9.n = 12;
         return effects.put(setScrollToMessagesAC(messageId, highlight));
-      case 14:
-        _context9.n = 46;
+      case 12:
+        _context9.n = 45;
         break;
-      case 15:
+      case 13:
         if (!messageId) {
-          _context9.n = 27;
+          _context9.n = 25;
           break;
         }
         _allMessages = getAllMessages();
@@ -18445,176 +18490,183 @@ function getMessagesQuery(action) {
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context9.n = 17;
+          _context9.n = 15;
           break;
         }
         result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context9.n = 16;
+        _context9.n = 14;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 16:
+      case 14:
         setHasPrevCached(messageIndex > maxLengthPart);
         setHasNextCached(_allMessages.length > maxLengthPart);
-        _context9.n = 24;
+        _context9.n = 22;
         break;
-      case 17:
+      case 15:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         log.info('load by message id from server ...............', messageId);
-        _context9.n = 18;
+        _context9.n = 16;
         return effects.call(messageQuery.loadNearMessageId, messageId);
-      case 18:
+      case 16:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 21;
+          _context9.n = 19;
           break;
         }
         messageQuery.limit = (MESSAGES_MAX_LENGTH - 50) / 2;
-        _context9.n = 19;
+        _context9.n = 17;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 19:
+      case 17:
         _secondResult = _context9.v;
         messageQuery.reverse = false;
-        _context9.n = 20;
+        _context9.n = 18;
         return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 20:
+      case 18:
         thirdResult = _context9.v;
         result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
         result.hasNext = _secondResult.hasNext;
         messageQuery.reverse = true;
-      case 21:
+      case 19:
         log.info('result from server ....... ', result);
-        _context9.n = 22;
+        _context9.n = 20;
         return effects.put(setMessagesHasNextAC(true));
-      case 22:
-        _context9.n = 23;
+      case 20:
+        _context9.n = 21;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 23:
+      case 21:
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 24:
-        _context9.n = 25;
+      case 22:
+        _context9.n = 23;
         return effects.put(setScrollToMessagesAC(messageId));
-      case 25:
-        _context9.n = 26;
+      case 23:
+        _context9.n = 24;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 26:
-        _context9.n = 46;
+      case 24:
+        _context9.n = 45;
         break;
-      case 27:
+      case 25:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context9.n = 40;
+          _context9.n = 38;
           break;
         }
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context9.n = 33;
+          _context9.n = 31;
           break;
         }
-        _context9.n = 28;
+        _context9.n = 26;
         return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 28:
+      case 26:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 32;
+          _context9.n = 30;
           break;
         }
         messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 29;
+        _context9.n = 27;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 29:
+      case 27:
         _secondResult2 = _context9.v;
         if (!(channel.newMessageCount > 25)) {
-          _context9.n = 31;
+          _context9.n = 29;
           break;
         }
         messageQuery.reverse = false;
-        _context9.n = 30;
+        _context9.n = 28;
         return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 30:
+      case 28:
         _thirdResult = _context9.v;
         result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
         messageQuery.reverse = true;
-        _context9.n = 32;
+        _context9.n = 30;
         break;
-      case 31:
+      case 29:
         result.messages = [].concat(_secondResult2.messages, result.messages);
-      case 32:
-        _context9.n = 36;
-        break;
-      case 33:
+      case 30:
         _context9.n = 34;
+        break;
+      case 31:
+        _context9.n = 32;
         return effects.call(messageQuery.loadPrevious);
-      case 34:
+      case 32:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 36;
+          _context9.n = 34;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 35;
+        _context9.n = 33;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 35:
+      case 33:
         _secondResult3 = _context9.v;
         result.messages = [].concat(_secondResult3.messages, result.messages);
         result.hasNext = _secondResult3.hasNext;
-      case 36:
+      case 34:
         setMessagesToMap(channel.id, result.messages);
-        _context9.n = 37;
+        _context9.n = 35;
         return effects.put(setMessagesHasPrevAC(true));
-      case 37:
-        _context9.n = 38;
+      case 35:
+        _context9.n = 36;
         return effects.put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
-      case 38:
+      case 36:
         setAllMessages([].concat(result.messages));
-        _context9.n = 39;
+        _context9.n = 37;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 39:
-        _context9.n = 46;
+      case 37:
+        _context9.n = 45;
         break;
-      case 40:
+      case 38:
         setAllMessages([]);
         if (!(cachedMessages && cachedMessages.length)) {
-          _context9.n = 41;
+          _context9.n = 39;
           break;
         }
         setAllMessages([].concat(cachedMessages));
-        _context9.n = 41;
+        _context9.n = 39;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 41:
+      case 39:
         log.info('load message from server');
-        _context9.n = 42;
+        _context9.n = 40;
         return effects.call(messageQuery.loadPrevious);
-      case 42:
+      case 40:
         result = _context9.v;
         if (!(result.messages.length === 50)) {
-          _context9.n = 44;
+          _context9.n = 42;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        _context9.n = 43;
+        _context9.n = 41;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 43:
+      case 41:
         _secondResult4 = _context9.v;
         result.messages = [].concat(_secondResult4.messages, result.messages);
         result.hasNext = _secondResult4.hasNext;
-      case 44:
+      case 42:
+        updatedMessages = [];
         result.messages.forEach(function (msg) {
-          updateMessageOnMap(channel.id, {
+          var updatedMessage = updateMessageOnMap(channel.id, {
             messageId: msg.id,
             params: msg
           });
-          updateMessageOnAllMessages(msg.id, msg);
+          updateMessageOnAllMessages(msg.id, updatedMessage || msg);
+          updatedMessages.push(updatedMessage || msg);
         });
-        _context9.n = 45;
+        setMessagesToMap(channel.id, updatedMessages);
+        setAllMessages([].concat(updatedMessages));
+        _context9.n = 43;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(updatedMessages))));
+      case 43:
+        _context9.n = 44;
         return effects.put(setMessagesHasPrevAC(result.hasNext));
-      case 45:
-        _context9.n = 46;
+      case 44:
+        _context9.n = 45;
         return effects.put(setMessagesHasNextAC(false));
-      case 46:
+      case 45:
         pendingMessages = getPendingMessages(channel.id);
         if (!(pendingMessages && pendingMessages.length)) {
-          _context9.n = 48;
+          _context9.n = 47;
           break;
         }
         _messagesMap = {};
@@ -18624,40 +18676,40 @@ function getMessagesQuery(action) {
         filteredPendingMessages = pendingMessages.filter(function (msg) {
           return !_messagesMap[msg.tid || ''];
         });
-        _context9.n = 47;
+        _context9.n = 46;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 47:
+      case 46:
         for (index = 0; index < filteredPendingMessages.length; index++) {
           mes = filteredPendingMessages[index];
           removePendingMessageFromMap(channel === null || channel === void 0 ? void 0 : channel.id, mes.tid || mes.id);
         }
-      case 48:
-        _context9.n = 50;
+      case 47:
+        _context9.n = 49;
         break;
-      case 49:
+      case 48:
         if (!channel.isMockChannel) {
-          _context9.n = 50;
+          _context9.n = 49;
           break;
         }
-        _context9.n = 50;
+        _context9.n = 49;
         return effects.put(setMessagesAC([]));
-      case 50:
-        _context9.n = 52;
+      case 49:
+        _context9.n = 51;
         break;
-      case 51:
-        _context9.p = 51;
+      case 50:
+        _context9.p = 50;
         _t9 = _context9.v;
         log.error('error in message query', _t9);
-      case 52:
-        _context9.p = 52;
-        _context9.n = 53;
+      case 51:
+        _context9.p = 51;
+        _context9.n = 52;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 52:
+        return _context9.f(51);
       case 53:
-        return _context9.f(52);
-      case 54:
         return _context9.a(2);
     }
-  }, _marked7$1, null, [[1, 51, 52, 54]]);
+  }, _marked7$1, null, [[0, 50, 51, 53]]);
 }
 function loadMoreMessages(action) {
   var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t0;
@@ -23133,7 +23185,8 @@ var ChannelList = function ChannelList(_ref) {
     channelAvatarSize = _ref.channelAvatarSize,
     channelAvatarTextSize = _ref.channelAvatarTextSize,
     searchChannelInputFontSize = _ref.searchChannelInputFontSize,
-    searchedChannelsTitleFontSize = _ref.searchedChannelsTitleFontSize;
+    searchedChannelsTitleFontSize = _ref.searchedChannelsTitleFontSize,
+    searchChannelsPadding = _ref.searchChannelsPadding;
   var _useColor = useColors(),
     background = _useColor[THEME_COLORS.BACKGROUND],
     textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -23370,7 +23423,8 @@ var ChannelList = function ChannelList(_ref) {
   }, /*#__PURE__*/React__default.createElement(ChannelListHeader, {
     withCustomList: !!List,
     maxWidth: channelListRef.current && ((_channelListRef$curre2 = channelListRef.current) === null || _channelListRef$curre2 === void 0 ? void 0 : _channelListRef$curre2.clientWidth) || 0,
-    borderColor: borderColor
+    borderColor: borderColor,
+    padding: searchChannelsPadding
   }, Profile, showSearch && searchChannelsPosition === 'inline' ? (/*#__PURE__*/React__default.createElement(ChannelSearch, {
     inline: true,
     borderRadius: searchInputBorderRadius,
@@ -23693,8 +23747,10 @@ var NoData = styled__default.div(_templateObject8$4 || (_templateObject8$4 = _ta
   return props.color;
 });
 var LoadingWrapper = styled__default.div(_templateObject9$4 || (_templateObject9$4 = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  left: calc(50% - 20px);\n  top: calc(50% - 20px);\n"])));
-var ChannelListHeader = styled__default.div(_templateObject0$3 || (_templateObject0$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  flex-direction: row;\n  justify-content: space-between;\n  max-width: ", ";\n  padding: 12px;\n  padding-left: 22px;\n  box-sizing: border-box;\n  padding-left: ", ";\n  border-right: ", ";\n"])), function (props) {
+var ChannelListHeader = styled__default.div(_templateObject0$3 || (_templateObject0$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  flex-direction: row;\n  justify-content: space-between;\n  max-width: ", ";\n  padding: ", ";\n  padding-left: 22px;\n  box-sizing: border-box;\n  padding-left: ", ";\n  border-right: ", ";\n"])), function (props) {
   return props.maxWidth ? props.maxWidth + "px" : 'inherit';
+}, function (props) {
+  return props.padding || '12px';
 }, function (props) {
   return props.withoutProfile && '52px';
 }, function (props) {
@@ -24720,7 +24776,7 @@ var VolumeSlide = styled__default.input(_templateObject9$6 || (_templateObject9$
 var Progress = styled__default.input(_templateObject0$5 || (_templateObject0$5 = _taggedTemplateLiteralLoose(["\n  -webkit-appearance: none;\n  margin-right: 15px;\n  width: 100%;\n  height: 4px;\n  background: rgba(255, 255, 255, 0.6);\n  border-radius: 5px;\n  background-image: linear-gradient(#fff, #fff);\n  //background-size: 70% 100%;\n  background-repeat: no-repeat;\n  cursor: pointer;\n\n  &::-webkit-slider-thumb {\n    -webkit-appearance: none;\n    height: 16px;\n    width: 16px;\n    border-radius: 50%;\n    background: #fff;\n    cursor: pointer;\n    box-shadow: 0 0 2px 0 #555;\n    transition: all 0.3s ease-in-out;\n  }\n  &::-moz-range-thumb {\n    -webkit-appearance: none;\n    height: 16px;\n    width: 16px;\n    border-radius: 50%;\n    background: #fff;\n    cursor: pointer;\n    box-shadow: 0 0 2px 0 #555;\n    transition: all 0.3s ease-in-out;\n  }\n\n  &::-ms-thumb {\n    -webkit-appearance: none;\n    height: 16px;\n    width: 16px;\n    border-radius: 50%;\n    background: #fff;\n    cursor: pointer;\n    box-shadow: 0 0 2px 0 #555;\n    transition: all 0.3s ease-in-out;\n  }\n\n  &::-webkit-slider-thumb:hover {\n    background: #fff;\n  }\n  &::-moz-range-thumb:hover {\n    background: #fff;\n  }\n  &::-ms-thumb:hover {\n    background: #fff;\n  }\n\n  &::-webkit-slider-runnable-track {\n    -webkit-appearance: none;\n    box-shadow: none;\n    border: none;\n    background: transparent;\n    transition: all 0.3s ease-in-out;\n  }\n\n  &::-moz-range-track {\n    -webkit-appearance: none;\n    box-shadow: none;\n    border: none;\n    background: transparent;\n    transition: all 0.3s ease-in-out;\n  }\n  &::-ms-track {\n    -webkit-appearance: none;\n    box-shadow: none;\n    border: none;\n    background: transparent;\n    transition: all 0.3s ease-in-out;\n  }\n"])));
 var FullScreenWrapper = styled__default.div(_templateObject1$3 || (_templateObject1$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  margin-left: 16px;\n  cursor: pointer;\n  @media (max-width: 768px) {\n    margin-left: 12px;\n    & > svg {\n      width: 18px;\n      height: 18px;\n    }\n  }\n  @media (max-width: 480px) {\n    margin-left: auto;\n    & > svg {\n      width: 16px;\n      height: 16px;\n    }\n  }\n"])));
 
-var _templateObject$l, _templateObject2$i, _templateObject3$e, _templateObject4$c, _templateObject5$a, _templateObject6$8, _templateObject7$7, _templateObject8$7, _templateObject9$7, _templateObject0$6;
+var _templateObject$l, _templateObject2$i, _templateObject3$e, _templateObject4$c, _templateObject5$a, _templateObject6$8, _templateObject7$7, _templateObject8$7, _templateObject9$7, _templateObject0$6, _templateObject1$4;
 function ForwardMessagePopup(_ref) {
   var title = _ref.title,
     buttonText = _ref.buttonText,
@@ -24970,7 +25026,9 @@ function ForwardMessagePopup(_ref) {
       backgroundColor: 'transparent',
       checkedBackgroundColor: accentColor
     }));
-  }))))) : channels.map(function (channel) {
+  }))), !searchedChannels.chats_groups.length && !searchedChannels.channels.length && (/*#__PURE__*/React__default.createElement(NoResults, {
+    color: textSecondary
+  }, "No channels found")))) : channels.map(function (channel) {
     var _channel$metadata3;
     var isDirectChannel = channel.type === DEFAULT_CHANNEL_TYPE.DIRECT;
     var isSelfChannel = isDirectChannel && ((_channel$metadata3 = channel.metadata) === null || _channel$metadata3 === void 0 ? void 0 : _channel$metadata3.s);
@@ -25054,6 +25112,9 @@ var SelectedChannelName = styled__default.span(_templateObject9$7 || (_templateO
   return props.color;
 });
 var StyledSubtractSvg$1 = styled__default(SvgCross)(_templateObject0$6 || (_templateObject0$6 = _taggedTemplateLiteralLoose(["\n  cursor: pointer;\n  margin-left: 4px;\n  transform: translate(2px, 0);\n"])));
+var NoResults = styled__default.div(_templateObject1$4 || (_templateObject1$4 = _taggedTemplateLiteralLoose(["\n  font-size: 15px;\n  line-height: 16px;\n  font-weight: 500;\n  text-align: center;\n  margin-top: 20px;\n  color: ", ";\n"])), function (props) {
+  return props.color;
+});
 
 var _templateObject$m, _templateObject2$j;
 var CustomRadio = function CustomRadio(_ref) {
@@ -25227,7 +25288,7 @@ var DeleteOptionItem = styled__default.div(_templateObject2$k || (_templateObjec
   return props.color;
 });
 
-var _templateObject$o, _templateObject2$l, _templateObject3$f, _templateObject4$d, _templateObject5$b, _templateObject6$9, _templateObject7$8, _templateObject8$8, _templateObject9$8, _templateObject0$7, _templateObject1$4, _templateObject10$2, _templateObject11$2, _templateObject12$2, _templateObject13$2;
+var _templateObject$o, _templateObject2$l, _templateObject3$f, _templateObject4$d, _templateObject5$b, _templateObject6$9, _templateObject7$8, _templateObject8$8, _templateObject9$8, _templateObject0$7, _templateObject1$5, _templateObject10$2, _templateObject11$2, _templateObject12$2, _templateObject13$2;
 var SliderPopup = function SliderPopup(_ref) {
   var channel = _ref.channel,
     setIsSliderOpen = _ref.setIsSliderOpen,
@@ -25768,7 +25829,7 @@ var FileSize = styled__default.span(_templateObject9$8 || (_templateObject9$8 =
 var UserName = styled__default.h4(_templateObject0$7 || (_templateObject0$7 = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  color: ", ";\n  font-weight: 500;\n  font-size: 15px;\n  line-height: 18px;\n  letter-spacing: -0.2px;\n"])), function (props) {
   return props.color;
 });
-var ActionsWrapper = styled__default.div(_templateObject1$4 || (_templateObject1$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n"])));
+var ActionsWrapper = styled__default.div(_templateObject1$5 || (_templateObject1$5 = _taggedTemplateLiteralLoose(["\n  display: flex;\n"])));
 var IconWrapper = styled__default.span(_templateObject10$2 || (_templateObject10$2 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  cursor: pointer;\n  color: ", ";\n  margin: ", ";\n\n  & > svg {\n    width: 28px;\n    height: 28px;\n  }\n\n  ", "\n"])), function (props) {
   return props.color;
 }, function (props) {
@@ -29113,7 +29174,7 @@ var Timer$1 = styled__default.div(_templateObject6$c || (_templateObject6$c = _t
   return props.color;
 });
 
-var _templateObject$u, _templateObject2$q, _templateObject3$k, _templateObject4$h, _templateObject5$f, _templateObject6$d, _templateObject7$b, _templateObject8$a, _templateObject9$a, _templateObject0$9, _templateObject1$5, _templateObject10$3, _templateObject11$3;
+var _templateObject$u, _templateObject2$q, _templateObject3$k, _templateObject4$h, _templateObject5$f, _templateObject6$d, _templateObject7$b, _templateObject8$a, _templateObject9$a, _templateObject0$9, _templateObject1$6, _templateObject10$3, _templateObject11$3;
 var Attachment = function Attachment(_ref) {
   var attachment = _ref.attachment,
     _ref$isPreview = _ref.isPreview,
@@ -29226,7 +29287,15 @@ var Attachment = function Attachment(_ref) {
     if (downloadIsCancelled) {
       setDownloadIsCancelled(false);
       if (customDownloader) {
-        customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
+        customDownloader(attachment.url, false, function (progress) {
+          var loadedRes = progress.loaded && progress.loaded / progress.total;
+          var uploadPercent = loadedRes && loadedRes * 100;
+          setSizeProgress({
+            loaded: progress.loaded || 0,
+            total: progress.total || 0
+          });
+          setProgress(uploadPercent);
+        }, messageType).then(function (url) {
           downloadImage(url);
         });
       } else {
@@ -29354,23 +29423,35 @@ var Attachment = function Attachment(_ref) {
     }
   }, [attachmentUrl]);
   React.useEffect(function () {
-    if (connectionStatus === CONNECTION_STATUS.CONNECTED && attachment.id && !(attachment.type === attachmentTypes.file || attachment.type === attachmentTypes.link)) {
+    if (!attachment.attachmentUrl && connectionStatus === CONNECTION_STATUS.CONNECTED && attachment.id && !(attachment.type === attachmentTypes.file || attachment.type === attachmentTypes.link)) {
       getAttachmentUrlFromCache(attachment.url).then(function (cachedUrl) {
         try {
           if (attachment.type === 'image' && !isPreview) {
             if (cachedUrl) {
               setAttachmentUrl(cachedUrl);
+              dispatch(setUpdateMessageAttachmentAC(attachment.url, attachment.messageId, {
+                attachmentUrl: cachedUrl
+              }));
               setIsCached(true);
             } else {
               setIsCached(false);
               setDownloadingFile(true);
               if (customDownloader) {
-                customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
+                customDownloader(attachment.url, false, function (progress) {
+                  var loadedRes = progress.loaded && progress.loaded / progress.total;
+                  var uploadPercent = loadedRes && loadedRes * 100;
+                  setSizeProgress({
+                    loaded: progress.loaded || 0,
+                    total: progress.total || 0
+                  });
+                  setProgress(uploadPercent);
+                }, messageType).then(function (url) {
                   try {
                     downloadImage(url);
                     return Promise.resolve(fetch(url)).then(function (response) {
                       setAttachmentToCache(attachment.url, response);
                       setIsCached(true);
+                      setDownloadingFile(false);
                     });
                   } catch (e) {
                     return Promise.reject(e);
@@ -29409,7 +29490,15 @@ var Attachment = function Attachment(_ref) {
         log.info('error on get attachment url from cache. .. ', e);
         if (customDownloader) {
           setDownloadingFile(true);
-          customDownloader(attachment.url, false, function () {}, messageType).then(function (url) {
+          customDownloader(attachment.url, true, function (progress) {
+            var loadedRes = progress.loaded && progress.loaded / progress.total;
+            var uploadPercent = loadedRes && loadedRes * 100;
+            setSizeProgress({
+              loaded: progress.loaded || 0,
+              total: progress.total || 0
+            });
+            setProgress(uploadPercent);
+          }, messageType).then(function (url) {
             try {
               return Promise.resolve(fetch(url)).then(function (response) {
                 setAttachmentToCache(attachment.url, response);
@@ -29514,7 +29603,7 @@ var Attachment = function Attachment(_ref) {
     imageMinWidth: imageMinWidth,
     withPrefix: withPrefix,
     borderColor: borderColor
-  }, /*#__PURE__*/React__default.createElement(UploadPercent, {
+  }, !isPreview && (isInUploadingState || downloadingFile) && sizeProgress && sizeProgress.loaded < sizeProgress.total && (/*#__PURE__*/React__default.createElement(UploadPercent, {
     isRepliedMessage: isRepliedMessage,
     isDetailsView: isDetailsView,
     backgroundColor: overlayBackground2
@@ -29544,7 +29633,7 @@ var Attachment = function Attachment(_ref) {
     }
   })), sizeProgress && (/*#__PURE__*/React__default.createElement(SizeProgress, {
     color: textOnPrimary
-  }, bytesToSize(sizeProgress.loaded, 1), " / ", bytesToSize(sizeProgress.total, 1)))))))) : null, isPreview && (/*#__PURE__*/React__default.createElement(RemoveChosenFile, {
+  }, bytesToSize(sizeProgress.loaded, 1), " / ", bytesToSize(sizeProgress.total, 1))))))))) : null, isPreview && (/*#__PURE__*/React__default.createElement(RemoveChosenFile, {
     backgroundColor: background,
     color: iconInactive,
     onClick: function onClick() {
@@ -29780,7 +29869,7 @@ var AttachmentSize = styled__default.span(_templateObject0$9 || (_templateObject
 }, function (props) {
   return props.errorColor;
 });
-var AttachmentFileInfo = styled__default.div(_templateObject1$5 || (_templateObject1$5 = _taggedTemplateLiteralLoose(["\n  margin-left: 12px;\n  ", "\n"])), function (props) {
+var AttachmentFileInfo = styled__default.div(_templateObject1$6 || (_templateObject1$6 = _taggedTemplateLiteralLoose(["\n  margin-left: 12px;\n  ", "\n"])), function (props) {
   return props.isPreview && "line-height: 14px;\n      max-width: calc(100% - 44px);\n  ";
 });
 var AttachmentImg$1 = styled__default.img(_templateObject10$3 || (_templateObject10$3 = _taggedTemplateLiteralLoose(["\n  position: ", ";\n  border-radius: ", ";\n  padding: ", ";\n  box-sizing: border-box;\n  max-width: 100%;\n  max-height: ", ";\n  width: ", ";\n  height: ", ";\n  min-height: ", ";\n  min-width: ", ";\n  object-fit: cover;\n  visibility: ", ";\n  z-index: 2;\n"])), function (props) {
@@ -31525,7 +31614,7 @@ var FrequentlyEmojisContainer = styled__default.div(_templateObject5$i || (_temp
   return props.rtlDirection && '0';
 });
 
-var _templateObject$C, _templateObject2$x, _templateObject3$r, _templateObject4$n, _templateObject5$j, _templateObject6$g, _templateObject7$e, _templateObject8$d, _templateObject9$b, _templateObject0$a, _templateObject1$6, _templateObject10$4, _templateObject11$4, _templateObject12$3;
+var _templateObject$C, _templateObject2$x, _templateObject3$r, _templateObject4$n, _templateObject5$j, _templateObject6$g, _templateObject7$e, _templateObject8$d, _templateObject9$b, _templateObject0$a, _templateObject1$7, _templateObject10$4, _templateObject11$4, _templateObject12$3;
 var Message$1 = function Message(_ref) {
   var message = _ref.message,
     channel = _ref.channel,
@@ -31854,7 +31943,6 @@ var Message$1 = function Message(_ref) {
     if (isVisible && message.incoming && !(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
     })) && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
-      log.info('send displayed marker for message ... ', message);
       dispatch(markMessagesAsReadAC(channel.id, [message.id]));
     }
   };
@@ -32303,7 +32391,7 @@ var ReactionsContainer = styled__default.div(_templateObject9$b || (_templateObj
 var MessageReactionsCont = styled__default.div(_templateObject0$a || (_templateObject0$a = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: inline-flex;\n  max-width: 300px;\n  direction: ", ";\n  cursor: pointer;\n"])), function (props) {
   return props.rtlDirection && 'ltr';
 });
-var MessageStatus$1 = styled__default.span(_templateObject1$6 || (_templateObject1$6 = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  align-items: center;\n  margin-left: 4px;\n  text-align: right;\n  height: ", ";\n  & > svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
+var MessageStatus$1 = styled__default.span(_templateObject1$7 || (_templateObject1$7 = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  align-items: center;\n  margin-left: 4px;\n  text-align: right;\n  height: ", ";\n  & > svg {\n    height: 16px;\n    width: 16px;\n  }\n"])), function (props) {
   return props.height || '14px';
 });
 var HiddenMessageTime$1 = styled__default.span(_templateObject10$4 || (_templateObject10$4 = _taggedTemplateLiteralLoose(["\n  display: ", ";\n  font-weight: 400;\n  font-size: ", ";\n  color: ", ";\n"])), function (props) {
@@ -32348,7 +32436,7 @@ var HiddenMessageProperty;
   HiddenMessageProperty["hideAfterSendMessage"] = "hideAfterSendMessage";
 })(HiddenMessageProperty || (HiddenMessageProperty = {}));
 
-var _templateObject$D, _templateObject2$y, _templateObject3$s, _templateObject4$o, _templateObject5$k, _templateObject6$h, _templateObject7$f, _templateObject8$e, _templateObject9$c, _templateObject0$b, _templateObject1$7;
+var _templateObject$D, _templateObject2$y, _templateObject3$s, _templateObject4$o, _templateObject5$k, _templateObject6$h, _templateObject7$f, _templateObject8$e, _templateObject9$c, _templateObject0$b, _templateObject1$8;
 var loadFromServer = false;
 var loadDirection = '';
 var nextDisable = false;
@@ -32939,7 +33027,7 @@ var MessageList = function MessageList(_ref2) {
         clearVisibleMessagesMap();
       }
       if (channel) {
-        dispatch(getMessagesAC(channel, true, undefined, undefined, true));
+        dispatch(getMessagesAC(channel, undefined, undefined, undefined, true));
       }
       if (channel.id) {
         if (channel.newMessageCount && channel.newMessageCount > 0) {
@@ -33398,7 +33486,7 @@ var NoMessagesContainer = styled__default.div(_templateObject9$c || (_templateOb
 var NoMessagesTitle = styled__default.h4(_templateObject0$b || (_templateObject0$b = _taggedTemplateLiteralLoose(["\n  margin: 12px 0 8px;\n  font-family: Inter, sans-serif;\n  text-align: center;\n  font-size: 20px;\n  font-style: normal;\n  font-weight: 500;\n  line-height: 24px;\n  color: ", ";\n"])), function (props) {
   return props.color;
 });
-var NoMessagesText = styled__default.p(_templateObject1$7 || (_templateObject1$7 = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  text-align: center;\n  font-feature-settings:\n    'clig' off,\n    'liga' off;\n  font-family: Inter, sans-serif;\n  font-size: 15px;\n  font-style: normal;\n  font-weight: 400;\n  line-height: 20px;\n  color: ", ";\n"])), function (props) {
+var NoMessagesText = styled__default.p(_templateObject1$8 || (_templateObject1$8 = _taggedTemplateLiteralLoose(["\n  margin: 0;\n  text-align: center;\n  font-feature-settings:\n    'clig' off,\n    'liga' off;\n  font-family: Inter, sans-serif;\n  font-size: 15px;\n  font-style: normal;\n  font-weight: 400;\n  line-height: 20px;\n  color: ", ";\n"])), function (props) {
   return props.color;
 });
 
@@ -35983,7 +36071,7 @@ var RecordingAnimation = function RecordingAnimation(_ref2) {
   }));
 };
 
-var _templateObject$J, _templateObject2$E, _templateObject3$x, _templateObject4$s, _templateObject5$o, _templateObject6$k, _templateObject7$i, _templateObject8$g, _templateObject9$d, _templateObject0$c, _templateObject1$8, _templateObject10$5, _templateObject11$5, _templateObject12$4, _templateObject13$3, _templateObject14$2, _templateObject15$2, _templateObject16$2, _templateObject17$2, _templateObject18$2, _templateObject19$2, _templateObject20$2, _templateObject21$1, _templateObject22$1, _templateObject23$1, _templateObject24$1, _templateObject25$1, _templateObject26$1, _templateObject27$1, _templateObject28$1, _templateObject29$1, _templateObject30$1, _templateObject31$1, _templateObject32$1, _templateObject33$1, _templateObject34$1;
+var _templateObject$J, _templateObject2$E, _templateObject3$x, _templateObject4$s, _templateObject5$o, _templateObject6$k, _templateObject7$i, _templateObject8$g, _templateObject9$d, _templateObject0$c, _templateObject1$9, _templateObject10$5, _templateObject11$5, _templateObject12$4, _templateObject13$3, _templateObject14$2, _templateObject15$2, _templateObject16$2, _templateObject17$2, _templateObject18$2, _templateObject19$2, _templateObject20$2, _templateObject21$1, _templateObject22$1, _templateObject23$1, _templateObject24$1, _templateObject25$1, _templateObject26$1, _templateObject27$1, _templateObject28$1, _templateObject29$1, _templateObject30$1, _templateObject31$1, _templateObject32$1, _templateObject33$1, _templateObject34$1;
 function AutoFocusPlugin(_ref) {
   var messageForReply = _ref.messageForReply;
   var _useLexicalComposerCo = LexicalComposerContext.useLexicalComposerContext(),
@@ -37607,7 +37695,7 @@ var AddAttachmentIcon = styled__default.span(_templateObject0$c || (_templateObj
 }, function (props) {
   return props.hoverColor;
 });
-var SendMessageInputContainer = styled__default.div(_templateObject1$8 || (_templateObject1$8 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: flex-end;\n  justify-content: space-between;\n  position: relative;\n  min-height: ", ";\n  box-sizing: border-box;\n  border-radius: ", ";\n\n  & .dropdown-trigger.open {\n    color: #ccc;\n\n    & ", " {\n      & > svg {\n        color: ", ";\n      }\n    ;\n    }\n  }\n}\n"])), function (props) {
+var SendMessageInputContainer = styled__default.div(_templateObject1$9 || (_templateObject1$9 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: flex-end;\n  justify-content: space-between;\n  position: relative;\n  min-height: ", ";\n  box-sizing: border-box;\n  border-radius: ", ";\n\n  & .dropdown-trigger.open {\n    color: #ccc;\n\n    & ", " {\n      & > svg {\n        color: ", ";\n      }\n    ;\n    }\n  }\n}\n"])), function (props) {
   return props.minHeight || '36px';
 }, function (props) {
   return props.messageForReply ? '0 0 4px 4px' : '4px';
@@ -37903,7 +37991,7 @@ function SvgUnpin(props) {
   })));
 }
 
-var _templateObject$K, _templateObject2$F, _templateObject3$y, _templateObject4$t, _templateObject5$p, _templateObject6$l, _templateObject7$j, _templateObject8$h, _templateObject9$e, _templateObject0$d, _templateObject1$9, _templateObject10$6, _templateObject11$6, _templateObject12$5, _templateObject13$4, _templateObject14$3, _templateObject15$3, _templateObject16$3;
+var _templateObject$K, _templateObject2$F, _templateObject3$y, _templateObject4$t, _templateObject5$p, _templateObject6$l, _templateObject7$j, _templateObject8$h, _templateObject9$e, _templateObject0$d, _templateObject1$a, _templateObject10$6, _templateObject11$6, _templateObject12$5, _templateObject13$4, _templateObject14$3, _templateObject15$3, _templateObject16$3;
 var Actions = function Actions(_ref) {
   var _channel$metadata;
   var setActionsHeight = _ref.setActionsHeight,
@@ -38382,7 +38470,7 @@ var DefaultStarIcon = styled__default(SvgStar)(_templateObject7$j || (_templateO
 var DefaultUnpinIcon = styled__default(SvgUnpin)(_templateObject8$h || (_templateObject8$h = _taggedTemplateLiteralLoose([""])));
 var DefaultPinIcon = styled__default(SvgPin)(_templateObject9$e || (_templateObject9$e = _taggedTemplateLiteralLoose([""])));
 var DefaultMarkAsRead = styled__default(SvgMarkAsRead)(_templateObject0$d || (_templateObject0$d = _taggedTemplateLiteralLoose([""])));
-var DefaultMarkAsUnRead = styled__default(SvgMarkAsUnRead)(_templateObject1$9 || (_templateObject1$9 = _taggedTemplateLiteralLoose([""])));
+var DefaultMarkAsUnRead = styled__default(SvgMarkAsUnRead)(_templateObject1$a || (_templateObject1$a = _taggedTemplateLiteralLoose([""])));
 var DefaultBlockIcon = styled__default(SvgBlockChannel)(_templateObject10$6 || (_templateObject10$6 = _taggedTemplateLiteralLoose([""])));
 var DefaultReportIcon = styled__default(SvgReport)(_templateObject11$6 || (_templateObject11$6 = _taggedTemplateLiteralLoose([""])));
 var DefaultClearIcon = styled__default(SvgClear)(_templateObject12$5 || (_templateObject12$5 = _taggedTemplateLiteralLoose([""])));
@@ -39928,7 +40016,7 @@ var EditChannel = function EditChannel(_ref) {
   })));
 };
 
-var _templateObject$V, _templateObject2$O, _templateObject3$F, _templateObject4$z, _templateObject5$u, _templateObject6$p, _templateObject7$n, _templateObject8$l, _templateObject9$g, _templateObject0$e, _templateObject1$a, _templateObject10$7;
+var _templateObject$V, _templateObject2$O, _templateObject3$F, _templateObject4$z, _templateObject5$u, _templateObject6$p, _templateObject7$n, _templateObject8$l, _templateObject9$g, _templateObject0$e, _templateObject1$b, _templateObject10$7;
 var Details = function Details(_ref) {
   var _activeChannel$metada;
   var detailsTitleText = _ref.detailsTitleText,
@@ -40360,7 +40448,7 @@ var ChannelName$1 = styled__default(SectionHeader)(_templateObject0$e || (_templ
 }, function (props) {
   return props.uppercase && 'uppercase';
 });
-var ChannelNameWrapper = styled__default.div(_templateObject1$a || (_templateObject1$a = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n"])));
+var ChannelNameWrapper = styled__default.div(_templateObject1$b || (_templateObject1$b = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: center;\n"])));
 var EditButton = styled__default.span(_templateObject10$7 || (_templateObject10$7 = _taggedTemplateLiteralLoose(["\n  margin-left: 6px;\n  cursor: pointer;\n  color: #b2b6be;\n"])));
 
 var _templateObject$W;
@@ -40642,7 +40730,10 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
   var showScrollToNewMessageButton = reactRedux.useSelector(showScrollToNewMessageButtonSelector);
   var messages = reactRedux.useSelector(activeChannelMessagesSelector) || [];
   var handleScrollToBottom = function handleScrollToBottom() {
-    dispatch(markMessagesAsReadAC(channel.id, [channel.lastMessage.id]));
+    var user = getClient().user;
+    if (channel.lastMessage.user.id !== user.id) {
+      dispatch(markMessagesAsReadAC(channel.id, [channel.lastMessage.id]));
+    }
     handleScrollToLastMessage(channel.lastMessage.id);
   };
   var handleScrollToLastMessage = function handleScrollToLastMessage(messageId) {