sceyt-chat-react-uikit 1.7.7 → 1.7.8-beta.10

package/index.js

@@ -9028,6 +9028,9 @@ var handleVoteDetails = function handleVoteDetails(voteDetails, message) {
     voteDetails: newVoteDetails
   });
 };
+var checkIsTypeKeyPressed = function checkIsTypeKeyPressed(code) {
+  return !(code === 'Enter' || code === 'NumpadEnter' || code === 'Backspace' || code === 'Delete' || code === 'ArrowLeft' || code === 'ArrowRight' || code === 'ArrowUp' || code === 'ArrowDown' || code === 'PageUp' || code === 'PageDown' || code === 'Home' || code === 'End' || code === 'Insert' || code === 'Escape' || code === 'Tab' || code === 'F1' || code === 'F2' || code === 'F3' || code === 'F4' || code === 'F5' || code === 'F6' || code === 'F7' || code === 'F8' || code === 'F9' || code === 'F10' || code === 'F11' || code === 'F12' || code === 'CapsLock' || code === 'Shift' || code === 'ShiftLeft' || code === 'ShiftRight' || code === 'Control' || code === 'ControlLeft' || code === 'ControlRight' || code === 'Alt' || code === 'AltLeft' || code === 'AltRight' || code === 'MetaLeft' || code === 'MetaRight' || code === 'Space' || code === 'Enter' || code === 'NumpadEnter' || code === 'Backspace' || code === 'Delete' || code === 'ArrowLeft' || code === 'ArrowRight' || code === 'ArrowUp' || code === 'ArrowDown' || code === 'PageUp' || code === 'PageDown' || code === 'Home' || code === 'End' || code === 'Insert' || code === 'Escape' || code === 'Tab' || code === 'F1' || code === 'F2' || code === 'F3' || code === 'F4' || code === 'F5' || code === 'F6' || code === 'F7' || code === 'F8' || code === 'F9' || code === 'F10' || code === 'F11' || code === 'F12' || code === 'Shift');
+};
 
 var baseUrlForInviteMembers = '';
 var autoSelectFitsChannel = false;
@@ -9212,7 +9215,9 @@ function updateChannelLastMessageOnAllChannels(channelId, message) {
     if (updateChannel) {
       var updateMessage = message;
       if (updateChannel.lastMessage && updateChannel.lastMessage.id === message.id && updateChannel.lastMessage.deliveryStatus === MESSAGE_DELIVERY_STATUS.READ) {
-        updateMessage.deliveryStatus = MESSAGE_DELIVERY_STATUS.READ;
+        updateMessage = _extends({}, message, {
+          deliveryStatus: MESSAGE_DELIVERY_STATUS.READ
+        });
       }
       updateChannel = _extends({}, updateChannel, {
         lastMessage: updateMessage
@@ -9229,7 +9234,9 @@ function updateChannelOnAllChannels(channelId, config, messageUpdateData) {
       if (messageUpdateData && channel.lastMessage && messageUpdateData.id === channel.lastMessage.id) {
         var updateMessage = messageUpdateData;
         if (channel.lastMessage.id === messageUpdateData.id && channel.lastMessage.deliveryStatus === MESSAGE_DELIVERY_STATUS.READ) {
-          updateMessage.deliveryStatus = MESSAGE_DELIVERY_STATUS.READ;
+          updateMessage = _extends({}, messageUpdateData, {
+            deliveryStatus: MESSAGE_DELIVERY_STATUS.READ
+          });
         }
         channel.lastMessage = _extends({}, channel.lastMessage, updateMessage);
       }
@@ -10058,46 +10065,76 @@ var hashString = function hashString(str) {
   }
 };
 var formatDisappearingMessageTime = function formatDisappearingMessageTime(periodInMilliseconds) {
-  var _getDisappearingSetti;
   if (!periodInMilliseconds) return 'Off';
   var periodInSeconds = periodInMilliseconds / 1000;
-  switch (periodInSeconds) {
-    case FIXED_TIMER_OPTIONS['1day']:
-      return '1 day';
-    case FIXED_TIMER_OPTIONS['1week']:
-      return '1 week';
-    case FIXED_TIMER_OPTIONS['1month']:
-      return '1 month';
-  }
-  var customOptions = ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.customOptions) || [];
-  var customMatch = customOptions.find(function (option) {
-    return option.seconds === periodInSeconds;
-  });
-  if (customMatch) return customMatch.label;
   var SECONDS_PER_MINUTE = 60;
   var SECONDS_PER_HOUR = SECONDS_PER_MINUTE * 60;
   var SECONDS_PER_DAY = SECONDS_PER_HOUR * 24;
   var DAYS_PER_WEEK = 7;
   var DAYS_PER_MONTH = 30;
-  var days = Math.floor(periodInSeconds / SECONDS_PER_DAY);
-  var weeks = Math.floor(days / DAYS_PER_WEEK);
-  var months = Math.floor(days / DAYS_PER_MONTH);
-  var hours = Math.floor(periodInSeconds / SECONDS_PER_HOUR);
-  var minutes = Math.floor(periodInSeconds / SECONDS_PER_MINUTE);
-  switch (true) {
-    case months > 0:
-      return months + " " + (months === 1 ? 'month' : 'months');
-    case weeks > 0:
-      return weeks + " " + (weeks === 1 ? 'week' : 'weeks');
-    case days > 0:
-      return days + " " + (days === 1 ? 'day' : 'days');
-    case hours > 0:
-      return hours + " " + (hours === 1 ? 'hour' : 'hours');
-    case minutes > 0:
-      return minutes + " " + (minutes === 1 ? 'minute' : 'minutes');
-    default:
-      return periodInSeconds + " " + (periodInSeconds === 1 ? 'second' : 'seconds');
+  var DAYS_PER_YEAR = 365;
+  var remainingSeconds = Math.floor(periodInSeconds);
+  var years = Math.floor(remainingSeconds / (SECONDS_PER_DAY * DAYS_PER_YEAR));
+  remainingSeconds %= SECONDS_PER_DAY * DAYS_PER_YEAR;
+  var months = Math.floor(remainingSeconds / (SECONDS_PER_DAY * DAYS_PER_MONTH));
+  remainingSeconds %= SECONDS_PER_DAY * DAYS_PER_MONTH;
+  var weeks = Math.floor(remainingSeconds / (SECONDS_PER_DAY * DAYS_PER_WEEK));
+  remainingSeconds %= SECONDS_PER_DAY * DAYS_PER_WEEK;
+  var days = Math.floor(remainingSeconds / SECONDS_PER_DAY);
+  remainingSeconds %= SECONDS_PER_DAY;
+  var hours = Math.floor(remainingSeconds / SECONDS_PER_HOUR);
+  remainingSeconds %= SECONDS_PER_HOUR;
+  var minutes = Math.floor(remainingSeconds / SECONDS_PER_MINUTE);
+  remainingSeconds %= SECONDS_PER_MINUTE;
+  var seconds = remainingSeconds;
+  var parts = [];
+  var partCount = 0;
+  if (years > 0) {
+    partCount++;
+  }
+  if (months > 0) {
+    partCount++;
+  }
+  if (weeks > 0) {
+    partCount++;
+  }
+  if (days > 0) {
+    partCount++;
+  }
+  if (hours > 0) {
+    partCount++;
+  }
+  if (minutes > 0) {
+    partCount++;
+  }
+  if (seconds > 0) {
+    partCount++;
+  }
+  if (years > 0) {
+    parts.push("" + years + (partCount > 1 ? 'y' : years === 1 ? ' year' : ' years'));
+  }
+  if (months > 0) {
+    parts.push("" + months + (partCount > 1 ? 'm' : months === 1 ? ' month' : ' months'));
+  }
+  if (weeks > 0) {
+    parts.push("" + weeks + (partCount > 1 ? 'w' : weeks === 1 ? ' week' : ' weeks'));
+  }
+  if (days > 0) {
+    parts.push("" + days + (partCount > 1 ? 'd' : days === 1 ? ' day' : ' days'));
+  }
+  if (hours > 0) {
+    parts.push("" + hours + (partCount > 1 ? 'h' : hours === 1 ? ' hour' : ' hours'));
+  }
+  if (minutes > 0) {
+    parts.push("" + minutes + (partCount > 1 ? 'm' : minutes === 1 ? ' minute' : ' minutes'));
   }
+  if (seconds > 0) {
+    parts.push("" + seconds + (partCount > 1 ? 's' : seconds === 1 ? ' second' : ' seconds'));
+  }
+  if (parts.length === 0) {
+    return '0 seconds';
+  }
+  return parts.join(' ');
 };
 
 var GET_MESSAGES = 'GET_MESSAGES';
@@ -10131,10 +10168,7 @@ var queryDirection = {
   NEAR: 'near'
 };
 
-function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSeparateMessage, isResend, isAddToPendingMessagesMap) {
-  if (isAddToPendingMessagesMap === void 0) {
-    isAddToPendingMessagesMap = true;
-  }
+function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSeparateMessage, isResend) {
   return {
     type: SEND_MESSAGE,
     payload: {
@@ -10142,22 +10176,17 @@ function sendMessageAC(message, channelId, connectionState, sendAttachmentsAsSep
       channelId: channelId,
       connectionState: connectionState,
       sendAttachmentsAsSeparateMessage: sendAttachmentsAsSeparateMessage,
-      isResend: isResend,
-      isAddToPendingMessagesMap: isAddToPendingMessagesMap
+      isResend: isResend
     }
   };
 }
-function sendTextMessageAC(message, channelId, connectionState, isAddToPendingMessagesMap) {
-  if (isAddToPendingMessagesMap === void 0) {
-    isAddToPendingMessagesMap = true;
-  }
+function sendTextMessageAC(message, channelId, connectionState) {
   return {
     type: SEND_TEXT_MESSAGE,
     payload: {
       message: message,
       channelId: channelId,
-      connectionState: connectionState,
-      isAddToPendingMessagesMap: isAddToPendingMessagesMap
+      connectionState: connectionState
     }
   };
 }
@@ -10171,21 +10200,17 @@ function resendMessageAC(message, channelId, connectionState) {
     }
   };
 }
-function forwardMessageAC(message, channelId, connectionState, isForward, isAddToPendingMessagesMap) {
+function forwardMessageAC(message, channelId, connectionState, isForward) {
   if (isForward === void 0) {
     isForward = true;
   }
-  if (isAddToPendingMessagesMap === void 0) {
-    isAddToPendingMessagesMap = true;
-  }
   return {
     type: FORWARD_MESSAGE,
     payload: {
       message: message,
       channelId: channelId,
       connectionState: connectionState,
-      isForward: isForward,
-      isAddToPendingMessagesMap: isAddToPendingMessagesMap
+      isForward: isForward
     }
   };
 }
@@ -10218,13 +10243,16 @@ function setMessageToEditAC(message) {
     message: message
   });
 }
-function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage) {
+function getMessagesAC(channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged) {
   if (highlight === void 0) {
     highlight = true;
   }
   if (scrollToMessage === void 0) {
     scrollToMessage = true;
   }
+  if (networkChanged === void 0) {
+    networkChanged = false;
+  }
   return {
     type: GET_MESSAGES,
     payload: {
@@ -10232,10 +10260,10 @@ function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliv
       loadWithLastMessage: loadWithLastMessage,
       messageId: messageId,
       limit: limit,
-      withDeliveredMessages: withDeliveredMessages,
       highlight: highlight,
       behavior: behavior,
-      scrollToMessage: scrollToMessage
+      scrollToMessage: scrollToMessage,
+      networkChanged: networkChanged
     }
   };
 }
@@ -10712,6 +10740,12 @@ function setPendingPollActionsMapAC(messageId, event) {
     event: event
   });
 }
+function updatePendingPollActionAC(messageId, message) {
+  return updatePendingPollAction({
+    messageId: messageId,
+    message: message
+  });
+}
 function setPendingMessageAC(channelId, message) {
   return setPendingMessage$1({
     channelId: channelId,
@@ -10732,7 +10766,8 @@ function updatePendingMessageAC(channelId, messageId, updatedMessage) {
   });
 }
 
-var MESSAGES_MAX_LENGTH = 80;
+var MESSAGES_MAX_PAGE_COUNT = 80;
+var MESSAGES_MAX_LENGTH = 50;
 var LOAD_MAX_MESSAGE_COUNT = 30;
 var MESSAGE_LOAD_DIRECTION = {
   PREV: 'prev',
@@ -10798,12 +10833,12 @@ var setAllMessages = function setAllMessages(messages) {
 var addAllMessages = function addAllMessages(messages, direction) {
   if (direction === MESSAGE_LOAD_DIRECTION.PREV) {
     activeChannelAllMessages = [].concat(messages, activeChannelAllMessages);
-    if (activeChannelAllMessages.length > MESSAGES_MAX_LENGTH) {
+    if (activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT) {
       setHasNextCached(true);
     }
   } else {
     activeChannelAllMessages = [].concat(activeChannelAllMessages, messages);
-    if (activeChannelAllMessages.length > MESSAGES_MAX_LENGTH) {
+    if (activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT) {
       setHasPrevCached(true);
     }
   }
@@ -10872,8 +10907,8 @@ var getHasNextCached = function getHasNextCached() {
 var getFromAllMessagesByMessageId = function getFromAllMessagesByMessageId(messageId, direction, getWithLastMessage) {
   var messagesForAdd = [];
   if (getWithLastMessage) {
-    messagesForAdd = [].concat(activeChannelAllMessages.slice(-MESSAGES_MAX_LENGTH));
-    setHasPrevCached(activeChannelAllMessages.length > MESSAGES_MAX_LENGTH);
+    messagesForAdd = [].concat(activeChannelAllMessages.slice(-MESSAGES_MAX_PAGE_COUNT));
+    setHasPrevCached(activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT);
     setHasNextCached(false);
   } else {
     var fromMessageIndex = activeChannelAllMessages.findIndex(function (mes) {
@@ -10901,14 +10936,25 @@ var getFromAllMessagesByMessageId = function getFromAllMessagesByMessageId(messa
   }
   return messagesForAdd;
 };
-function setMessagesToMap(channelId, messages) {
+function setMessagesToMap(channelId, messages, firstMessageId, lastMessageId) {
+  if (firstMessageId === void 0) {
+    firstMessageId = '0';
+  }
+  if (lastMessageId === void 0) {
+    lastMessageId = '0';
+  }
   if (!messagesMap[channelId]) {
     messagesMap[channelId] = {};
   }
-  messages.forEach(function (msg) {
-    if (msg.tid && messagesMap[channelId][msg.tid]) {
-      delete messagesMap[channelId][msg.tid];
+  for (var key in messagesMap[channelId]) {
+    if (Object.prototype.hasOwnProperty.call(messagesMap[channelId], key)) {
+      var element = messagesMap[channelId][key];
+      if (element.id >= firstMessageId && element.id <= lastMessageId) {
+        delete messagesMap[channelId][key];
+      }
     }
+  }
+  messages.forEach(function (msg) {
     messagesMap[channelId][msg.id || msg.tid] = msg;
   });
 }
@@ -10936,8 +10982,6 @@ function updateMessageOnMap(channelId, updatedMessage, voteDetails) {
       updatedPendingMessages.forEach(function (msg) {
         store.dispatch(updatePendingMessageAC(channelId, msg.tid || msg.id, msg));
       });
-    } else {
-      store.dispatch(removePendingMessageAC(channelId, updatedMessage.messageId));
     }
   }
   var updatedMessageData = null;
@@ -11336,42 +11380,36 @@ var messageSlice = createSlice({
         });
       });
       if (direction === MESSAGE_LOAD_DIRECTION.PREV && newMessagesLength > 0) {
-        if (currentMessagesLength + newMessagesLength >= MESSAGES_MAX_LENGTH) {
+        if (currentMessagesLength + newMessagesLength > MESSAGES_MAX_PAGE_COUNT) {
           var _state$activeChannelM;
           setHasNextCached(true);
           if (newMessagesLength > 0) {
-            if (currentMessagesLength >= MESSAGES_MAX_LENGTH) {
+            if (currentMessagesLength >= MESSAGES_MAX_PAGE_COUNT) {
               state.activeChannelMessages.splice(-newMessagesLength);
             } else {
-              state.activeChannelMessages.splice(-(newMessagesLength - (MESSAGES_MAX_LENGTH - currentMessagesLength)));
+              state.activeChannelMessages.splice(-(currentMessagesLength - currentMessagesLength + newMessagesLength - MESSAGES_MAX_PAGE_COUNT));
             }
           }
           (_state$activeChannelM = state.activeChannelMessages).splice.apply(_state$activeChannelM, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
-        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_LENGTH) {
+        } else {
           var _state$activeChannelM2;
-          var sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_LENGTH;
-          setHasNextCached(true);
-          state.activeChannelMessages.splice(-sliceElementCount);
           (_state$activeChannelM2 = state.activeChannelMessages).splice.apply(_state$activeChannelM2, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
-        } else {
-          var _state$activeChannelM3;
-          (_state$activeChannelM3 = state.activeChannelMessages).splice.apply(_state$activeChannelM3, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
         }
-      } else if (direction === 'next' && newMessagesLength > 0) {
-        if (currentMessagesLength >= MESSAGES_MAX_LENGTH) {
-          var _state$activeChannelM4;
+      } else if (direction === MESSAGE_LOAD_DIRECTION.NEXT && newMessagesLength > 0) {
+        if (currentMessagesLength >= MESSAGES_MAX_PAGE_COUNT) {
+          var _state$activeChannelM3;
           setHasPrevCached(true);
           state.activeChannelMessages.splice(0, messagesIsNotIncludeInActiveChannelMessages.length);
+          (_state$activeChannelM3 = state.activeChannelMessages).push.apply(_state$activeChannelM3, messagesIsNotIncludeInActiveChannelMessages);
+        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_PAGE_COUNT) {
+          var _state$activeChannelM4;
+          var sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_PAGE_COUNT;
+          setHasPrevCached(true);
+          state.activeChannelMessages.splice(0, sliceElementCount);
           (_state$activeChannelM4 = state.activeChannelMessages).push.apply(_state$activeChannelM4, messagesIsNotIncludeInActiveChannelMessages);
-        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_LENGTH) {
+        } else {
           var _state$activeChannelM5;
-          var _sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_LENGTH;
-          setHasPrevCached(true);
-          state.activeChannelMessages.splice(0, _sliceElementCount);
           (_state$activeChannelM5 = state.activeChannelMessages).push.apply(_state$activeChannelM5, messagesIsNotIncludeInActiveChannelMessages);
-        } else {
-          var _state$activeChannelM6;
-          (_state$activeChannelM6 = state.activeChannelMessages).push.apply(_state$activeChannelM6, messagesIsNotIncludeInActiveChannelMessages);
         }
       }
     },
@@ -11395,6 +11433,9 @@ var messageSlice = createSlice({
           });
         }
       }
+      state.activeChannelMessages.sort(function (a, b) {
+        return !(a !== null && a !== void 0 && a.id) ? 1 : (a === null || a === void 0 ? void 0 : a.id) < (b === null || b === void 0 ? void 0 : b.id) ? -1 : 1;
+      });
     },
     updateMessage: function updateMessage(state, action) {
       var _action$payload3 = action.payload,
@@ -11440,6 +11481,9 @@ var messageSlice = createSlice({
       if (!messageFound && addIfNotExists) {
         state.activeChannelMessages.push(params);
       }
+      state.activeChannelMessages.sort(function (a, b) {
+        return !(a !== null && a !== void 0 && a.id) ? 1 : (a === null || a === void 0 ? void 0 : a.id) < (b === null || b === void 0 ? void 0 : b.id) ? -1 : 1;
+      });
     },
     updateMessageAttachment: function updateMessageAttachment(state, action) {
       var _action$payload4 = action.payload,
@@ -11803,10 +11847,24 @@ var messageSlice = createSlice({
       }
       state.pendingPollActions[messageId] = [].concat(state.pendingPollActions[messageId], [event]);
     },
-    setPendingMessage: function setPendingMessage(state, action) {
+    updatePendingPollAction: function updatePendingPollAction(state, action) {
       var _action$payload20 = action.payload,
-        channelId = _action$payload20.channelId,
+        messageId = _action$payload20.messageId,
         message = _action$payload20.message;
+      if (!state.pendingPollActions[messageId]) {
+        return;
+      }
+      state.pendingPollActions[messageId] = state.pendingPollActions[messageId].map(function (action) {
+        var _action$message, _action$message2;
+        return ((_action$message = action.message) === null || _action$message === void 0 ? void 0 : _action$message.id) === messageId || ((_action$message2 = action.message) === null || _action$message2 === void 0 ? void 0 : _action$message2.tid) === messageId ? _extends({}, action, {
+          message: message
+        }) : action;
+      });
+    },
+    setPendingMessage: function setPendingMessage(state, action) {
+      var _action$payload21 = action.payload,
+        channelId = _action$payload21.channelId,
+        message = _action$payload21.message;
       if (!state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = [];
       }
@@ -11818,9 +11876,9 @@ var messageSlice = createSlice({
       }
     },
     removePendingMessage: function removePendingMessage(state, action) {
-      var _action$payload21 = action.payload,
-        channelId = _action$payload21.channelId,
-        messageId = _action$payload21.messageId;
+      var _action$payload22 = action.payload,
+        channelId = _action$payload22.channelId,
+        messageId = _action$payload22.messageId;
       if (state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = state.pendingMessagesMap[channelId].filter(function (msg) {
           return !(msg.id === messageId || msg.tid === messageId);
@@ -11831,10 +11889,10 @@ var messageSlice = createSlice({
       }
     },
     updatePendingMessage: function updatePendingMessage(state, action) {
-      var _action$payload22 = action.payload,
-        channelId = _action$payload22.channelId,
-        messageId = _action$payload22.messageId,
-        updatedMessage = _action$payload22.updatedMessage;
+      var _action$payload23 = action.payload,
+        channelId = _action$payload23.channelId,
+        messageId = _action$payload23.messageId,
+        updatedMessage = _action$payload23.updatedMessage;
       if (state.pendingMessagesMap[channelId]) {
         state.pendingMessagesMap[channelId] = state.pendingMessagesMap[channelId].map(function (msg) {
           if (msg.id === messageId || msg.tid === messageId) {
@@ -11909,16 +11967,22 @@ var _messageSlice$actions = messageSlice.actions,
   setPendingPollActionsMap = _messageSlice$actions.setPendingPollActionsMap,
   setPendingMessage$1 = _messageSlice$actions.setPendingMessage,
   removePendingMessage = _messageSlice$actions.removePendingMessage,
-  updatePendingMessage = _messageSlice$actions.updatePendingMessage;
+  updatePendingMessage = _messageSlice$actions.updatePendingMessage,
+  updatePendingPollAction = _messageSlice$actions.updatePendingPollAction;
 var MessageReducer = messageSlice.reducer;
 
 var initialState$2 = {
-  membersLoadingState: false,
+  membersLoadingState: 0,
   membersHasNext: true,
   activeChannelMembers: [],
   roles: [],
   getRolesFail: undefined,
-  rolesMap: {}
+  rolesMap: {},
+  restricted: {
+    isRestricted: false,
+    fromChannel: false
+  },
+  openInviteModal: false
 };
 var memberSlice = createSlice({
   name: 'members',
@@ -11998,6 +12062,19 @@ var memberSlice = createSlice({
       } else {
         state.getRolesFail = undefined;
       }
+    },
+    setMembersHasNext: function setMembersHasNext(state, action) {
+      state.membersHasNext = action.payload.hasNext;
+    },
+    setActionIsRestricted: function setActionIsRestricted(state, action) {
+      var _action$payload2 = action.payload,
+        isRestricted = _action$payload2.isRestricted,
+        fromChannel = _action$payload2.fromChannel;
+      state.restricted.isRestricted = isRestricted;
+      state.restricted.fromChannel = fromChannel;
+    },
+    setOpenInviteModal: function setOpenInviteModal(state, action) {
+      state.openInviteModal = action.payload.open;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -12014,7 +12091,10 @@ var _memberSlice$actions = memberSlice.actions,
   removeMemberFromList = _memberSlice$actions.removeMemberFromList,
   setMembersLoadingState = _memberSlice$actions.setMembersLoadingState,
   getRolesSuccess = _memberSlice$actions.getRolesSuccess,
-  getRolesFail = _memberSlice$actions.getRolesFail;
+  getRolesFail = _memberSlice$actions.getRolesFail,
+  setMembersHasNext = _memberSlice$actions.setMembersHasNext,
+  setActionIsRestricted = _memberSlice$actions.setActionIsRestricted,
+  setOpenInviteModal = _memberSlice$actions.setOpenInviteModal;
 var MembersReducer = memberSlice.reducer;
 
 var SET_CONTACT_LOADING_STATE = 'SET_CONTACT_LOADING_STATE';
@@ -12761,12 +12841,13 @@ var getChannelInviteKeysAC = function getChannelInviteKeysAC(channelId) {
     }
   };
 };
-var regenerateChannelInviteKeyAC = function regenerateChannelInviteKeyAC(channelId, key) {
+var regenerateChannelInviteKeyAC = function regenerateChannelInviteKeyAC(channelId, key, deletePermanently) {
   return {
     type: REGENERATE_CHANNEL_INVITE_KEY,
     payload: {
       channelId: channelId,
-      key: key
+      key: key,
+      deletePermanently: deletePermanently
     }
   };
 };
@@ -13190,7 +13271,7 @@ var updateMembersPresenceAC = function updateMembersPresenceAC(usersMap) {
 };
 var setMembersLoadingStateAC = function setMembersLoadingStateAC(state) {
   return setMembersLoadingState({
-    state: !!state
+    state: state
   });
 };
 var removeMemberFromListAC = function removeMemberFromListAC(members) {
@@ -13209,6 +13290,22 @@ var getRolesFailAC = function getRolesFailAC(timeout, attempts) {
     attempts: attempts
   });
 };
+var setMembersHasNextAC = function setMembersHasNextAC(hasNext) {
+  return setMembersHasNext({
+    hasNext: hasNext
+  });
+};
+var setActionIsRestrictedAC = function setActionIsRestrictedAC(isRestricted, fromChannel) {
+  return setActionIsRestricted({
+    isRestricted: isRestricted,
+    fromChannel: fromChannel
+  });
+};
+var setOpenInviteModalAC = function setOpenInviteModalAC(open) {
+  return setOpenInviteModal({
+    open: open
+  });
+};
 
 var connectionStatusSelector = function connectionStatusSelector(store) {
   return store.UserReducer.connectionStatus;
@@ -14157,7 +14254,7 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
 var _marked = /*#__PURE__*/_regenerator().m(updateActiveChannelMembersAdd),
   _marked2 = /*#__PURE__*/_regenerator().m(updateActiveChannelMembersRemove);
 function updateActiveChannelMembersAdd(addedMembers) {
-  var state, activeChannel, updatedMembers;
+  var state, activeChannel, members, shouldUpdateMembers, updatedMembers;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.n) {
       case 0:
@@ -14166,11 +14263,17 @@ function updateActiveChannelMembersAdd(addedMembers) {
       case 1:
         state = _context.v;
         activeChannel = state.ChannelReducer.activeChannel;
+        members = (activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.members) || [];
+        shouldUpdateMembers = addedMembers.filter(function (member) {
+          return !members.some(function (m) {
+            return m.id === member.id;
+          });
+        });
         if (!(activeChannel && activeChannel.id)) {
           _context.n = 2;
           break;
         }
-        updatedMembers = [].concat(activeChannel.members || [], addedMembers);
+        updatedMembers = [].concat(activeChannel.members || [], shouldUpdateMembers);
         updatedMembers = Array.from(new Set(updatedMembers));
         return _context.a(2, {
           members: updatedMembers
@@ -15372,6 +15475,7 @@ function watchForEvents() {
                 }
                 return _context.a(3, 183);
               case 99:
+                log.info('CHANNEL_EVENT_TYPES.POLL_ADDED ... ');
                 _channel10 = args.channel, pollDetails = args.pollDetails, _messageId = args.messageId;
                 pollDetailsData = pollDetails;
                 _context.n = 100;
@@ -15456,6 +15560,7 @@ function watchForEvents() {
               case 108:
                 return _context.a(3, 183);
               case 109:
+                log.info('CHANNEL_EVENT_TYPES.POLL_DELETED ... ');
                 _channel11 = args.channel, _pollDetails = args.pollDetails, _messageId2 = args.messageId;
                 _pollDetailsData = _pollDetails;
                 _context.n = 110;
@@ -15515,6 +15620,7 @@ function watchForEvents() {
               case 116:
                 return _context.a(3, 183);
               case 117:
+                log.info('CHANNEL_EVENT_TYPES.POLL_RETRACTED ... ');
                 _channel12 = args.channel, _pollDetails2 = args.pollDetails, _messageId3 = args.messageId;
                 _context.n = 118;
                 return effects.call(getActiveChannelId);
@@ -15573,6 +15679,7 @@ function watchForEvents() {
               case 124:
                 return _context.a(3, 183);
               case 125:
+                log.info('CHANNEL_EVENT_TYPES.POLL_CLOSED ... ');
                 _channel13 = args.channel, _messageId4 = args.messageId;
                 _context.n = 126;
                 return effects.call(getActiveChannelId);
@@ -16171,13 +16278,20 @@ function createChannel(action) {
         _context.n = 16;
         return effects.call(setActiveChannelId, createdChannel.id);
       case 16:
-        _context.n = 18;
+        _context.n = 19;
         break;
       case 17:
         _context.p = 17;
         _t = _context.v;
-        log.error(_t, 'Error on create channel');
+        if (!(_t.code === 1041)) {
+          _context.n = 18;
+          break;
+        }
+        _context.n = 18;
+        return effects.put(setActionIsRestrictedAC(true, false));
       case 18:
+        log.error(_t, 'Error on create channel');
+      case 19:
         return _context.a(2);
     }
   }, _marked$2, null, [[0, 17]]);
@@ -16292,7 +16406,7 @@ function getChannels(action) {
               try {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
-                    channelMessageMap[channel.id] = messages[0];
+                    channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id] = messages[0];
                     log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
@@ -16311,8 +16425,8 @@ function getChannels(action) {
       case 13:
         log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
-          if (channelMessageMap[channel.id]) {
-            channel.lastReactedMessage = channelMessageMap[channel.id];
+          if (channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id]) {
+            channel.lastReactedMessage = channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id];
           }
           return channel;
         });
@@ -18093,13 +18207,13 @@ function getChannelInviteKeys(action) {
   }, _marked30, null, [[0, 4]]);
 }
 function regenerateChannelInviteKey(action) {
-  var payload, channelId, key, channel, inviteKey, _t31;
+  var payload, channelId, key, deletePermanently, channel, inviteKey, _t31;
   return _regenerator().w(function (_context31) {
     while (1) switch (_context31.p = _context31.n) {
       case 0:
         _context31.p = 0;
         payload = action.payload;
-        channelId = payload.channelId, key = payload.key;
+        channelId = payload.channelId, key = payload.key, deletePermanently = payload.deletePermanently;
         _context31.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
@@ -18114,7 +18228,8 @@ function regenerateChannelInviteKey(action) {
         _context31.n = 2;
         return effects.call(channel.regenerateInviteKey, {
           key: key,
-          channelId: channelId
+          channelId: channelId,
+          deletePermanently: deletePermanently
         });
       case 2:
         inviteKey = _context31.v;
@@ -18850,6 +18965,56 @@ var getFrame = function getFrame(videoSrc, time) {
   }
 };
 
+var SDKErrorTypeEnum = {
+  BadRequest: {
+    value: 'BadRequest',
+    isResendable: false
+  },
+  BadParam: {
+    value: 'BadParam',
+    isResendable: false
+  },
+  NotFound: {
+    value: 'NotFound',
+    isResendable: false
+  },
+  NotAllowed: {
+    value: 'NotAllowed',
+    isResendable: false
+  },
+  TooLargeRequest: {
+    value: 'TooLargeRequest',
+    isResendable: false
+  },
+  InternalError: {
+    value: 'InternalError',
+    isResendable: true
+  },
+  TooManyRequests: {
+    value: 'TooManyRequests',
+    isResendable: true
+  },
+  Authentication: {
+    value: 'Authentication',
+    isResendable: true
+  }
+};
+var fromValue = function fromValue(value) {
+  if (!value) return null;
+  var entries = Object.values(SDKErrorTypeEnum);
+  return entries.find(function (entry) {
+    return entry.value === value;
+  }) || null;
+};
+var isResendableError = function isResendableError(value) {
+  var _errorType$isResendab;
+  if (!value) {
+    return true;
+  }
+  var errorType = fromValue(value);
+  return (_errorType$isResendab = errorType === null || errorType === void 0 ? void 0 : errorType.isResendable) != null ? _errorType$isResendab : true;
+};
+
 var _marked$3 = /*#__PURE__*/_regenerator().m(sendMessage),
   _marked2$2 = /*#__PURE__*/_regenerator().m(sendTextMessage),
   _marked3$1 = /*#__PURE__*/_regenerator().m(forwardMessage),
@@ -18965,63 +19130,100 @@ var handleUploadAttachments = function handleUploadAttachments(attachments, mess
     return Promise.reject(e);
   }
 };
-var addPendingMessage = function addPendingMessage(message, messageCopy, channel) {
+var addPendingMessage = function addPendingMessage(message, messageCopy, channelId) {
   try {
     var messageToAdd = _extends({}, messageCopy, {
       createdAt: new Date(Date.now()),
       mentionedUsers: message.mentionedUsers,
       parentMessage: message.parentMessage
     });
-    setPendingMessage(channel.id, messageToAdd);
+    setPendingMessage(channelId, messageToAdd);
     return Promise.resolve();
   } catch (e) {
     return Promise.reject(e);
   }
 };
-var updateMessage$1 = function updateMessage(actionType, pending, channel, scrollToNewMessage) {
+var updateMessage$1 = function updateMessage(actionType, pending, channelId, scrollToNewMessage, message) {
   if (scrollToNewMessage === void 0) {
     scrollToNewMessage = true;
   }
   return /*#__PURE__*/_regenerator().m(function _callee() {
-    var activeChannelId;
+    var activeChannelId, channel, messages, _channel$lastMessage2, repliedMessage, scrollRef, _channel$lastMessage3;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           activeChannelId = getActiveChannelId();
           if (!(actionType !== RESEND_MESSAGE)) {
-            _context.n = 2;
+            _context.n = 7;
             break;
           }
-          addMessageToMap(channel.id, pending);
-          if (activeChannelId === channel.id) {
+          if (activeChannelId === channelId) {
             addAllMessages([pending], MESSAGE_LOAD_DIRECTION.NEXT);
           }
-          if (!(activeChannelId === channel.id)) {
+          if (!(activeChannelId === channelId)) {
             _context.n = 1;
             break;
           }
           _context.n = 1;
           return effects.put(addMessageAC(pending));
         case 1:
+          _context.n = 2;
+          return effects.call(addPendingMessage, message, pending, channelId);
+        case 2:
           if (!scrollToNewMessage) {
-            _context.n = 2;
+            _context.n = 7;
             break;
           }
-          _context.n = 2;
-          return effects.put(scrollToNewMessageAC(true, true));
-        case 2:
+          _context.n = 3;
+          return effects.call(getChannelFromAllChannels, channelId);
+        case 3:
+          channel = _context.v;
+          messages = store.getState().MessageReducer.activeChannelMessages;
+          if (!(messages.findIndex(function (msg) {
+            var _channel$lastMessage;
+            return msg.id === (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage = channel.lastMessage) === null || _channel$lastMessage === void 0 ? void 0 : _channel$lastMessage.id);
+          }) >= 10)) {
+            _context.n = 6;
+            break;
+          }
+          _context.n = 4;
+          return effects.put(scrollToNewMessageAC(true, false, false));
+        case 4:
+          _context.n = 5;
+          return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
+        case 5:
+          repliedMessage = document.getElementById(channel === null || channel === void 0 ? void 0 : (_channel$lastMessage2 = channel.lastMessage) === null || _channel$lastMessage2 === void 0 ? void 0 : _channel$lastMessage2.id);
+          if (repliedMessage) {
+            scrollRef = document.getElementById('scrollableDiv');
+            if (scrollRef) {
+              scrollRef.scrollTo({
+                top: 1000,
+                behavior: 'smooth'
+              });
+            }
+          }
+          _context.n = 7;
+          break;
+        case 6:
+          if (!(channel !== null && channel !== void 0 && channel.id)) {
+            _context.n = 7;
+            break;
+          }
+          _context.n = 7;
+          return effects.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));
+        case 7:
           return _context.a(2);
       }
     }, _callee);
   })();
 };
 function sendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, pending, _loop2, _i, _t2;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, pending, _loop2, _i, _t2;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, sendAttachmentsAsSeparateMessage = payload.sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
+        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, sendAttachmentsAsSeparateMessage = payload.sendAttachmentsAsSeparateMessage;
         pendingMessages = [];
         _context4.p = 1;
         _context4.n = 2;
@@ -19156,8 +19358,12 @@ function sendMessage(action) {
                   createdAt: new Date(Date.now())
                 });
                 pendingMessages.push(_pending);
+                if (!(action.type !== RESEND_MESSAGE)) {
+                  _context2.n = 1;
+                  break;
+                }
                 _context2.n = 1;
-                return effects.call(updateMessage$1, action.type, _pending, channel);
+                return effects.call(updateMessage$1, action.type, _pending, channel.id, true, message);
               case 1:
                 _context2.n = 3;
                 break;
@@ -19205,8 +19411,12 @@ function sendMessage(action) {
           createdAt: new Date(Date.now())
         });
         pendingMessages.push(pending);
+        if (!(action.type !== RESEND_MESSAGE)) {
+          _context4.n = 11;
+          break;
+        }
         _context4.n = 11;
-        return effects.call(updateMessage$1, action.type, pending, channel);
+        return effects.call(updateMessage$1, action.type, pending, channel.id, true, message);
       case 11:
         messageToSend = _extends({}, messageToSend, {
           attachments: attachmentsToSend
@@ -19214,7 +19424,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, connectionIsDisconnected, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, channelUpdateParam, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -19223,7 +19433,7 @@ function sendMessage(action) {
                 _context3.p = 1;
                 messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
                 if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-                  _context3.n = 12;
+                  _context3.n = 13;
                   break;
                 }
                 _attachmentsToSend = messageAttachment;
@@ -19284,9 +19494,6 @@ function sendMessage(action) {
                 _context3.n = 5;
                 break;
               case 8:
-                if (action.type === RESEND_MESSAGE) {
-                  messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
-                }
                 attachmentsToUpdate = [];
                 if (messageResponse.attachments && messageResponse.attachments.length > 0) {
                   currentAttachmentsMap = {};
@@ -19319,61 +19526,56 @@ function sendMessage(action) {
                   createdAt: messageResponse.createdAt,
                   channelId: channel.id
                 };
+                stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageUpdateData));
+                activeChannelId = getActiveChannelId();
+                if (!(activeChannelId === channel.id)) {
+                  _context3.n = 9;
+                  break;
+                }
                 _context3.n = 9;
-                return effects.put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData))));
+                return effects.put(updateMessageAC(messageToSend.tid, stringifiedMessageUpdateData, true));
               case 9:
-                updateMessageOnMap(channel.id, {
-                  messageId: messageToSend.tid,
-                  params: messageUpdateData
-                });
+                _context3.n = 10;
+                return effects.put(removePendingMessageAC(channel.id, messageToSend.tid));
+              case 10:
+                addMessageToMap(channel.id, stringifiedMessageUpdateData);
                 updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
-                messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
-                updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
+                updateChannelLastMessageOnAllChannels(channel.id, stringifiedMessageUpdateData);
                 channelUpdateParam = {
-                  lastMessage: messageToUpdate,
+                  lastMessage: stringifiedMessageUpdateData,
                   lastReactedMessage: null
                 };
                 if (!channel.unread) {
-                  _context3.n = 10;
+                  _context3.n = 11;
                   break;
                 }
-                _context3.n = 10;
-                return effects.put(markChannelAsReadAC(channel.id));
-              case 10:
                 _context3.n = 11;
-                return effects.put(updateChannelDataAC(channel.id, channelUpdateParam, true));
+                return effects.put(markChannelAsReadAC(channel.id));
               case 11:
+                _context3.n = 12;
+                return effects.put(updateChannelDataAC(channel.id, channelUpdateParam, true));
+              case 12:
                 updateChannelOnAllChannels(channel.id, channelUpdateParam);
-                _context3.n = 13;
+                _context3.n = 14;
                 break;
-              case 12:
-                throw new Error('Connection required to send message');
               case 13:
+                throw new Error('Connection required to send message');
+              case 14:
                 _context3.n = 19;
                 break;
-              case 14:
-                _context3.p = 14;
+              case 15:
+                _context3.p = 15;
                 _t = _context3.v;
-                pendingMessage = pendingMessages === null || pendingMessages === void 0 ? void 0 : pendingMessages.find(function (pendingMessage) {
-                  return pendingMessage.tid === messageToSend.tid;
-                });
-                if (!(channel && pendingMessage && action.type !== RESEND_MESSAGE)) {
+                isErrorResendable = isResendableError(_t === null || _t === void 0 ? void 0 : _t.type);
+                if (isErrorResendable) {
                   _context3.n = 17;
                   break;
                 }
-                connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
-                if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
-                  _context3.n = 16;
-                  break;
-                }
-                _context3.n = 15;
-                return effects.call(addPendingMessage, message, pendingMessage, channel);
-              case 15:
-                _context3.n = 17;
-                break;
+                _context3.n = 16;
+                return effects.put(removePendingMessageAC(channel.id, messageToSend.tid));
               case 16:
-                _context3.n = 17;
-                return effects.put(removePendingMessageAC(channel.id, pendingMessage.tid));
+                _context3.n = 19;
+                break;
               case 17:
                 log.error('Error on uploading attachment', messageToSend.tid, _t);
                 if (!(messageToSend.attachments && messageToSend.attachments.length)) {
@@ -19399,7 +19601,7 @@ function sendMessage(action) {
               case 19:
                 return _context3.a(2);
             }
-          }, _callee3, null, [[1, 14]]);
+          }, _callee3, null, [[1, 15]]);
         });
         _i = 0;
       case 13:
@@ -19431,12 +19633,12 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId, _t3;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
+        message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
         _context5.n = 1;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
@@ -19450,8 +19652,8 @@ function sendTextMessage(action) {
             setChannelInMap(channel);
           }
         }
+        sendMessageTid = null;
         pendingMessage = null;
-        activeChannelId = getActiveChannelId();
         _context5.p = 3;
         if (!channel.isMockChannel) {
           _context5.n = 6;
@@ -19511,11 +19713,15 @@ function sendTextMessage(action) {
           _context5.n = 8;
           break;
         }
+        if (!(action.type !== RESEND_MESSAGE)) {
+          _context5.n = 8;
+          break;
+        }
         _context5.n = 8;
-        return effects.call(updateMessage$1, action.type, pendingMessage, channel);
+        return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, true, message);
       case 8:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context5.n = 16;
+          _context5.n = 18;
           break;
         }
         if (!sendMessageHandler) {
@@ -19551,19 +19757,24 @@ function sendTextMessage(action) {
           pollDetails: (_messageResponse = messageResponse) === null || _messageResponse === void 0 ? void 0 : _messageResponse.pollDetails,
           channelId: channel.id
         };
+        activeChannelId = getActiveChannelId();
         if (!(activeChannelId === channel.id)) {
           _context5.n = 13;
           break;
         }
         _context5.n = 13;
-        return effects.put(updateMessageAC(messageToSend.tid, messageUpdateData));
+        return effects.put(updateMessageAC(messageToSend.tid, messageUpdateData, true));
       case 13:
-        updateMessageOnMap(channel.id, {
-          messageId: !isAddToPendingMessagesMap ? message.tid : messageToSend.tid,
-          params: messageUpdateData
-        });
+        stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageUpdateData));
+        _context5.n = 14;
+        return effects.put(updatePendingPollActionAC(messageToSend.tid, stringifiedMessageUpdateData));
+      case 14:
+        _context5.n = 15;
+        return effects.put(removePendingMessageAC(channel.id, messageToSend.tid));
+      case 15:
+        addMessageToMap(channel.id, stringifiedMessageUpdateData);
         if (activeChannelId === channel.id) {
-          updateMessageOnAllMessages(!isAddToPendingMessagesMap ? message.tid : messageToSend.tid, messageUpdateData);
+          updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
         }
         messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
         updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
@@ -19571,85 +19782,80 @@ function sendTextMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context5.n = 14;
+        _context5.n = 16;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 14:
+      case 16:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context5.n = 15;
+          _context5.n = 17;
           break;
         }
-        _context5.n = 15;
+        _context5.n = 17;
         return effects.put(markChannelAsReadAC(channel.id));
-      case 15:
+      case 17:
         channel.lastMessage = messageToUpdate;
-        if (action.type === RESEND_MESSAGE) {
-          messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
-        }
-        _context5.n = 17;
+        _context5.n = 19;
         break;
-      case 16:
+      case 18:
         throw new Error('Connection required to send message');
-      case 17:
-        _context5.n = 22;
+      case 19:
+        _context5.n = 23;
         break;
-      case 18:
-        _context5.p = 18;
+      case 20:
+        _context5.p = 20;
         _t3 = _context5.v;
-        if (!(activeChannelId === channel.id && pendingMessage && action.type !== RESEND_MESSAGE)) {
-          _context5.n = 21;
-          break;
-        }
-        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
-        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
-          _context5.n = 20;
+        log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
+        isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
+        if (!(!isErrorResendable && channel.id && sendMessageTid)) {
+          _context5.n = 22;
           break;
         }
-        _context5.n = 19;
-        return effects.call(addPendingMessage, message, pendingMessage, channel);
-      case 19:
-        _context5.n = 21;
-        break;
-      case 20:
         _context5.n = 21;
-        return effects.put(removePendingMessageAC(channel.id, pendingMessage.tid));
+        return effects.put(removePendingMessageAC(channel.id, sendMessageTid));
       case 21:
-        log.error('error on send text message ... ', _t3);
+        _context5.n = 23;
+        break;
+      case 22:
+        if (!(channel.id && sendMessageTid)) {
+          _context5.n = 23;
+          break;
+        }
         updateMessageOnMap(channel.id, {
           messageId: sendMessageTid,
           params: {
             state: MESSAGE_STATUS.FAILED
           }
         });
-        if (!(activeChannelId === channel.id)) {
-          _context5.n = 22;
+        _activeChannelId = getActiveChannelId();
+        if (!(_activeChannelId === channel.id)) {
+          _context5.n = 23;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context5.n = 22;
+        _context5.n = 23;
         return effects.put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 22:
-        _context5.p = 22;
-        _context5.n = 23;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 23:
-        return _context5.f(22);
+        _context5.p = 23;
+        _context5.n = 24;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 24:
+        return _context5.f(23);
+      case 25:
         return _context5.a(2);
     }
-  }, _marked2$2, null, [[3, 18, 22, 24]]);
+  }, _marked2$2, null, [[3, 20, 23, 25]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t4;
+  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId2, _t4;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
         payload = action.payload;
-        message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
+        message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward;
         pendingMessage = null;
         channel = null;
         activeChannelId = getActiveChannelId();
@@ -19692,7 +19898,7 @@ function forwardMessage(action) {
         }) : [];
         attachments = message.attachments;
         if ((channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC) && !(channel.userRole === 'admin' || channel.userRole === 'owner')) {
-          _context6.n = 16;
+          _context6.n = 17;
           break;
         }
         if (message.attachments && message.attachments.length) {
@@ -19719,7 +19925,7 @@ function forwardMessage(action) {
           };
         }
         messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisableMentionsCount(getDisableFrowardMentionsCount()).setMetadata(message.metadata ? isJSON(message.metadata) ? message.metadata : JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id).setPollDetails(pollDetails);
-        messageToSend = messageBuilder.create();
+        messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
         messageToSend.tid = action.type === RESEND_MESSAGE ? action.payload.message.tid : messageToSend.tid;
         messageTid = messageToSend.tid;
         pendingMessage = _extends({}, messageToSend, {
@@ -19755,11 +19961,15 @@ function forwardMessage(action) {
           _context6.n = 9;
           break;
         }
+        if (!(action.type !== RESEND_MESSAGE)) {
+          _context6.n = 9;
+          break;
+        }
         _context6.n = 9;
-        return effects.call(updateMessage$1, action.type, pendingMessage, channel, false);
+        return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, false, message);
       case 9:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context6.n = 15;
+          _context6.n = 16;
           break;
         }
         _context6.n = 10;
@@ -19785,61 +19995,55 @@ function forwardMessage(action) {
           break;
         }
         _context6.n = 11;
-        return effects.put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData))));
+        return effects.put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
       case 11:
         updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
       case 12:
-        if (action.type === RESEND_MESSAGE) {
-          messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
+        if (!messageToSend.tid) {
+          _context6.n = 13;
+          break;
         }
-        updateMessageOnMap(channel.id, {
-          messageId: !isAddToPendingMessagesMap ? message.tid : messageToSend.tid,
-          params: messageUpdateData
-        });
+        _context6.n = 13;
+        return effects.put(removePendingMessageAC(channel.id, messageToSend.tid));
+      case 13:
+        addMessageToMap(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
         messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
         updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
         channelUpdateParam = {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context6.n = 13;
+        _context6.n = 14;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 13:
+      case 14:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context6.n = 14;
+          _context6.n = 15;
           break;
         }
-        _context6.n = 14;
+        _context6.n = 15;
         return effects.put(markChannelAsReadAC(channel.id));
-      case 14:
-        _context6.n = 16;
-        break;
       case 15:
-        throw new Error('Connection required to forward message');
+        _context6.n = 17;
+        break;
       case 16:
+        throw new Error('Connection required to forward message');
+      case 17:
         _context6.n = 22;
         break;
-      case 17:
-        _context6.p = 17;
+      case 18:
+        _context6.p = 18;
         _t4 = _context6.v;
-        if (!(pendingMessage && channel && action.type !== RESEND_MESSAGE)) {
+        isErrorResendable = isResendableError(_t4 === null || _t4 === void 0 ? void 0 : _t4.type);
+        if (isErrorResendable) {
           _context6.n = 20;
           break;
         }
-        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
-        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
-          _context6.n = 19;
-          break;
-        }
-        _context6.n = 18;
-        return effects.call(addPendingMessage, message, pendingMessage, channel);
-      case 18:
-        _context6.n = 20;
-        break;
+        _context6.n = 19;
+        return effects.put(removePendingMessageAC(channel.id, messageTid));
       case 19:
-        _context6.n = 20;
-        return effects.put(removePendingMessageAC(channel.id, pendingMessage.tid));
+        _context6.n = 21;
+        break;
       case 20:
         if (!(channel && messageTid)) {
           _context6.n = 21;
@@ -19851,7 +20055,8 @@ function forwardMessage(action) {
             state: MESSAGE_STATUS.FAILED
           }
         });
-        if (!(activeChannelId === channel.id)) {
+        _activeChannelId2 = getActiveChannelId();
+        if (!(_activeChannelId2 === channel.id)) {
           _context6.n = 21;
           break;
         }
@@ -19873,25 +20078,67 @@ function forwardMessage(action) {
       case 24:
         return _context6.a(2);
     }
-  }, _marked3$1, null, [[1, 17, 22, 24]]);
+  }, _marked3$1, null, [[1, 18, 22, 24]]);
 }
 function resendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isVoiceMessage;
+  var _message$attachments;
+  var payload, message, connectionState, channelId, attachments, sendAttachmentsAsSeparateMessage, isVoiceMessage;
   return _regenerator().w(function (_context7) {
     while (1) switch (_context7.n) {
       case 0:
         payload = action.payload;
         message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
-        if (message.forwardingDetails) {
-          store.dispatch(forwardMessageAC(message, channelId, connectionState, false, false));
-        } else if (message.attachments && message.attachments.length) {
-          sendAttachmentsAsSeparateMessage = getSendAttachmentsAsSeparateMessages();
-          isVoiceMessage = message.attachments[0].type === attachmentTypes.voice;
-          store.dispatch(sendMessageAC(message, channelId, connectionState, isVoiceMessage ? false : sendAttachmentsAsSeparateMessage, false, false));
-        } else {
-          store.dispatch(sendTextMessageAC(message, channelId, connectionState, false));
+        attachments = message === null || message === void 0 ? void 0 : (_message$attachments = message.attachments) === null || _message$attachments === void 0 ? void 0 : _message$attachments.filter(function (att) {
+          return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
+        });
+        if (!message.forwardingDetails) {
+          _context7.n = 2;
+          break;
         }
+        _context7.n = 1;
+        return effects.call(forwardMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: message,
+            connectionState: connectionState,
+            channelId: channelId,
+            isForward: false
+          }
+        });
       case 1:
+        _context7.n = 5;
+        break;
+      case 2:
+        if (!(attachments && attachments.length)) {
+          _context7.n = 4;
+          break;
+        }
+        sendAttachmentsAsSeparateMessage = getSendAttachmentsAsSeparateMessages();
+        isVoiceMessage = message.attachments[0].type === attachmentTypes.voice;
+        _context7.n = 3;
+        return effects.call(sendMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: message,
+            connectionState: connectionState,
+            channelId: channelId,
+            sendAttachmentsAsSeparateMessage: isVoiceMessage ? false : sendAttachmentsAsSeparateMessage
+          }
+        });
+      case 3:
+        _context7.n = 5;
+        break;
+      case 4:
+        _context7.n = 5;
+        return effects.call(sendTextMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: message,
+            connectionState: connectionState,
+            channelId: channelId
+          }
+        });
+      case 5:
         return _context7.a(2);
     }
   }, _marked4$1);
@@ -20053,8 +20300,7 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
             message: msg,
             connectionState: connectionState,
             channelId: channelId,
-            isForward: true,
-            isAddToPendingMessagesMap: false
+            isForward: true
           }
         });
       case 4:
@@ -20072,9 +20318,7 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
             message: msg,
             connectionState: connectionState,
             channelId: channelId,
-            sendAttachmentsAsSeparateMessage: false,
-            isResend: true,
-            isAddToPendingMessagesMap: false
+            sendAttachmentsAsSeparateMessage: false
           }
         });
       case 6:
@@ -20087,8 +20331,7 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
           payload: {
             message: msg,
             connectionState: connectionState,
-            channelId: channelId,
-            isAddToPendingMessagesMap: false
+            channelId: channelId
           }
         });
       case 8:
@@ -20117,26 +20360,13 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
     }
   }, _callee4, null, [[3, 9]]);
 });
-var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, updatedMessages) {
-  var _messages, _Object$values;
-  var previousAllMessages, messages, lastMessageId, setMappedAllMessages, allMessagesAfterLastMessage;
+var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, updatedMessages, firstMessageId, lastMessageId) {
+  var messages;
   return _regenerator().w(function (_context1) {
     while (1) switch (_context1.n) {
       case 0:
-        previousAllMessages = getAllMessages();
         messages = [].concat(updatedMessages);
-        lastMessageId = (_messages = messages[messages.length - 1]) === null || _messages === void 0 ? void 0 : _messages.id;
-        setMappedAllMessages = {};
-        previousAllMessages.forEach(function (msg) {
-          if (msg.channelId === channel.id) {
-            setMappedAllMessages[msg.id || msg.tid || ''] = msg;
-          }
-        });
-        allMessagesAfterLastMessage = lastMessageId ? (_Object$values = Object.values(setMappedAllMessages || {})) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (msg) {
-          return msg.id > lastMessageId || !msg.id;
-        }) : Object.values(setMappedAllMessages || {});
-        messages = [].concat(messages, allMessagesAfterLastMessage || []);
-        setMessagesToMap(channel.id, messages);
+        setMessagesToMap(channel.id, messages, firstMessageId, lastMessageId);
         setAllMessages(messages);
         _context1.n = 1;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(messages))));
@@ -20145,8 +20375,23 @@ var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, up
     }
   }, _callee5);
 });
+var getFilteredPendingMessages = function getFilteredPendingMessages(messages) {
+  var filteredPendingMessages = [];
+  var activeChannelId = getActiveChannelId();
+  var pendingMessages = JSON.parse(JSON.stringify(getPendingMessages(activeChannelId) || []));
+  if (pendingMessages && pendingMessages.length) {
+    var messagesMap = {};
+    messages.forEach(function (msg) {
+      messagesMap[msg.tid || ''] = msg;
+    });
+    filteredPendingMessages = pendingMessages.filter(function (msg) {
+      return !messagesMap[msg.tid || ''];
+    });
+  }
+  return filteredPendingMessages;
+};
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, pendingMessages, _messagesMap, filteredPendingMessages, waitToSendPendingMessages, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20, _t21;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, 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, _updatedMessages$, _parsedMessages$, _parsedMessages, parsedMessages, _filteredPendingMessages, updatedMessages, messageIdForLoad, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -20154,10 +20399,10 @@ function getMessagesQuery(action) {
         _context10.n = 1;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior, scrollToMessage = _action$payload.scrollToMessage;
+        _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;
         connectionState = store.getState().UserReducer.connectionStatus;
-        if (!(channel.id && !channel.isMockChannel)) {
-          _context10.n = 76;
+        if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
+          _context10.n = 84;
           break;
         }
         SceytChatClient = getClient();
@@ -20187,24 +20432,26 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context10.n = 19;
+          _context10.n = 22;
           break;
         }
-        allMessages = getAllMessages();
-        havLastMessage = allMessages && allMessages.length && channel.lastMessage && allMessages[allMessages.length - 1] && allMessages[allMessages.length - 1].id === channel.lastMessage.id;
-        if (!(channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage)) {
-          _context10.n = 14;
+        if (!(channel.newMessageCount && channel.newMessageCount > 0)) {
+          _context10.n = 15;
           break;
         }
         setHasPrevCached(false);
-        setMessagesToMap(channel.id, []);
         setAllMessages([]);
+        messageQuery.limit = MESSAGES_MAX_LENGTH;
+        if (!Number(channel.lastDisplayedMessageId)) {
+          _context10.n = 8;
+          break;
+        }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context10.n = 6;
           break;
         }
         _context10.n = 5;
-        return effects.call(messageQuery.loadPreviousMessageId, '0');
+        return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
       case 5:
         _t1 = _context10.v;
         _context10.n = 7;
@@ -20216,381 +20463,368 @@ function getMessagesQuery(action) {
         };
       case 7:
         result = _t1;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 11;
-          break;
-        }
-        messageQuery.limit = 30;
+        _context10.n = 12;
+        break;
+      case 8:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 9;
+          _context10.n = 10;
           break;
         }
-        _context10.n = 8;
-        return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 8:
+        _context10.n = 9;
+        return effects.call(messageQuery.loadPrevious);
+      case 9:
         _t10 = _context10.v;
-        _context10.n = 10;
+        _context10.n = 11;
         break;
-      case 9:
+      case 10:
         _t10 = {
           messages: [],
           hasNext: false
         };
-      case 10:
-        secondResult = _t10;
-        result.messages = [].concat(secondResult.messages, result.messages);
-        result.hasNext = secondResult.hasNext;
       case 11:
-        sentMessages = [];
-        if (withDeliveredMessages) {
-          sentMessages = getFromAllMessagesByMessageId('', '', true);
-        }
-        messagesMap = {};
-        result.messages.forEach(function (msg) {
-          messagesMap[msg.tid || ''] = msg;
-        });
-        filteredSentMessages = sentMessages.filter(function (msg) {
-          return !messagesMap[msg.tid || ''];
-        });
-        result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
-        _context10.n = 12;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        result = _t10;
       case 12:
-        setMessagesToMap(channel.id, result.messages);
-        setAllMessages(result.messages);
         _context10.n = 13;
-        return effects.put(setMessagesHasPrevAC(true));
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 13:
-        _context10.n = 16;
-        break;
+        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 effects.put(setMessagesHasPrevAC(true));
       case 14:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context10.n = 15;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        _context10.n = 17;
+        break;
       case 15:
+        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context10.n = 16;
-        return effects.put(setMessagesHasPrevAC(true));
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 16:
         _context10.n = 17;
-        return effects.put(setMessagesHasNextAC(false));
+        return effects.put(setMessagesHasPrevAC(true));
       case 17:
+        _context10.n = 18;
+        return effects.put(setMessagesHasNextAC(false));
+      case 18:
         setHasNextCached(false);
         if (!(messageId && scrollToMessage)) {
-          _context10.n = 18;
+          _context10.n = 21;
           break;
         }
-        _context10.n = 18;
-        return effects.put(setScrollToMessagesAC(messageId, highlight, behavior));
-      case 18:
-        _context10.n = 72;
-        break;
+        if (!(channel.newMessageCount && channel.newMessageCount > 0)) {
+          _context10.n = 20;
+          break;
+        }
+        _context10.n = 19;
+        return effects.put(setScrollToMessagesAC(channel.lastDisplayedMessageId, highlight, behavior));
       case 19:
+        _context10.n = 21;
+        break;
+      case 20:
+        _context10.n = 21;
+        return effects.put(scrollToNewMessageAC(true));
+      case 21:
+        _context10.n = 77;
+        break;
+      case 22:
         if (!messageId) {
-          _context10.n = 38;
+          _context10.n = 52;
           break;
         }
-        _allMessages = getAllMessages();
-        messageIndex = _allMessages.findIndex(function (msg) {
-          return msg.id === messageId;
+        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 = 22;
+          _context10.n = 25;
           break;
         }
-        result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context10.n = 20;
+        result.messages = allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
+        _context10.n = 23;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 20:
+      case 23:
         setHasPrevCached(messageIndex > maxLengthPart);
-        setHasNextCached(_allMessages.length > maxLengthPart);
-        _context10.n = 21;
+        setHasNextCached(allMessages.length > maxLengthPart);
+        _context10.n = 24;
         return effects.put(setMessagesHasPrevAC(true));
-      case 21:
-        _context10.n = 34;
+      case 24:
+        _context10.n = 48;
         break;
-      case 22:
+      case 25:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
-        log.info('load by message id from server ...............', messageId);
+        log.info('load by message id from server ...............', loadWithMessageId);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 24;
+          _context10.n = 27;
           break;
         }
-        _context10.n = 23;
-        return effects.call(messageQuery.loadNearMessageId, messageId);
-      case 23:
+        _context10.n = 26;
+        return effects.call(messageQuery.loadNearMessageId, loadWithMessageId);
+      case 26:
         _t11 = _context10.v;
-        _context10.n = 25;
+        _context10.n = 28;
         break;
-      case 24:
+      case 27:
         _t11 = {
           messages: [],
           hasNext: false
         };
-      case 25:
+      case 28:
         result = _t11;
+        _context10.n = 29;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+      case 29:
         if (!(result.messages.length === 50)) {
-          _context10.n = 32;
+          _context10.n = 47;
           break;
         }
-        messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
+        messageQuery.limit = (MESSAGES_MAX_PAGE_COUNT - 50) / 2;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 27;
+          _context10.n = 31;
           break;
         }
-        _context10.n = 26;
+        _context10.n = 30;
         return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 26:
+      case 30:
         _t12 = _context10.v;
-        _context10.n = 28;
+        _context10.n = 32;
         break;
-      case 27:
+      case 31:
         _t12 = {
           messages: [],
           hasNext: false
         };
-      case 28:
-        _secondResult = _t12;
+      case 32:
+        secondResult = _t12;
+        result.messages = [].concat(secondResult.messages, result.messages);
+        _context10.n = 33;
+        return effects.put(addMessagesAC(JSON.parse(JSON.stringify(secondResult.messages)), MESSAGE_LOAD_DIRECTION.PREV));
+      case 33:
+        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length;
         messageQuery.reverse = false;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 30;
+          _context10.n = 35;
           break;
         }
-        _context10.n = 29;
+        _context10.n = 34;
         return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 29:
+      case 34:
         _t13 = _context10.v;
-        _context10.n = 31;
+        _context10.n = 36;
         break;
-      case 30:
+      case 35:
         _t13 = {
           messages: [],
           hasNext: false
         };
-      case 31:
-        thirdResult = _t13;
-        result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
-        result.hasNext = _secondResult.hasNext;
-        messageQuery.reverse = true;
-        _context10.n = 32;
-        return effects.put(setMessagesHasPrevAC(_secondResult.hasNext));
-      case 32:
-        _context10.n = 33;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 33:
-        setMessagesToMap(channel.id, result.messages);
-        setAllMessages([].concat(result.messages));
-        setHasPrevCached(false);
-        setHasNextCached(false);
-      case 34:
-        _context10.n = 35;
-        return effects.put(setMessagesHasNextAC(true));
-      case 35:
-        if (!scrollToMessage) {
-          _context10.n = 36;
-          break;
-        }
-        _context10.n = 36;
-        return effects.put(setScrollToMessagesAC(messageId, true, behavior));
       case 36:
+        thirdResult = _t13;
+        result.messages = [].concat(result.messages, thirdResult.messages);
         _context10.n = 37;
-        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(addMessagesAC(JSON.parse(JSON.stringify(thirdResult.messages)), MESSAGE_LOAD_DIRECTION.NEXT));
       case 37:
-        _context10.n = 72;
-        break;
-      case 38:
-        if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context10.n = 61;
-          break;
-        }
-        setMessagesToMap(channel.id, []);
-        setAllMessages([]);
-        messageQuery.limit = MESSAGES_MAX_LENGTH;
-        if (!Number(channel.lastDisplayedMessageId)) {
-          _context10.n = 50;
+        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 = 40;
+          _context10.n = 39;
           break;
         }
-        _context10.n = 39;
-        return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 39:
+        _context10.n = 38;
+        return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
+      case 38:
         _t14 = _context10.v;
-        _context10.n = 41;
+        _context10.n = 40;
         break;
-      case 40:
+      case 39:
         _t14 = {
           messages: [],
           hasNext: false
         };
+      case 40:
+        fourthResult = _t14;
+        result.messages = [].concat(fourthResult.messages, result.messages);
+        _context10.n = 41;
+        return effects.put(addMessagesAC(JSON.parse(JSON.stringify(fourthResult.messages)), MESSAGE_LOAD_DIRECTION.PREV));
       case 41:
-        result = _t14;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 49;
+        _context10.n = 46;
+        break;
+      case 42:
+        if (!(!secondResult.hasNext && thirdResult.hasNext)) {
+          _context10.n = 46;
           break;
         }
-        messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
+        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length - result.messages.length;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 43;
+          _context10.n = 44;
           break;
         }
-        _context10.n = 42;
-        return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 42:
+        _context10.n = 43;
+        return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
+      case 43:
         _t15 = _context10.v;
-        _context10.n = 44;
+        _context10.n = 45;
         break;
-      case 43:
+      case 44:
         _t15 = {
           messages: [],
           hasNext: false
         };
-      case 44:
-        _secondResult2 = _t15;
-        if (!(channel.newMessageCount > 25)) {
-          _context10.n = 48;
+      case 45:
+        _fourthResult = _t15;
+        result.messages = [].concat(result.messages, _fourthResult.messages);
+        _context10.n = 46;
+        return effects.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;
+        return effects.put(setMessagesHasNextAC(true));
+      case 49:
+        if (!scrollToMessage) {
+          _context10.n = 50;
+          break;
+        }
+        _context10.n = 50;
+        return effects.put(setScrollToMessagesAC(loadWithMessageId, highlight, behavior));
+      case 50:
+        _context10.n = 51;
+        return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 51:
+        _context10.n = 77;
+        break;
+      case 52:
+        if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
+          _context10.n = 64;
+          break;
+        }
+        setAllMessages([]);
+        messageQuery.limit = MESSAGES_MAX_LENGTH;
+        if (!Number(channel.lastDisplayedMessageId)) {
+          _context10.n = 56;
           break;
         }
-        messageQuery.reverse = false;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 46;
+          _context10.n = 54;
           break;
         }
-        _context10.n = 45;
-        return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 45:
+        _context10.n = 53;
+        return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
+      case 53:
         _t16 = _context10.v;
-        _context10.n = 47;
+        _context10.n = 55;
         break;
-      case 46:
+      case 54:
         _t16 = {
           messages: [],
           hasNext: false
         };
-      case 47:
-        _thirdResult = _t16;
-        result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
-        messageQuery.reverse = true;
-        _context10.n = 49;
-        break;
-      case 48:
-        result.messages = [].concat(_secondResult2.messages, result.messages);
-      case 49:
-        _context10.n = 57;
+      case 55:
+        result = _t16;
+        _context10.n = 60;
         break;
-      case 50:
+      case 56:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 52;
+          _context10.n = 58;
           break;
         }
-        _context10.n = 51;
+        _context10.n = 57;
         return effects.call(messageQuery.loadPrevious);
-      case 51:
+      case 57:
         _t17 = _context10.v;
-        _context10.n = 53;
+        _context10.n = 59;
         break;
-      case 52:
+      case 58:
         _t17 = {
           messages: [],
           hasNext: false
         };
-      case 53:
+      case 59:
         result = _t17;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 57;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 55;
-          break;
-        }
-        _context10.n = 54;
-        return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 54:
-        _t18 = _context10.v;
-        _context10.n = 56;
-        break;
-      case 55:
-        _t18 = {
-          messages: [],
-          hasNext: false
-        };
-      case 56:
-        _secondResult3 = _t18;
-        result.messages = [].concat(_secondResult3.messages, result.messages);
-        result.hasNext = _secondResult3.hasNext;
-      case 57:
-        _context10.n = 58;
+      case 60:
+        _context10.n = 61;
         return effects.put(setMessagesHasPrevAC(true));
-      case 58:
-        _context10.n = 59;
+      case 61:
+        _context10.n = 62;
         return effects.put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
-      case 59:
-        setMessagesToMap(channel.id, result.messages);
+      case 62:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$3 = result.messages[0]) === null || _result$messages$3 === void 0 ? void 0 : _result$messages$3.id, (_result$messages3 = result.messages[result.messages.length - 1]) === null || _result$messages3 === void 0 ? void 0 : _result$messages3.id);
         setAllMessages([].concat(result.messages));
-        _context10.n = 60;
+        _context10.n = 63;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 60:
-        _context10.n = 72;
+      case 63:
+        _context10.n = 77;
         break;
-      case 61:
-        setMessagesToMap(channel.id, []);
-        setAllMessages([]);
+      case 64:
         if (!(cachedMessages && cachedMessages.length)) {
-          _context10.n = 62;
+          _context10.n = 66;
           break;
         }
-        setMessagesToMap(channel.id, []);
-        setAllMessages([].concat(cachedMessages));
-        _context10.n = 62;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 62:
+        parsedMessages = getFromAllMessagesByMessageId('', '', true);
+        setMessagesToMap(channel.id, parsedMessages, (_parsedMessages$ = parsedMessages[0]) === null || _parsedMessages$ === void 0 ? void 0 : _parsedMessages$.id, (_parsedMessages = parsedMessages[parsedMessages.length - 1]) === null || _parsedMessages === void 0 ? void 0 : _parsedMessages.id);
+        _context10.n = 65;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(parsedMessages))));
+      case 65:
+        _filteredPendingMessages = getFilteredPendingMessages(parsedMessages);
+        _context10.n = 66;
+        return effects.put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 66:
         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 = 70;
+          break;
+        }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 64;
+          _context10.n = 68;
           break;
         }
-        _context10.n = 63;
-        return effects.call(messageQuery.loadPrevious);
-      case 63:
-        _t19 = _context10.v;
-        _context10.n = 65;
+        _context10.n = 67;
+        return effects.call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
+      case 67:
+        _t18 = _context10.v;
+        _context10.n = 69;
         break;
-      case 64:
-        _t19 = {
+      case 68:
+        _t18 = {
           messages: [],
           hasNext: false
         };
-      case 65:
-        result = _t19;
-        if (!(result.messages.length === 50)) {
-          _context10.n = 69;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
+      case 69:
+        result = _t18;
+        _context10.n = 74;
+        break;
+      case 70:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 67;
+          _context10.n = 72;
           break;
         }
-        _context10.n = 66;
-        return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 66:
-        _t20 = _context10.v;
-        _context10.n = 68;
+        _context10.n = 71;
+        return effects.call(messageQuery.loadPrevious);
+      case 71:
+        _t19 = _context10.v;
+        _context10.n = 73;
         break;
-      case 67:
-        _t20 = {
+      case 72:
+        _t19 = {
           messages: [],
           hasNext: false
         };
-      case 68:
-        _secondResult4 = _t20;
-        result.messages = [].concat(_secondResult4.messages, result.messages);
-        result.hasNext = _secondResult4.hasNext;
-      case 69:
+      case 73:
+        result = _t19;
+      case 74:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -20600,70 +20834,73 @@ function getMessagesQuery(action) {
           updateMessageOnAllMessages(msg.id, updatedMessage || msg);
           updatedMessages.push(updatedMessage || msg);
         });
-        _context10.n = 70;
-        return effects.call(updateMessages, channel, updatedMessages);
-      case 70:
-        _context10.n = 71;
+        messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
+        _context10.n = 75;
+        return effects.call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
+      case 75:
+        _context10.n = 76;
         return effects.put(setMessagesHasPrevAC(true));
-      case 71:
-        _context10.n = 72;
+      case 76:
+        _context10.n = 77;
         return effects.put(setMessagesHasNextAC(false));
-      case 72:
-        pendingMessages = getPendingMessages(channel.id);
-        if (!(pendingMessages && pendingMessages.length)) {
-          _context10.n = 73;
-          break;
-        }
-        _messagesMap = {};
-        result.messages.forEach(function (msg) {
-          _messagesMap[msg.tid || ''] = msg;
-        });
-        filteredPendingMessages = pendingMessages.filter(function (msg) {
-          return !_messagesMap[msg.tid || ''];
-        });
-        _context10.n = 73;
+      case 77:
+        filteredPendingMessages = getFilteredPendingMessages(result.messages);
+        _context10.n = 78;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 73:
+      case 78:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 75;
+          _context10.n = 80;
           break;
         }
-        _context10.n = 74;
+        _context10.n = 79;
         return effects.put(setWaitToSendPendingMessagesAC(false));
-      case 74:
-        _context10.n = 75;
+      case 79:
+        _context10.n = 80;
         return effects.spawn(sendPendingMessages, connectionState);
-      case 75:
-        _context10.n = 77;
+      case 80:
+        _context10.n = 81;
+        return effects.call(SceytChatClient.getChannel, channel.id, true);
+      case 81:
+        updatedChannel = _context10.v;
+        if (!updatedChannel) {
+          _context10.n = 83;
+          break;
+        }
+        _context10.n = 82;
+        return effects.put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
+      case 82:
+        updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
+      case 83:
+        _context10.n = 85;
         break;
-      case 76:
-        if (!channel.isMockChannel) {
-          _context10.n = 77;
+      case 84:
+        if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
+          _context10.n = 85;
           break;
         }
-        _context10.n = 77;
+        _context10.n = 85;
         return effects.put(setMessagesAC([]));
-      case 77:
-        _context10.n = 79;
+      case 85:
+        _context10.n = 87;
         break;
-      case 78:
-        _context10.p = 78;
-        _t21 = _context10.v;
-        log.error('error in message query', _t21);
-      case 79:
-        _context10.p = 79;
-        _context10.n = 80;
+      case 86:
+        _context10.p = 86;
+        _t20 = _context10.v;
+        log.error('error in message query', _t20);
+      case 87:
+        _context10.p = 87;
+        _context10.n = 88;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 80:
-        return _context10.f(79);
-      case 81:
+      case 88:
+        return _context10.f(87);
+      case 89:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 78, 79, 81]]);
+  }, _marked7$1, null, [[0, 86, 87, 89]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t22;
+  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t21;
   return _regenerator().w(function (_context11) {
     while (1) switch (_context11.p = _context11.n) {
       case 0:
@@ -20713,15 +20950,15 @@ function getMessageQuery(action) {
         break;
       case 7:
         _context11.p = 7;
-        _t22 = _context11.v;
-        log.error('error in message query', _t22);
+        _t21 = _context11.v;
+        log.error('error in message query', _t21);
       case 8:
         return _context11.a(2);
     }
   }, _marked8$1, null, [[0, 7]]);
 }
 function loadMoreMessages(action) {
-  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t23;
+  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _result$messages$4, _result$messages4, _result$messages$5, _result$messages5, _t22;
   return _regenerator().w(function (_context12) {
     while (1) switch (_context12.p = _context12.n) {
       case 0:
@@ -20765,7 +21002,7 @@ function loadMoreMessages(action) {
         result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.PREV);
-          setMessagesToMap(channelId, result.messages);
+          setMessagesToMap(channelId, result.messages, (_result$messages$4 = result.messages[0]) === null || _result$messages$4 === void 0 ? void 0 : _result$messages$4.id, (_result$messages4 = result.messages[result.messages.length - 1]) === null || _result$messages4 === void 0 ? void 0 : _result$messages4.id);
         }
         _context12.n = 5;
         return effects.put(setMessagesHasPrevAC(result.hasNext));
@@ -20793,7 +21030,7 @@ function loadMoreMessages(action) {
         result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.NEXT);
-          setMessagesToMap(channelId, result.messages);
+          setMessagesToMap(channelId, result.messages, (_result$messages$5 = result.messages[0]) === null || _result$messages$5 === void 0 ? void 0 : _result$messages$5.id, (_result$messages5 = result.messages[result.messages.length - 1]) === null || _result$messages5 === void 0 ? void 0 : _result$messages5.id);
         }
         _context12.n = 9;
         return effects.put(setMessagesHasNextAC(result.hasNext));
@@ -20834,15 +21071,15 @@ function loadMoreMessages(action) {
         break;
       case 18:
         _context12.p = 18;
-        _t23 = _context12.v;
-        log.error('error in load more messages', _t23);
+        _t22 = _context12.v;
+        log.error('error in load more messages', _t22);
       case 19:
         return _context12.a(2);
     }
   }, _marked9$1, null, [[0, 18]]);
 }
 function addReaction(action) {
-  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t24;
+  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t23;
   return _regenerator().w(function (_context13) {
     while (1) switch (_context13.p = _context13.n) {
       case 0:
@@ -20895,15 +21132,15 @@ function addReaction(action) {
         break;
       case 8:
         _context13.p = 8;
-        _t24 = _context13.v;
-        log.error('ERROR in add reaction', _t24.message);
+        _t23 = _context13.v;
+        log.error('ERROR in add reaction', _t23.message);
       case 9:
         return _context13.a(2);
     }
   }, _marked0$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
-  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t25;
+  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t24;
   return _regenerator().w(function (_context14) {
     while (1) switch (_context14.p = _context14.n) {
       case 0:
@@ -20951,15 +21188,15 @@ function deleteReaction(action) {
         break;
       case 7:
         _context14.p = 7;
-        _t25 = _context14.v;
-        log.error('ERROR in delete reaction', _t25.message);
+        _t24 = _context14.v;
+        log.error('ERROR in delete reaction', _t24.message);
       case 8:
         return _context14.a(2);
     }
   }, _marked1$1, null, [[0, 7]]);
 }
 function getReactions(action) {
-  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t26;
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t25;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -20994,15 +21231,15 @@ function getReactions(action) {
         break;
       case 6:
         _context15.p = 6;
-        _t26 = _context15.v;
-        log.error('ERROR in get reactions', _t26.message);
+        _t25 = _context15.v;
+        log.error('ERROR in get reactions', _t25.message);
       case 7:
         return _context15.a(2);
     }
   }, _marked10$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
-  var payload, limit, ReactionQuery, result, _t27;
+  var payload, limit, ReactionQuery, result, _t26;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.p = _context16.n) {
       case 0:
@@ -21030,15 +21267,15 @@ function loadMoreReactions(action) {
         break;
       case 5:
         _context16.p = 5;
-        _t27 = _context16.v;
-        log.error('ERROR in load more reactions', _t27.message);
+        _t26 = _context16.v;
+        log.error('ERROR in load more reactions', _t26.message);
       case 6:
         return _context16.a(2);
     }
   }, _marked11$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t28;
+  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t27;
   return _regenerator().w(function (_context17) {
     while (1) switch (_context17.p = _context17.n) {
       case 0:
@@ -21116,15 +21353,15 @@ function getMessageAttachments(action) {
         break;
       case 13:
         _context17.p = 13;
-        _t28 = _context17.v;
-        log.error('error in message attachment query', _t28);
+        _t27 = _context17.v;
+        log.error('error in message attachment query', _t27);
       case 14:
         return _context17.a(2);
     }
   }, _marked12$1, null, [[0, 13]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t29;
+  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t28;
   return _regenerator().w(function (_context18) {
     while (1) switch (_context18.p = _context18.n) {
       case 0:
@@ -21168,15 +21405,15 @@ function loadMoreMessageAttachments(action) {
         break;
       case 8:
         _context18.p = 8;
-        _t29 = _context18.v;
-        log.error('error in message attachment query', _t29);
+        _t28 = _context18.v;
+        log.error('error in message attachment query', _t28);
       case 9:
         return _context18.a(2);
     }
   }, _marked13$1, null, [[0, 8]]);
 }
 function pauseAttachmentUploading(action) {
-  var attachmentId, isPaused, _t30;
+  var attachmentId, isPaused, _t29;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -21198,15 +21435,15 @@ function pauseAttachmentUploading(action) {
         break;
       case 2:
         _context19.p = 2;
-        _t30 = _context19.v;
-        log.error('error in pause attachment uploading', _t30);
+        _t29 = _context19.v;
+        log.error('error in pause attachment uploading', _t29);
       case 3:
         return _context19.a(2);
     }
   }, _marked14$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t31;
+  var attachmentId, isResumed, _t30;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.p = _context20.n) {
       case 0:
@@ -21229,15 +21466,15 @@ function resumeAttachmentUploading(action) {
         break;
       case 2:
         _context20.p = 2;
-        _t31 = _context20.v;
-        log.error('error in resume attachment uploading', _t31);
+        _t30 = _context20.v;
+        log.error('error in resume attachment uploading', _t30);
       case 3:
         return _context20.a(2);
     }
   }, _marked15$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
-  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t32;
+  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t31;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
@@ -21267,8 +21504,8 @@ function getMessageMarkers(action) {
         break;
       case 5:
         _context21.p = 5;
-        _t32 = _context21.v;
-        log.error('error in get message markers', _t32);
+        _t31 = _context21.v;
+        log.error('error in get message markers', _t31);
       case 6:
         _context21.p = 6;
         _context21.n = 7;
@@ -21280,9 +21517,9 @@ function getMessageMarkers(action) {
     }
   }, _marked16$1, null, [[0, 5, 6, 8]]);
 }
-function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
+function executeAddPollVote(channelId, pollId, optionId, message) {
   var _user$presence, _message$pollDetails, _message$pollDetails2, _message$pollDetails3, _message$pollDetails4;
-  var channel, user, vote, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7, _iterator2, _step2, obj;
+  var channel, user, vote, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7;
   return _regenerator().w(function (_context22) {
     while (1) switch (_context22.n) {
       case 0:
@@ -21331,38 +21568,16 @@ function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
           vote: vote,
           incrementVotesPerOptionCount: 1
         });
-        if (isResend) {
-          _context22.n = 5;
-          break;
-        }
-        _iterator2 = _createForOfIteratorHelperLoose(objs);
-      case 3:
-        if ((_step2 = _iterator2()).done) {
-          _context22.n = 5;
+        if (!(channel && message.id)) {
+          _context22.n = 4;
           break;
         }
-        obj = _step2.value;
-        updateMessageOnMap(channel.id, {
-          messageId: message.id,
-          params: {}
-        }, obj);
-        updateMessageOnAllMessages(message.id, {}, obj);
-        _context22.n = 4;
-        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
-      case 4:
         _context22.n = 3;
-        break;
-      case 5:
-        if (!channel) {
-          _context22.n = 7;
-          break;
-        }
-        _context22.n = 6;
         return effects.call(channel.addVote, message.id, pollId, [optionId]);
-      case 6:
-        _context22.n = 7;
+      case 3:
+        _context22.n = 4;
         return effects.put(removePendingPollActionAC(message.id, 'ADD_POLL_VOTE', optionId));
-      case 7:
+      case 4:
         return _context22.a(2);
     }
   }, _marked17$1);
@@ -21406,7 +21621,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values2, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t33;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t32;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
@@ -21415,10 +21630,9 @@ function addPollVote(action) {
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context24.n = 7;
+          _context24.n = 6;
           break;
         }
-        connectionState = sceytChatClient.connectionState;
         user = sceytChatClient.user;
         vote = {
           optionId: optionId,
@@ -21441,10 +21655,6 @@ function addPollVote(action) {
             createdAt: new Date().getTime()
           }
         };
-        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context24.n = 6;
-          break;
-        }
         pendingAction = {
           type: 'ADD_POLL_VOTE',
           channelId: channelId,
@@ -21465,7 +21675,7 @@ function addPollVote(action) {
           _context24.n = 3;
           break;
         }
-        currentMessage = ((_Object$values2 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values2 === void 0 ? void 0 : _Object$values2.find(function (msg) {
+        currentMessage = ((_Object$values = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values === void 0 ? void 0 : _Object$values.find(function (msg) {
           return msg.id === message.id || msg.tid === message.id;
         })) || message;
         hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[pollId]) || false;
@@ -21494,27 +21704,25 @@ function addPollVote(action) {
         }
         return _context24.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, message, vote)), 5);
       case 5:
-        if (!conflictCheck.shouldSkip) {
+        if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        return _context24.a(2);
+        return _context24.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message)), 6);
       case 6:
-        return _context24.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message, isResend)), 7);
-      case 7:
-        _context24.n = 9;
+        _context24.n = 8;
         break;
+      case 7:
+        _context24.p = 7;
+        _t32 = _context24.v;
+        log.error('error in add poll vote', _t32);
       case 8:
-        _context24.p = 8;
-        _t33 = _context24.v;
-        log.error('error in add poll vote', _t33);
-      case 9:
         return _context24.a(2);
     }
-  }, _marked19$1, null, [[0, 8]]);
+  }, _marked19$1, null, [[0, 7]]);
 }
-function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
+function executeDeletePollVote(channelId, pollId, optionId, message) {
   var _message$pollDetails8, _message$pollDetails9, _message$pollDetails0;
-  var channel, vote, obj;
+  var channel, vote;
   return _regenerator().w(function (_context25) {
     while (1) switch (_context25.n) {
       case 0:
@@ -21537,33 +21745,16 @@ function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
         }
         return _context25.a(2);
       case 3:
-        obj = {
-          type: 'deleteOwn',
-          vote: vote,
-          incrementVotesPerOptionCount: -1
-        };
-        if (isResend) {
-          _context25.n = 4;
+        if (!(channel && message.id)) {
+          _context25.n = 5;
           break;
         }
-        updateMessageOnMap(channel.id, {
-          messageId: message.id,
-          params: {}
-        }, obj);
-        updateMessageOnAllMessages(message.id, {}, obj);
         _context25.n = 4;
-        return effects.put(updateMessageAC(message.id, {}, undefined, obj));
+        return effects.call(channel.deleteVote, message.id, pollId, [optionId]);
       case 4:
-        if (!channel) {
-          _context25.n = 6;
-          break;
-        }
         _context25.n = 5;
-        return effects.call(channel.deleteVote, message.id, pollId, [optionId]);
-      case 5:
-        _context25.n = 6;
         return effects.put(removePendingPollActionAC(message.id, 'DELETE_POLL_VOTE', optionId));
-      case 6:
+      case 5:
         return _context25.a(2);
     }
   }, _marked20$1);
@@ -21607,7 +21798,7 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, connectionState, vote, pendingAction, conflictCheck, channel, _Object$values3, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t34;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t33;
   return _regenerator().w(function (_context27) {
     while (1) switch (_context27.p = _context27.n) {
       case 0:
@@ -21616,10 +21807,9 @@ function deletePollVote(action) {
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context27.n = 8;
+          _context27.n = 7;
           break;
         }
-        connectionState = sceytChatClient.connectionState;
         vote = (_message$pollDetails1 = message.pollDetails) === null || _message$pollDetails1 === void 0 ? void 0 : (_message$pollDetails10 = _message$pollDetails1.voteDetails) === null || _message$pollDetails10 === void 0 ? void 0 : (_message$pollDetails11 = _message$pollDetails10.ownVotes) === null || _message$pollDetails11 === void 0 ? void 0 : _message$pollDetails11.find(function (vote) {
           return vote.optionId === optionId;
         });
@@ -21629,10 +21819,6 @@ function deletePollVote(action) {
         }
         return _context27.a(2);
       case 1:
-        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context27.n = 7;
-          break;
-        }
         pendingAction = {
           type: 'DELETE_POLL_VOTE',
           channelId: channelId,
@@ -21653,7 +21839,7 @@ function deletePollVote(action) {
           _context27.n = 4;
           break;
         }
-        currentMessage = ((_Object$values3 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values3 === void 0 ? void 0 : _Object$values3.find(function (msg) {
+        currentMessage = ((_Object$values2 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values2 === void 0 ? void 0 : _Object$values2.find(function (msg) {
           return msg.id === message.id || msg.tid === message.id;
         })) || message;
         _context27.n = 3;
@@ -21681,23 +21867,21 @@ function deletePollVote(action) {
         }
         return _context27.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)), 6);
       case 6:
-        if (!conflictCheck.shouldSkip) {
+        if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        return _context27.a(2);
+        return _context27.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message)), 7);
       case 7:
-        return _context27.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message, isResend)), 8);
-      case 8:
-        _context27.n = 10;
+        _context27.n = 9;
         break;
+      case 8:
+        _context27.p = 8;
+        _t33 = _context27.v;
+        log.error('error in delete poll vote', _t33);
       case 9:
-        _context27.p = 9;
-        _t34 = _context27.v;
-        log.error('error in delete poll vote', _t34);
-      case 10:
         return _context27.a(2);
     }
-  }, _marked22$1, null, [[0, 9]]);
+  }, _marked22$1, null, [[0, 8]]);
 }
 function executeClosePoll(channelId, pollId, message) {
   var channel, obj;
@@ -21720,7 +21904,7 @@ function executeClosePoll(channelId, pollId, message) {
         _context28.n = 2;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 2:
-        if (!channel) {
+        if (!(channel && message.id)) {
           _context28.n = 4;
           break;
         }
@@ -21771,7 +21955,7 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
   }, _marked24$1);
 }
 function closePoll(action) {
-  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t35;
+  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t34;
   return _regenerator().w(function (_context30) {
     while (1) switch (_context30.p = _context30.n) {
       case 0:
@@ -21804,15 +21988,15 @@ function closePoll(action) {
         break;
       case 4:
         _context30.p = 4;
-        _t35 = _context30.v;
-        log.error('error in close poll', _t35);
+        _t34 = _context30.v;
+        log.error('error in close poll', _t34);
       case 5:
         return _context30.a(2);
     }
   }, _marked25$1, null, [[0, 4]]);
 }
 function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
-  var channel, _iterator3, _step3, obj;
+  var channel, _iterator2, _step2, obj;
   return _regenerator().w(function (_context31) {
     while (1) switch (_context31.n) {
       case 0:
@@ -21824,13 +22008,13 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
           _context31.n = 4;
           break;
         }
-        _iterator3 = _createForOfIteratorHelperLoose(objs);
+        _iterator2 = _createForOfIteratorHelperLoose(objs);
       case 2:
-        if ((_step3 = _iterator3()).done) {
+        if ((_step2 = _iterator2()).done) {
           _context31.n = 4;
           break;
         }
-        obj = _step3.value;
+        obj = _step2.value;
         updateMessageOnMap(channelId, {
           messageId: message.id,
           params: {}
@@ -21842,7 +22026,7 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
         _context31.n = 2;
         break;
       case 4:
-        if (!channel) {
+        if (!(channel && message.id)) {
           _context31.n = 6;
           break;
         }
@@ -21857,7 +22041,7 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
   }, _marked26$1);
 }
 function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs) {
-  var channel, _iterator4, _step4, obj;
+  var channel, _iterator3, _step3, obj;
   return _regenerator().w(function (_context32) {
     while (1) switch (_context32.n) {
       case 0:
@@ -21871,13 +22055,13 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
         }
         return _context32.a(2);
       case 2:
-        _iterator4 = _createForOfIteratorHelperLoose(objs);
+        _iterator3 = _createForOfIteratorHelperLoose(objs);
       case 3:
-        if ((_step4 = _iterator4()).done) {
+        if ((_step3 = _iterator3()).done) {
           _context32.n = 5;
           break;
         }
-        obj = _step4.value;
+        obj = _step3.value;
         updateMessageOnMap(channelId, {
           messageId: message.id,
           params: {}
@@ -21894,7 +22078,7 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator5, _step5, _message$pollDetails12, _message$pollDetails13, vote, _t36;
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message$pollDetails12, _message$pollDetails13, vote, _t35;
   return _regenerator().w(function (_context33) {
     while (1) switch (_context33.p = _context33.n) {
       case 0:
@@ -21908,8 +22092,8 @@ function retractPollVote(action) {
         }
         connectionState = sceytChatClient.connectionState;
         objs = [];
-        for (_iterator5 = _createForOfIteratorHelperLoose(((_message$pollDetails12 = message.pollDetails) === null || _message$pollDetails12 === void 0 ? void 0 : (_message$pollDetails13 = _message$pollDetails12.voteDetails) === null || _message$pollDetails13 === void 0 ? void 0 : _message$pollDetails13.ownVotes) || []); !(_step5 = _iterator5()).done;) {
-          vote = _step5.value;
+        for (_iterator4 = _createForOfIteratorHelperLoose(((_message$pollDetails12 = message.pollDetails) === null || _message$pollDetails12 === void 0 ? void 0 : (_message$pollDetails13 = _message$pollDetails12.voteDetails) === null || _message$pollDetails13 === void 0 ? void 0 : _message$pollDetails13.ownVotes) || []); !(_step4 = _iterator4()).done;) {
+          vote = _step4.value;
           objs.push({
             type: 'deleteOwn',
             vote: vote,
@@ -21936,15 +22120,15 @@ function retractPollVote(action) {
         break;
       case 4:
         _context33.p = 4;
-        _t36 = _context33.v;
-        log.error('error in retract poll vote', _t36);
+        _t35 = _context33.v;
+        log.error('error in retract poll vote', _t35);
       case 5:
         return _context33.a(2);
     }
   }, _marked28$1, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
-  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t37;
+  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t36;
   return _regenerator().w(function (_context34) {
     while (1) switch (_context34.p = _context34.n) {
       case 0:
@@ -21960,13 +22144,6 @@ function resendPendingPollActions(action) {
       case 1:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         pendingPollActionsMapCopy = JSON.parse(JSON.stringify(pendingPollActionsMap));
-        _context34.n = 2;
-        return effects.call(function () {
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 1000);
-          });
-        });
-      case 2:
         Object.keys(pendingPollActionsMapCopy).forEach(function (messageId) {
           pendingPollActionsMapCopy[messageId].forEach(function (pendingAction) {
             var type = pendingAction.type,
@@ -21996,19 +22173,19 @@ function resendPendingPollActions(action) {
             }
           });
         });
-        _context34.n = 4;
+        _context34.n = 3;
         break;
+      case 2:
+        _context34.p = 2;
+        _t36 = _context34.v;
+        log.error('error in resend pending poll actions', _t36);
       case 3:
-        _context34.p = 3;
-        _t37 = _context34.v;
-        log.error('error in resend pending poll actions', _t37);
-      case 4:
         return _context34.a(2);
     }
-  }, _marked29$1, null, [[0, 3]]);
+  }, _marked29$1, null, [[0, 2]]);
 }
 function getPollVotes(action) {
-  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t38;
+  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t37;
   return _regenerator().w(function (_context35) {
     while (1) switch (_context35.p = _context35.n) {
       case 0:
@@ -22074,8 +22251,8 @@ function getPollVotes(action) {
         break;
       case 7:
         _context35.p = 7;
-        _t38 = _context35.v;
-        log.error('ERROR in get poll votes', _t38);
+        _t37 = _context35.v;
+        log.error('ERROR in get poll votes', _t37);
         _context35.n = 8;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
@@ -22084,7 +22261,7 @@ function getPollVotes(action) {
   }, _marked30$1, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
-  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t39;
+  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t38;
   return _regenerator().w(function (_context36) {
     while (1) switch (_context36.p = _context36.n) {
       case 0:
@@ -22142,8 +22319,8 @@ function loadMorePollVotes(action) {
         break;
       case 6:
         _context36.p = 6;
-        _t39 = _context36.v;
-        log.error('ERROR in load more poll votes', _t39);
+        _t38 = _context36.v;
+        log.error('ERROR in load more poll votes', _t38);
         _context36.n = 7;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
@@ -22245,54 +22422,71 @@ var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
   _marked8$2 = /*#__PURE__*/_regenerator().m(getRoles),
   _marked9$2 = /*#__PURE__*/_regenerator().m(MembersSaga);
 function getMembers(action) {
-  var payload, channelId, SceytChatClient, membersQueryBuilder, membersQuery, _yield$call, members, _t;
+  var payload, channelId, SceytChatClient, membersQueryBuilder, membersQuery, _yield$call, members, hasNext, updateChannelData, _t;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.p = _context.n) {
       case 0:
         _context.p = 0;
+        _context.n = 1;
+        return effects.put(setMembersHasNextAC(true));
+      case 1:
         payload = action.payload;
         channelId = payload.channelId;
         if (channelId) {
-          _context.n = 1;
+          _context.n = 2;
           break;
         }
         return _context.a(2);
-      case 1:
+      case 2:
         SceytChatClient = getClient();
         membersQueryBuilder = new SceytChatClient.MemberListQueryBuilder(channelId);
         membersQueryBuilder.all().byAffiliationOrder().orderKeyByUsername().limit(50);
-        _context.n = 2;
+        _context.n = 3;
         return effects.call(membersQueryBuilder.build);
-      case 2:
+      case 3:
         membersQuery = _context.v;
         query.membersQuery = membersQuery;
-        _context.n = 3;
-        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADING));
-      case 3:
         _context.n = 4;
-        return effects.call(membersQuery.loadNextPage);
+        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADING));
       case 4:
-        _yield$call = _context.v;
-        members = _yield$call.members;
         _context.n = 5;
-        return effects.put(setMembersToListAC(members));
+        return effects.call(membersQuery.loadNextPage);
       case 5:
+        _yield$call = _context.v;
+        members = _yield$call.members;
+        hasNext = _yield$call.hasNext;
         _context.n = 6;
-        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setMembersToListAC(members));
       case 6:
+        _context.n = 7;
+        return effects.put(setMembersHasNextAC(hasNext));
+      case 7:
         _context.n = 8;
+        return effects.call(updateActiveChannelMembersAdd, members) || {};
+      case 8:
+        updateChannelData = _context.v;
+        _context.n = 9;
+        return effects.put(updateChannelDataAC(channelId, updateChannelData));
+      case 9:
+        _context.n = 11;
         break;
-      case 7:
-        _context.p = 7;
+      case 10:
+        _context.p = 10;
         _t = _context.v;
         log.error('ERROR in get members - ', _t.message);
-      case 8:
+      case 11:
+        _context.p = 11;
+        _context.n = 12;
+        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+      case 12:
+        return _context.f(11);
+      case 13:
         return _context.a(2);
     }
-  }, _marked$4, null, [[0, 7]]);
+  }, _marked$4, null, [[0, 10, 11, 13]]);
 }
 function loadMoreMembers(action) {
-  var payload, limit, channelId, membersQuery, _yield$call2, members, updateChannelData;
+  var payload, limit, channelId, membersQuery, _yield$call2, members, hasNext, updateChannelData;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
@@ -22312,27 +22506,34 @@ function loadMoreMembers(action) {
       case 2:
         _yield$call2 = _context2.v;
         members = _yield$call2.members;
+        hasNext = _yield$call2.hasNext;
         _context2.n = 3;
         return effects.put(addMembersToListAC(members));
       case 3:
         _context2.n = 4;
-        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setMembersHasNextAC(hasNext));
       case 4:
         _context2.n = 5;
         return effects.call(updateActiveChannelMembersAdd, members) || {};
       case 5:
         updateChannelData = _context2.v;
         _context2.n = 6;
-        return effects.put(updateChannelDataAC(channelId, _extends({}, updateChannelData)));
+        return effects.put(updateChannelDataAC(channelId, updateChannelData));
       case 6:
         _context2.n = 8;
         break;
       case 7:
         _context2.p = 7;
       case 8:
+        _context2.p = 8;
+        _context2.n = 9;
+        return effects.put(setMembersLoadingStateAC(LOADING_STATE.LOADED));
+      case 9:
+        return _context2.f(8);
+      case 10:
         return _context2.a(2);
     }
-  }, _marked2$3, null, [[0, 7]]);
+  }, _marked2$3, null, [[0, 7, 8, 10]]);
 }
 function addMembers(action) {
   var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _t3;
@@ -22393,13 +22594,20 @@ function addMembers(action) {
           memberCount: channel.memberCount + addedMembers.length
         }, updateChannelData)));
       case 6:
-        _context3.n = 8;
+        _context3.n = 9;
         break;
       case 7:
         _context3.p = 7;
         _t3 = _context3.v;
-        log.error('error on add members... ', _t3);
+        if (!(_t3.code === 1041)) {
+          _context3.n = 8;
+          break;
+        }
+        _context3.n = 8;
+        return effects.put(setActionIsRestrictedAC(true, true));
       case 8:
+        log.error('error on add members... ', _t3);
+      case 9:
         return _context3.a(2);
     }
   }, _marked3$2, null, [[0, 7]]);
@@ -22640,6 +22848,10 @@ function getContacts() {
       case 0:
         _context.p = 0;
         SceytChatClient = getClient();
+        if (!(SceytChatClient.connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context.n = 3;
+          break;
+        }
         _context.n = 1;
         return effects.call(SceytChatClient.getAllContacts);
       case 1:
@@ -22850,6 +23062,12 @@ function getUsers(action) {
         payload = action.payload;
         params = payload.params;
         SceytChatClient = getClient();
+        if (!(SceytChatClient.connectionState !== CONNECTION_STATUS.CONNECTED)) {
+          _context5.n = 1;
+          break;
+        }
+        return _context5.a(2);
+      case 1:
         usersQueryBuilder = new SceytChatClient.UserListQueryBuilder();
         if (params.query) {
           usersQueryBuilder.query(params.query);
@@ -22879,35 +23097,35 @@ function getUsers(action) {
           usersQueryBuilder.filterByUsername();
         }
         log.info('user query params ..... ', params);
-        _context5.n = 1;
+        _context5.n = 2;
         return effects.call(usersQueryBuilder.build);
-      case 1:
+      case 2:
         usersQuery = _context5.v;
         query.usersQuery = usersQuery;
-        _context5.n = 2;
-        return effects.put(setUsersLoadingStateAC(LOADING_STATE.LOADING));
-      case 2:
         _context5.n = 3;
-        return effects.call(usersQuery.loadNextPage);
+        return effects.put(setUsersLoadingStateAC(LOADING_STATE.LOADING));
       case 3:
-        _yield$call = _context5.v;
-        users = _yield$call.users;
         _context5.n = 4;
-        return effects.put(setUsersAC(JSON.parse(JSON.stringify(users))));
+        return effects.call(usersQuery.loadNextPage);
       case 4:
+        _yield$call = _context5.v;
+        users = _yield$call.users;
         _context5.n = 5;
-        return effects.put(setUsersLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setUsersAC(JSON.parse(JSON.stringify(users))));
       case 5:
-        _context5.n = 7;
-        break;
+        _context5.n = 6;
+        return effects.put(setUsersLoadingStateAC(LOADING_STATE.LOADED));
       case 6:
-        _context5.p = 6;
+        _context5.n = 8;
+        break;
+      case 7:
+        _context5.p = 7;
         _t5 = _context5.v;
         log.error('ERROR on get users', _t5.message);
-      case 7:
+      case 8:
         return _context5.a(2);
     }
-  }, _marked5$3, null, [[0, 6]]);
+  }, _marked5$3, null, [[0, 7]]);
 }
 function loadMoreUsers(action) {
   var payload, limit, usersQuery, _yield$call2, users, _t6;
@@ -23108,6 +23326,15 @@ var rolesMapSelector = function rolesMapSelector(store) {
 var membersLoadingStateSelector = function membersLoadingStateSelector(store) {
   return store.MembersReducer.membersLoadingState;
 };
+var membersHasNextSelector = function membersHasNextSelector(store) {
+  return store.MembersReducer.membersHasNext;
+};
+var restrictedSelector = function restrictedSelector(store) {
+  return store.MembersReducer.restricted;
+};
+var openInviteModalSelector = function openInviteModalSelector(store) {
+  return store.MembersReducer.openInviteModal;
+};
 
 var useDidUpdate = function useDidUpdate(callback, deps) {
   var hasMount = React.useRef(false);
@@ -23660,6 +23887,57 @@ var MembersText = styled__default.div(_templateObject7$1 || (_templateObject7$1
 });
 var Center = styled__default.div(_templateObject8$1 || (_templateObject8$1 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  margin-top: 24px;\n"])));
 
+var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
+  var fromChannel = _ref.fromChannel;
+  var dispatch = useDispatch();
+  var _useColor = useColors(),
+    background = _useColor[THEME_COLORS.BACKGROUND],
+    textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
+    surface1 = _useColor[THEME_COLORS.SURFACE_1],
+    iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
+    accentColor = _useColor[THEME_COLORS.ACCENT],
+    textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
+    linkColor = _useColor[THEME_COLORS.LINK_COLOR];
+  var handleClose = function handleClose() {
+    dispatch(setActionIsRestrictedAC(false, false));
+  };
+  var handleInvite = function handleInvite() {
+    dispatch(setOpenInviteModalAC(true));
+    handleClose();
+  };
+  return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
+    backgroundColor: background,
+    maxWidth: '520px',
+    minWidth: '520px',
+    padding: '0'
+  }, /*#__PURE__*/React__default.createElement(PopupBody, {
+    paddingH: '24px',
+    paddingV: '24px'
+  }, /*#__PURE__*/React__default.createElement(CloseIcon, {
+    color: iconPrimary,
+    onClick: handleClose
+  }), /*#__PURE__*/React__default.createElement(PopupName, {
+    color: textPrimary,
+    marginBottom: '20px'
+  }, "Privacy note"), /*#__PURE__*/React__default.createElement(PopupDescription, {
+    color: textPrimary,
+    highlightColor: linkColor
+  }, "Unable to add this member. Try inviting them directly to the group.")), /*#__PURE__*/React__default.createElement(PopupFooter, {
+    backgroundColor: surface1
+  }, /*#__PURE__*/React__default.createElement(Button, {
+    type: 'button',
+    color: textPrimary,
+    backgroundColor: 'transparent',
+    onClick: handleClose
+  }, "Cancel"), fromChannel && (/*#__PURE__*/React__default.createElement(Button, {
+    type: 'button',
+    backgroundColor: accentColor,
+    color: textOnPrimary,
+    borderRadius: '8px',
+    onClick: handleInvite
+  }, "Invite")))));
+};
+
 var _templateObject$5, _templateObject2$4, _templateObject3$4;
 var SceytChat = function SceytChat(_ref) {
   var client = _ref.client,
@@ -23703,6 +23981,7 @@ var SceytChat = function SceytChat(_ref) {
     SceytChatClient = _useState[0],
     setSceytChatClient = _useState[1];
   var connectionStatus = useSelector(connectionStatusSelector, reactRedux.shallowEqual);
+  var restricted = useSelector(restrictedSelector, reactRedux.shallowEqual);
   var _useState2 = React.useState(true),
     tabIsActive = _useState2[0],
     setTabIsActive = _useState2[1];
@@ -23947,7 +24226,9 @@ var SceytChat = function SceytChat(_ref) {
     highlightedBackground: highlightedBackground,
     id: 'sceyt_chat_container',
     chatMinWidth: chatMinWidth
-  }, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup))) : '', !embeddedJoinGroupPopup && joinPopup);
+  }, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && /*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
+    fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel
+  }))) : '', !embeddedJoinGroupPopup && joinPopup);
 };
 var Container$2 = styled__default.div(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  height: 100vh;\n"])));
 var ChatContainer = styled__default.div(_templateObject2$4 || (_templateObject2$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  height: 100%;\n  max-height: 100vh;\n  min-width: ", ";\n  background-color: ", ";\n  position: relative;\n\n  /* Global highlighted background styles */\n  ::selection {\n    background-color: ", ";\n  }\n\n  ::-moz-selection {\n    background-color: ", ";\n  }\n\n  /* For text selection highlighting */\n  *::selection {\n    background-color: ", ";\n  }\n\n  *::-moz-selection {\n    background-color: ", ";\n  }\n"])), function (props) {
@@ -37405,16 +37686,7 @@ var Message$1 = function Message(_ref) {
     setMessageActionsShow(false);
   };
   var handleResendMessage = function handleResendMessage() {
-    var messageToResend = _extends({}, message);
-    if (message.attachments && message.attachments.length) {
-      messageToResend.attachments = message.attachments.map(function (att) {
-        var pendingAttachment = getPendingAttachment(att.tid);
-        return _extends({}, att, {
-          data: new File([pendingAttachment.file], att.data.name)
-        });
-      });
-    }
-    dispatch(resendMessageAC(messageToResend, channel.id, connectionStatus));
+    dispatch(resendMessageAC(message, channel.id, connectionStatus));
     setMessageActionsShow(false);
   };
   var handleCopyMessage = function handleCopyMessage() {
@@ -37472,12 +37744,12 @@ var Message$1 = function Message(_ref) {
     setFrequentlyEmojisOpen(false);
   };
   var handleSendReadMarker = function handleSendReadMarker() {
-    if (!message.userMarkers.find(function (marker) {
+    if (message.incoming && !message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.DELIVERED;
     })) {
       if (message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
         return marker.name === MESSAGE_DELIVERY_STATUS.READ;
-      }) && message.incoming && !unreadScrollTo) {
+      }) && !unreadScrollTo) {
         dispatch(markMessagesAsDeliveredAC(channel.id, [message.id]));
       }
     }
@@ -37635,7 +37907,8 @@ var Message$1 = function Message(_ref) {
     withAvatar: !(channel.type === DEFAULT_CHANNEL_TYPE.DIRECT && !showSenderNameOnDirectChannel) && !(!message.incoming && !showOwnAvatar),
     className: 'messageContent'
   }, message.state === MESSAGE_STATUS.FAILED && (/*#__PURE__*/React__default.createElement(FailedMessageIcon, {
-    rtl: ownMessageOnRightSide && !message.incoming
+    rtl: ownMessageOnRightSide && !message.incoming,
+    onClick: handleResendMessage
   }, /*#__PURE__*/React__default.createElement(ErrorIconWrapper, null))), CustomMessageItem ? (/*#__PURE__*/React__default.createElement(CustomMessageItem, {
     key: message.id || message.tid,
     channel: channel,
@@ -37940,7 +38213,7 @@ var MessageReaction = styled__default.span(_templateObject3$y || (_templateObjec
 var ThreadMessageCountContainer = styled__default.div(_templateObject4$t || (_templateObject4$t = _taggedTemplateLiteralLoose(["\n  position: relative;\n  color: ", ";\n  font-weight: 500;\n  font-size: 13px;\n  line-height: 15px;\n  margin: 12px;\n  cursor: pointer;\n\n  &::before {\n    content: '';\n    position: absolute;\n    left: -25px;\n    top: -21px;\n    width: 16px;\n    height: 26px;\n    border-left: 2px solid #cdcdcf;\n    border-bottom: 2px solid #cdcdcf;\n    border-radius: 0 0 0 14px;\n  }\n"])), function (props) {
   return props.color;
 });
-var FailedMessageIcon = styled__default.div(_templateObject5$o || (_templateObject5$o = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  top: -6px;\n  left: ", ";\n  right: ", ";\n  width: 20px;\n  height: 20px;\n"])), function (props) {
+var FailedMessageIcon = styled__default.div(_templateObject5$o || (_templateObject5$o = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  top: -6px;\n  left: ", ";\n  right: ", ";\n  width: 20px;\n  height: 20px;\n  cursor: pointer;\n"])), function (props) {
   return !props.rtl && '-24px';
 }, function (props) {
   return props.rtl && '-24px';
@@ -38319,7 +38592,8 @@ var MessageList = function MessageList(_ref2) {
   var handleMessagesListScroll = React.useCallback(function () {
     try {
       var target = scrollRef.current;
-      if (!target) return Promise.resolve();
+      var messageBox = document.getElementById('messageBox');
+      if (!target || !messageBox) return Promise.resolve();
       if (scrollToMentionedMessage) {
         if (target.scrollTop <= -50 || channel.lastMessage.id !== messages[messages.length - 1].id) {
           dispatch(showScrollToNewMessageButtonAC(true));
@@ -38332,10 +38606,13 @@ var MessageList = function MessageList(_ref2) {
       clearTimeout(hideTopDateTimeout.current);
       renderTopDate();
       var forceLoadPrevMessages = false;
-      if (-target.scrollTop + target.offsetHeight + 30 > target.scrollHeight) {
+      if (-target.scrollTop + target.offsetHeight + 100 > messageBox.scrollHeight) {
         forceLoadPrevMessages = true;
       }
-      if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING) {
+      if (unreadScrollTo) {
+        return Promise.resolve();
+      }
+      if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING && channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, true));
       }
       if (target.scrollTop <= -50) {
@@ -38349,7 +38626,7 @@ var MessageList = function MessageList(_ref2) {
       }
       var currentIndex = messagesIndexMapRef.current[lastVisibleMessageId];
       var hasIndex = typeof currentIndex === 'number';
-      if (hasIndex && currentIndex < 15 || forceLoadPrevMessages) {
+      if (hasIndex && currentIndex < 10 || forceLoadPrevMessages) {
         if (connectionStatus === CONNECTION_STATUS.CONNECTED && !scrollToNewMessage.scrollToBottom && hasPrevMessages) {
           if (loadingRef.current || messagesLoading === LOADING_STATE.LOADING || prevDisableRef.current) {
             shouldLoadMessagesRef.current = 'prev';
@@ -38366,7 +38643,7 @@ var MessageList = function MessageList(_ref2) {
           }
         }
       }
-      if (hasIndex && currentIndex >= messages.length - 15 || target.scrollTop === 0) {
+      if (hasIndex && currentIndex >= messages.length - 10 || target.scrollTop > -100) {
         if (connectionStatus === CONNECTION_STATUS.CONNECTED && !scrollToNewMessage.scrollToBottom && (hasNextMessages || getHasNextCached())) {
           if (loadingRef.current || messagesLoading === LOADING_STATE.LOADING || nextDisableRef.current) {
             shouldLoadMessagesRef.current = 'next';
@@ -38424,8 +38701,8 @@ var MessageList = function MessageList(_ref2) {
             nextDisableRef.current = false;
           }, 1000 + positiveValue * 0.1);
         }
-      } else {
-        dispatch(getMessagesAC(channel, undefined, messageId));
+      } else if (channel !== null && channel !== void 0 && channel.id) {
+        dispatch(getMessagesAC(channel, undefined, messageId, undefined, true, 'smooth', true));
       }
       return Promise.resolve();
     } catch (e) {
@@ -38433,7 +38710,7 @@ var MessageList = function MessageList(_ref2) {
     }
   };
   var handleLoadMoreMessages = function handleLoadMoreMessages(direction, limit) {
-    if (scrollToMentionedMessage) {
+    if (scrollToMentionedMessage || scrollToNewMessage.scrollToBottom) {
       return;
     }
     var lastMessageId = messages.length && messages[messages.length - 1].id;
@@ -38577,9 +38854,6 @@ var MessageList = function MessageList(_ref2) {
             behavior: 'smooth'
           });
         }
-        setTimeout(function () {
-          dispatch(scrollToNewMessageAC(false, false, false));
-        }, 800);
       } else {
         nextDisableRef.current = true;
         prevDisableRef.current = true;
@@ -38588,10 +38862,6 @@ var MessageList = function MessageList(_ref2) {
           behavior: 'smooth'
         });
         dispatch(showScrollToNewMessageButtonAC(false));
-        setTimeout(function () {
-          prevDisableRef.current = false;
-          dispatch(scrollToNewMessageAC(false, false, false));
-        }, 800);
       }
     }
   }, [scrollToNewMessage]);
@@ -38615,17 +38885,17 @@ var MessageList = function MessageList(_ref2) {
     prevDisableRef.current = false;
     shouldLoadMessagesRef.current = '';
     loadingRef.current = false;
-    if (channel.backToLinkedChannel) {
+    if (channel.backToLinkedChannel && channel !== null && channel !== void 0 && channel.id) {
       var visibleMessages = getVisibleMessagesMap();
       var visibleMessagesIds = Object.keys(visibleMessages);
       var messageId = visibleMessagesIds[visibleMessagesIds.length - 1];
-      dispatch(getMessagesAC(channel, undefined, messageId, undefined, undefined, undefined, 'instant'));
+      dispatch(getMessagesAC(channel, undefined, messageId, undefined, undefined, 'instant'));
       setUnreadMessageId(messageId);
     } else {
       if (!channel.isLinkedChannel) {
         clearVisibleMessagesMap();
       }
-      if (channel) {
+      if (channel && channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, undefined, undefined, undefined, true));
       }
       if (channel.id) {
@@ -38776,13 +39046,13 @@ var MessageList = function MessageList(_ref2) {
   }, [messagesLoading, messages, lastVisibleMessageId]);
   React.useEffect(function () {
     log.info('connection status is changed.. .... ', connectionStatus, 'channel  ... ', channel);
-    if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
+    if (connectionStatus === CONNECTION_STATUS.CONNECTED && channel !== null && channel !== void 0 && channel.id) {
       loadingRef.current = false;
       prevDisableRef.current = false;
       nextDisableRef.current = false;
       clearMessagesMap();
       removeAllMessages();
-      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, false, 'instant', false));
+      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, 'instant', false, true));
     }
   }, [connectionStatus]);
   React.useEffect(function () {
@@ -38792,7 +39062,21 @@ var MessageList = function MessageList(_ref2) {
         scrollElement.style.scrollBehavior = 'inherit';
       }
       setScrollIntoView(true);
-      var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId);
+      var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId) || null;
+      var newLastDisplayedMessageId = channel.lastDisplayedMessageId;
+      if (!lastReadMessageNode && channel.lastDisplayedMessageId && channel.lastDisplayedMessageId !== '0') {
+        for (var index = 0; index < messages.length; index++) {
+          var message = messages[index];
+          if (channel.lastDisplayedMessageId >= message.id && (messages.length < index + 2 || channel.lastDisplayedMessageId <= messages[index + 1].id)) {
+            newLastDisplayedMessageId = message.id;
+            lastReadMessageNode = document.getElementById(newLastDisplayedMessageId);
+            break;
+          }
+        }
+      } else if (!lastReadMessageNode && (!channel.lastDisplayedMessageId || channel.lastDisplayedMessageId === '0') && messages !== null && messages !== void 0 && messages.length) {
+        newLastDisplayedMessageId = messages[0].id;
+        lastReadMessageNode = document.getElementById(newLastDisplayedMessageId);
+      }
       if (lastReadMessageNode && scrollElement) {
         dispatch(scrollToNewMessageAC(false));
         scrollElement.scrollTo({
@@ -38877,7 +39161,8 @@ var MessageList = function MessageList(_ref2) {
     enableResetScrollToCoords: false,
     replyMessage: messageForReply && messageForReply.id,
     attachmentsSelected: attachmentsSelected,
-    className: 'messageBox'
+    className: 'messageBox',
+    id: 'messageBox'
   }, messages.map(function (message, index) {
     var prevMessage = messages[index - 1];
     var nextMessage = messages[index + 1];
@@ -41131,6 +41416,13 @@ function SvgRecordButton(props) {
 }
 
 var _templateObject$O, _templateObject2$J, _templateObject3$C, _templateObject4$x, _templateObject5$s, _templateObject6$o, _templateObject7$n;
+var fieldsObject = {
+  channelId: '',
+  currentRecordedFile: null,
+  recording: null,
+  recorder: null,
+  wavesurferContainer: null
+};
 var shouldDraw = false;
 var DEFAULT_MAX_RECORDING_DURATION = 600;
 var AudioRecord = function AudioRecord(_ref) {
@@ -41464,7 +41756,7 @@ var AudioRecord = function AudioRecord(_ref) {
     handleStopRecording();
     shouldDraw = false;
     var id = cId || channelId;
-    recorder.stop().getMp3().then(function (_ref4) {
+    recorder === null || recorder === void 0 ? void 0 : recorder.stop().getMp3().then(function (_ref4) {
       var buffer = _ref4[0],
         blob = _ref4[1];
       var file = new File(buffer, 'record.mp3', {
@@ -41584,6 +41876,30 @@ var AudioRecord = function AudioRecord(_ref) {
       }
     };
   }, [recording, maxRecordingDuration]);
+  React.useEffect(function () {
+    fieldsObject.channelId = channelId;
+  }, [channelId]);
+  React.useEffect(function () {
+    fieldsObject.recorder = recorder;
+  }, [recorder]);
+  React.useEffect(function () {
+    fieldsObject.currentRecordedFile = currentRecordedFile;
+  }, [currentRecordedFile]);
+  React.useEffect(function () {
+    fieldsObject.recording = recording;
+  }, [recording]);
+  React.useEffect(function () {
+    fieldsObject.wavesurferContainer = wavesurferContainer.current;
+  }, [wavesurferContainer.current]);
+  React.useEffect(function () {
+    return function () {
+      var _fieldsObject$current;
+      if (fieldsObject.channelId && (!fieldsObject.currentRecordedFile || !((_fieldsObject$current = fieldsObject.currentRecordedFile) !== null && _fieldsObject$current !== void 0 && _fieldsObject$current.file)) && fieldsObject.recorder && fieldsObject.recording) {
+        stopRecording(false, fieldsObject.channelId, true, fieldsObject.recorder, fieldsObject.wavesurferContainer);
+        handleStopRecording();
+      }
+    };
+  }, []);
   React.useEffect(function () {
     if (currentRecordedFile) {
       _initWaveSurfer();
@@ -41708,6 +42024,9 @@ var AudioRecord = function AudioRecord(_ref) {
     iconColor: accentColor
   }, showRecording || currentRecordedFile ? /*#__PURE__*/React__default.createElement(SvgSend, null) : /*#__PURE__*/React__default.createElement(SvgRecordButton, null)));
 };
+var AudioRecord$1 = /*#__PURE__*/React.memo(AudioRecord, function (prevProps, nextProps) {
+  return prevProps.channelId === nextProps.channelId && prevProps.showRecording === nextProps.showRecording && prevProps.maxRecordingDuration === nextProps.maxRecordingDuration;
+});
 var Container$l = styled__default.div(_templateObject$O || (_templateObject$O = _taggedTemplateLiteralLoose(["\n  width: 32px;\n  position: relative;\n  display: flex;\n  align-items: center;\n  justify-content: flex-end;\n  ", ";\n  transition: all 0.3s ease-in-out;\n"])), function (props) {
   return props.recording && "width: 400px";
 });
@@ -42286,7 +42605,7 @@ function onError(error) {
 var prevActiveChannelId;
 var attachmentsUpdate = [];
 var SendMessageInput = function SendMessageInput(_ref3) {
-  var _pollOptions$choosePo;
+  var _pollOptions$choosePo, _getAudioRecordingFro;
   var handleAttachmentSelected = _ref3.handleAttachmentSelected,
     handleSendMessage = _ref3.handleSendMessage,
     _ref3$disabled = _ref3.disabled,
@@ -42513,7 +42832,13 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     nodes: [MentionNode],
     onError: onError
   };
-  var handleSendTypingState = function handleSendTypingState(typingState) {
+  var handleSendTypingState = function handleSendTypingState(typingState, code) {
+    if (code) {
+      var isTypeKeyPressed = checkIsTypeKeyPressed(code);
+      if (!isTypeKeyPressed) {
+        return;
+      }
+    }
     if (typingState) {
       setInTypingStateTimout(setTimeout(function () {
         setInTypingStateTimout(0);
@@ -42650,11 +42975,11 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     } else {
       if (typingTimout) {
         if (!inTypingStateTimout) {
-          handleSendTypingState(true);
+          handleSendTypingState(true, code);
         }
         clearTimeout(typingTimout);
       } else {
-        handleSendTypingState(true);
+        handleSendTypingState(true, code);
       }
       setTypingTimout(setTimeout(function () {
         setTypingTimout(0);
@@ -43329,7 +43654,9 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (activeChannel.id) {
       prevActiveChannelId = activeChannel.id;
     }
-    dispatch(getMembersAC(activeChannel.id));
+    if (activeChannel.id) {
+      dispatch(getMembersAC(activeChannel.id));
+    }
     setMentionedUsers([]);
   }, [activeChannel.id]);
   React.useEffect(function () {
@@ -43394,7 +43721,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         document.body.removeAttribute('onbeforeunload');
       }
     }
-  }, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes]);
+  }, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes, messageToEdit]);
   useDidUpdate(function () {
     if (mentionedUsers && mentionedUsers.length) {
       setDraftMessageToMap(activeChannel.id, {
@@ -43709,7 +44036,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     onChange: handleFileUpload,
     multiple: true,
     type: 'file'
-  }), showRecording || getAudioRecordingFromMap(activeChannel.id) ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
+  }), (showRecording || getAudioRecordingFromMap(activeChannel.id)) && !messageToEdit ? (/*#__PURE__*/React__default.createElement(AudioCont, null)) : (/*#__PURE__*/React__default.createElement(MessageInputWrapper, {
     className: 'message_input_wrapper',
     borderRadius: messageForReply || messageToEdit ? borderRadiusOnOpenedEditReplyMessage : borderRadius,
     ref: inputWrapperRef,
@@ -43832,7 +44159,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     ErrorBoundary: LexicalErrorBoundary
   }), floatingAnchorElem && !isSmallWidthViewport && allowTextEdit && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(FloatingTextFormatToolbarPlugin, {
     anchorElem: floatingAnchorElem
-  })))))))), sendMessageIsActive || !voiceMessage || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
+  })))))))), sendMessageIsActive || !voiceMessage && !((_getAudioRecordingFro = getAudioRecordingFromMap(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.id)) !== null && _getAudioRecordingFro !== void 0 && _getAudioRecordingFro.file) || messageToEdit ? (/*#__PURE__*/React__default.createElement(SendMessageButton, {
     isCustomButton: CustomSendMessageButton,
     isActive: sendMessageIsActive,
     order: sendIconOrder,
@@ -43848,7 +44175,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     color: accentColor,
     iconColor: accentColor,
     activeColor: accentColor
-  }, /*#__PURE__*/React__default.createElement(AudioRecord, {
+  }, /*#__PURE__*/React__default.createElement(AudioRecord$1, {
     sendRecordedFile: sendRecordedFile,
     setShowRecording: setShowRecording,
     showRecording: showRecording,
@@ -44919,7 +45246,8 @@ var Actions = function Actions(_ref) {
     iconColor: iconPrimary,
     color: textPrimary,
     hoverColor: textPrimary,
-    fontSize: actionItemsFontSize
+    fontSize: actionItemsFontSize,
+    flexWrap: 'wrap'
   }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(DefaultWatchIcon, {
     "$isLightMode": backgroundColor === '#FFFFFF'
   }), "Disappearing messages", /*#__PURE__*/React__default.createElement(DisappearingMessagesStatusWrapper, null, /*#__PURE__*/React__default.createElement(DisappearingMessagesStatus, {
@@ -45123,7 +45451,7 @@ var DefaultMarkAsReadIcon = styled__default(SvgLeave)(_templateObject15$3 || (_t
 var DefaultWatchIcon = styled__default(SvgWatch)(_templateObject16$3 || (_templateObject16$3 = _taggedTemplateLiteralLoose(["\n  width: 24px;\n  height: 24px;\n\n  path.watch-ticks,\n  path:nth-child(2) {\n    fill: ", " !important;\n  }\n"])), function (props) {
   return props.$isLightMode ? '#FFFFFF' : '#000000';
 });
-var ActionItem = styled__default.li(_templateObject17$3 || (_templateObject17$3 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  padding: 10px 0;\n  font-size: ", ";\n  color: ", ";\n  cursor: pointer;\n  order: ", ";\n  pointer-events: ", ";\n\n  & > div {\n    margin-left: auto;\n  }\n\n  & > svg {\n    margin-right: 16px;\n    color: ", ";\n    width: 24px;\n    height: 24px;\n  }\n\n  &:hover {\n    color: ", ";\n  }\n\n  &:last-child {\n    //margin-bottom: 0;\n  }\n"])), function (props) {
+var ActionItem = styled__default.li(_templateObject17$3 || (_templateObject17$3 = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: flex;\n  align-items: center;\n  padding: 10px 0;\n  font-size: ", ";\n  color: ", ";\n  cursor: pointer;\n  order: ", ";\n  pointer-events: ", ";\n  ", "\n  & > div {\n    margin-left: auto;\n  }\n\n  & > svg {\n    margin-right: 16px;\n    color: ", ";\n    width: 24px;\n    height: 24px;\n  }\n\n  &:hover {\n    color: ", ";\n  }\n\n  &:last-child {\n    //margin-bottom: 0;\n  }\n"])), function (props) {
   return props.fontSize || '15px';
 }, function (props) {
   return props.color;
@@ -45131,6 +45459,8 @@ var ActionItem = styled__default.li(_templateObject17$3 || (_templateObject17$3
   return props.order;
 }, function (props) {
   return props.disableEvent && 'none';
+}, function (props) {
+  return props.flexWrap && "flex-wrap: " + props.flexWrap + ";";
 }, function (props) {
   return props.iconColor;
 }, function (props) {
@@ -45659,7 +45989,7 @@ function InviteLinkModal(_ref) {
   var handleConfirmReset = function handleConfirmReset() {
     var _channelInviteKeys$;
     setShowResetConfirm(false);
-    dispatch(regenerateChannelInviteKeyAC(channelId, (channelInviteKeys === null || channelInviteKeys === void 0 ? void 0 : (_channelInviteKeys$ = channelInviteKeys[0]) === null || _channelInviteKeys$ === void 0 ? void 0 : _channelInviteKeys$.key) || ''));
+    dispatch(regenerateChannelInviteKeyAC(channelId, (channelInviteKeys === null || channelInviteKeys === void 0 ? void 0 : (_channelInviteKeys$ = channelInviteKeys[0]) === null || _channelInviteKeys$ === void 0 ? void 0 : _channelInviteKeys$.key) || '', true));
   };
   React.useEffect(function () {
     if (channelId) {
@@ -45931,27 +46261,17 @@ var Members = function Members(_ref) {
   var _useState7 = React.useState(false),
     addMemberPopupOpen = _useState7[0],
     setAddMemberPopupOpen = _useState7[1];
-  var _useState8 = React.useState(false),
-    openInviteModal = _useState8[0],
-    setOpenInviteModal = _useState8[1];
-  var _useState9 = React.useState(),
-    closeMenu = _useState9[0],
-    setCloseMenu = _useState9[1];
+  var _useState8 = React.useState(),
+    closeMenu = _useState8[0],
+    setCloseMenu = _useState8[1];
   var members = useSelector(activeChannelMembersSelector) || [];
   var contactsMap = useSelector(contactsMapSelector) || {};
-  var membersLoading = useSelector(membersLoadingStateSelector) || {};
+  var openInviteModal = useSelector(openInviteModalSelector);
   var user = getClient().user;
   var memberDisplayText = getChannelTypesMemberDisplayTextMap();
   var channelTypeRoleMap = getDefaultRolesByChannelTypesMap();
   var displayMemberText = memberDisplayText && memberDisplayText[channel.type] ? memberDisplayText[channel.type] + "s" : channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? 'subscribers' : 'members';
   var noMemberEditPermissions = !checkActionPermission('changeMemberRole') && !checkActionPermission('kickAndBlockMember') && !checkActionPermission('kickMember');
-  var handleMembersListScroll = function handleMembersListScroll(event) {
-    if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
-      if (membersLoading === LOADING_STATE.LOADED) {
-        dispatch(loadMoreMembersAC(15, channel.id));
-      }
-    }
-  };
   var watchDropdownState = function watchDropdownState(state, memberId) {
     if (state) {
       setCloseMenu(memberId);
@@ -46042,23 +46362,23 @@ var Members = function Members(_ref) {
     }
   };
   var handleOpenInviteModal = function handleOpenInviteModal() {
-    setOpenInviteModal(true);
+    dispatch(setOpenInviteModalAC(true));
     setAddMemberPopupOpen(false);
   };
   React.useEffect(function () {
     if (getFromContacts) {
       dispatch(getContactsAC());
     }
-    dispatch(getMembersAC(channel.id));
-  }, [channel]);
+    if (channel !== null && channel !== void 0 && channel.id) {
+      dispatch(getMembersAC(channel.id));
+    }
+  }, [channel === null || channel === void 0 ? void 0 : channel.id]);
   var currentUserRole = (_members$find = members.find(function (member) {
     return member.id === user.id;
   })) === null || _members$find === void 0 ? void 0 : _members$find.role;
   return /*#__PURE__*/React__default.createElement(Container$o, {
     theme: theme
-  }, /*#__PURE__*/React__default.createElement(ActionsMenu$1, null, /*#__PURE__*/React__default.createElement(MembersList, {
-    onScroll: handleMembersListScroll
-  }, checkActionPermission('addMember') && (currentUserRole === 'owner' || currentUserRole === 'admin') && (/*#__PURE__*/React__default.createElement(MemberItem$1, {
+  }, /*#__PURE__*/React__default.createElement(ActionsMenu$1, null, /*#__PURE__*/React__default.createElement(MembersList, null, checkActionPermission('addMember') && (currentUserRole === 'owner' || currentUserRole === 'admin') && (/*#__PURE__*/React__default.createElement(MemberItem$1, {
     key: 1,
     onClick: handleAddMemberPopup,
     color: textPrimary,
@@ -46194,7 +46514,7 @@ var Members = function Members(_ref) {
     handleOpenInviteModal: handleOpenInviteModal
   })), openInviteModal && (/*#__PURE__*/React__default.createElement(InviteLinkModal, {
     onClose: function onClose() {
-      return setOpenInviteModal(false);
+      return dispatch(setOpenInviteModalAC(false));
     },
     SVGOrPNGLogoIcon: QRCodeIcon,
     channelId: channel.id
@@ -47463,6 +47783,7 @@ var Details = function Details(_ref) {
   var _usePermissions = usePermissions(activeChannel ? activeChannel.userRole : ''),
     checkActionPermission = _usePermissions[0];
   var membersLoading = useSelector(membersLoadingStateSelector);
+  var membersHasNext = useSelector(membersHasNextSelector);
   var messagesLoading = useSelector(messagesLoadingState);
   var attachmentsHasNex = useSelector(activeTabAttachmentsHasNextSelector);
   var contactsMap = useSelector(contactsMapSelector);
@@ -47486,7 +47807,7 @@ var Details = function Details(_ref) {
   var handleMembersListScroll = function handleMembersListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100) {
       if (activeTab === channelDetailsTabs.member) {
-        if (membersLoading === LOADING_STATE.LOADED) {
+        if (membersLoading === LOADING_STATE.LOADED && membersHasNext) {
           dispatch(loadMoreMembersAC(15, activeChannel.id));
         }
       } else if (messagesLoading === LOADING_STATE.LOADED && attachmentsHasNex) {
@@ -48099,8 +48420,8 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
             });
           }
         }
-      } else {
-        dispatch(getMessagesAC(channel, true, messageId, undefined, undefined, false));
+      } else if (channel !== null && channel !== void 0 && channel.id) {
+        dispatch(getMessagesAC(channel, true, messageId, undefined, false, 'smooth', true));
       }
       return Promise.resolve();
     } catch (e) {
@@ -48288,7 +48609,7 @@ var MessagesScrollToUnreadMentionsButton = function MessagesScrollToUnreadMentio
             repliedMessage.classList.remove('highlight');
           }, 1500);
         }
-      } else {
+      } else if (channel !== null && channel !== void 0 && channel.id) {
         dispatch(getMessagesAC(channel, undefined, messageId));
       }
       return Promise.resolve();