sceyt-chat-react-uikit 1.7.9-beta.7 → 1.7.9-beta.9

package/index.modern.js

@@ -9410,7 +9410,7 @@ var channelSlice = createSlice({
       }
     },
     setChannels: function setChannels(state, action) {
-      state.channels = [].concat(action.payload.channels);
+      state.channels = sortChannelByLastMessage([].concat(action.payload.channels));
     },
     setSearchedChannels: function setSearchedChannels(state, action) {
       state.searchedChannels = action.payload.searchedChannels;
@@ -9583,7 +9583,7 @@ var channelSlice = createSlice({
           })
         });
       }
-      state.channels = [].concat(updatedChannels);
+      state.channels = sortChannelByLastMessage([].concat(updatedChannels));
     },
     updateChannelLastMessage: function updateChannelLastMessage(state, action) {
       var _action$payload5 = action.payload,
@@ -9603,6 +9603,7 @@ var channelSlice = createSlice({
             }
             return chan;
           });
+          state.channels = sortChannelByLastMessage(state.channels);
         }
       } else {
         var updatedChannels = state.channels.filter(function (chan) {
@@ -9632,6 +9633,7 @@ var channelSlice = createSlice({
         }
         return chan;
       });
+      state.channels = sortChannelByLastMessage(state.channels);
     },
     setChannelInfoOpenClose: function setChannelInfoOpenClose(state, action) {
       state.channelInfoIsOpen = action.payload.open;
@@ -10846,6 +10848,11 @@ function updatePendingMessageAC(channelId, messageId, updatedMessage) {
     updatedMessage: updatedMessage
   });
 }
+function setUnreadMessageIdAC(messageId) {
+  return setUnreadMessageId({
+    messageId: messageId
+  });
+}
 
 var MESSAGES_MAX_PAGE_COUNT = 80;
 var MESSAGES_MAX_LENGTH = 50;
@@ -11366,6 +11373,31 @@ var setPendingPollAction = function setPendingPollAction(action) {
   }
   store.dispatch(setPendingPollActionsMapAC(messageId, action));
 };
+var getCenterTwoMessages = function getCenterTwoMessages(messages) {
+  var mid = Math.floor(messages.length / 2);
+  if (messages.length % 2 === 0) {
+    return {
+      mid1: {
+        messageId: messages[mid - 1].id,
+        index: mid - 1
+      },
+      mid2: {
+        messageId: messages[mid].id,
+        index: mid
+      }
+    };
+  }
+  return {
+    mid1: {
+      messageId: messages[mid - 1].id,
+      index: mid - 1
+    },
+    mid2: {
+      messageId: messages[mid + 1].id,
+      index: mid + 1
+    }
+  };
+};
 
 var initialState$1 = {
   messagesLoadingState: null,
@@ -11412,7 +11444,8 @@ var initialState$1 = {
   pollVotesInitialCount: null,
   pendingPollActions: {},
   pendingMessagesMap: {},
-  unreadScrollTo: true
+  unreadScrollTo: true,
+  unreadMessageId: ''
 };
 var messageSlice = createSlice({
   name: 'messages',
@@ -11988,6 +12021,9 @@ var messageSlice = createSlice({
     },
     clearPendingMessagesMap: function clearPendingMessagesMap(state) {
       state.pendingMessagesMap = {};
+    },
+    setUnreadMessageId: function setUnreadMessageId(state, action) {
+      state.unreadMessageId = action.payload.messageId;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -12052,7 +12088,8 @@ var _messageSlice$actions = messageSlice.actions,
   setPendingMessage$1 = _messageSlice$actions.setPendingMessage,
   removePendingMessage = _messageSlice$actions.removePendingMessage,
   updatePendingMessage = _messageSlice$actions.updatePendingMessage,
-  updatePendingPollAction = _messageSlice$actions.updatePendingPollAction;
+  updatePendingPollAction = _messageSlice$actions.updatePendingPollAction,
+  setUnreadMessageId = _messageSlice$actions.setUnreadMessageId;
 var MessageReducer = messageSlice.reducer;
 
 var initialState$2 = {
@@ -17490,7 +17527,7 @@ function markMessagesRead(action) {
   }, _marked9, null, [[2, 9]]);
 }
 function markVoiceMessageAsPlayed(action) {
-  var payload, channelId, messageIds, channel, _t10;
+  var payload, channelId, messageIds, channel, messageListMarker, _iterator6, _step6, messageId, updateParams, _t10;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
@@ -17508,25 +17545,54 @@ function markVoiceMessageAsPlayed(action) {
           }
         }
         if (!channel) {
-          _context0.n = 3;
+          _context0.n = 7;
           break;
         }
         _context0.n = 3;
         return call(channel.markVoiceMessagesAsPlayed, messageIds);
       case 3:
+        messageListMarker = _context0.v;
+        _iterator6 = _createForOfIteratorHelperLoose(messageListMarker.messageIds);
+      case 4:
+        if ((_step6 = _iterator6()).done) {
+          _context0.n = 7;
+          break;
+        }
+        messageId = _step6.value;
+        updateParams = {
+          deliveryStatus: MESSAGE_DELIVERY_STATUS.PLAYED,
+          userMarkers: [{
+            user: messageListMarker.user,
+            createdAt: messageListMarker.createdAt,
+            messageId: messageId,
+            name: MESSAGE_DELIVERY_STATUS.READ
+          }]
+        };
         _context0.n = 5;
+        return put(updateMessageAC(messageId, updateParams));
+      case 5:
+        updateMessageOnMap(channel.id, {
+          messageId: messageId,
+          params: updateParams
+        });
+        updateMessageOnAllMessages(messageId, updateParams);
+      case 6:
+        _context0.n = 4;
         break;
-      case 4:
-        _context0.p = 4;
+      case 7:
+        _context0.n = 9;
+        break;
+      case 8:
+        _context0.p = 8;
         _t10 = _context0.v;
         log.error(_t10, 'Error on mark voice messages read');
-      case 5:
+      case 9:
         return _context0.a(2);
     }
-  }, _marked0, null, [[1, 4]]);
+  }, _marked0, null, [[1, 8]]);
 }
 function markMessagesDelivered(action) {
-  var payload, channelId, messageIds, channel, _t11;
+  var payload, channelId, messageIds, channel, messageListMarker, _iterator7, _step7, messageId, updateParams, _t11;
   return _regenerator().w(function (_context1) {
     while (1) switch (_context1.p = _context1.n) {
       case 0:
@@ -17544,23 +17610,52 @@ function markMessagesDelivered(action) {
           }
         }
         if (!channel) {
-          _context1.n = 3;
+          _context1.n = 7;
           break;
         }
         log.info('send delivered marker ', messageIds);
         _context1.n = 3;
         return call(channel.markMessagesAsReceived, messageIds);
       case 3:
+        messageListMarker = _context1.v;
+        _iterator7 = _createForOfIteratorHelperLoose(messageListMarker.messageIds);
+      case 4:
+        if ((_step7 = _iterator7()).done) {
+          _context1.n = 7;
+          break;
+        }
+        messageId = _step7.value;
+        updateParams = {
+          deliveryStatus: MESSAGE_DELIVERY_STATUS.DELIVERED,
+          userMarkers: [{
+            user: messageListMarker.user,
+            createdAt: messageListMarker.createdAt,
+            messageId: messageId,
+            name: MESSAGE_DELIVERY_STATUS.DELIVERED
+          }]
+        };
         _context1.n = 5;
+        return put(updateMessageAC(messageId, updateParams));
+      case 5:
+        updateMessageOnMap(channel.id, {
+          messageId: messageId,
+          params: updateParams
+        });
+        updateMessageOnAllMessages(messageId, updateParams);
+      case 6:
+        _context1.n = 4;
         break;
-      case 4:
-        _context1.p = 4;
+      case 7:
+        _context1.n = 9;
+        break;
+      case 8:
+        _context1.p = 8;
         _t11 = _context1.v;
         log.error(_t11, 'Error on mark messages delivered');
-      case 5:
+      case 9:
         return _context1.a(2);
     }
-  }, _marked1, null, [[1, 4]]);
+  }, _marked1, null, [[1, 8]]);
 }
 function switchChannel(action) {
   var payload, channel, updateActiveChannel, channelToSwitch, existingChannel, addChannel, _SceytChatClient5, fetchedChannel, channelFromMap, currentActiveChannel, _t12;
@@ -17958,18 +18053,18 @@ function leaveChannel(action) {
   }, _marked18, null, [[0, 6]]);
 }
 function deletePendingDeleteChannels() {
-  var pendingDeleteChannels, _iterator6, _step6, channel, resendableError, _t20;
+  var pendingDeleteChannels, _iterator8, _step8, channel, resendableError, _t20;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
         pendingDeleteChannels = getPendingDeleteChannels();
-        _iterator6 = _createForOfIteratorHelperLoose(pendingDeleteChannels);
+        _iterator8 = _createForOfIteratorHelperLoose(pendingDeleteChannels);
       case 1:
-        if ((_step6 = _iterator6()).done) {
+        if ((_step8 = _iterator8()).done) {
           _context19.n = 9;
           break;
         }
-        channel = _step6.value;
+        channel = _step8.value;
         _context19.p = 2;
         _context19.n = 3;
         return call(channel["delete"]);
@@ -19698,7 +19793,7 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
             break;
           }
           _context.n = 7;
-          return put(getMessagesAC(channel, false, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
+          return put(getMessagesAC(channel, true, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
         case 7:
           return _context.a(2);
       }
@@ -20001,22 +20096,10 @@ function sendMessage(action) {
                     return attachment;
                   });
                 }
-                messageUpdateData = {
-                  id: messageResponse.id,
-                  body: messageResponse.body,
-                  type: messageResponse.type,
-                  state: messageResponse.state,
-                  displayCount: messageResponse.displayCount,
-                  deliveryStatus: messageResponse.deliveryStatus,
+                messageUpdateData = _extends({}, messageResponse, {
                   attachments: attachmentsToUpdate,
-                  mentionedUsers: messageResponse.mentionedUsers,
-                  bodyAttributes: messageResponse.bodyAttributes,
-                  metadata: messageResponse.metadata,
-                  parentMessage: messageResponse.parentMessage,
-                  repliedInThread: messageResponse.repliedInThread,
-                  createdAt: messageResponse.createdAt,
                   channelId: channel.id
-                };
+                });
                 stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageResponse));
                 activeChannelId = getActiveChannelId();
                 if (!(activeChannelId === channel.id)) {
@@ -20129,7 +20212,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, _channel3, _channel4, isErrorResendable, _activeChannelId, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, _channel3, _channel4, isErrorResendable, _activeChannelId, _t3;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
@@ -20239,23 +20322,9 @@ function sendTextMessage(action) {
       case 11:
         messageResponse = _context5.v;
       case 12:
-        messageUpdateData = {
-          id: messageResponse.id,
-          body: messageResponse.body,
-          type: messageResponse.type,
-          state: messageResponse.state,
-          bodyAttributes: messageResponse.bodyAttributes,
-          displayCount: messageResponse.displayCount,
-          deliveryStatus: messageResponse.deliveryStatus,
-          attachments: messageResponse.attachments,
-          mentionedUsers: messageResponse.mentionedUsers,
-          metadata: messageResponse.metadata,
-          parentMessage: messageResponse.parentMessage,
-          repliedInThread: messageResponse.repliedInThread,
-          createdAt: messageResponse.createdAt,
-          pollDetails: (_messageResponse = messageResponse) === null || _messageResponse === void 0 ? void 0 : _messageResponse.pollDetails,
+        messageUpdateData = _extends({}, messageResponse, {
           channelId: channel.id
-        };
+        });
         activeChannelId = getActiveChannelId();
         if (!(activeChannelId === channel.id)) {
           _context5.n = 13;
@@ -20478,20 +20547,9 @@ function forwardMessage(action) {
         return call(channel.sendMessage, messageToSend);
       case 10:
         messageResponse = _context6.v;
-        messageUpdateData = {
-          id: messageResponse.id,
-          type: messageResponse.type,
-          state: messageResponse.state,
-          displayCount: messageResponse.displayCount,
-          deliveryStatus: messageResponse.deliveryStatus,
-          attachments: messageResponse.attachments,
-          mentionedUsers: messageResponse.mentionedUsers,
-          metadata: messageResponse.metadata,
-          parentMessage: messageResponse.parentMessage,
-          repliedInThread: messageResponse.repliedInThread,
-          createdAt: messageResponse.createdAt,
+        messageUpdateData = _extends({}, messageResponse, {
           channelId: channel.id
-        };
+        });
         if (!(channelId === activeChannelId)) {
           _context6.n = 12;
           break;
@@ -20893,7 +20951,7 @@ var getFilteredPendingMessages = function getFilteredPendingMessages(messages) {
   return filteredPendingMessages;
 };
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _messages$Math$floor, messages, centerMessageId, loadWithMessageId, allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, secondResult, thirdResult, fourthResult, _fourthResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _result$messages4, _filteredPendingMessages, updatedMessages, messageIdForLoad, _updatedMessages$, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, channelNewMessageCount, connectionState, SceytChatClient, _updatedChannel, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _result$messages$2, _result$messages2, messages, loadNextMessageId, loadPreviousMessageId, nextLoadLimit, previousLoadLimit, centerMessageIndex, firstResult, secondResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _result$messages4, _messages, _filteredPendingMessages, updatedMessages, messageIdForLoad, _updatedMessages$, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -20902,29 +20960,69 @@ function getMessagesQuery(action) {
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, highlight = _action$payload.highlight, behavior = _action$payload.behavior, scrollToMessage = _action$payload.scrollToMessage, networkChanged = _action$payload.networkChanged;
+        channelNewMessageCount = (channel === null || channel === void 0 ? void 0 : channel.newMessageCount) || 0;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
-          _context10.n = 87;
+          _context10.n = 77;
           break;
         }
         SceytChatClient = getClient();
+        if (!networkChanged) {
+          _context10.n = 8;
+          break;
+        }
+        _context10.p = 2;
+        _context10.n = 3;
+        return call(SceytChatClient.getChannel, channel.id, true);
+      case 3:
+        _updatedChannel = _context10.v;
+        if (!(_updatedChannel && _updatedChannel !== null && _updatedChannel !== void 0 && _updatedChannel.id)) {
+          _context10.n = 6;
+          break;
+        }
+        _context10.n = 4;
+        return put(updateChannelDataAC(channel.id, _extends({}, _updatedChannel)));
+      case 4:
+        channelNewMessageCount = (_updatedChannel === null || _updatedChannel === void 0 ? void 0 : _updatedChannel.newMessageCount) || 0;
+        if (!(channelNewMessageCount !== channel.newMessageCount)) {
+          _context10.n = 6;
+          break;
+        }
+        _context10.n = 5;
+        return put(updateChannelDataAC(channel.id, {
+          newMessageCount: channelNewMessageCount
+        }));
+      case 5:
+        updateChannelOnAllChannels(channel.id, {
+          newMessageCount: channelNewMessageCount
+        });
+        _context10.n = 6;
+        return put(setUnreadMessageIdAC(channel.lastDisplayedMessageId));
+      case 6:
+        _context10.n = 8;
+        break;
+      case 7:
+        _context10.p = 7;
+        _t0 = _context10.v;
+        log.error('error to get updated channel in get messages query', _t0);
+      case 8:
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channel.id);
         messageQueryBuilder.limit(limit || MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 3;
+          _context10.n = 10;
           break;
         }
-        _context10.n = 2;
+        _context10.n = 9;
         return call(messageQueryBuilder.build);
-      case 2:
-        _t0 = _context10.v;
-        _context10.n = 4;
+      case 9:
+        _t1 = _context10.v;
+        _context10.n = 11;
         break;
-      case 3:
-        _t0 = null;
-      case 4:
-        messageQuery = _t0;
+      case 10:
+        _t1 = null;
+      case 11:
+        messageQuery = _t1;
         query.messageQuery = messageQuery;
         cachedMessages = Object.values(getMessagesFromMap(channel.id) || {}).sort(function (a, b) {
           return Number(a.id) - Number(b.id);
@@ -20934,161 +21032,126 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context10.n = 22;
+          _context10.n = 29;
           break;
         }
-        if (!(channel.newMessageCount && channel.newMessageCount > 0)) {
-          _context10.n = 15;
+        if (!(channelNewMessageCount && channelNewMessageCount > 0)) {
+          _context10.n = 22;
           break;
         }
         setHasPrevCached(false);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context10.n = 8;
+          _context10.n = 15;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 6;
+          _context10.n = 13;
           break;
         }
-        _context10.n = 5;
+        _context10.n = 12;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 5:
-        _t1 = _context10.v;
-        _context10.n = 7;
+      case 12:
+        _t10 = _context10.v;
+        _context10.n = 14;
         break;
-      case 6:
-        _t1 = {
+      case 13:
+        _t10 = {
           messages: [],
           hasNext: false
         };
-      case 7:
-        result = _t1;
-        _context10.n = 12;
+      case 14:
+        result = _t10;
+        _context10.n = 19;
         break;
-      case 8:
+      case 15:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 10;
+          _context10.n = 17;
           break;
         }
-        _context10.n = 9;
+        _context10.n = 16;
         return call(messageQuery.loadPrevious);
-      case 9:
-        _t10 = _context10.v;
-        _context10.n = 11;
+      case 16:
+        _t11 = _context10.v;
+        _context10.n = 18;
         break;
-      case 10:
-        _t10 = {
+      case 17:
+        _t11 = {
           messages: [],
           hasNext: false
         };
-      case 11:
-        result = _t10;
-      case 12:
-        _context10.n = 13;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 13:
-        setMessagesToMap(channel.id, result.messages, (_result$messages$ = result.messages[0]) === null || _result$messages$ === void 0 ? void 0 : _result$messages$.id, (_result$messages = result.messages[result.messages.length - 1]) === null || _result$messages === void 0 ? void 0 : _result$messages.id);
-        setAllMessages(result.messages);
-        _context10.n = 14;
-        return put(setMessagesHasPrevAC(true));
-      case 14:
-        _context10.n = 17;
-        break;
-      case 15:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context10.n = 16;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 16:
-        _context10.n = 17;
-        return put(setMessagesHasPrevAC(true));
-      case 17:
-        _context10.n = 18;
-        return put(setMessagesHasNextAC(false));
       case 18:
-        setHasNextCached(false);
-        if (!(messageId && scrollToMessage)) {
-          _context10.n = 21;
-          break;
-        }
-        if (!(channel.newMessageCount && channel.newMessageCount > 0)) {
-          _context10.n = 20;
-          break;
-        }
-        _context10.n = 19;
-        return put(setScrollToMessagesAC(channel.lastDisplayedMessageId, highlight, behavior));
+        result = _t11;
       case 19:
-        _context10.n = 21;
-        break;
+        _context10.n = 20;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 20:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$ = result.messages[0]) === null || _result$messages$ === void 0 ? void 0 : _result$messages$.id, (_result$messages = result.messages[result.messages.length - 1]) === null || _result$messages === void 0 ? void 0 : _result$messages.id);
+        setAllMessages(result.messages);
         _context10.n = 21;
-        return put(scrollToNewMessageAC(true));
+        return put(setMessagesHasPrevAC(true));
       case 21:
-        _context10.n = 80;
+        _context10.n = 24;
         break;
       case 22:
-        if (!messageId) {
-          _context10.n = 52;
-          break;
-        }
-        messages = store.getState().MessageReducer.activeChannelMessages;
-        centerMessageId = (_messages$Math$floor = messages[Math.floor(messages.length / 2)]) === null || _messages$Math$floor === void 0 ? void 0 : _messages$Math$floor.id;
-        loadWithMessageId = networkChanged && (messages === null || messages === void 0 ? void 0 : messages.length) > 0 ? centerMessageId : messageId;
-        allMessages = getAllMessages();
-        messageIndex = allMessages.findIndex(function (msg) {
-          return msg.id === loadWithMessageId;
-        });
-        maxLengthPart = MESSAGES_MAX_LENGTH / 2;
-        if (!(messageIndex >= maxLengthPart)) {
-          _context10.n = 25;
-          break;
-        }
-        result.messages = allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
+        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context10.n = 23;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 23:
-        setHasPrevCached(messageIndex > maxLengthPart);
-        setHasNextCached(allMessages.length > maxLengthPart);
         _context10.n = 24;
         return put(setMessagesHasPrevAC(true));
       case 24:
-        _context10.n = 48;
-        break;
+        _context10.n = 25;
+        return put(setMessagesHasNextAC(false));
       case 25:
-        messageQuery.limit = MESSAGES_MAX_LENGTH;
-        log.info('load by message id from server ...............', loadWithMessageId);
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+        setHasNextCached(false);
+        if (!(messageId && scrollToMessage)) {
+          _context10.n = 28;
+          break;
+        }
+        if (!(channelNewMessageCount && channelNewMessageCount > 0)) {
           _context10.n = 27;
           break;
         }
         _context10.n = 26;
-        return call(messageQuery.loadNearMessageId, loadWithMessageId);
+        return put(setScrollToMessagesAC(channel.lastDisplayedMessageId, highlight, behavior));
       case 26:
-        _t11 = _context10.v;
         _context10.n = 28;
         break;
       case 27:
-        _t11 = {
-          messages: [],
-          hasNext: false
-        };
+        _context10.n = 28;
+        return put(scrollToNewMessageAC(true));
       case 28:
-        result = _t11;
-        _context10.n = 29;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        _context10.n = 70;
+        break;
       case 29:
-        if (!(result.messages.length === 50)) {
-          _context10.n = 47;
+        if (!messageId) {
+          _context10.n = 40;
           break;
         }
-        messageQuery.limit = (MESSAGES_MAX_PAGE_COUNT - 50) / 2;
+        messages = store.getState().MessageReducer.activeChannelMessages;
+        loadNextMessageId = '';
+        loadPreviousMessageId = '';
+        nextLoadLimit = MESSAGES_MAX_PAGE_COUNT / 2;
+        previousLoadLimit = MESSAGES_MAX_PAGE_COUNT / 2;
+        if (networkChanged) {
+          centerMessageIndex = getCenterTwoMessages(messages);
+          loadPreviousMessageId = centerMessageIndex.mid2.messageId;
+          loadNextMessageId = centerMessageIndex.mid1.messageId;
+          previousLoadLimit = centerMessageIndex.mid2.index;
+          nextLoadLimit = messages.length - centerMessageIndex.mid1.index - 1;
+        } else if (messageId) {
+          loadPreviousMessageId = messageId;
+        }
+        messageQuery.limit = previousLoadLimit;
+        log.info('load by message id from server ...............', messageId);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context10.n = 31;
           break;
         }
         _context10.n = 30;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
+        return call(messageQuery.loadPreviousMessageId, loadPreviousMessageId);
       case 30:
         _t12 = _context10.v;
         _context10.n = 32;
@@ -21099,235 +21162,185 @@ function getMessagesQuery(action) {
           hasNext: false
         };
       case 32:
-        secondResult = _t12;
-        result.messages = [].concat(secondResult.messages, result.messages);
-        _context10.n = 33;
-        return put(addMessagesAC(JSON.parse(JSON.stringify(secondResult.messages)), MESSAGE_LOAD_DIRECTION.PREV));
-      case 33:
-        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length;
+        firstResult = _t12;
+        if (!networkChanged && firstResult.messages.length > 0) {
+          loadNextMessageId = firstResult.messages[firstResult.messages.length - 1].id;
+        } else if (!networkChanged && !firstResult.messages.length) {
+          loadNextMessageId = '0';
+        }
         messageQuery.reverse = false;
+        messageQuery.limit = nextLoadLimit;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 35;
+          _context10.n = 34;
           break;
         }
-        _context10.n = 34;
-        return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 34:
+        _context10.n = 33;
+        return call(messageQuery.loadNextMessageId, loadNextMessageId);
+      case 33:
         _t13 = _context10.v;
-        _context10.n = 36;
+        _context10.n = 35;
         break;
-      case 35:
+      case 34:
         _t13 = {
           messages: [],
           hasNext: false
         };
+      case 35:
+        secondResult = _t13;
+        result.messages = [].concat(firstResult.messages, secondResult.messages);
+        _context10.n = 36;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 36:
-        thirdResult = _t13;
-        result.messages = [].concat(result.messages, thirdResult.messages);
-        _context10.n = 37;
-        return put(addMessagesAC(JSON.parse(JSON.stringify(thirdResult.messages)), MESSAGE_LOAD_DIRECTION.NEXT));
-      case 37:
-        if (!(secondResult.hasNext && !thirdResult.hasNext)) {
-          _context10.n = 42;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length - result.messages.length;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 39;
-          break;
-        }
-        _context10.n = 38;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 38:
-        _t14 = _context10.v;
-        _context10.n = 40;
-        break;
-      case 39:
-        _t14 = {
-          messages: [],
-          hasNext: false
-        };
-      case 40:
-        fourthResult = _t14;
-        result.messages = [].concat(fourthResult.messages, result.messages);
-        _context10.n = 41;
-        return put(addMessagesAC(JSON.parse(JSON.stringify(fourthResult.messages)), MESSAGE_LOAD_DIRECTION.PREV));
-      case 41:
-        _context10.n = 46;
-        break;
-      case 42:
-        if (!(!secondResult.hasNext && thirdResult.hasNext)) {
-          _context10.n = 46;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length - result.messages.length;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 44;
-          break;
-        }
-        _context10.n = 43;
-        return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 43:
-        _t15 = _context10.v;
-        _context10.n = 45;
-        break;
-      case 44:
-        _t15 = {
-          messages: [],
-          hasNext: false
-        };
-      case 45:
-        _fourthResult = _t15;
-        result.messages = [].concat(result.messages, _fourthResult.messages);
-        _context10.n = 46;
-        return put(addMessagesAC(JSON.parse(JSON.stringify(_fourthResult.messages)), MESSAGE_LOAD_DIRECTION.NEXT));
-      case 46:
-        messageQuery.reverse = true;
-      case 47:
         setMessagesToMap(channel.id, result.messages, (_result$messages$2 = result.messages[0]) === null || _result$messages$2 === void 0 ? void 0 : _result$messages$2.id, (_result$messages2 = result.messages[result.messages.length - 1]) === null || _result$messages2 === void 0 ? void 0 : _result$messages2.id);
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 48:
-        _context10.n = 49;
+        _context10.n = 37;
         return put(setMessagesHasNextAC(true));
-      case 49:
-        if (!scrollToMessage) {
-          _context10.n = 50;
+      case 37:
+        if (!(scrollToMessage && !networkChanged)) {
+          _context10.n = 38;
           break;
         }
-        _context10.n = 50;
-        return put(setScrollToMessagesAC(loadWithMessageId, highlight, behavior));
-      case 50:
-        _context10.n = 51;
+        _context10.n = 38;
+        return put(setScrollToMessagesAC(messageId, highlight, behavior));
+      case 38:
+        _context10.n = 39;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 51:
-        _context10.n = 80;
+      case 39:
+        _context10.n = 70;
         break;
-      case 52:
-        if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context10.n = 64;
+      case 40:
+        if (!(channelNewMessageCount && channel.lastDisplayedMessageId)) {
+          _context10.n = 54;
           break;
         }
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context10.n = 56;
+          _context10.n = 44;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 54;
+          _context10.n = 42;
           break;
         }
-        _context10.n = 53;
+        _context10.n = 41;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 53:
-        _t16 = _context10.v;
-        _context10.n = 55;
+      case 41:
+        _t14 = _context10.v;
+        _context10.n = 43;
         break;
-      case 54:
-        _t16 = {
+      case 42:
+        _t14 = {
           messages: [],
           hasNext: false
         };
-      case 55:
-        result = _t16;
-        _context10.n = 60;
+      case 43:
+        result = _t14;
+        _context10.n = 48;
         break;
-      case 56:
+      case 44:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 58;
+          _context10.n = 46;
           break;
         }
-        _context10.n = 57;
+        _context10.n = 45;
         return call(messageQuery.loadPrevious);
-      case 57:
-        _t17 = _context10.v;
-        _context10.n = 59;
+      case 45:
+        _t15 = _context10.v;
+        _context10.n = 47;
         break;
-      case 58:
-        _t17 = {
+      case 46:
+        _t15 = {
           messages: [],
           hasNext: false
         };
-      case 59:
-        result = _t17;
-      case 60:
-        _context10.n = 61;
+      case 47:
+        result = _t15;
+      case 48:
+        _context10.n = 49;
         return put(setMessagesHasPrevAC(true));
-      case 61:
-        _context10.n = 62;
+      case 49:
+        _context10.n = 50;
         return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
-      case 62:
+      case 50:
         setMessagesToMap(channel.id, result.messages, (_result$messages$3 = result.messages[0]) === null || _result$messages$3 === void 0 ? void 0 : _result$messages$3.id, (_result$messages3 = result.messages[result.messages.length - 1]) === null || _result$messages3 === void 0 ? void 0 : _result$messages3.id);
         setAllMessages([].concat(result.messages));
-        _context10.n = 63;
+        _context10.n = 51;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 63:
-        _context10.n = 80;
+      case 51:
+        _context10.n = 52;
+        return put(scrollToNewMessageAC(false));
+      case 52:
+        _context10.n = 53;
+        return put(setUnreadScrollToAC(true));
+      case 53:
+        _context10.n = 70;
         break;
-      case 64:
+      case 54:
         if (!(cachedMessages && cachedMessages.length)) {
-          _context10.n = 67;
+          _context10.n = 57;
           break;
         }
-        _context10.n = 65;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 65:
-        _context10.n = 66;
+        _messages = getFromAllMessagesByMessageId('', '', true);
+        _context10.n = 55;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(_messages))));
+      case 55:
+        _context10.n = 56;
         return delay(0);
-      case 66:
-        _filteredPendingMessages = getFilteredPendingMessages(cachedMessages);
-        _context10.n = 67;
+      case 56:
+        _filteredPendingMessages = getFilteredPendingMessages(_messages);
+        _context10.n = 57;
         return put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 67:
+      case 57:
         log.info('load message from server');
         result = {
           messages: [],
           hasNext: false
         };
         if (!((channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage4 = channel.lastMessage) === null || _channel$lastMessage4 === void 0 ? void 0 : _channel$lastMessage4.id))) {
-          _context10.n = 71;
+          _context10.n = 61;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 69;
+          _context10.n = 59;
           break;
         }
-        _context10.n = 68;
+        _context10.n = 58;
         return call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
-      case 68:
-        _t18 = _context10.v;
-        _context10.n = 70;
+      case 58:
+        _t16 = _context10.v;
+        _context10.n = 60;
         break;
-      case 69:
-        _t18 = {
+      case 59:
+        _t16 = {
           messages: [],
           hasNext: false
         };
-      case 70:
-        result = _t18;
-        _context10.n = 75;
+      case 60:
+        result = _t16;
+        _context10.n = 65;
         break;
-      case 71:
+      case 61:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 73;
+          _context10.n = 63;
           break;
         }
-        _context10.n = 72;
+        _context10.n = 62;
         return call(messageQuery.loadPrevious);
-      case 72:
-        _t19 = _context10.v;
-        _context10.n = 74;
+      case 62:
+        _t17 = _context10.v;
+        _context10.n = 64;
         break;
-      case 73:
-        _t19 = {
+      case 63:
+        _t17 = {
           messages: [],
           hasNext: false
         };
-      case 74:
-        result = _t19;
-      case 75:
+      case 64:
+        result = _t17;
+      case 65:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -21339,85 +21352,85 @@ function getMessagesQuery(action) {
         });
         messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
         if (!updatedMessages.length) {
-          _context10.n = 79;
+          _context10.n = 69;
           break;
         }
-        _context10.n = 76;
+        _context10.n = 66;
         return call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
-      case 76:
-        _context10.n = 77;
+      case 66:
+        _context10.n = 67;
         return put(setMessagesHasPrevAC(true));
-      case 77:
-        _context10.n = 78;
+      case 67:
+        _context10.n = 68;
         return put(setMessagesHasNextAC(false));
-      case 78:
-        _context10.n = 80;
+      case 68:
+        _context10.n = 70;
         break;
-      case 79:
+      case 69:
         if (!(!(cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length) && !((_result$messages4 = result.messages) !== null && _result$messages4 !== void 0 && _result$messages4.length))) {
-          _context10.n = 80;
+          _context10.n = 70;
           break;
         }
-        _context10.n = 80;
+        _context10.n = 70;
         return put(setMessagesAC([]));
-      case 80:
+      case 70:
         filteredPendingMessages = getFilteredPendingMessages(result.messages);
-        _context10.n = 81;
+        _context10.n = 71;
         return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 81:
+      case 71:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 83;
+          _context10.n = 73;
           break;
         }
-        _context10.n = 82;
+        _context10.n = 72;
         return put(setWaitToSendPendingMessagesAC(false));
-      case 82:
-        _context10.n = 83;
+      case 72:
+        _context10.n = 73;
         return spawn(sendPendingMessages, connectionState);
-      case 83:
-        _context10.n = 84;
+      case 73:
+        _context10.n = 74;
         return call(SceytChatClient.getChannel, channel.id, true);
-      case 84:
+      case 74:
         updatedChannel = _context10.v;
         if (!(updatedChannel && updatedChannel !== null && updatedChannel !== void 0 && updatedChannel.lastMessage)) {
-          _context10.n = 86;
+          _context10.n = 76;
           break;
         }
-        _context10.n = 85;
+        _context10.n = 75;
         return put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
-      case 85:
+      case 75:
         updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
-      case 86:
-        _context10.n = 88;
+      case 76:
+        _context10.n = 78;
         break;
-      case 87:
+      case 77:
         if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
-          _context10.n = 88;
+          _context10.n = 78;
           break;
         }
-        _context10.n = 88;
+        _context10.n = 78;
         return put(setMessagesAC([]));
-      case 88:
-        _context10.n = 90;
+      case 78:
+        _context10.n = 80;
         break;
-      case 89:
-        _context10.p = 89;
-        _t20 = _context10.v;
-        log.error('error in message query', _t20);
-      case 90:
-        _context10.p = 90;
-        _context10.n = 91;
+      case 79:
+        _context10.p = 79;
+        _t18 = _context10.v;
+        log.error('error in message query', _t18);
+      case 80:
+        _context10.p = 80;
+        _context10.n = 81;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 91:
-        return _context10.f(90);
-      case 92:
+      case 81:
+        return _context10.f(80);
+      case 82:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 89, 90, 92]]);
+  }, _marked7$1, null, [[2, 7], [0, 79, 80, 82]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t21;
+  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t19;
   return _regenerator().w(function (_context11) {
     while (1) switch (_context11.p = _context11.n) {
       case 0:
@@ -21467,15 +21480,15 @@ function getMessageQuery(action) {
         break;
       case 7:
         _context11.p = 7;
-        _t21 = _context11.v;
-        log.error('error in message query', _t21);
+        _t19 = _context11.v;
+        log.error('error in message query', _t19);
       case 8:
         return _context11.a(2);
     }
   }, _marked8$1, null, [[0, 7]]);
 }
 function loadMoreMessages(action) {
-  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _result$messages$4, _result$messages5, _result$messages$5, _result$messages6, _t22;
+  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _result$messages$4, _result$messages5, _result$messages$5, _result$messages6, _t20;
   return _regenerator().w(function (_context12) {
     while (1) switch (_context12.p = _context12.n) {
       case 0:
@@ -21588,15 +21601,15 @@ function loadMoreMessages(action) {
         break;
       case 18:
         _context12.p = 18;
-        _t22 = _context12.v;
-        log.error('error in load more messages', _t22);
+        _t20 = _context12.v;
+        log.error('error in load more messages', _t20);
       case 19:
         return _context12.a(2);
     }
   }, _marked9$1, null, [[0, 18]]);
 }
 function addReaction(action) {
-  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t23;
+  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t21;
   return _regenerator().w(function (_context13) {
     while (1) switch (_context13.p = _context13.n) {
       case 0:
@@ -21649,15 +21662,15 @@ function addReaction(action) {
         break;
       case 8:
         _context13.p = 8;
-        _t23 = _context13.v;
-        log.error('ERROR in add reaction', _t23.message);
+        _t21 = _context13.v;
+        log.error('ERROR in add reaction', _t21.message);
       case 9:
         return _context13.a(2);
     }
   }, _marked0$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
-  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t24;
+  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t22;
   return _regenerator().w(function (_context14) {
     while (1) switch (_context14.p = _context14.n) {
       case 0:
@@ -21705,15 +21718,15 @@ function deleteReaction(action) {
         break;
       case 7:
         _context14.p = 7;
-        _t24 = _context14.v;
-        log.error('ERROR in delete reaction', _t24.message);
+        _t22 = _context14.v;
+        log.error('ERROR in delete reaction', _t22.message);
       case 8:
         return _context14.a(2);
     }
   }, _marked1$1, null, [[0, 7]]);
 }
 function getReactions(action) {
-  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t25;
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t23;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -21748,15 +21761,15 @@ function getReactions(action) {
         break;
       case 6:
         _context15.p = 6;
-        _t25 = _context15.v;
-        log.error('ERROR in get reactions', _t25.message);
+        _t23 = _context15.v;
+        log.error('ERROR in get reactions', _t23.message);
       case 7:
         return _context15.a(2);
     }
   }, _marked10$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
-  var payload, limit, ReactionQuery, result, _t26;
+  var payload, limit, ReactionQuery, result, _t24;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.p = _context16.n) {
       case 0:
@@ -21784,15 +21797,15 @@ function loadMoreReactions(action) {
         break;
       case 5:
         _context16.p = 5;
-        _t26 = _context16.v;
-        log.error('ERROR in load more reactions', _t26.message);
+        _t24 = _context16.v;
+        log.error('ERROR in load more reactions', _t24.message);
       case 6:
         return _context16.a(2);
     }
   }, _marked11$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t27;
+  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t25;
   return _regenerator().w(function (_context17) {
     while (1) switch (_context17.p = _context17.n) {
       case 0:
@@ -21870,15 +21883,15 @@ function getMessageAttachments(action) {
         break;
       case 13:
         _context17.p = 13;
-        _t27 = _context17.v;
-        log.error('error in message attachment query', _t27);
+        _t25 = _context17.v;
+        log.error('error in message attachment query', _t25);
       case 14:
         return _context17.a(2);
     }
   }, _marked12$1, null, [[0, 13]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t28;
+  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t26;
   return _regenerator().w(function (_context18) {
     while (1) switch (_context18.p = _context18.n) {
       case 0:
@@ -21922,15 +21935,15 @@ function loadMoreMessageAttachments(action) {
         break;
       case 8:
         _context18.p = 8;
-        _t28 = _context18.v;
-        log.error('error in message attachment query', _t28);
+        _t26 = _context18.v;
+        log.error('error in message attachment query', _t26);
       case 9:
         return _context18.a(2);
     }
   }, _marked13$1, null, [[0, 8]]);
 }
 function pauseAttachmentUploading(action) {
-  var attachmentId, isPaused, _t29;
+  var attachmentId, isPaused, _t27;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -21952,15 +21965,15 @@ function pauseAttachmentUploading(action) {
         break;
       case 2:
         _context19.p = 2;
-        _t29 = _context19.v;
-        log.error('error in pause attachment uploading', _t29);
+        _t27 = _context19.v;
+        log.error('error in pause attachment uploading', _t27);
       case 3:
         return _context19.a(2);
     }
   }, _marked14$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t30;
+  var attachmentId, isResumed, _t28;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.p = _context20.n) {
       case 0:
@@ -21983,15 +21996,15 @@ function resumeAttachmentUploading(action) {
         break;
       case 2:
         _context20.p = 2;
-        _t30 = _context20.v;
-        log.error('error in resume attachment uploading', _t30);
+        _t28 = _context20.v;
+        log.error('error in resume attachment uploading', _t28);
       case 3:
         return _context20.a(2);
     }
   }, _marked15$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
-  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t31;
+  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t29;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
@@ -22021,8 +22034,8 @@ function getMessageMarkers(action) {
         break;
       case 5:
         _context21.p = 5;
-        _t31 = _context21.v;
-        log.error('error in get message markers', _t31);
+        _t29 = _context21.v;
+        log.error('error in get message markers', _t29);
       case 6:
         _context21.p = 6;
         _context21.n = 7;
@@ -22138,7 +22151,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t32;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t30;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
@@ -22230,8 +22243,8 @@ function addPollVote(action) {
         break;
       case 7:
         _context24.p = 7;
-        _t32 = _context24.v;
-        log.error('error in add poll vote', _t32);
+        _t30 = _context24.v;
+        log.error('error in add poll vote', _t30);
       case 8:
         return _context24.a(2);
     }
@@ -22315,7 +22328,7 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t33;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t31;
   return _regenerator().w(function (_context27) {
     while (1) switch (_context27.p = _context27.n) {
       case 0:
@@ -22393,8 +22406,8 @@ function deletePollVote(action) {
         break;
       case 8:
         _context27.p = 8;
-        _t33 = _context27.v;
-        log.error('error in delete poll vote', _t33);
+        _t31 = _context27.v;
+        log.error('error in delete poll vote', _t31);
       case 9:
         return _context27.a(2);
     }
@@ -22472,7 +22485,7 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
   }, _marked24$1);
 }
 function closePoll(action) {
-  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t34;
+  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t32;
   return _regenerator().w(function (_context30) {
     while (1) switch (_context30.p = _context30.n) {
       case 0:
@@ -22505,8 +22518,8 @@ function closePoll(action) {
         break;
       case 4:
         _context30.p = 4;
-        _t34 = _context30.v;
-        log.error('error in close poll', _t34);
+        _t32 = _context30.v;
+        log.error('error in close poll', _t32);
       case 5:
         return _context30.a(2);
     }
@@ -22595,7 +22608,7 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message$pollDetails12, _message$pollDetails13, vote, _t35;
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message$pollDetails12, _message$pollDetails13, vote, _t33;
   return _regenerator().w(function (_context33) {
     while (1) switch (_context33.p = _context33.n) {
       case 0:
@@ -22637,15 +22650,15 @@ function retractPollVote(action) {
         break;
       case 4:
         _context33.p = 4;
-        _t35 = _context33.v;
-        log.error('error in retract poll vote', _t35);
+        _t33 = _context33.v;
+        log.error('error in retract poll vote', _t33);
       case 5:
         return _context33.a(2);
     }
   }, _marked28$1, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
-  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t36;
+  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t34;
   return _regenerator().w(function (_context34) {
     while (1) switch (_context34.p = _context34.n) {
       case 0:
@@ -22694,15 +22707,15 @@ function resendPendingPollActions(action) {
         break;
       case 2:
         _context34.p = 2;
-        _t36 = _context34.v;
-        log.error('error in resend pending poll actions', _t36);
+        _t34 = _context34.v;
+        log.error('error in resend pending poll actions', _t34);
       case 3:
         return _context34.a(2);
     }
   }, _marked29$1, null, [[0, 2]]);
 }
 function getPollVotes(action) {
-  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t37;
+  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t35;
   return _regenerator().w(function (_context35) {
     while (1) switch (_context35.p = _context35.n) {
       case 0:
@@ -22768,8 +22781,8 @@ function getPollVotes(action) {
         break;
       case 7:
         _context35.p = 7;
-        _t37 = _context35.v;
-        log.error('ERROR in get poll votes', _t37);
+        _t35 = _context35.v;
+        log.error('ERROR in get poll votes', _t35);
         _context35.n = 8;
         return put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
@@ -22778,7 +22791,7 @@ function getPollVotes(action) {
   }, _marked30$1, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
-  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t38;
+  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t36;
   return _regenerator().w(function (_context36) {
     while (1) switch (_context36.p = _context36.n) {
       case 0:
@@ -22836,8 +22849,8 @@ function loadMorePollVotes(action) {
         break;
       case 6:
         _context36.p = 6;
-        _t38 = _context36.v;
-        log.error('ERROR in load more poll votes', _t38);
+        _t36 = _context36.v;
+        log.error('ERROR in load more poll votes', _t36);
         _context36.n = 7;
         return put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
@@ -28696,6 +28709,9 @@ var pollVotesLoadingStateSelector = function pollVotesLoadingStateSelector(store
 var unreadScrollToSelector = function unreadScrollToSelector(store) {
   return store.MessageReducer.unreadScrollTo;
 };
+var unreadMessageIdSelector = function unreadMessageIdSelector(store) {
+  return store.MessageReducer.unreadMessageId;
+};
 
 var _path$v;
 function _extends$w() {
@@ -31241,6 +31257,10 @@ var _templateObject$t, _templateObject2$p, _templateObject3$k;
 function MessageActions(_ref) {
   var _ref$isPollMessage = _ref.isPollMessage,
     isPollMessage = _ref$isPollMessage === void 0 ? false : _ref$isPollMessage,
+    _ref$allowVoteRetract = _ref.allowVoteRetract,
+    allowVoteRetract = _ref$allowVoteRetract === void 0 ? false : _ref$allowVoteRetract,
+    _ref$pollClosed = _ref.pollClosed,
+    pollClosed = _ref$pollClosed === void 0 ? false : _ref$pollClosed,
     editModeToggle = _ref.editModeToggle,
     channel = _ref.channel,
     handleResendMessage = _ref.handleResendMessage,
@@ -31333,7 +31353,7 @@ function MessageActions(_ref) {
   }, /*#__PURE__*/React__default.createElement(EditMessageContainer, {
     backgroundColor: backgroundSections,
     className: 'message_actions_cont '
-  }, showMessageReaction && !isPollMessage && messageStatus !== MESSAGE_DELIVERY_STATUS.PENDING && checkActionPermission('addMessageReaction') && (/*#__PURE__*/React__default.createElement(Action, {
+  }, showMessageReaction && messageStatus !== MESSAGE_DELIVERY_STATUS.PENDING && checkActionPermission('addMessageReaction') && (/*#__PURE__*/React__default.createElement(Action, {
     order: reactionIconOrder || 0,
     iconColor: messageActionIconsColor || iconInactive,
     hoverBackgroundColor: backgroundHovered,
@@ -31402,7 +31422,7 @@ function MessageActions(_ref) {
     disabledColor: textSecondary,
     bgColor: tooltipBackground,
     direction: 'top'
-  }, copyIconTooltipText || 'Copy', /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), copyIcon || /*#__PURE__*/React__default.createElement(SvgCopyIcon, null))), isPollMessage && (/*#__PURE__*/React__default.createElement(Action, {
+  }, copyIconTooltipText || 'Copy', /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), copyIcon || /*#__PURE__*/React__default.createElement(SvgCopyIcon, null))), isPollMessage && allowVoteRetract && !pollClosed && (/*#__PURE__*/React__default.createElement(Action, {
     onClick: handleRetractVote,
     iconColor: messageActionIconsColor || iconInactive,
     hoverBackgroundColor: backgroundHovered,
@@ -31411,7 +31431,7 @@ function MessageActions(_ref) {
     disabledColor: textSecondary,
     bgColor: tooltipBackground,
     direction: 'top'
-  }, "Retract Vote", /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), retractVoteIcon || /*#__PURE__*/React__default.createElement(SvgRetractVote, null))), !isPollMessage && (/*#__PURE__*/React__default.createElement(Action, {
+  }, "Retract Vote", /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), retractVoteIcon || /*#__PURE__*/React__default.createElement(SvgRetractVote, null))), isPollMessage && !isIncoming && !pollClosed && (/*#__PURE__*/React__default.createElement(Action, {
     onClick: handleEndVote,
     iconColor: messageActionIconsColor || iconInactive,
     hoverBackgroundColor: backgroundHovered,
@@ -31420,7 +31440,7 @@ function MessageActions(_ref) {
     disabledColor: textSecondary,
     bgColor: tooltipBackground,
     direction: 'top'
-  }, "End Vote", /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), endVoteIcon || /*#__PURE__*/React__default.createElement(SvgEndVote, null))), showForwardMessage && forwardMessagePermitted && messageStatus !== MESSAGE_DELIVERY_STATUS.PENDING && (/*#__PURE__*/React__default.createElement(Action, {
+  }, "End Vote", /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), endVoteIcon || /*#__PURE__*/React__default.createElement(SvgEndVote, null))), showForwardMessage && forwardMessagePermitted && messageStatus !== MESSAGE_DELIVERY_STATUS.PENDING && !isPollMessage && (/*#__PURE__*/React__default.createElement(Action, {
     order: forwardIconOrder || 5,
     iconColor: messageActionIconsColor || iconInactive,
     hoverBackgroundColor: backgroundHovered,
@@ -36304,11 +36324,11 @@ var PollMessage = function PollMessage(_ref) {
       onClick: handleResultsClick,
       cursor: poll.anonymous ? 'default' : 'pointer'
     }, optionVotesUsers.map(function (vote) {
-      var _vote$user, _vote$user2, _vote$user2$profile, _vote$user3, _vote$user3$profile;
+      var _vote$user, _vote$user2, _vote$user2$profile, _vote$user3, _vote$user3$profile, _vote$user4;
       return /*#__PURE__*/React__default.createElement(Avatar, {
         key: vote === null || vote === void 0 ? void 0 : (_vote$user = vote.user) === null || _vote$user === void 0 ? void 0 : _vote$user.id,
         image: vote === null || vote === void 0 ? void 0 : (_vote$user2 = vote.user) === null || _vote$user2 === void 0 ? void 0 : (_vote$user2$profile = _vote$user2.profile) === null || _vote$user2$profile === void 0 ? void 0 : _vote$user2$profile.avatar,
-        name: vote === null || vote === void 0 ? void 0 : (_vote$user3 = vote.user) === null || _vote$user3 === void 0 ? void 0 : (_vote$user3$profile = _vote$user3.profile) === null || _vote$user3$profile === void 0 ? void 0 : _vote$user3$profile.firstName,
+        name: (vote === null || vote === void 0 ? void 0 : (_vote$user3 = vote.user) === null || _vote$user3 === void 0 ? void 0 : (_vote$user3$profile = _vote$user3.profile) === null || _vote$user3$profile === void 0 ? void 0 : _vote$user3$profile.firstName) || (vote === null || vote === void 0 ? void 0 : (_vote$user4 = vote.user) === null || _vote$user4 === void 0 ? void 0 : _vote$user4.id),
         size: 18,
         textSize: 12,
         setDefaultAvatar: true,
@@ -36854,6 +36874,7 @@ var FaviconImg = styled.img(_templateObject1$a || (_templateObject1$a = _taggedT
 
 var _templateObject$H, _templateObject2$C, _templateObject3$w, _templateObject4$r, _templateObject5$m, _templateObject6$k, _templateObject7$j;
 var MessageBody = function MessageBody(_ref) {
+  var _message$pollDetails, _message$pollDetails2;
   var message = _ref.message,
     channel = _ref.channel,
     MessageActionsMenu = _ref.MessageActionsMenu,
@@ -37229,6 +37250,8 @@ var MessageBody = function MessageBody(_ref) {
     handleEndVote: handleEndVote
   })) : (/*#__PURE__*/React__default.createElement(MessageActions, {
     isPollMessage: (message === null || message === void 0 ? void 0 : message.type) === MESSAGE_TYPE.POLL,
+    allowVoteRetract: message === null || message === void 0 ? void 0 : (_message$pollDetails = message.pollDetails) === null || _message$pollDetails === void 0 ? void 0 : _message$pollDetails.allowVoteRetract,
+    pollClosed: message === null || message === void 0 ? void 0 : (_message$pollDetails2 = message.pollDetails) === null || _message$pollDetails2 === void 0 ? void 0 : _message$pollDetails2.closed,
     messageFrom: message.user,
     channel: channel,
     editModeToggle: toggleEditMode,
@@ -39250,42 +39273,40 @@ var MessageList = function MessageList(_ref2) {
   var showScrollToNewMessageButton = useSelector(showScrollToNewMessageButtonSelector, shallowEqual);
   var unreadScrollTo = useSelector(unreadScrollToSelector, shallowEqual);
   var messages = useSelector(activeChannelMessagesSelector, shallowEqual) || [];
-  var _useState2 = useState(''),
-    unreadMessageId = _useState2[0],
-    setUnreadMessageId = _useState2[1];
+  var unreadMessageId = useSelector(unreadMessageIdSelector, shallowEqual);
+  var _useState2 = useState(null),
+    mediaFile = _useState2[0],
+    setMediaFile = _useState2[1];
   var _useState3 = useState(null),
-    mediaFile = _useState3[0],
-    setMediaFile = _useState3[1];
+    isDragging = _useState3[0],
+    setIsDragging = _useState3[1];
   var _useState4 = useState(null),
-    isDragging = _useState4[0],
-    setIsDragging = _useState4[1];
-  var _useState5 = useState(null),
-    showTopDate = _useState5[0],
-    setShowTopDate = _useState5[1];
+    showTopDate = _useState4[0],
+    setShowTopDate = _useState4[1];
+  var _useState5 = useState(false),
+    stopScrolling = _useState5[0],
+    setStopScrolling = _useState5[1];
   var _useState6 = useState(false),
-    stopScrolling = _useState6[0],
-    setStopScrolling = _useState6[1];
-  var _useState7 = useState(false),
-    isScrolling = _useState7[0],
-    setIsScrolling = _useState7[1];
+    isScrolling = _useState6[0],
+    setIsScrolling = _useState6[1];
   var hideTopDateTimeout = useRef(null);
-  var _useState8 = useState(''),
-    lastVisibleMessageId = _useState8[0],
-    _setLastVisibleMessageId = _useState8[1];
-  var _useState9 = useState(null),
-    scrollToReply = _useState9[0],
-    setScrollToReply = _useState9[1];
-  var _useState0 = useState(0),
-    previousScrollTop = _useState0[0],
-    setPreviousScrollTop = _useState0[1];
-  var _useState1 = useState(false),
-    shouldPreserveScroll = _useState1[0],
-    setShouldPreserveScroll = _useState1[1];
+  var _useState7 = useState(''),
+    lastVisibleMessageId = _useState7[0],
+    _setLastVisibleMessageId = _useState7[1];
+  var _useState8 = useState(null),
+    scrollToReply = _useState8[0],
+    setScrollToReply = _useState8[1];
+  var _useState9 = useState(0),
+    previousScrollTop = _useState9[0],
+    setPreviousScrollTop = _useState9[1];
+  var _useState0 = useState(false),
+    shouldPreserveScroll = _useState0[0],
+    setShouldPreserveScroll = _useState0[1];
   var messageForReply = {};
   var attachmentsSelected = false;
-  var _useState10 = useState(''),
-    topDateLabel = _useState10[0],
-    setTopDateLabel = _useState10[1];
+  var _useState1 = useState(''),
+    topDateLabel = _useState1[0],
+    setTopDateLabel = _useState1[1];
   var scrollRef = useRef(null);
   var loadFromServerRef = useRef(false);
   var loadDirectionRef = useRef('');
@@ -39620,7 +39641,7 @@ var MessageList = function MessageList(_ref2) {
       var visibleMessagesIds = Object.keys(visibleMessages);
       var messageId = visibleMessagesIds[visibleMessagesIds.length - 1];
       dispatch(getMessagesAC(channel, undefined, messageId, undefined, undefined, 'instant'));
-      setUnreadMessageId(messageId);
+      dispatch(setUnreadMessageIdAC(messageId));
     } else {
       if (!channel.isLinkedChannel) {
         clearVisibleMessagesMap();
@@ -39630,9 +39651,9 @@ var MessageList = function MessageList(_ref2) {
       }
       if (channel.id) {
         if (channel.newMessageCount && channel.newMessageCount > 0) {
-          setUnreadMessageId(channel.lastDisplayedMessageId);
+          dispatch(setUnreadMessageIdAC(channel.lastDisplayedMessageId));
         } else {
-          setUnreadMessageId('');
+          dispatch(setUnreadMessageIdAC(''));
         }
       }
     }
@@ -39656,7 +39677,7 @@ var MessageList = function MessageList(_ref2) {
     if (messages.length > 0 && hiddenMessagesProperties !== null && hiddenMessagesProperties !== void 0 && hiddenMessagesProperties.includes(HiddenMessageProperty.hideAfterSendMessage)) {
       var lastMessage = messages[messages.length - 1];
       if (lastMessage.user.id === user.id) {
-        setUnreadMessageId('');
+        dispatch(setUnreadMessageIdAC(''));
       }
     }
   }, [messages, hiddenMessagesProperties, user === null || user === void 0 ? void 0 : user.id]);
@@ -39777,12 +39798,14 @@ var MessageList = function MessageList(_ref2) {
   useEffect(function () {
     log.info('connection status is changed.. .... ', connectionStatus, 'channel  ... ', channel);
     if (connectionStatus === CONNECTION_STATUS.CONNECTED && channel !== null && channel !== void 0 && channel.id) {
+      var _channel$lastMessage4;
       loadingRef.current = false;
       prevDisableRef.current = false;
       nextDisableRef.current = false;
       clearMessagesMap();
       removeAllMessages();
-      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, 'instant', false, true));
+      var isWithLastVisibleMessageId = lastVisibleMessageId !== ((_channel$lastMessage4 = channel.lastMessage) === null || _channel$lastMessage4 === void 0 ? void 0 : _channel$lastMessage4.id) && lastVisibleMessageId ? lastVisibleMessageId : '';
+      dispatch(getMessagesAC(channel, false, isWithLastVisibleMessageId, 0, false, 'instant', false, true));
     }
   }, [connectionStatus]);
   useEffect(function () {