sceyt-chat-react-uikit 1.7.9-beta.6 → 1.7.9-beta.8

package/index.modern.js

@@ -9059,6 +9059,7 @@ var autoSelectFitsChannel = false;
 var allChannels = [];
 var channelsMap = {};
 var allChannelsMap = {};
+var pendingDeleteChannelMap = {};
 var channelTypesMemberDisplayTextMap;
 var defaultRolesByChannelTypesMap;
 var activeChannelId = '';
@@ -9118,8 +9119,20 @@ function setChannelsInMap(channels) {
 function getChannelFromMap(channelId) {
   return channelsMap[channelId];
 }
-function getLastChannelFromMap() {
-  return Object.values(channelsMap)[0];
+function getLastChannelFromMap(deletePending) {
+  if (deletePending === void 0) {
+    deletePending = false;
+  }
+  var channels = Object.values(channelsMap);
+  if (deletePending) {
+    for (var _iterator = _createForOfIteratorHelperLoose(channels), _step; !(_step = _iterator()).done;) {
+      var channel = _step.value;
+      if (!getPendingDeleteChannel(channel.id)) {
+        return channel;
+      }
+    }
+  }
+  return channels[0];
 }
 function removeChannelFromMap(channelId) {
   delete channelsMap[channelId];
@@ -9327,6 +9340,18 @@ var sortChannelByLastMessage = function sortChannelByLastMessage(channels) {
     }
   });
 };
+var setPendingDeleteChannel = function setPendingDeleteChannel(channel) {
+  pendingDeleteChannelMap[channel === null || channel === void 0 ? void 0 : channel.id] = channel;
+};
+var getPendingDeleteChannel = function getPendingDeleteChannel(channelId) {
+  return pendingDeleteChannelMap[channelId];
+};
+var getPendingDeleteChannels = function getPendingDeleteChannels() {
+  return Object.values(pendingDeleteChannelMap);
+};
+var removePendingDeleteChannel = function removePendingDeleteChannel(channelId) {
+  delete pendingDeleteChannelMap[channelId];
+};
 
 var initialState = {
   channelsLoadingState: null,
@@ -10821,6 +10846,11 @@ function updatePendingMessageAC(channelId, messageId, updatedMessage) {
     updatedMessage: updatedMessage
   });
 }
+function setUnreadMessageIdAC(messageId) {
+  return setUnreadMessageId({
+    messageId: messageId
+  });
+}
 
 var MESSAGES_MAX_PAGE_COUNT = 80;
 var MESSAGES_MAX_LENGTH = 50;
@@ -11341,6 +11371,31 @@ var setPendingPollAction = function setPendingPollAction(action) {
   }
   store.dispatch(setPendingPollActionsMapAC(messageId, action));
 };
+var getCenterTwoMessages = function getCenterTwoMessages(messages) {
+  var mid = Math.floor(messages.length / 2);
+  if (messages.length % 2 === 0) {
+    return {
+      mid1: {
+        messageId: messages[mid - 1].id,
+        index: mid - 1
+      },
+      mid2: {
+        messageId: messages[mid].id,
+        index: mid
+      }
+    };
+  }
+  return {
+    mid1: {
+      messageId: messages[mid - 1].id,
+      index: mid - 1
+    },
+    mid2: {
+      messageId: messages[mid + 1].id,
+      index: mid + 1
+    }
+  };
+};
 
 var initialState$1 = {
   messagesLoadingState: null,
@@ -11387,7 +11442,8 @@ var initialState$1 = {
   pollVotesInitialCount: null,
   pendingPollActions: {},
   pendingMessagesMap: {},
-  unreadScrollTo: true
+  unreadScrollTo: true,
+  unreadMessageId: ''
 };
 var messageSlice = createSlice({
   name: 'messages',
@@ -11963,6 +12019,9 @@ var messageSlice = createSlice({
     },
     clearPendingMessagesMap: function clearPendingMessagesMap(state) {
       state.pendingMessagesMap = {};
+    },
+    setUnreadMessageId: function setUnreadMessageId(state, action) {
+      state.unreadMessageId = action.payload.messageId;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -12027,7 +12086,8 @@ var _messageSlice$actions = messageSlice.actions,
   setPendingMessage$1 = _messageSlice$actions.setPendingMessage,
   removePendingMessage = _messageSlice$actions.removePendingMessage,
   updatePendingMessage = _messageSlice$actions.updatePendingMessage,
-  updatePendingPollAction = _messageSlice$actions.updatePendingPollAction;
+  updatePendingPollAction = _messageSlice$actions.updatePendingPollAction,
+  setUnreadMessageId = _messageSlice$actions.setUnreadMessageId;
 var MessageReducer = messageSlice.reducer;
 
 var initialState$2 = {
@@ -16317,6 +16377,56 @@ function watchForEvents() {
   }, _marked$1);
 }
 
+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$2 = /*#__PURE__*/_regenerator().m(createChannel),
   _marked2$1 = /*#__PURE__*/_regenerator().m(getChannels),
   _marked3 = /*#__PURE__*/_regenerator().m(searchChannels),
@@ -16337,26 +16447,27 @@ var _marked$2 = /*#__PURE__*/_regenerator().m(createChannel),
   _marked16 = /*#__PURE__*/_regenerator().m(unpinChannel),
   _marked17 = /*#__PURE__*/_regenerator().m(removeChannelCaches),
   _marked18 = /*#__PURE__*/_regenerator().m(leaveChannel),
-  _marked19 = /*#__PURE__*/_regenerator().m(deleteChannel),
-  _marked20 = /*#__PURE__*/_regenerator().m(blockChannel),
-  _marked21 = /*#__PURE__*/_regenerator().m(updateChannel),
-  _marked22 = /*#__PURE__*/_regenerator().m(checkUsersStatus),
-  _marked23 = /*#__PURE__*/_regenerator().m(sendTyping),
-  _marked24 = /*#__PURE__*/_regenerator().m(sendRecording),
-  _marked25 = /*#__PURE__*/_regenerator().m(clearHistory),
-  _marked26 = /*#__PURE__*/_regenerator().m(deleteAllMessages),
-  _marked27 = /*#__PURE__*/_regenerator().m(joinChannel),
-  _marked28 = /*#__PURE__*/_regenerator().m(watchForChannelEvents),
-  _marked29 = /*#__PURE__*/_regenerator().m(createChannelInviteKey),
-  _marked30 = /*#__PURE__*/_regenerator().m(getChannelInviteKeys),
-  _marked31 = /*#__PURE__*/_regenerator().m(regenerateChannelInviteKey),
-  _marked32 = /*#__PURE__*/_regenerator().m(updateChannelInviteKey),
-  _marked33 = /*#__PURE__*/_regenerator().m(getChannelByInviteKey),
-  _marked34 = /*#__PURE__*/_regenerator().m(joinChannelWithInviteKey),
-  _marked35 = /*#__PURE__*/_regenerator().m(setMessageRetentionPeriod),
-  _marked36 = /*#__PURE__*/_regenerator().m(getChannelsWithUser),
-  _marked37 = /*#__PURE__*/_regenerator().m(loadMoreMutualChannels),
-  _marked38 = /*#__PURE__*/_regenerator().m(ChannelsSaga);
+  _marked19 = /*#__PURE__*/_regenerator().m(deletePendingDeleteChannels),
+  _marked20 = /*#__PURE__*/_regenerator().m(deleteChannel),
+  _marked21 = /*#__PURE__*/_regenerator().m(blockChannel),
+  _marked22 = /*#__PURE__*/_regenerator().m(updateChannel),
+  _marked23 = /*#__PURE__*/_regenerator().m(checkUsersStatus),
+  _marked24 = /*#__PURE__*/_regenerator().m(sendTyping),
+  _marked25 = /*#__PURE__*/_regenerator().m(sendRecording),
+  _marked26 = /*#__PURE__*/_regenerator().m(clearHistory),
+  _marked27 = /*#__PURE__*/_regenerator().m(deleteAllMessages),
+  _marked28 = /*#__PURE__*/_regenerator().m(joinChannel),
+  _marked29 = /*#__PURE__*/_regenerator().m(watchForChannelEvents),
+  _marked30 = /*#__PURE__*/_regenerator().m(createChannelInviteKey),
+  _marked31 = /*#__PURE__*/_regenerator().m(getChannelInviteKeys),
+  _marked32 = /*#__PURE__*/_regenerator().m(regenerateChannelInviteKey),
+  _marked33 = /*#__PURE__*/_regenerator().m(updateChannelInviteKey),
+  _marked34 = /*#__PURE__*/_regenerator().m(getChannelByInviteKey),
+  _marked35 = /*#__PURE__*/_regenerator().m(joinChannelWithInviteKey),
+  _marked36 = /*#__PURE__*/_regenerator().m(setMessageRetentionPeriod),
+  _marked37 = /*#__PURE__*/_regenerator().m(getChannelsWithUser),
+  _marked38 = /*#__PURE__*/_regenerator().m(loadMoreMutualChannels),
+  _marked39 = /*#__PURE__*/_regenerator().m(ChannelsSaga);
 function createChannel(action) {
   var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, whoDoesNotAdded, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
   return _regenerator().w(function (_context) {
@@ -16564,20 +16675,23 @@ function getChannels(action) {
         _context2.p = 1;
         payload = action.payload;
         params = payload.params;
+        _context2.n = 2;
+        return call(deletePendingDeleteChannels);
+      case 2:
         log.info(new Date().toISOString() + " [getChannels] input params: " + JSON.stringify(params));
         SceytChatClient = getClient();
         connectionStatus = store.getState().UserReducer.connectionStatus;
         log.info(new Date().toISOString() + " [getChannels] connection status: " + connectionStatus);
         if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
-          _context2.n = 2;
+          _context2.n = 3;
           break;
         }
         log.warn(new Date().toISOString() + " [getChannels] connection not ready, aborting. Status: " + connectionStatus);
         return _context2.a(2);
-      case 2:
-        _context2.n = 3;
-        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
       case 3:
+        _context2.n = 4;
+        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
+      case 4:
         channelQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
         channelTypesFilter = getChannelTypesFilter();
         log.info(new Date().toISOString() + " [getChannels] channelTypesFilter: " + JSON.stringify(channelTypesFilter));
@@ -16600,50 +16714,50 @@ function getChannels(action) {
         limit = params.limit || 50;
         log.info(new Date().toISOString() + " [getChannels] query limit: " + limit);
         channelQueryBuilder.limit(limit);
-        _context2.n = 4;
+        _context2.n = 5;
         return call(channelQueryBuilder.build);
-      case 4:
+      case 5:
         channelQuery = _context2.v;
         log.info(new Date().toISOString() + " [getChannels] query built successfully");
-        _context2.n = 5;
+        _context2.n = 6;
         return call(channelQuery.loadNextPage);
-      case 5:
+      case 6:
         channelsData = _context2.v;
         channelList = channelsData.channels;
         log.info(new Date().toISOString() + " [getChannels] channelsData received: " + JSON.stringify({
           channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
           hasNext: channelsData.hasNext
         }));
-        _context2.n = 6;
-        return put(channelHasNextAC(channelsData.hasNext));
-      case 6:
         _context2.n = 7;
-        return call(getActiveChannelId);
+        return put(channelHasNextAC(channelsData.hasNext));
       case 7:
+        _context2.n = 8;
+        return call(getActiveChannelId);
+      case 8:
         channelId = _context2.v;
         log.info(new Date().toISOString() + " [getChannels] active channelId: " + channelId);
         if (!channelId) {
-          _context2.n = 9;
+          _context2.n = 10;
           break;
         }
-        _context2.n = 8;
+        _context2.n = 9;
         return call(getChannelFromMap, channelId);
-      case 8:
+      case 9:
         _t2 = _context2.v;
-        _context2.n = 10;
+        _context2.n = 11;
         break;
-      case 9:
-        _t2 = null;
       case 10:
+        _t2 = null;
+      case 11:
         activeChannel = _t2;
         log.info(new Date().toISOString() + " [getChannels] activeChannel from map: " + (activeChannel ? (_activeChannel = activeChannel) === null || _activeChannel === void 0 ? void 0 : _activeChannel.id : 'null'));
-        _context2.n = 11;
+        _context2.n = 12;
         return call(destroyChannelsMap);
-      case 11:
+      case 12:
         log.info(new Date().toISOString() + " [getChannels] channels map destroyed");
-        _context2.n = 12;
+        _context2.n = 13;
         return call(setChannelsInMap, channelList);
-      case 12:
+      case 13:
         _yield$call = _context2.v;
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
@@ -16653,12 +16767,12 @@ function getChannels(action) {
         }));
         log.info(new Date().toISOString() + " channelsForUpdateLastReactionMessage: " + (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length));
         if (!(channelsForUpdateLastReactionMessage !== null && channelsForUpdateLastReactionMessage !== void 0 && channelsForUpdateLastReactionMessage.length)) {
-          _context2.n = 14;
+          _context2.n = 15;
           break;
         }
         log.info(new Date().toISOString() + " [getChannels] processing channels for\n        reaction message update: " + (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length));
         channelMessageMap = {};
-        _context2.n = 13;
+        _context2.n = 14;
         return call(function () {
           try {
             return Promise.resolve(Promise.all(channelsForUpdateLastReactionMessage.map(function (channel) {
@@ -16681,7 +16795,7 @@ function getChannels(action) {
             return Promise.reject(e);
           }
         });
-      case 13:
+      case 14:
         log.info(new Date().toISOString() + " [getChannels] reaction messages fetched: " + (channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0), channelMessageMap ? (_Object$keys2 = Object.keys(channelMessageMap)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id]) {
@@ -16690,31 +16804,31 @@ function getChannels(action) {
           return channel;
         });
         log.info(new Date().toISOString() + " [getChannels] mappedChannels updated with reaction messages, final count: " + (((_mappedChannels2 = mappedChannels) === null || _mappedChannels2 === void 0 ? void 0 : _mappedChannels2.length) || 0));
-      case 14:
+      case 15:
         log.info(new Date().toISOString() + " [getChannels] setting channels in state, count: " + (((_mappedChannels3 = mappedChannels) === null || _mappedChannels3 === void 0 ? void 0 : _mappedChannels3.length) || 0));
-        _context2.n = 15;
+        _context2.n = 16;
         return put(setChannelsAC(mappedChannels));
-      case 15:
+      case 16:
         if (!channelId) {
           activeChannel = channelList[0];
           log.info(new Date().toISOString() + " [getChannels] no active channelId, setting first channel as active: " + ((_activeChannel2 = activeChannel) === null || _activeChannel2 === void 0 ? void 0 : _activeChannel2.id));
         }
         query.channelQuery = channelQuery;
         if (!(activeChannel && getAutoSelectFitsChannel())) {
-          _context2.n = 16;
+          _context2.n = 17;
           break;
         }
         log.info(new Date().toISOString() + " [getChannels] auto-selecting channel: " + ((_activeChannel3 = activeChannel) === null || _activeChannel3 === void 0 ? void 0 : _activeChannel3.id));
-        _context2.n = 16;
-        return put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
-      case 16:
         _context2.n = 17;
-        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
+        return put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
       case 17:
+        _context2.n = 18;
+        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
+      case 18:
         hiddenList = store.getState().ChannelReducer.hideChannelList;
         log.info(new Date().toISOString() + " [getChannels] hiddenList state: " + hiddenList);
         if (hiddenList) {
-          _context2.n = 28;
+          _context2.n = 29;
           break;
         }
         log.info(new Date().toISOString() + " [getChannels] starting all channels query (hiddenList is false)");
@@ -16729,36 +16843,36 @@ function getChannels(action) {
           log.info(new Date().toISOString() + " [getChannels] allChannelsQuery memberCount: " + (params === null || params === void 0 ? void 0 : params.memberCount));
         }
         allChannelsQueryBuilder.limit(50);
-        _context2.n = 18;
+        _context2.n = 19;
         return call(allChannelsQueryBuilder.build);
-      case 18:
+      case 19:
         allChannelsQuery = _context2.v;
         log.info(new Date().toISOString() + " [getChannels] allChannelsQuery built");
         hasNext = true;
         totalAllChannelsAdded = 0;
         i = 0;
-      case 19:
+      case 20:
         if (!(i <= 4)) {
-          _context2.n = 27;
+          _context2.n = 28;
           break;
         }
         if (!hasNext) {
-          _context2.n = 25;
+          _context2.n = 26;
           break;
         }
-        _context2.p = 20;
+        _context2.p = 21;
         _connectionStatus = store.getState().UserReducer.connectionStatus;
         if (!(_connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
-          _context2.n = 21;
+          _context2.n = 22;
           break;
         }
         log.warn(new Date().toISOString() + " [getChannels] connection not ready, aborting. Status: " + _connectionStatus);
-        return _context2.a(3, 27);
-      case 21:
+        return _context2.a(3, 28);
+      case 22:
         log.info(new Date().toISOString() + " [getChannels] loading all channels page: " + (i + 1));
-        _context2.n = 22;
+        _context2.n = 23;
         return call(allChannelsQuery.loadNextPage);
-      case 22:
+      case 23:
         allChannelsData = _context2.v;
         hasNext = allChannelsData.hasNext;
         allChannelList = allChannelsData.channels;
@@ -16769,34 +16883,34 @@ function getChannels(action) {
         addChannelsToAllChannels(allChannelList);
         totalAllChannelsAdded += (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0;
         log.info(new Date().toISOString() + " [getChannels] total all channels added so far: " + totalAllChannelsAdded);
-        _context2.n = 24;
+        _context2.n = 25;
         break;
-      case 23:
-        _context2.p = 23;
+      case 24:
+        _context2.p = 24;
         _t3 = _context2.v;
         log.error(_t3, "Error on get all channels page: " + (i + 1));
-        return _context2.a(3, 27);
-      case 24:
-        _context2.n = 26;
-        break;
+        return _context2.a(3, 28);
       case 25:
-        log.info(new Date().toISOString() + " [getChannels] no more pages available, stopping at iteration: " + i);
+        _context2.n = 27;
+        break;
       case 26:
+        log.info(new Date().toISOString() + " [getChannels] no more pages available, stopping at iteration: " + i);
+      case 27:
         i++;
-        _context2.n = 19;
+        _context2.n = 20;
         break;
-      case 27:
+      case 28:
         log.info(new Date().toISOString() + " [getChannels] all channels query completed, total channels added: " + totalAllChannelsAdded);
-        _context2.n = 29;
+        _context2.n = 30;
         break;
-      case 28:
-        log.info(new Date().toISOString() + " [getChannels] skipping all channels query (hiddenList is true)");
       case 29:
+        log.info(new Date().toISOString() + " [getChannels] skipping all channels query (hiddenList is true)");
+      case 30:
         log.info(new Date().toISOString() + " [getChannels] completed successfully. Final mapped channels count: " + (((_mappedChannels4 = mappedChannels) === null || _mappedChannels4 === void 0 ? void 0 : _mappedChannels4.length) || 0));
-        _context2.n = 31;
+        _context2.n = 32;
         break;
-      case 30:
-        _context2.p = 30;
+      case 31:
+        _context2.p = 31;
         _t4 = _context2.v;
         log.error(new Date().toISOString() + " [getChannels] error occurred: " + JSON.stringify(_t4), 'Error on get channels');
         log.error(new Date().toISOString() + " [getChannels] error details: " + JSON.stringify({
@@ -16804,10 +16918,10 @@ function getChannels(action) {
           code: _t4.code,
           stack: _t4.stack
         }));
-      case 31:
+      case 32:
         return _context2.a(2);
     }
-  }, _marked2$1, null, [[20, 23], [1, 30]]);
+  }, _marked2$1, null, [[21, 24], [1, 31]]);
 }
 function searchChannels(action) {
   var payload, params, contactsMap, SceytChatClient, getFromContacts, searchBy, _params$filter2, _types2, channelQueryBuilder, channelTypesFilter, types, allChannels, publicChannels, chatsGroups, contactsList, contactsWithChannelsMap, lowerCaseSearchBy, handleChannels, channelsMap, _iterator, _step, channel, channelQuery, channelsData, _iterator2, _step2, _channel, channelsToAdd, _t5;
@@ -17411,7 +17525,7 @@ function markMessagesRead(action) {
   }, _marked9, null, [[2, 9]]);
 }
 function markVoiceMessageAsPlayed(action) {
-  var payload, channelId, messageIds, channel, _t10;
+  var payload, channelId, messageIds, channel, messageListMarker, _iterator6, _step6, messageId, updateParams, _t10;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
@@ -17429,25 +17543,54 @@ function markVoiceMessageAsPlayed(action) {
           }
         }
         if (!channel) {
-          _context0.n = 3;
+          _context0.n = 7;
           break;
         }
         _context0.n = 3;
         return call(channel.markVoiceMessagesAsPlayed, messageIds);
       case 3:
+        messageListMarker = _context0.v;
+        _iterator6 = _createForOfIteratorHelperLoose(messageListMarker.messageIds);
+      case 4:
+        if ((_step6 = _iterator6()).done) {
+          _context0.n = 7;
+          break;
+        }
+        messageId = _step6.value;
+        updateParams = {
+          deliveryStatus: MESSAGE_DELIVERY_STATUS.PLAYED,
+          userMarkers: [{
+            user: messageListMarker.user,
+            createdAt: messageListMarker.createdAt,
+            messageId: messageId,
+            name: MESSAGE_DELIVERY_STATUS.READ
+          }]
+        };
         _context0.n = 5;
+        return put(updateMessageAC(messageId, updateParams));
+      case 5:
+        updateMessageOnMap(channel.id, {
+          messageId: messageId,
+          params: updateParams
+        });
+        updateMessageOnAllMessages(messageId, updateParams);
+      case 6:
+        _context0.n = 4;
         break;
-      case 4:
-        _context0.p = 4;
+      case 7:
+        _context0.n = 9;
+        break;
+      case 8:
+        _context0.p = 8;
         _t10 = _context0.v;
         log.error(_t10, 'Error on mark voice messages read');
-      case 5:
+      case 9:
         return _context0.a(2);
     }
-  }, _marked0, null, [[1, 4]]);
+  }, _marked0, null, [[1, 8]]);
 }
 function markMessagesDelivered(action) {
-  var payload, channelId, messageIds, channel, _t11;
+  var payload, channelId, messageIds, channel, messageListMarker, _iterator7, _step7, messageId, updateParams, _t11;
   return _regenerator().w(function (_context1) {
     while (1) switch (_context1.p = _context1.n) {
       case 0:
@@ -17465,23 +17608,52 @@ function markMessagesDelivered(action) {
           }
         }
         if (!channel) {
-          _context1.n = 3;
+          _context1.n = 7;
           break;
         }
         log.info('send delivered marker ', messageIds);
         _context1.n = 3;
         return call(channel.markMessagesAsReceived, messageIds);
       case 3:
+        messageListMarker = _context1.v;
+        _iterator7 = _createForOfIteratorHelperLoose(messageListMarker.messageIds);
+      case 4:
+        if ((_step7 = _iterator7()).done) {
+          _context1.n = 7;
+          break;
+        }
+        messageId = _step7.value;
+        updateParams = {
+          deliveryStatus: MESSAGE_DELIVERY_STATUS.DELIVERED,
+          userMarkers: [{
+            user: messageListMarker.user,
+            createdAt: messageListMarker.createdAt,
+            messageId: messageId,
+            name: MESSAGE_DELIVERY_STATUS.DELIVERED
+          }]
+        };
         _context1.n = 5;
+        return put(updateMessageAC(messageId, updateParams));
+      case 5:
+        updateMessageOnMap(channel.id, {
+          messageId: messageId,
+          params: updateParams
+        });
+        updateMessageOnAllMessages(messageId, updateParams);
+      case 6:
+        _context1.n = 4;
         break;
-      case 4:
-        _context1.p = 4;
+      case 7:
+        _context1.n = 9;
+        break;
+      case 8:
+        _context1.p = 8;
         _t11 = _context1.v;
         log.error(_t11, 'Error on mark messages delivered');
-      case 5:
+      case 9:
         return _context1.a(2);
     }
-  }, _marked1, null, [[1, 4]]);
+  }, _marked1, null, [[1, 8]]);
 }
 function switchChannel(action) {
   var payload, channel, updateActiveChannel, channelToSwitch, existingChannel, addChannel, _SceytChatClient5, fetchedChannel, channelFromMap, currentActiveChannel, _t12;
@@ -17878,50 +18050,52 @@ function leaveChannel(action) {
     }
   }, _marked18, null, [[0, 6]]);
 }
-function deleteChannel(action) {
-  var payload, channelId, channel, _t20;
+function deletePendingDeleteChannels() {
+  var pendingDeleteChannels, _iterator8, _step8, channel, resendableError, _t20;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
-        _context19.p = 0;
-        payload = action.payload;
-        channelId = payload.channelId;
-        _context19.n = 1;
-        return call(getChannelFromMap, channelId);
+        pendingDeleteChannels = getPendingDeleteChannels();
+        _iterator8 = _createForOfIteratorHelperLoose(pendingDeleteChannels);
       case 1:
-        channel = _context19.v;
-        if (!channel) {
-          channel = getChannelFromAllChannels(channelId);
-        }
-        if (!channel) {
-          _context19.n = 5;
+        if ((_step8 = _iterator8()).done) {
+          _context19.n = 9;
           break;
         }
-        _context19.n = 2;
-        return call(channel["delete"]);
-      case 2:
+        channel = _step8.value;
+        _context19.p = 2;
         _context19.n = 3;
-        return put(setChannelToRemoveAC(channel));
+        return call(channel["delete"]);
       case 3:
         _context19.n = 4;
-        return put(removeChannelAC(channelId));
+        return put(setChannelToRemoveAC(channel));
       case 4:
         _context19.n = 5;
-        return put(removeChannelCachesAC(channelId));
+        return put(removeChannelAC(channel.id));
       case 5:
-        _context19.n = 7;
-        break;
+        _context19.n = 6;
+        return put(removeChannelCachesAC(channel.id));
       case 6:
-        _context19.p = 6;
-        _t20 = _context19.v;
-        log.error('ERROR in delete channel', _t20);
+        removePendingDeleteChannel(channel.id);
+        _context19.n = 8;
+        break;
       case 7:
+        _context19.p = 7;
+        _t20 = _context19.v;
+        resendableError = isResendableError(_t20 === null || _t20 === void 0 ? void 0 : _t20.type);
+        if (!resendableError) {
+          removePendingDeleteChannel(channel.id);
+        }
+      case 8:
+        _context19.n = 1;
+        break;
+      case 9:
         return _context19.a(2);
     }
-  }, _marked19, null, [[0, 6]]);
+  }, _marked19, null, [[2, 7]]);
 }
-function blockChannel(action) {
-  var payload, channelId, channel, _t21;
+function deleteChannel(action) {
+  var payload, channelId, channel, activeChannelId, lastChannel, _t21;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.p = _context20.n) {
       case 0:
@@ -17935,39 +18109,63 @@ function blockChannel(action) {
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
-        if (!channel) {
-          _context20.n = 4;
+        if (!(store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
+          _context20.n = 5;
           break;
         }
+        setPendingDeleteChannel(channel);
         _context20.n = 2;
-        return call(channel.block);
+        return call(getActiveChannelId);
       case 2:
+        activeChannelId = _context20.v;
+        if (!(activeChannelId === channelId)) {
+          _context20.n = 4;
+          break;
+        }
         _context20.n = 3;
-        return put(removeChannelAC(channelId));
+        return call(getLastChannelFromMap, true);
       case 3:
+        lastChannel = _context20.v;
         _context20.n = 4;
-        return put(removeChannelCachesAC(channelId));
+        return put(switchChannelActionAC(lastChannel || null));
       case 4:
-        _context20.n = 6;
-        break;
+        return _context20.a(2);
       case 5:
-        _context20.p = 5;
-        _t21 = _context20.v;
-        log.error('ERROR in block channel - ', _t21.message);
+        if (!channel) {
+          _context20.n = 9;
+          break;
+        }
+        _context20.n = 6;
+        return call(channel["delete"]);
       case 6:
+        _context20.n = 7;
+        return put(setChannelToRemoveAC(channel));
+      case 7:
+        _context20.n = 8;
+        return put(removeChannelAC(channelId));
+      case 8:
+        _context20.n = 9;
+        return put(removeChannelCachesAC(channelId));
+      case 9:
+        _context20.n = 11;
+        break;
+      case 10:
+        _context20.p = 10;
+        _t21 = _context20.v;
+        log.error('ERROR in delete channel', _t21);
+      case 11:
         return _context20.a(2);
     }
-  }, _marked20, null, [[0, 5]]);
+  }, _marked20, null, [[0, 10]]);
 }
-function updateChannel(action) {
-  var payload, channelId, config, _SceytChatClient6, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, onUpdateChannel, _channel3, _channel4, _channel5, fields, updatedChannel, _t22;
+function blockChannel(action) {
+  var payload, channelId, channel, _t22;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
         _context21.p = 0;
         payload = action.payload;
-        channelId = payload.channelId, config = payload.config;
-        _SceytChatClient6 = getClient();
+        channelId = payload.channelId;
         _context21.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
@@ -17975,6 +18173,46 @@ function updateChannel(action) {
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
+        if (!channel) {
+          _context21.n = 4;
+          break;
+        }
+        _context21.n = 2;
+        return call(channel.block);
+      case 2:
+        _context21.n = 3;
+        return put(removeChannelAC(channelId));
+      case 3:
+        _context21.n = 4;
+        return put(removeChannelCachesAC(channelId));
+      case 4:
+        _context21.n = 6;
+        break;
+      case 5:
+        _context21.p = 5;
+        _t22 = _context21.v;
+        log.error('ERROR in block channel - ', _t22.message);
+      case 6:
+        return _context21.a(2);
+    }
+  }, _marked21, null, [[0, 5]]);
+}
+function updateChannel(action) {
+  var payload, channelId, config, _SceytChatClient6, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, onUpdateChannel, _channel3, _channel4, _channel5, fields, updatedChannel, _t23;
+  return _regenerator().w(function (_context22) {
+    while (1) switch (_context22.p = _context22.n) {
+      case 0:
+        _context22.p = 0;
+        payload = action.payload;
+        channelId = payload.channelId, config = payload.config;
+        _SceytChatClient6 = getClient();
+        _context22.n = 1;
+        return call(getChannelFromMap, channelId);
+      case 1:
+        channel = _context22.v;
+        if (!channel) {
+          channel = getChannelFromAllChannels(channelId);
+        }
         paramsToUpdate = {
           uri: channel.uri,
           subject: channel.subject,
@@ -17982,7 +18220,7 @@ function updateChannel(action) {
           avatarUrl: channel.avatarUrl
         };
         if (!config.avatar) {
-          _context21.n = 3;
+          _context22.n = 3;
           break;
         }
         fileToUpload = {
@@ -17991,10 +18229,10 @@ function updateChannel(action) {
             log.info('upload percent - ', progressPercent);
           }
         };
-        _context21.n = 2;
+        _context22.n = 2;
         return call(_SceytChatClient6.uploadFile, fileToUpload);
       case 2:
-        paramsToUpdate.avatarUrl = _context21.v;
+        paramsToUpdate.avatarUrl = _context22.v;
       case 3:
         if (config.subject) {
           paramsToUpdate.subject = config.subject;
@@ -18005,14 +18243,14 @@ function updateChannel(action) {
         if (config.avatarUrl === '') {
           paramsToUpdate.avatarUrl = '';
         }
-        _context21.n = 4;
+        _context22.n = 4;
         return call(channel.update, paramsToUpdate);
       case 4:
-        _yield$call5 = _context21.v;
+        _yield$call5 = _context22.v;
         subject = _yield$call5.subject;
         avatarUrl = _yield$call5.avatarUrl;
         metadata = _yield$call5.metadata;
-        _context21.n = 5;
+        _context22.n = 5;
         return put(updateChannelDataAC(channelId, {
           subject: subject,
           avatarUrl: avatarUrl,
@@ -18026,7 +18264,7 @@ function updateChannel(action) {
         });
         onUpdateChannel = getOnUpdateChannel();
         if (!onUpdateChannel) {
-          _context21.n = 7;
+          _context22.n = 7;
           break;
         }
         fields = [];
@@ -18039,35 +18277,35 @@ function updateChannel(action) {
         if (JSON.stringify((_channel5 = channel) === null || _channel5 === void 0 ? void 0 : _channel5.metadata) !== metadata) {
           fields.push('metadata');
         }
-        _context21.n = 6;
+        _context22.n = 6;
         return call(getChannelFromMap, channelId);
       case 6:
-        updatedChannel = _context21.v;
+        updatedChannel = _context22.v;
         onUpdateChannel(updatedChannel, fields);
       case 7:
-        _context21.n = 9;
+        _context22.n = 9;
         break;
       case 8:
-        _context21.p = 8;
-        _t22 = _context21.v;
-        log.error('ERROR in update channel', _t22.message);
+        _context22.p = 8;
+        _t23 = _context22.v;
+        log.error('ERROR in update channel', _t23.message);
       case 9:
-        return _context21.a(2);
+        return _context22.a(2);
     }
-  }, _marked21, null, [[0, 8]]);
+  }, _marked22, null, [[0, 8]]);
 }
 function checkUsersStatus() {
-  var _SceytChatClient7, usersForUpdate, updatedUsers, usersToUpdateMap, update, updateData, _t23;
-  return _regenerator().w(function (_context22) {
-    while (1) switch (_context22.p = _context22.n) {
+  var _SceytChatClient7, usersForUpdate, updatedUsers, usersToUpdateMap, update, updateData, _t24;
+  return _regenerator().w(function (_context23) {
+    while (1) switch (_context23.p = _context23.n) {
       case 0:
-        _context22.p = 0;
+        _context23.p = 0;
         _SceytChatClient7 = getClient();
         usersForUpdate = Object.keys(usersMap);
-        _context22.n = 1;
+        _context23.n = 1;
         return call(_SceytChatClient7.getUsers, usersForUpdate);
       case 1:
-        updatedUsers = _context22.v;
+        updatedUsers = _context23.v;
         usersToUpdateMap = {};
         update = false;
         updatedUsers.forEach(function (updatedUser) {
@@ -18079,149 +18317,149 @@ function checkUsersStatus() {
           }
         });
         if (!update) {
-          _context22.n = 4;
+          _context23.n = 4;
           break;
         }
         updateData = JSON.parse(JSON.stringify(usersToUpdateMap));
-        _context22.n = 2;
+        _context23.n = 2;
         return put(updateMembersPresenceAC(updateData));
       case 2:
-        _context22.n = 3;
+        _context23.n = 3;
         return put(updateUserStatusOnMapAC(updateData));
       case 3:
-        _context22.n = 4;
+        _context23.n = 4;
         return put(updateUserStatusOnChannelAC(updateData));
       case 4:
-        _context22.n = 6;
+        _context23.n = 6;
         break;
       case 5:
-        _context22.p = 5;
-        _t23 = _context22.v;
-        log.error('ERROR in check user status : ', _t23.message);
+        _context23.p = 5;
+        _t24 = _context23.v;
+        log.error('ERROR in check user status : ', _t24.message);
       case 6:
-        return _context22.a(2);
+        return _context23.a(2);
     }
-  }, _marked22, null, [[0, 5]]);
+  }, _marked23, null, [[0, 5]]);
 }
 function sendTyping(action) {
-  var state, activeChannelId, channel, _t24;
-  return _regenerator().w(function (_context23) {
-    while (1) switch (_context23.p = _context23.n) {
+  var state, activeChannelId, channel, _t25;
+  return _regenerator().w(function (_context24) {
+    while (1) switch (_context24.p = _context24.n) {
       case 0:
         state = action.payload.state;
-        _context23.n = 1;
+        _context24.n = 1;
         return call(getActiveChannelId);
       case 1:
-        activeChannelId = _context23.v;
-        _context23.n = 2;
+        activeChannelId = _context24.v;
+        _context24.n = 2;
         return call(getChannelFromMap, activeChannelId);
       case 2:
-        channel = _context23.v;
-        _context23.p = 3;
+        channel = _context24.v;
+        _context24.p = 3;
         if (!channel) {
-          _context23.n = 6;
+          _context24.n = 6;
           break;
         }
         if (!state) {
-          _context23.n = 5;
+          _context24.n = 5;
           break;
         }
-        _context23.n = 4;
+        _context24.n = 4;
         return call(channel.startTyping);
       case 4:
-        _context23.n = 6;
+        _context24.n = 6;
         break;
       case 5:
-        _context23.n = 6;
+        _context24.n = 6;
         return call(channel.stopTyping);
       case 6:
-        _context23.n = 8;
+        _context24.n = 8;
         break;
       case 7:
-        _context23.p = 7;
-        _t24 = _context23.v;
-        log.error('ERROR in send typing', _t24);
+        _context24.p = 7;
+        _t25 = _context24.v;
+        log.error('ERROR in send typing', _t25);
       case 8:
-        return _context23.a(2);
+        return _context24.a(2);
     }
-  }, _marked23, null, [[3, 7]]);
+  }, _marked24, null, [[3, 7]]);
 }
 function sendRecording(action) {
-  var _action$payload, state, channelId, channel, _t25;
-  return _regenerator().w(function (_context24) {
-    while (1) switch (_context24.p = _context24.n) {
+  var _action$payload, state, channelId, channel, _t26;
+  return _regenerator().w(function (_context25) {
+    while (1) switch (_context25.p = _context25.n) {
       case 0:
         _action$payload = action.payload, state = _action$payload.state, channelId = _action$payload.channelId;
-        _context24.n = 1;
+        _context25.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context24.v;
-        _context24.p = 2;
+        channel = _context25.v;
+        _context25.p = 2;
         if (!channel) {
-          _context24.n = 5;
+          _context25.n = 5;
           break;
         }
         if (!state) {
-          _context24.n = 4;
+          _context25.n = 4;
           break;
         }
-        _context24.n = 3;
+        _context25.n = 3;
         return call(channel.startRecording);
       case 3:
-        _context24.n = 5;
+        _context25.n = 5;
         break;
       case 4:
-        _context24.n = 5;
+        _context25.n = 5;
         return call(channel.stopRecording);
       case 5:
-        _context24.n = 7;
+        _context25.n = 7;
         break;
       case 6:
-        _context24.p = 6;
-        _t25 = _context24.v;
-        log.error('ERROR in send recording', _t25);
+        _context25.p = 6;
+        _t26 = _context25.v;
+        log.error('ERROR in send recording', _t26);
       case 7:
-        return _context24.a(2);
+        return _context25.a(2);
     }
-  }, _marked24, null, [[2, 6]]);
+  }, _marked25, null, [[2, 6]]);
 }
 function clearHistory(action) {
-  var payload, channelId, channel, activeChannelId, groupName, _t26;
-  return _regenerator().w(function (_context25) {
-    while (1) switch (_context25.p = _context25.n) {
+  var payload, channelId, channel, activeChannelId, groupName, _t27;
+  return _regenerator().w(function (_context26) {
+    while (1) switch (_context26.p = _context26.n) {
       case 0:
-        _context25.p = 0;
+        _context26.p = 0;
         payload = action.payload;
         channelId = payload.channelId;
-        _context25.n = 1;
+        _context26.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context25.v;
+        channel = _context26.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
-        _context25.n = 2;
+        _context26.n = 2;
         return call(getActiveChannelId);
       case 2:
-        activeChannelId = _context25.v;
+        activeChannelId = _context26.v;
         if (!channel) {
-          _context25.n = 7;
+          _context26.n = 7;
           break;
         }
-        _context25.n = 3;
+        _context26.n = 3;
         return call(channel.deleteAllMessages);
       case 3:
-        _context25.n = 4;
+        _context26.n = 4;
         return put(clearMessagesAC());
       case 4:
         removeMessagesFromMap(channelId);
         if (channelId === activeChannelId) {
           removeAllMessages();
         }
-        _context25.n = 5;
+        _context26.n = 5;
         return put(clearSelectedMessagesAC());
       case 5:
-        _context25.n = 6;
+        _context26.n = 6;
         return put(updateChannelDataAC(channel.id, {
           lastMessage: null,
           newMessageCount: 0,
@@ -18234,64 +18472,64 @@ function clearHistory(action) {
           newMentionCount: 0
         });
         groupName = getChannelGroupName(channel);
-        _context25.n = 7;
+        _context26.n = 7;
         return put(updateSearchedChannelDataAC(channel.id, {
           lastMessage: null,
           newMessageCount: 0,
           newMentionCount: 0
         }, groupName));
       case 7:
-        _context25.n = 9;
+        _context26.n = 9;
         break;
       case 8:
-        _context25.p = 8;
-        _t26 = _context25.v;
-        log.error('ERROR in clear history', _t26);
+        _context26.p = 8;
+        _t27 = _context26.v;
+        log.error('ERROR in clear history', _t27);
       case 9:
-        return _context25.a(2);
+        return _context26.a(2);
     }
-  }, _marked25, null, [[0, 8]]);
+  }, _marked26, null, [[0, 8]]);
 }
 function deleteAllMessages(action) {
-  var payload, channelId, channel, activeChannelId, groupName, _t27;
-  return _regenerator().w(function (_context26) {
-    while (1) switch (_context26.p = _context26.n) {
+  var payload, channelId, channel, activeChannelId, groupName, _t28;
+  return _regenerator().w(function (_context27) {
+    while (1) switch (_context27.p = _context27.n) {
       case 0:
-        _context26.p = 0;
+        _context27.p = 0;
         payload = action.payload;
         channelId = payload.channelId;
-        _context26.n = 1;
+        _context27.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context26.v;
+        channel = _context27.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
-        _context26.n = 2;
+        _context27.n = 2;
         return call(getActiveChannelId);
       case 2:
-        activeChannelId = _context26.v;
+        activeChannelId = _context27.v;
         if (!channel) {
-          _context26.n = 8;
+          _context27.n = 8;
           break;
         }
-        _context26.n = 3;
+        _context27.n = 3;
         return call(channel.deleteAllMessages, true);
       case 3:
         removeMessagesFromMap(channelId);
         if (!(channelId === activeChannelId)) {
-          _context26.n = 5;
+          _context27.n = 5;
           break;
         }
-        _context26.n = 4;
+        _context27.n = 4;
         return put(clearMessagesAC());
       case 4:
         removeAllMessages();
       case 5:
-        _context26.n = 6;
+        _context27.n = 6;
         return put(clearSelectedMessagesAC());
       case 6:
-        _context26.n = 7;
+        _context27.n = 7;
         return put(updateChannelDataAC(channel.id, {
           lastMessage: null,
           newMessageCount: 0,
@@ -18304,230 +18542,230 @@ function deleteAllMessages(action) {
           newMentionCount: 0
         });
         groupName = getChannelGroupName(channel);
-        _context26.n = 8;
+        _context27.n = 8;
         return put(updateSearchedChannelDataAC(channel.id, {
           lastMessage: null,
           newMessageCount: 0,
           newMentionCount: 0
         }, groupName));
       case 8:
-        _context26.n = 10;
+        _context27.n = 10;
         break;
       case 9:
-        _context26.p = 9;
-        _t27 = _context26.v;
-        log.error('ERROR in clear history', _t27);
+        _context27.p = 9;
+        _t28 = _context27.v;
+        log.error('ERROR in clear history', _t28);
       case 10:
-        return _context26.a(2);
+        return _context27.a(2);
     }
-  }, _marked26, null, [[0, 9]]);
+  }, _marked27, null, [[0, 9]]);
 }
 function joinChannel(action) {
-  var payload, channelId, _SceytChatClient8, channel, joinedChannel, _t28;
-  return _regenerator().w(function (_context27) {
-    while (1) switch (_context27.p = _context27.n) {
+  var payload, channelId, _SceytChatClient8, channel, joinedChannel, _t29;
+  return _regenerator().w(function (_context28) {
+    while (1) switch (_context28.p = _context28.n) {
       case 0:
-        _context27.p = 0;
+        _context28.p = 0;
         payload = action.payload;
         channelId = payload.channelId;
         _SceytChatClient8 = getClient();
-        _context27.n = 1;
+        _context28.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context27.v;
+        channel = _context28.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
         if (channel) {
-          _context27.n = 3;
+          _context28.n = 3;
           break;
         }
-        _context27.n = 2;
+        _context28.n = 2;
         return call(_SceytChatClient8.getChannel, channelId);
       case 2:
-        channel = _context27.v;
+        channel = _context28.v;
       case 3:
-        _context27.n = 4;
+        _context28.n = 4;
         return call(channel.join);
       case 4:
-        joinedChannel = _context27.v;
-        _context27.n = 5;
+        joinedChannel = _context28.v;
+        _context28.n = 5;
         return put(setCloseSearchChannelsAC(true));
       case 5:
-        _context27.n = 6;
+        _context28.n = 6;
         return put(setChannelToAddAC(JSON.parse(JSON.stringify(joinedChannel))));
       case 6:
-        _context27.n = 7;
+        _context28.n = 7;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(joinedChannel))));
       case 7:
         addChannelToAllChannels(joinedChannel);
-        _context27.n = 8;
+        _context28.n = 8;
         return call(setActiveChannelId, joinedChannel.id);
       case 8:
-        _context27.n = 10;
+        _context28.n = 10;
         break;
       case 9:
-        _context27.p = 9;
-        _t28 = _context27.v;
-        log.error(_t28, 'Error in join to channel');
+        _context28.p = 9;
+        _t29 = _context28.v;
+        log.error(_t29, 'Error in join to channel');
       case 10:
-        return _context27.a(2);
+        return _context28.a(2);
     }
-  }, _marked27, null, [[0, 9]]);
+  }, _marked28, null, [[0, 9]]);
 }
 function watchForChannelEvents() {
-  return _regenerator().w(function (_context28) {
-    while (1) switch (_context28.n) {
+  return _regenerator().w(function (_context29) {
+    while (1) switch (_context29.n) {
       case 0:
-        _context28.n = 1;
+        _context29.n = 1;
         return call(watchForEvents);
       case 1:
-        return _context28.a(2);
+        return _context29.a(2);
     }
-  }, _marked28);
+  }, _marked29);
 }
 function createChannelInviteKey(action) {
-  var payload, channelId, _SceytChatClient9, channel, inviteKey, _t29;
-  return _regenerator().w(function (_context29) {
-    while (1) switch (_context29.p = _context29.n) {
+  var payload, channelId, _SceytChatClient9, channel, inviteKey, _t30;
+  return _regenerator().w(function (_context30) {
+    while (1) switch (_context30.p = _context30.n) {
       case 0:
-        _context29.p = 0;
+        _context30.p = 0;
         payload = action.payload;
         channelId = payload.channelId;
         _SceytChatClient9 = getClient();
-        _context29.n = 1;
+        _context30.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context29.v;
+        channel = _context30.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
         if (!channel) {
-          _context29.n = 3;
+          _context30.n = 3;
           break;
         }
-        _context29.n = 2;
+        _context30.n = 2;
         return call(_SceytChatClient9.createInviteKey, {
           maxUses: 0,
           expiresAt: 0,
           accessPriorHistory: true
         });
       case 2:
-        inviteKey = _context29.v;
-        _context29.n = 3;
+        inviteKey = _context30.v;
+        _context30.n = 3;
         return put(setChannelInviteKeysAC(channelId, [inviteKey]));
       case 3:
-        _context29.n = 5;
+        _context30.n = 5;
         break;
       case 4:
-        _context29.p = 4;
-        _t29 = _context29.v;
-        log.error('ERROR in create channel invite key', _t29);
+        _context30.p = 4;
+        _t30 = _context30.v;
+        log.error('ERROR in create channel invite key', _t30);
       case 5:
-        return _context29.a(2);
+        return _context30.a(2);
     }
-  }, _marked29, null, [[0, 4]]);
+  }, _marked30, null, [[0, 4]]);
 }
 function getChannelInviteKeys(action) {
-  var payload, channelId, channel, inviteKeys, _t30;
-  return _regenerator().w(function (_context30) {
-    while (1) switch (_context30.p = _context30.n) {
+  var payload, channelId, channel, inviteKeys, _t31;
+  return _regenerator().w(function (_context31) {
+    while (1) switch (_context31.p = _context31.n) {
       case 0:
-        _context30.p = 0;
+        _context31.p = 0;
         payload = action.payload;
         channelId = payload.channelId;
-        _context30.n = 1;
+        _context31.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context30.v;
+        channel = _context31.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
         if (!channel) {
-          _context30.n = 3;
+          _context31.n = 3;
           break;
         }
-        _context30.n = 2;
+        _context31.n = 2;
         return call(channel.getInviteKeys);
       case 2:
-        inviteKeys = _context30.v;
-        _context30.n = 3;
+        inviteKeys = _context31.v;
+        _context31.n = 3;
         return put(setChannelInviteKeysAC(channelId, inviteKeys));
       case 3:
-        _context30.n = 5;
+        _context31.n = 5;
         break;
       case 4:
-        _context30.p = 4;
-        _t30 = _context30.v;
-        log.error('ERROR in get channel invite keys', _t30);
+        _context31.p = 4;
+        _t31 = _context31.v;
+        log.error('ERROR in get channel invite keys', _t31);
       case 5:
-        return _context30.a(2);
+        return _context31.a(2);
     }
-  }, _marked30, null, [[0, 4]]);
+  }, _marked31, null, [[0, 4]]);
 }
 function regenerateChannelInviteKey(action) {
-  var payload, channelId, key, deletePermanently, channel, inviteKey, _t31;
-  return _regenerator().w(function (_context31) {
-    while (1) switch (_context31.p = _context31.n) {
+  var payload, channelId, key, deletePermanently, channel, inviteKey, _t32;
+  return _regenerator().w(function (_context32) {
+    while (1) switch (_context32.p = _context32.n) {
       case 0:
-        _context31.p = 0;
+        _context32.p = 0;
         payload = action.payload;
         channelId = payload.channelId, key = payload.key, deletePermanently = payload.deletePermanently;
-        _context31.n = 1;
+        _context32.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context31.v;
+        channel = _context32.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
         if (!channel) {
-          _context31.n = 3;
+          _context32.n = 3;
           break;
         }
-        _context31.n = 2;
+        _context32.n = 2;
         return call(channel.regenerateInviteKey, {
           key: key,
           channelId: channelId,
           deletePermanently: deletePermanently
         });
       case 2:
-        inviteKey = _context31.v;
-        _context31.n = 3;
+        inviteKey = _context32.v;
+        _context32.n = 3;
         return put(setChannelInviteKeysAC(channelId, [inviteKey]));
       case 3:
-        _context31.n = 5;
+        _context32.n = 5;
         break;
       case 4:
-        _context31.p = 4;
-        _t31 = _context31.v;
-        log.error('ERROR in regenerate channel invite key', _t31);
+        _context32.p = 4;
+        _t32 = _context32.v;
+        log.error('ERROR in regenerate channel invite key', _t32);
       case 5:
-        return _context31.a(2);
+        return _context32.a(2);
     }
-  }, _marked31, null, [[0, 4]]);
+  }, _marked32, null, [[0, 4]]);
 }
 function updateChannelInviteKey(action) {
-  var channelInviteKeys, channelId, payload, payloadChannelId, key, accessPriorHistory, expiresAt, maxUses, channel, copiedChannelInviteKeys, _t32;
-  return _regenerator().w(function (_context32) {
-    while (1) switch (_context32.p = _context32.n) {
+  var channelInviteKeys, channelId, payload, payloadChannelId, key, accessPriorHistory, expiresAt, maxUses, channel, copiedChannelInviteKeys, _t33;
+  return _regenerator().w(function (_context33) {
+    while (1) switch (_context33.p = _context33.n) {
       case 0:
         channelInviteKeys = [];
         channelId = '';
-        _context32.p = 1;
+        _context33.p = 1;
         payload = action.payload;
         payloadChannelId = payload.channelId, key = payload.key, accessPriorHistory = payload.accessPriorHistory, expiresAt = payload.expiresAt, maxUses = payload.maxUses;
         channelId = payloadChannelId;
-        _context32.n = 2;
+        _context33.n = 2;
         return call(getChannelFromMap, channelId);
       case 2:
-        channel = _context32.v;
+        channel = _context33.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
         channelInviteKeys = store.getState().ChannelReducer.channelInviteKeys[channelId];
         copiedChannelInviteKeys = JSON.parse(JSON.stringify(channelInviteKeys));
         if (!copiedChannelInviteKeys) {
-          _context32.n = 3;
+          _context33.n = 3;
           break;
         }
         copiedChannelInviteKeys.forEach(function (inviteKey) {
@@ -18537,14 +18775,14 @@ function updateChannelInviteKey(action) {
             inviteKey.maxUses = maxUses;
           }
         });
-        _context32.n = 3;
+        _context33.n = 3;
         return put(setChannelInviteKeysAC(channelId, copiedChannelInviteKeys));
       case 3:
         if (!channel) {
-          _context32.n = 4;
+          _context33.n = 4;
           break;
         }
-        _context32.n = 4;
+        _context33.n = 4;
         return call(channel.updateInviteKey, {
           key: key,
           channelId: channelId,
@@ -18553,88 +18791,88 @@ function updateChannelInviteKey(action) {
           accessPriorHistory: accessPriorHistory
         });
       case 4:
-        _context32.n = 6;
+        _context33.n = 6;
         break;
       case 5:
-        _context32.p = 5;
-        _t32 = _context32.v;
-        log.error('ERROR in update channel invite key', _t32);
-        _context32.n = 6;
+        _context33.p = 5;
+        _t33 = _context33.v;
+        log.error('ERROR in update channel invite key', _t33);
+        _context33.n = 6;
         return put(setChannelInviteKeysAC(channelId, channelInviteKeys));
       case 6:
-        return _context32.a(2);
+        return _context33.a(2);
     }
-  }, _marked32, null, [[1, 5]]);
+  }, _marked33, null, [[1, 5]]);
 }
 function getChannelByInviteKey(action) {
-  var _channel$, _channel$2, payload, key, _SceytChatClient0, channel, _t33;
-  return _regenerator().w(function (_context33) {
-    while (1) switch (_context33.p = _context33.n) {
+  var _channel$, _channel$2, payload, key, _SceytChatClient0, channel, _t34;
+  return _regenerator().w(function (_context34) {
+    while (1) switch (_context34.p = _context34.n) {
       case 0:
-        _context33.p = 0;
+        _context34.p = 0;
         payload = action.payload;
         key = payload.key;
         _SceytChatClient0 = getClient();
-        _context33.n = 1;
+        _context34.n = 1;
         return call(_SceytChatClient0.Channel.getChannelByInviteKey, key);
       case 1:
-        channel = _context33.v;
+        channel = _context34.v;
         if (!(channel && channel.length > 0 && !((_channel$ = channel[0]) !== null && _channel$ !== void 0 && _channel$.role))) {
-          _context33.n = 3;
+          _context34.n = 3;
           break;
         }
-        _context33.n = 2;
+        _context34.n = 2;
         return put(setJoinableChannelAC(JSON.parse(JSON.stringify(channel[0]))));
       case 2:
         window.history.pushState({}, '', window.location.pathname + '?join=' + key);
-        _context33.n = 5;
+        _context34.n = 5;
         break;
       case 3:
         if (!(channel && channel.length > 0 && (_channel$2 = channel[0]) !== null && _channel$2 !== void 0 && _channel$2.role)) {
-          _context33.n = 5;
+          _context34.n = 5;
           break;
         }
-        _context33.n = 4;
+        _context34.n = 4;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(channel[0]))));
       case 4:
         window.history.pushState({}, '', window.location.pathname);
       case 5:
-        _context33.n = 8;
+        _context34.n = 8;
         break;
       case 6:
-        _context33.p = 6;
-        _t33 = _context33.v;
-        if (!(_t33.code === 1109)) {
-          _context33.n = 7;
+        _context34.p = 6;
+        _t34 = _context34.v;
+        if (!(_t34.code === 1109)) {
+          _context34.n = 7;
           break;
         }
-        _context33.n = 7;
+        _context34.n = 7;
         return put(setChannelInviteKeyAvailableAC(false));
       case 7:
-        log.error('ERROR in get channel by invite key', _t33);
+        log.error('ERROR in get channel by invite key', _t34);
       case 8:
-        return _context33.a(2);
+        return _context34.a(2);
     }
-  }, _marked33, null, [[0, 6]]);
+  }, _marked34, null, [[0, 6]]);
 }
 function joinChannelWithInviteKey(action) {
-  var payload, key, _SceytChatClient1, user, channel, messageToSend, _t34;
-  return _regenerator().w(function (_context34) {
-    while (1) switch (_context34.p = _context34.n) {
+  var payload, key, _SceytChatClient1, user, channel, messageToSend, _t35;
+  return _regenerator().w(function (_context35) {
+    while (1) switch (_context35.p = _context35.n) {
       case 0:
-        _context34.p = 0;
+        _context35.p = 0;
         payload = action.payload;
         key = payload.key;
         _SceytChatClient1 = getClient();
         user = _SceytChatClient1.user;
-        _context34.n = 1;
+        _context35.n = 1;
         return call(_SceytChatClient1.Channel.joinChannelByInviteKey, key);
       case 1:
-        channel = _context34.v;
-        _context34.n = 2;
+        channel = _context35.v;
+        _context35.n = 2;
         return put(setJoinableChannelAC(null));
       case 2:
-        _context34.n = 3;
+        _context35.n = 3;
         return call(setChannelInMap, channel);
       case 3:
         messageToSend = {
@@ -18643,47 +18881,47 @@ function joinChannelWithInviteKey(action) {
           attachments: [],
           type: 'system'
         };
-        _context34.n = 4;
+        _context35.n = 4;
         return put(sendTextMessageAC(messageToSend, channel === null || channel === void 0 ? void 0 : channel.id, CONNECTION_STATUS.CONNECTED));
       case 4:
-        _context34.n = 5;
+        _context35.n = 5;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(channel))));
       case 5:
         window.history.pushState({}, '', window.location.pathname);
-        _context34.n = 7;
+        _context35.n = 7;
         break;
       case 6:
-        _context34.p = 6;
-        _t34 = _context34.v;
-        log.error('ERROR in join channel with invite key', _t34);
+        _context35.p = 6;
+        _t35 = _context35.v;
+        log.error('ERROR in join channel with invite key', _t35);
       case 7:
-        return _context34.a(2);
+        return _context35.a(2);
     }
-  }, _marked34, null, [[0, 6]]);
+  }, _marked35, null, [[0, 6]]);
 }
 function setMessageRetentionPeriod(action) {
-  var payload, channelId, periodInMilliseconds, channel, messageToSend, _t35;
-  return _regenerator().w(function (_context35) {
-    while (1) switch (_context35.p = _context35.n) {
+  var payload, channelId, periodInMilliseconds, channel, messageToSend, _t36;
+  return _regenerator().w(function (_context36) {
+    while (1) switch (_context36.p = _context36.n) {
       case 0:
-        _context35.p = 0;
+        _context36.p = 0;
         payload = action.payload;
         channelId = payload.channelId, periodInMilliseconds = payload.periodInMilliseconds;
-        _context35.n = 1;
+        _context36.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context35.v;
+        channel = _context36.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
         }
         if (!channel) {
-          _context35.n = 4;
+          _context36.n = 4;
           break;
         }
-        _context35.n = 2;
+        _context36.n = 2;
         return call(channel.setMessageRetentionPeriod, periodInMilliseconds);
       case 2:
-        _context35.n = 3;
+        _context36.n = 3;
         return put(updateChannelDataAC(channelId, {
           messageRetentionPeriod: periodInMilliseconds
         }));
@@ -18700,32 +18938,32 @@ function setMessageRetentionPeriod(action) {
           attachments: [],
           type: 'system'
         };
-        _context35.n = 4;
+        _context36.n = 4;
         return put(sendTextMessageAC(messageToSend, channelId, CONNECTION_STATUS.CONNECTED));
       case 4:
-        _context35.n = 6;
+        _context36.n = 6;
         break;
       case 5:
-        _context35.p = 5;
-        _t35 = _context35.v;
-        log.error('ERROR in set message retention period', _t35);
+        _context36.p = 5;
+        _t36 = _context36.v;
+        log.error('ERROR in set message retention period', _t36);
       case 6:
-        return _context35.a(2);
+        return _context36.a(2);
     }
-  }, _marked35, null, [[0, 5]]);
+  }, _marked36, null, [[0, 5]]);
 }
 function getChannelsWithUser(action) {
-  var payload, userId, _SceytChatClient10, channelsQueryBuilder, channelsQuery, channelsData, channels, _t36;
-  return _regenerator().w(function (_context36) {
-    while (1) switch (_context36.p = _context36.n) {
+  var payload, userId, _SceytChatClient10, channelsQueryBuilder, channelsQuery, channelsData, channels, _t37;
+  return _regenerator().w(function (_context37) {
+    while (1) switch (_context37.p = _context37.n) {
       case 0:
-        _context36.n = 1;
+        _context37.n = 1;
         return put(setMutualChannelsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _context36.n = 2;
+        _context37.n = 2;
         return put(setMutualChannelsAC([]));
       case 2:
-        _context36.p = 2;
+        _context37.p = 2;
         payload = action.payload;
         userId = payload.userId;
         _SceytChatClient10 = getClient();
@@ -18734,231 +18972,231 @@ function getChannelsWithUser(action) {
         channelsQueryBuilder.setMutualWithUserId(userId);
         channelsQueryBuilder.withExcludeTypes([DEFAULT_CHANNEL_TYPE.DIRECT]);
         channelsQueryBuilder.limit(15);
-        _context36.n = 3;
+        _context37.n = 3;
         return call(channelsQueryBuilder.build);
       case 3:
-        channelsQuery = _context36.v;
+        channelsQuery = _context37.v;
         query.mutualChannelsQuery = channelsQuery;
-        _context36.n = 4;
+        _context37.n = 4;
         return call(channelsQuery.loadNextPage);
       case 4:
-        channelsData = _context36.v;
+        channelsData = _context37.v;
         channels = channelsData.channels;
         if (!channelsData.hasNext) {
-          _context36.n = 6;
+          _context37.n = 6;
           break;
         }
-        _context36.n = 5;
+        _context37.n = 5;
         return put(setMutualChannelsHasNextAC(true));
       case 5:
-        _context36.n = 7;
+        _context37.n = 7;
         break;
       case 6:
-        _context36.n = 7;
+        _context37.n = 7;
         return put(setMutualChannelsHasNextAC(false));
       case 7:
-        _context36.n = 8;
+        _context37.n = 8;
         return put(setMutualChannelsAC(channels));
       case 8:
-        _context36.n = 10;
+        _context37.n = 10;
         break;
       case 9:
-        _context36.p = 9;
-        _t36 = _context36.v;
-        log.error('ERROR in get groups in common', _t36);
+        _context37.p = 9;
+        _t37 = _context37.v;
+        log.error('ERROR in get groups in common', _t37);
       case 10:
-        _context36.p = 10;
-        _context36.n = 11;
+        _context37.p = 10;
+        _context37.n = 11;
         return put(setMutualChannelsLoadingStateAC(LOADING_STATE.LOADED));
       case 11:
-        return _context36.f(10);
+        return _context37.f(10);
       case 12:
-        return _context36.a(2);
+        return _context37.a(2);
     }
-  }, _marked36, null, [[2, 9, 10, 12]]);
+  }, _marked37, null, [[2, 9, 10, 12]]);
 }
 function loadMoreMutualChannels(action) {
-  var payload, limit, mutualChannelsQuery, channelsData, _t37;
-  return _regenerator().w(function (_context37) {
-    while (1) switch (_context37.p = _context37.n) {
+  var payload, limit, mutualChannelsQuery, channelsData, _t38;
+  return _regenerator().w(function (_context38) {
+    while (1) switch (_context38.p = _context38.n) {
       case 0:
-        _context37.n = 1;
+        _context38.n = 1;
         return put(setMutualChannelsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _context37.p = 1;
+        _context38.p = 1;
         payload = action.payload;
         limit = payload.limit;
         mutualChannelsQuery = query.mutualChannelsQuery;
         if (mutualChannelsQuery) {
-          _context37.n = 2;
+          _context38.n = 2;
           break;
         }
-        return _context37.a(2);
+        return _context38.a(2);
       case 2:
         if (limit) {
           mutualChannelsQuery.limit = limit;
         }
-        _context37.n = 3;
+        _context38.n = 3;
         return call(mutualChannelsQuery.loadNextPage);
       case 3:
-        channelsData = _context37.v;
+        channelsData = _context38.v;
         if (!channelsData.hasNext) {
-          _context37.n = 5;
+          _context38.n = 5;
           break;
         }
-        _context37.n = 4;
+        _context38.n = 4;
         return put(setMutualChannelsHasNextAC(true));
       case 4:
-        _context37.n = 6;
+        _context38.n = 6;
         break;
       case 5:
-        _context37.n = 6;
+        _context38.n = 6;
         return put(setMutualChannelsHasNextAC(false));
       case 6:
-        _context37.n = 7;
+        _context38.n = 7;
         return put(setMutualChannelsAC(channelsData.channels));
       case 7:
-        _context37.n = 9;
+        _context38.n = 9;
         break;
       case 8:
-        _context37.p = 8;
-        _t37 = _context37.v;
-        log.error('ERROR in load more mutual channels', _t37);
+        _context38.p = 8;
+        _t38 = _context38.v;
+        log.error('ERROR in load more mutual channels', _t38);
       case 9:
-        _context37.p = 9;
-        _context37.n = 10;
+        _context38.p = 9;
+        _context38.n = 10;
         return put(setMutualChannelsLoadingStateAC(LOADING_STATE.LOADED));
       case 10:
-        return _context37.f(9);
+        return _context38.f(9);
       case 11:
-        return _context37.a(2);
+        return _context38.a(2);
     }
-  }, _marked37, null, [[1, 8, 9, 11]]);
+  }, _marked38, null, [[1, 8, 9, 11]]);
 }
 function ChannelsSaga() {
-  return _regenerator().w(function (_context38) {
-    while (1) switch (_context38.n) {
+  return _regenerator().w(function (_context39) {
+    while (1) switch (_context39.n) {
       case 0:
-        _context38.n = 1;
+        _context39.n = 1;
         return takeLatest(CREATE_CHANNEL, createChannel);
       case 1:
-        _context38.n = 2;
+        _context39.n = 2;
         return takeLatest(GET_CHANNELS, getChannels);
       case 2:
-        _context38.n = 3;
+        _context39.n = 3;
         return takeLatest(SEARCH_CHANNELS, searchChannels);
       case 3:
-        _context38.n = 4;
+        _context39.n = 4;
         return takeLatest(GET_CHANNELS_FOR_FORWARD, getChannelsForForward);
       case 4:
-        _context38.n = 5;
+        _context39.n = 5;
         return takeLatest(SEARCH_CHANNELS_FOR_FORWARD, searchChannelsForForward);
       case 5:
-        _context38.n = 6;
+        _context39.n = 6;
         return takeLatest(LOAD_MORE_CHANNEL, channelsLoadMore);
       case 6:
-        _context38.n = 7;
+        _context39.n = 7;
         return takeLatest(LOAD_MORE_CHANNELS_FOR_FORWARD, channelsForForwardLoadMore);
       case 7:
-        _context38.n = 8;
+        _context39.n = 8;
         return takeLatest(GET_CHANNELS_WITH_USER, getChannelsWithUser);
       case 8:
-        _context38.n = 9;
+        _context39.n = 9;
         return takeLatest(LOAD_MORE_MUTUAL_CHANNELS, loadMoreMutualChannels);
       case 9:
-        _context38.n = 10;
+        _context39.n = 10;
         return takeEvery(SWITCH_CHANNEL, switchChannel);
       case 10:
-        _context38.n = 11;
+        _context39.n = 11;
         return takeLatest(LEAVE_CHANNEL, leaveChannel);
       case 11:
-        _context38.n = 12;
+        _context39.n = 12;
         return takeLatest(DELETE_CHANNEL, deleteChannel);
       case 12:
-        _context38.n = 13;
+        _context39.n = 13;
         return takeLatest(BLOCK_CHANNEL, blockChannel);
       case 13:
-        _context38.n = 14;
+        _context39.n = 14;
         return takeLatest(UPDATE_CHANNEL, updateChannel);
       case 14:
-        _context38.n = 15;
+        _context39.n = 15;
         return takeEvery(MARK_MESSAGES_AS_READ, markMessagesRead);
       case 15:
-        _context38.n = 16;
+        _context39.n = 16;
         return takeLatest(MARK_MESSAGES_AS_DELIVERED, markMessagesDelivered);
       case 16:
-        _context38.n = 17;
+        _context39.n = 17;
         return takeLatest(MARK_VOICE_MESSAGE_AS_PLAYED, markVoiceMessageAsPlayed);
       case 17:
-        _context38.n = 18;
+        _context39.n = 18;
         return takeLatest(WATCH_FOR_EVENTS, watchForChannelEvents);
       case 18:
-        _context38.n = 19;
+        _context39.n = 19;
         return takeLatest(TURN_OFF_NOTIFICATION, notificationsTurnOff);
       case 19:
-        _context38.n = 20;
+        _context39.n = 20;
         return takeLatest(TURN_ON_NOTIFICATION, notificationsTurnOn);
       case 20:
-        _context38.n = 21;
+        _context39.n = 21;
         return takeLatest(MARK_CHANNEL_AS_READ, markChannelAsRead);
       case 21:
-        _context38.n = 22;
+        _context39.n = 22;
         return takeLatest(MARK_CHANNEL_AS_UNREAD, markChannelAsUnRead);
       case 22:
-        _context38.n = 23;
+        _context39.n = 23;
         return takeLatest(CHECK_USER_STATUS, checkUsersStatus);
       case 23:
-        _context38.n = 24;
+        _context39.n = 24;
         return takeLatest(SEND_TYPING, sendTyping);
       case 24:
-        _context38.n = 25;
+        _context39.n = 25;
         return takeLatest(SEND_RECORDING, sendRecording);
       case 25:
-        _context38.n = 26;
+        _context39.n = 26;
         return takeLatest(PIN_CHANNEL, pinChannel);
       case 26:
-        _context38.n = 27;
+        _context39.n = 27;
         return takeLatest(UNPIN_CHANNEL, unpinChannel);
       case 27:
-        _context38.n = 28;
+        _context39.n = 28;
         return takeLatest(CLEAR_HISTORY, clearHistory);
       case 28:
-        _context38.n = 29;
+        _context39.n = 29;
         return takeLatest(JOIN_TO_CHANNEL, joinChannel);
       case 29:
-        _context38.n = 30;
+        _context39.n = 30;
         return takeLatest(DELETE_ALL_MESSAGES, deleteAllMessages);
       case 30:
-        _context38.n = 31;
+        _context39.n = 31;
         return takeLatest(REMOVE_CHANNEL_CACHES, removeChannelCaches);
       case 31:
-        _context38.n = 32;
+        _context39.n = 32;
         return takeLatest(GET_CHANNEL_MENTIONS, getChannelMentions);
       case 32:
-        _context38.n = 33;
+        _context39.n = 33;
         return takeLatest(CREATE_CHANNEL_INVITE_KEY, createChannelInviteKey);
       case 33:
-        _context38.n = 34;
+        _context39.n = 34;
         return takeLatest(UPDATE_CHANNEL_INVITE_KEY, updateChannelInviteKey);
       case 34:
-        _context38.n = 35;
+        _context39.n = 35;
         return takeLatest(REGENERATE_CHANNEL_INVITE_KEY, regenerateChannelInviteKey);
       case 35:
-        _context38.n = 36;
+        _context39.n = 36;
         return takeLatest(GET_CHANNEL_INVITE_KEYS, getChannelInviteKeys);
       case 36:
-        _context38.n = 37;
+        _context39.n = 37;
         return takeLatest(GET_CHANNEL_BY_INVITE_KEY, getChannelByInviteKey);
       case 37:
-        _context38.n = 38;
+        _context39.n = 38;
         return takeLatest(JOIN_TO_CHANNEL_WITH_INVITE_KEY, joinChannelWithInviteKey);
       case 38:
-        _context38.n = 39;
+        _context39.n = 39;
         return takeLatest(SET_MESSAGE_RETENTION_PERIOD, setMessageRetentionPeriod);
       case 39:
-        return _context38.a(2);
+        return _context39.a(2);
     }
-  }, _marked38);
+  }, _marked39);
 }
 
 function rgbaToThumbHash(w, h, rgba) {
@@ -19358,56 +19596,6 @@ 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),
@@ -19603,7 +19791,7 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
             break;
           }
           _context.n = 7;
-          return put(getMessagesAC(channel, false, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
+          return put(getMessagesAC(channel, true, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
         case 7:
           return _context.a(2);
       }
@@ -19906,22 +20094,10 @@ function sendMessage(action) {
                     return attachment;
                   });
                 }
-                messageUpdateData = {
-                  id: messageResponse.id,
-                  body: messageResponse.body,
-                  type: messageResponse.type,
-                  state: messageResponse.state,
-                  displayCount: messageResponse.displayCount,
-                  deliveryStatus: messageResponse.deliveryStatus,
+                messageUpdateData = _extends({}, messageResponse, {
                   attachments: attachmentsToUpdate,
-                  mentionedUsers: messageResponse.mentionedUsers,
-                  bodyAttributes: messageResponse.bodyAttributes,
-                  metadata: messageResponse.metadata,
-                  parentMessage: messageResponse.parentMessage,
-                  repliedInThread: messageResponse.repliedInThread,
-                  createdAt: messageResponse.createdAt,
                   channelId: channel.id
-                };
+                });
                 stringifiedMessageUpdateData = JSON.parse(JSON.stringify(messageResponse));
                 activeChannelId = getActiveChannelId();
                 if (!(activeChannelId === channel.id)) {
@@ -20034,7 +20210,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, _channel3, _channel4, isErrorResendable, _activeChannelId, _t3;
+  var payload, message, connectionState, channelId, channel, sendMessageTid, pendingMessage, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, messageResponse, messageUpdateData, activeChannelId, stringifiedMessageUpdateData, messageToUpdate, channelUpdateParam, _channel3, _channel4, isErrorResendable, _activeChannelId, _t3;
   return _regenerator().w(function (_context5) {
     while (1) switch (_context5.p = _context5.n) {
       case 0:
@@ -20144,23 +20320,9 @@ function sendTextMessage(action) {
       case 11:
         messageResponse = _context5.v;
       case 12:
-        messageUpdateData = {
-          id: messageResponse.id,
-          body: messageResponse.body,
-          type: messageResponse.type,
-          state: messageResponse.state,
-          bodyAttributes: messageResponse.bodyAttributes,
-          displayCount: messageResponse.displayCount,
-          deliveryStatus: messageResponse.deliveryStatus,
-          attachments: messageResponse.attachments,
-          mentionedUsers: messageResponse.mentionedUsers,
-          metadata: messageResponse.metadata,
-          parentMessage: messageResponse.parentMessage,
-          repliedInThread: messageResponse.repliedInThread,
-          createdAt: messageResponse.createdAt,
-          pollDetails: (_messageResponse = messageResponse) === null || _messageResponse === void 0 ? void 0 : _messageResponse.pollDetails,
+        messageUpdateData = _extends({}, messageResponse, {
           channelId: channel.id
-        };
+        });
         activeChannelId = getActiveChannelId();
         if (!(activeChannelId === channel.id)) {
           _context5.n = 13;
@@ -20383,20 +20545,9 @@ function forwardMessage(action) {
         return call(channel.sendMessage, messageToSend);
       case 10:
         messageResponse = _context6.v;
-        messageUpdateData = {
-          id: messageResponse.id,
-          type: messageResponse.type,
-          state: messageResponse.state,
-          displayCount: messageResponse.displayCount,
-          deliveryStatus: messageResponse.deliveryStatus,
-          attachments: messageResponse.attachments,
-          mentionedUsers: messageResponse.mentionedUsers,
-          metadata: messageResponse.metadata,
-          parentMessage: messageResponse.parentMessage,
-          repliedInThread: messageResponse.repliedInThread,
-          createdAt: messageResponse.createdAt,
+        messageUpdateData = _extends({}, messageResponse, {
           channelId: channel.id
-        };
+        });
         if (!(channelId === activeChannelId)) {
           _context6.n = 12;
           break;
@@ -20798,7 +20949,7 @@ var getFilteredPendingMessages = function getFilteredPendingMessages(messages) {
   return filteredPendingMessages;
 };
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _messages$Math$floor, messages, centerMessageId, loadWithMessageId, allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, secondResult, thirdResult, fourthResult, _fourthResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _filteredPendingMessages, updatedMessages, messageIdForLoad, _updatedMessages$, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, channelNewMessageCount, connectionState, SceytChatClient, _updatedChannel, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _result$messages$2, _result$messages2, messages, loadNextMessageId, loadPreviousMessageId, nextLoadLimit, previousLoadLimit, centerMessageIndex, firstResult, secondResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _result$messages4, _messages, _filteredPendingMessages, updatedMessages, messageIdForLoad, _updatedMessages$, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -20807,29 +20958,69 @@ function getMessagesQuery(action) {
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, highlight = _action$payload.highlight, behavior = _action$payload.behavior, scrollToMessage = _action$payload.scrollToMessage, networkChanged = _action$payload.networkChanged;
+        channelNewMessageCount = (channel === null || channel === void 0 ? void 0 : channel.newMessageCount) || 0;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
-          _context10.n = 85;
+          _context10.n = 77;
           break;
         }
         SceytChatClient = getClient();
+        if (!networkChanged) {
+          _context10.n = 8;
+          break;
+        }
+        _context10.p = 2;
+        _context10.n = 3;
+        return call(SceytChatClient.getChannel, channel.id, true);
+      case 3:
+        _updatedChannel = _context10.v;
+        if (!(_updatedChannel && _updatedChannel !== null && _updatedChannel !== void 0 && _updatedChannel.id)) {
+          _context10.n = 6;
+          break;
+        }
+        _context10.n = 4;
+        return put(updateChannelDataAC(channel.id, _extends({}, _updatedChannel)));
+      case 4:
+        channelNewMessageCount = (_updatedChannel === null || _updatedChannel === void 0 ? void 0 : _updatedChannel.newMessageCount) || 0;
+        if (!(channelNewMessageCount !== channel.newMessageCount)) {
+          _context10.n = 6;
+          break;
+        }
+        _context10.n = 5;
+        return put(updateChannelDataAC(channel.id, {
+          newMessageCount: channelNewMessageCount
+        }));
+      case 5:
+        updateChannelOnAllChannels(channel.id, {
+          newMessageCount: channelNewMessageCount
+        });
+        _context10.n = 6;
+        return put(setUnreadMessageIdAC(channel.lastDisplayedMessageId));
+      case 6:
+        _context10.n = 8;
+        break;
+      case 7:
+        _context10.p = 7;
+        _t0 = _context10.v;
+        log.error('error to get updated channel in get messages query', _t0);
+      case 8:
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channel.id);
         messageQueryBuilder.limit(limit || MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 3;
+          _context10.n = 10;
           break;
         }
-        _context10.n = 2;
+        _context10.n = 9;
         return call(messageQueryBuilder.build);
-      case 2:
-        _t0 = _context10.v;
-        _context10.n = 4;
+      case 9:
+        _t1 = _context10.v;
+        _context10.n = 11;
         break;
-      case 3:
-        _t0 = null;
-      case 4:
-        messageQuery = _t0;
+      case 10:
+        _t1 = null;
+      case 11:
+        messageQuery = _t1;
         query.messageQuery = messageQuery;
         cachedMessages = Object.values(getMessagesFromMap(channel.id) || {}).sort(function (a, b) {
           return Number(a.id) - Number(b.id);
@@ -20839,161 +21030,126 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context10.n = 22;
+          _context10.n = 29;
           break;
         }
-        if (!(channel.newMessageCount && channel.newMessageCount > 0)) {
-          _context10.n = 15;
+        if (!(channelNewMessageCount && channelNewMessageCount > 0)) {
+          _context10.n = 22;
           break;
         }
         setHasPrevCached(false);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context10.n = 8;
+          _context10.n = 15;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 6;
+          _context10.n = 13;
           break;
         }
-        _context10.n = 5;
+        _context10.n = 12;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 5:
-        _t1 = _context10.v;
-        _context10.n = 7;
+      case 12:
+        _t10 = _context10.v;
+        _context10.n = 14;
         break;
-      case 6:
-        _t1 = {
+      case 13:
+        _t10 = {
           messages: [],
           hasNext: false
         };
-      case 7:
-        result = _t1;
-        _context10.n = 12;
+      case 14:
+        result = _t10;
+        _context10.n = 19;
         break;
-      case 8:
+      case 15:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 10;
+          _context10.n = 17;
           break;
         }
-        _context10.n = 9;
+        _context10.n = 16;
         return call(messageQuery.loadPrevious);
-      case 9:
-        _t10 = _context10.v;
-        _context10.n = 11;
+      case 16:
+        _t11 = _context10.v;
+        _context10.n = 18;
         break;
-      case 10:
-        _t10 = {
+      case 17:
+        _t11 = {
           messages: [],
           hasNext: false
         };
-      case 11:
-        result = _t10;
-      case 12:
-        _context10.n = 13;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 13:
-        setMessagesToMap(channel.id, result.messages, (_result$messages$ = result.messages[0]) === null || _result$messages$ === void 0 ? void 0 : _result$messages$.id, (_result$messages = result.messages[result.messages.length - 1]) === null || _result$messages === void 0 ? void 0 : _result$messages.id);
-        setAllMessages(result.messages);
-        _context10.n = 14;
-        return put(setMessagesHasPrevAC(true));
-      case 14:
-        _context10.n = 17;
-        break;
-      case 15:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context10.n = 16;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 16:
-        _context10.n = 17;
-        return put(setMessagesHasPrevAC(true));
-      case 17:
-        _context10.n = 18;
-        return put(setMessagesHasNextAC(false));
       case 18:
-        setHasNextCached(false);
-        if (!(messageId && scrollToMessage)) {
-          _context10.n = 21;
-          break;
-        }
-        if (!(channel.newMessageCount && channel.newMessageCount > 0)) {
-          _context10.n = 20;
-          break;
-        }
-        _context10.n = 19;
-        return put(setScrollToMessagesAC(channel.lastDisplayedMessageId, highlight, behavior));
+        result = _t11;
       case 19:
-        _context10.n = 21;
-        break;
+        _context10.n = 20;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 20:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$ = result.messages[0]) === null || _result$messages$ === void 0 ? void 0 : _result$messages$.id, (_result$messages = result.messages[result.messages.length - 1]) === null || _result$messages === void 0 ? void 0 : _result$messages.id);
+        setAllMessages(result.messages);
         _context10.n = 21;
-        return put(scrollToNewMessageAC(true));
+        return put(setMessagesHasPrevAC(true));
       case 21:
-        _context10.n = 78;
+        _context10.n = 24;
         break;
       case 22:
-        if (!messageId) {
-          _context10.n = 52;
-          break;
-        }
-        messages = store.getState().MessageReducer.activeChannelMessages;
-        centerMessageId = (_messages$Math$floor = messages[Math.floor(messages.length / 2)]) === null || _messages$Math$floor === void 0 ? void 0 : _messages$Math$floor.id;
-        loadWithMessageId = networkChanged && (messages === null || messages === void 0 ? void 0 : messages.length) > 0 ? centerMessageId : messageId;
-        allMessages = getAllMessages();
-        messageIndex = allMessages.findIndex(function (msg) {
-          return msg.id === loadWithMessageId;
-        });
-        maxLengthPart = MESSAGES_MAX_LENGTH / 2;
-        if (!(messageIndex >= maxLengthPart)) {
-          _context10.n = 25;
-          break;
-        }
-        result.messages = allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
+        result.messages = getFromAllMessagesByMessageId('', '', true);
         _context10.n = 23;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 23:
-        setHasPrevCached(messageIndex > maxLengthPart);
-        setHasNextCached(allMessages.length > maxLengthPart);
         _context10.n = 24;
         return put(setMessagesHasPrevAC(true));
       case 24:
-        _context10.n = 48;
-        break;
+        _context10.n = 25;
+        return put(setMessagesHasNextAC(false));
       case 25:
-        messageQuery.limit = MESSAGES_MAX_LENGTH;
-        log.info('load by message id from server ...............', loadWithMessageId);
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+        setHasNextCached(false);
+        if (!(messageId && scrollToMessage)) {
+          _context10.n = 28;
+          break;
+        }
+        if (!(channelNewMessageCount && channelNewMessageCount > 0)) {
           _context10.n = 27;
           break;
         }
         _context10.n = 26;
-        return call(messageQuery.loadNearMessageId, loadWithMessageId);
+        return put(setScrollToMessagesAC(channel.lastDisplayedMessageId, highlight, behavior));
       case 26:
-        _t11 = _context10.v;
         _context10.n = 28;
         break;
       case 27:
-        _t11 = {
-          messages: [],
-          hasNext: false
-        };
+        _context10.n = 28;
+        return put(scrollToNewMessageAC(true));
       case 28:
-        result = _t11;
-        _context10.n = 29;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        _context10.n = 70;
+        break;
       case 29:
-        if (!(result.messages.length === 50)) {
-          _context10.n = 47;
+        if (!messageId) {
+          _context10.n = 40;
           break;
         }
-        messageQuery.limit = (MESSAGES_MAX_PAGE_COUNT - 50) / 2;
+        messages = store.getState().MessageReducer.activeChannelMessages;
+        loadNextMessageId = '';
+        loadPreviousMessageId = '';
+        nextLoadLimit = MESSAGES_MAX_PAGE_COUNT / 2;
+        previousLoadLimit = MESSAGES_MAX_PAGE_COUNT / 2;
+        if (networkChanged) {
+          centerMessageIndex = getCenterTwoMessages(messages);
+          loadPreviousMessageId = centerMessageIndex.mid2.messageId;
+          loadNextMessageId = centerMessageIndex.mid1.messageId;
+          previousLoadLimit = centerMessageIndex.mid2.index;
+          nextLoadLimit = messages.length - centerMessageIndex.mid1.index - 1;
+        } else if (messageId) {
+          loadPreviousMessageId = messageId;
+        }
+        messageQuery.limit = previousLoadLimit;
+        log.info('load by message id from server ...............', messageId);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context10.n = 31;
           break;
         }
         _context10.n = 30;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
+        return call(messageQuery.loadPreviousMessageId, loadPreviousMessageId);
       case 30:
         _t12 = _context10.v;
         _context10.n = 32;
@@ -21004,235 +21160,185 @@ function getMessagesQuery(action) {
           hasNext: false
         };
       case 32:
-        secondResult = _t12;
-        result.messages = [].concat(secondResult.messages, result.messages);
-        _context10.n = 33;
-        return put(addMessagesAC(JSON.parse(JSON.stringify(secondResult.messages)), MESSAGE_LOAD_DIRECTION.PREV));
-      case 33:
-        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length;
+        firstResult = _t12;
+        if (!networkChanged && firstResult.messages.length > 0) {
+          loadNextMessageId = firstResult.messages[firstResult.messages.length - 1].id;
+        } else if (!networkChanged && !firstResult.messages.length) {
+          loadNextMessageId = '0';
+        }
         messageQuery.reverse = false;
+        messageQuery.limit = nextLoadLimit;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 35;
+          _context10.n = 34;
           break;
         }
-        _context10.n = 34;
-        return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 34:
+        _context10.n = 33;
+        return call(messageQuery.loadNextMessageId, loadNextMessageId);
+      case 33:
         _t13 = _context10.v;
-        _context10.n = 36;
+        _context10.n = 35;
         break;
-      case 35:
+      case 34:
         _t13 = {
           messages: [],
           hasNext: false
         };
+      case 35:
+        secondResult = _t13;
+        result.messages = [].concat(firstResult.messages, secondResult.messages);
+        _context10.n = 36;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 36:
-        thirdResult = _t13;
-        result.messages = [].concat(result.messages, thirdResult.messages);
-        _context10.n = 37;
-        return put(addMessagesAC(JSON.parse(JSON.stringify(thirdResult.messages)), MESSAGE_LOAD_DIRECTION.NEXT));
-      case 37:
-        if (!(secondResult.hasNext && !thirdResult.hasNext)) {
-          _context10.n = 42;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length - result.messages.length;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 39;
-          break;
-        }
-        _context10.n = 38;
-        return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 38:
-        _t14 = _context10.v;
-        _context10.n = 40;
-        break;
-      case 39:
-        _t14 = {
-          messages: [],
-          hasNext: false
-        };
-      case 40:
-        fourthResult = _t14;
-        result.messages = [].concat(fourthResult.messages, result.messages);
-        _context10.n = 41;
-        return put(addMessagesAC(JSON.parse(JSON.stringify(fourthResult.messages)), MESSAGE_LOAD_DIRECTION.PREV));
-      case 41:
-        _context10.n = 46;
-        break;
-      case 42:
-        if (!(!secondResult.hasNext && thirdResult.hasNext)) {
-          _context10.n = 46;
-          break;
-        }
-        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length - result.messages.length;
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 44;
-          break;
-        }
-        _context10.n = 43;
-        return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 43:
-        _t15 = _context10.v;
-        _context10.n = 45;
-        break;
-      case 44:
-        _t15 = {
-          messages: [],
-          hasNext: false
-        };
-      case 45:
-        _fourthResult = _t15;
-        result.messages = [].concat(result.messages, _fourthResult.messages);
-        _context10.n = 46;
-        return put(addMessagesAC(JSON.parse(JSON.stringify(_fourthResult.messages)), MESSAGE_LOAD_DIRECTION.NEXT));
-      case 46:
-        messageQuery.reverse = true;
-      case 47:
         setMessagesToMap(channel.id, result.messages, (_result$messages$2 = result.messages[0]) === null || _result$messages$2 === void 0 ? void 0 : _result$messages$2.id, (_result$messages2 = result.messages[result.messages.length - 1]) === null || _result$messages2 === void 0 ? void 0 : _result$messages2.id);
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 48:
-        _context10.n = 49;
+        _context10.n = 37;
         return put(setMessagesHasNextAC(true));
-      case 49:
-        if (!scrollToMessage) {
-          _context10.n = 50;
+      case 37:
+        if (!(scrollToMessage && !networkChanged)) {
+          _context10.n = 38;
           break;
         }
-        _context10.n = 50;
-        return put(setScrollToMessagesAC(loadWithMessageId, highlight, behavior));
-      case 50:
-        _context10.n = 51;
+        _context10.n = 38;
+        return put(setScrollToMessagesAC(messageId, highlight, behavior));
+      case 38:
+        _context10.n = 39;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 51:
-        _context10.n = 78;
+      case 39:
+        _context10.n = 70;
         break;
-      case 52:
-        if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context10.n = 64;
+      case 40:
+        if (!(channelNewMessageCount && channel.lastDisplayedMessageId)) {
+          _context10.n = 54;
           break;
         }
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context10.n = 56;
+          _context10.n = 44;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 54;
+          _context10.n = 42;
           break;
         }
-        _context10.n = 53;
+        _context10.n = 41;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 53:
-        _t16 = _context10.v;
-        _context10.n = 55;
+      case 41:
+        _t14 = _context10.v;
+        _context10.n = 43;
         break;
-      case 54:
-        _t16 = {
+      case 42:
+        _t14 = {
           messages: [],
           hasNext: false
         };
-      case 55:
-        result = _t16;
-        _context10.n = 60;
+      case 43:
+        result = _t14;
+        _context10.n = 48;
         break;
-      case 56:
+      case 44:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 58;
+          _context10.n = 46;
           break;
         }
-        _context10.n = 57;
+        _context10.n = 45;
         return call(messageQuery.loadPrevious);
-      case 57:
-        _t17 = _context10.v;
-        _context10.n = 59;
+      case 45:
+        _t15 = _context10.v;
+        _context10.n = 47;
         break;
-      case 58:
-        _t17 = {
+      case 46:
+        _t15 = {
           messages: [],
           hasNext: false
         };
-      case 59:
-        result = _t17;
-      case 60:
-        _context10.n = 61;
+      case 47:
+        result = _t15;
+      case 48:
+        _context10.n = 49;
         return put(setMessagesHasPrevAC(true));
-      case 61:
-        _context10.n = 62;
+      case 49:
+        _context10.n = 50;
         return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
-      case 62:
+      case 50:
         setMessagesToMap(channel.id, result.messages, (_result$messages$3 = result.messages[0]) === null || _result$messages$3 === void 0 ? void 0 : _result$messages$3.id, (_result$messages3 = result.messages[result.messages.length - 1]) === null || _result$messages3 === void 0 ? void 0 : _result$messages3.id);
         setAllMessages([].concat(result.messages));
-        _context10.n = 63;
+        _context10.n = 51;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 63:
-        _context10.n = 78;
+      case 51:
+        _context10.n = 52;
+        return put(scrollToNewMessageAC(false));
+      case 52:
+        _context10.n = 53;
+        return put(setUnreadScrollToAC(true));
+      case 53:
+        _context10.n = 70;
         break;
-      case 64:
+      case 54:
         if (!(cachedMessages && cachedMessages.length)) {
-          _context10.n = 67;
+          _context10.n = 57;
           break;
         }
-        _context10.n = 65;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 65:
-        _context10.n = 66;
+        _messages = getFromAllMessagesByMessageId('', '', true);
+        _context10.n = 55;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(_messages))));
+      case 55:
+        _context10.n = 56;
         return delay(0);
-      case 66:
-        _filteredPendingMessages = getFilteredPendingMessages(cachedMessages);
-        _context10.n = 67;
+      case 56:
+        _filteredPendingMessages = getFilteredPendingMessages(_messages);
+        _context10.n = 57;
         return put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 67:
+      case 57:
         log.info('load message from server');
         result = {
           messages: [],
           hasNext: false
         };
         if (!((channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage4 = channel.lastMessage) === null || _channel$lastMessage4 === void 0 ? void 0 : _channel$lastMessage4.id))) {
-          _context10.n = 71;
+          _context10.n = 61;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 69;
+          _context10.n = 59;
           break;
         }
-        _context10.n = 68;
+        _context10.n = 58;
         return call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
-      case 68:
-        _t18 = _context10.v;
-        _context10.n = 70;
+      case 58:
+        _t16 = _context10.v;
+        _context10.n = 60;
         break;
-      case 69:
-        _t18 = {
+      case 59:
+        _t16 = {
           messages: [],
           hasNext: false
         };
-      case 70:
-        result = _t18;
-        _context10.n = 75;
+      case 60:
+        result = _t16;
+        _context10.n = 65;
         break;
-      case 71:
+      case 61:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 73;
+          _context10.n = 63;
           break;
         }
-        _context10.n = 72;
+        _context10.n = 62;
         return call(messageQuery.loadPrevious);
-      case 72:
-        _t19 = _context10.v;
-        _context10.n = 74;
+      case 62:
+        _t17 = _context10.v;
+        _context10.n = 64;
         break;
-      case 73:
-        _t19 = {
+      case 63:
+        _t17 = {
           messages: [],
           hasNext: false
         };
-      case 74:
-        result = _t19;
-      case 75:
+      case 64:
+        result = _t17;
+      case 65:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -21244,75 +21350,85 @@ function getMessagesQuery(action) {
         });
         messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
         if (!updatedMessages.length) {
-          _context10.n = 78;
+          _context10.n = 69;
           break;
         }
-        _context10.n = 76;
+        _context10.n = 66;
         return call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
-      case 76:
-        _context10.n = 77;
+      case 66:
+        _context10.n = 67;
         return put(setMessagesHasPrevAC(true));
-      case 77:
-        _context10.n = 78;
+      case 67:
+        _context10.n = 68;
         return put(setMessagesHasNextAC(false));
-      case 78:
+      case 68:
+        _context10.n = 70;
+        break;
+      case 69:
+        if (!(!(cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length) && !((_result$messages4 = result.messages) !== null && _result$messages4 !== void 0 && _result$messages4.length))) {
+          _context10.n = 70;
+          break;
+        }
+        _context10.n = 70;
+        return put(setMessagesAC([]));
+      case 70:
         filteredPendingMessages = getFilteredPendingMessages(result.messages);
-        _context10.n = 79;
+        _context10.n = 71;
         return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 79:
+      case 71:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 81;
+          _context10.n = 73;
           break;
         }
-        _context10.n = 80;
+        _context10.n = 72;
         return put(setWaitToSendPendingMessagesAC(false));
-      case 80:
-        _context10.n = 81;
+      case 72:
+        _context10.n = 73;
         return spawn(sendPendingMessages, connectionState);
-      case 81:
-        _context10.n = 82;
+      case 73:
+        _context10.n = 74;
         return call(SceytChatClient.getChannel, channel.id, true);
-      case 82:
+      case 74:
         updatedChannel = _context10.v;
         if (!(updatedChannel && updatedChannel !== null && updatedChannel !== void 0 && updatedChannel.lastMessage)) {
-          _context10.n = 84;
+          _context10.n = 76;
           break;
         }
-        _context10.n = 83;
+        _context10.n = 75;
         return put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
-      case 83:
+      case 75:
         updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
-      case 84:
-        _context10.n = 86;
+      case 76:
+        _context10.n = 78;
         break;
-      case 85:
+      case 77:
         if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
-          _context10.n = 86;
+          _context10.n = 78;
           break;
         }
-        _context10.n = 86;
+        _context10.n = 78;
         return put(setMessagesAC([]));
-      case 86:
-        _context10.n = 88;
+      case 78:
+        _context10.n = 80;
         break;
-      case 87:
-        _context10.p = 87;
-        _t20 = _context10.v;
-        log.error('error in message query', _t20);
-      case 88:
-        _context10.p = 88;
-        _context10.n = 89;
+      case 79:
+        _context10.p = 79;
+        _t18 = _context10.v;
+        log.error('error in message query', _t18);
+      case 80:
+        _context10.p = 80;
+        _context10.n = 81;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 89:
-        return _context10.f(88);
-      case 90:
+      case 81:
+        return _context10.f(80);
+      case 82:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 87, 88, 90]]);
+  }, _marked7$1, null, [[2, 7], [0, 79, 80, 82]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t21;
+  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t19;
   return _regenerator().w(function (_context11) {
     while (1) switch (_context11.p = _context11.n) {
       case 0:
@@ -21362,15 +21478,15 @@ function getMessageQuery(action) {
         break;
       case 7:
         _context11.p = 7;
-        _t21 = _context11.v;
-        log.error('error in message query', _t21);
+        _t19 = _context11.v;
+        log.error('error in message query', _t19);
       case 8:
         return _context11.a(2);
     }
   }, _marked8$1, null, [[0, 7]]);
 }
 function loadMoreMessages(action) {
-  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _result$messages$4, _result$messages4, _result$messages$5, _result$messages5, _t22;
+  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _result$messages$4, _result$messages5, _result$messages$5, _result$messages6, _t20;
   return _regenerator().w(function (_context12) {
     while (1) switch (_context12.p = _context12.n) {
       case 0:
@@ -21414,7 +21530,7 @@ function loadMoreMessages(action) {
         result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.PREV);
-          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);
+          setMessagesToMap(channelId, result.messages, (_result$messages$4 = result.messages[0]) === null || _result$messages$4 === void 0 ? void 0 : _result$messages$4.id, (_result$messages5 = result.messages[result.messages.length - 1]) === null || _result$messages5 === void 0 ? void 0 : _result$messages5.id);
         }
         _context12.n = 5;
         return put(setMessagesHasPrevAC(result.hasNext));
@@ -21442,7 +21558,7 @@ function loadMoreMessages(action) {
         result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.NEXT);
-          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);
+          setMessagesToMap(channelId, result.messages, (_result$messages$5 = result.messages[0]) === null || _result$messages$5 === void 0 ? void 0 : _result$messages$5.id, (_result$messages6 = result.messages[result.messages.length - 1]) === null || _result$messages6 === void 0 ? void 0 : _result$messages6.id);
         }
         _context12.n = 9;
         return put(setMessagesHasNextAC(result.hasNext));
@@ -21483,15 +21599,15 @@ function loadMoreMessages(action) {
         break;
       case 18:
         _context12.p = 18;
-        _t22 = _context12.v;
-        log.error('error in load more messages', _t22);
+        _t20 = _context12.v;
+        log.error('error in load more messages', _t20);
       case 19:
         return _context12.a(2);
     }
   }, _marked9$1, null, [[0, 18]]);
 }
 function addReaction(action) {
-  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t23;
+  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t21;
   return _regenerator().w(function (_context13) {
     while (1) switch (_context13.p = _context13.n) {
       case 0:
@@ -21544,15 +21660,15 @@ function addReaction(action) {
         break;
       case 8:
         _context13.p = 8;
-        _t23 = _context13.v;
-        log.error('ERROR in add reaction', _t23.message);
+        _t21 = _context13.v;
+        log.error('ERROR in add reaction', _t21.message);
       case 9:
         return _context13.a(2);
     }
   }, _marked0$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
-  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t24;
+  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t22;
   return _regenerator().w(function (_context14) {
     while (1) switch (_context14.p = _context14.n) {
       case 0:
@@ -21600,15 +21716,15 @@ function deleteReaction(action) {
         break;
       case 7:
         _context14.p = 7;
-        _t24 = _context14.v;
-        log.error('ERROR in delete reaction', _t24.message);
+        _t22 = _context14.v;
+        log.error('ERROR in delete reaction', _t22.message);
       case 8:
         return _context14.a(2);
     }
   }, _marked1$1, null, [[0, 7]]);
 }
 function getReactions(action) {
-  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t25;
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t23;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -21643,15 +21759,15 @@ function getReactions(action) {
         break;
       case 6:
         _context15.p = 6;
-        _t25 = _context15.v;
-        log.error('ERROR in get reactions', _t25.message);
+        _t23 = _context15.v;
+        log.error('ERROR in get reactions', _t23.message);
       case 7:
         return _context15.a(2);
     }
   }, _marked10$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
-  var payload, limit, ReactionQuery, result, _t26;
+  var payload, limit, ReactionQuery, result, _t24;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.p = _context16.n) {
       case 0:
@@ -21679,15 +21795,15 @@ function loadMoreReactions(action) {
         break;
       case 5:
         _context16.p = 5;
-        _t26 = _context16.v;
-        log.error('ERROR in load more reactions', _t26.message);
+        _t24 = _context16.v;
+        log.error('ERROR in load more reactions', _t24.message);
       case 6:
         return _context16.a(2);
     }
   }, _marked11$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t27;
+  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t25;
   return _regenerator().w(function (_context17) {
     while (1) switch (_context17.p = _context17.n) {
       case 0:
@@ -21765,15 +21881,15 @@ function getMessageAttachments(action) {
         break;
       case 13:
         _context17.p = 13;
-        _t27 = _context17.v;
-        log.error('error in message attachment query', _t27);
+        _t25 = _context17.v;
+        log.error('error in message attachment query', _t25);
       case 14:
         return _context17.a(2);
     }
   }, _marked12$1, null, [[0, 13]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t28;
+  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t26;
   return _regenerator().w(function (_context18) {
     while (1) switch (_context18.p = _context18.n) {
       case 0:
@@ -21817,15 +21933,15 @@ function loadMoreMessageAttachments(action) {
         break;
       case 8:
         _context18.p = 8;
-        _t28 = _context18.v;
-        log.error('error in message attachment query', _t28);
+        _t26 = _context18.v;
+        log.error('error in message attachment query', _t26);
       case 9:
         return _context18.a(2);
     }
   }, _marked13$1, null, [[0, 8]]);
 }
 function pauseAttachmentUploading(action) {
-  var attachmentId, isPaused, _t29;
+  var attachmentId, isPaused, _t27;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -21847,15 +21963,15 @@ function pauseAttachmentUploading(action) {
         break;
       case 2:
         _context19.p = 2;
-        _t29 = _context19.v;
-        log.error('error in pause attachment uploading', _t29);
+        _t27 = _context19.v;
+        log.error('error in pause attachment uploading', _t27);
       case 3:
         return _context19.a(2);
     }
   }, _marked14$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t30;
+  var attachmentId, isResumed, _t28;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.p = _context20.n) {
       case 0:
@@ -21878,15 +21994,15 @@ function resumeAttachmentUploading(action) {
         break;
       case 2:
         _context20.p = 2;
-        _t30 = _context20.v;
-        log.error('error in resume attachment uploading', _t30);
+        _t28 = _context20.v;
+        log.error('error in resume attachment uploading', _t28);
       case 3:
         return _context20.a(2);
     }
   }, _marked15$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
-  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t31;
+  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t29;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
@@ -21916,8 +22032,8 @@ function getMessageMarkers(action) {
         break;
       case 5:
         _context21.p = 5;
-        _t31 = _context21.v;
-        log.error('error in get message markers', _t31);
+        _t29 = _context21.v;
+        log.error('error in get message markers', _t29);
       case 6:
         _context21.p = 6;
         _context21.n = 7;
@@ -22033,7 +22149,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t32;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t30;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
@@ -22125,8 +22241,8 @@ function addPollVote(action) {
         break;
       case 7:
         _context24.p = 7;
-        _t32 = _context24.v;
-        log.error('error in add poll vote', _t32);
+        _t30 = _context24.v;
+        log.error('error in add poll vote', _t30);
       case 8:
         return _context24.a(2);
     }
@@ -22210,7 +22326,7 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t33;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t31;
   return _regenerator().w(function (_context27) {
     while (1) switch (_context27.p = _context27.n) {
       case 0:
@@ -22288,8 +22404,8 @@ function deletePollVote(action) {
         break;
       case 8:
         _context27.p = 8;
-        _t33 = _context27.v;
-        log.error('error in delete poll vote', _t33);
+        _t31 = _context27.v;
+        log.error('error in delete poll vote', _t31);
       case 9:
         return _context27.a(2);
     }
@@ -22367,7 +22483,7 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
   }, _marked24$1);
 }
 function closePoll(action) {
-  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t34;
+  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t32;
   return _regenerator().w(function (_context30) {
     while (1) switch (_context30.p = _context30.n) {
       case 0:
@@ -22400,8 +22516,8 @@ function closePoll(action) {
         break;
       case 4:
         _context30.p = 4;
-        _t34 = _context30.v;
-        log.error('error in close poll', _t34);
+        _t32 = _context30.v;
+        log.error('error in close poll', _t32);
       case 5:
         return _context30.a(2);
     }
@@ -22490,7 +22606,7 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message$pollDetails12, _message$pollDetails13, vote, _t35;
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator4, _step4, _message$pollDetails12, _message$pollDetails13, vote, _t33;
   return _regenerator().w(function (_context33) {
     while (1) switch (_context33.p = _context33.n) {
       case 0:
@@ -22532,15 +22648,15 @@ function retractPollVote(action) {
         break;
       case 4:
         _context33.p = 4;
-        _t35 = _context33.v;
-        log.error('error in retract poll vote', _t35);
+        _t33 = _context33.v;
+        log.error('error in retract poll vote', _t33);
       case 5:
         return _context33.a(2);
     }
   }, _marked28$1, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
-  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t36;
+  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t34;
   return _regenerator().w(function (_context34) {
     while (1) switch (_context34.p = _context34.n) {
       case 0:
@@ -22589,15 +22705,15 @@ function resendPendingPollActions(action) {
         break;
       case 2:
         _context34.p = 2;
-        _t36 = _context34.v;
-        log.error('error in resend pending poll actions', _t36);
+        _t34 = _context34.v;
+        log.error('error in resend pending poll actions', _t34);
       case 3:
         return _context34.a(2);
     }
   }, _marked29$1, null, [[0, 2]]);
 }
 function getPollVotes(action) {
-  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t37;
+  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t35;
   return _regenerator().w(function (_context35) {
     while (1) switch (_context35.p = _context35.n) {
       case 0:
@@ -22663,8 +22779,8 @@ function getPollVotes(action) {
         break;
       case 7:
         _context35.p = 7;
-        _t37 = _context35.v;
-        log.error('ERROR in get poll votes', _t37);
+        _t35 = _context35.v;
+        log.error('ERROR in get poll votes', _t35);
         _context35.n = 8;
         return put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
@@ -22673,7 +22789,7 @@ function getPollVotes(action) {
   }, _marked30$1, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
-  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t38;
+  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t36;
   return _regenerator().w(function (_context36) {
     while (1) switch (_context36.p = _context36.n) {
       case 0:
@@ -22731,8 +22847,8 @@ function loadMorePollVotes(action) {
         break;
       case 6:
         _context36.p = 6;
-        _t38 = _context36.v;
-        log.error('ERROR in load more poll votes', _t38);
+        _t36 = _context36.v;
+        log.error('ERROR in load more poll votes', _t36);
         _context36.n = 7;
         return put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
@@ -27874,7 +27990,7 @@ var ChannelList = function ChannelList(_ref) {
     loadMoreChannels: handleLoadMoreChannels,
     searchValue: searchValue
   }, !searchValue ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, channels.map(function (channel) {
-    return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
+    return !getPendingDeleteChannel(channel.id) && (ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
       channel: channel,
       setSelectedChannel: setSelectedChannel,
       key: channel.id
@@ -27907,7 +28023,7 @@ var ChannelList = function ChannelList(_ref) {
       getCustomLatestMessage: getCustomLatestMessage,
       doNotShowMessageDeliveryTypes: doNotShowMessageDeliveryTypes,
       showPhoneNumber: showPhoneNumber
-    }));
+    })));
   }))) : channelsLoading === LOADING_STATE.LOADED && searchValue ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$cha = searchedChannels.chats_groups) !== null && _searchedChannels$cha !== void 0 && _searchedChannels$cha.length || searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$cha2 = searchedChannels.channels) !== null && _searchedChannels$cha2 !== void 0 && _searchedChannels$cha2.length || searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$con = searchedChannels.contacts) !== null && _searchedChannels$con !== void 0 && _searchedChannels$con.length ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, !!(searchedChannels.chats_groups && searchedChannels.chats_groups.length) && (/*#__PURE__*/React__default.createElement(DirectChannels, null, /*#__PURE__*/React__default.createElement(SearchedChannelsHeader, {
     color: textSecondary,
     fontSize: searchedChannelsTitleFontSize
@@ -28591,6 +28707,9 @@ var pollVotesLoadingStateSelector = function pollVotesLoadingStateSelector(store
 var unreadScrollToSelector = function unreadScrollToSelector(store) {
   return store.MessageReducer.unreadScrollTo;
 };
+var unreadMessageIdSelector = function unreadMessageIdSelector(store) {
+  return store.MessageReducer.unreadMessageId;
+};
 
 var _path$v;
 function _extends$w() {
@@ -39145,42 +39264,40 @@ var MessageList = function MessageList(_ref2) {
   var showScrollToNewMessageButton = useSelector(showScrollToNewMessageButtonSelector, shallowEqual);
   var unreadScrollTo = useSelector(unreadScrollToSelector, shallowEqual);
   var messages = useSelector(activeChannelMessagesSelector, shallowEqual) || [];
-  var _useState2 = useState(''),
-    unreadMessageId = _useState2[0],
-    setUnreadMessageId = _useState2[1];
+  var unreadMessageId = useSelector(unreadMessageIdSelector, shallowEqual);
+  var _useState2 = useState(null),
+    mediaFile = _useState2[0],
+    setMediaFile = _useState2[1];
   var _useState3 = useState(null),
-    mediaFile = _useState3[0],
-    setMediaFile = _useState3[1];
+    isDragging = _useState3[0],
+    setIsDragging = _useState3[1];
   var _useState4 = useState(null),
-    isDragging = _useState4[0],
-    setIsDragging = _useState4[1];
-  var _useState5 = useState(null),
-    showTopDate = _useState5[0],
-    setShowTopDate = _useState5[1];
+    showTopDate = _useState4[0],
+    setShowTopDate = _useState4[1];
+  var _useState5 = useState(false),
+    stopScrolling = _useState5[0],
+    setStopScrolling = _useState5[1];
   var _useState6 = useState(false),
-    stopScrolling = _useState6[0],
-    setStopScrolling = _useState6[1];
-  var _useState7 = useState(false),
-    isScrolling = _useState7[0],
-    setIsScrolling = _useState7[1];
+    isScrolling = _useState6[0],
+    setIsScrolling = _useState6[1];
   var hideTopDateTimeout = useRef(null);
-  var _useState8 = useState(''),
-    lastVisibleMessageId = _useState8[0],
-    _setLastVisibleMessageId = _useState8[1];
-  var _useState9 = useState(null),
-    scrollToReply = _useState9[0],
-    setScrollToReply = _useState9[1];
-  var _useState0 = useState(0),
-    previousScrollTop = _useState0[0],
-    setPreviousScrollTop = _useState0[1];
-  var _useState1 = useState(false),
-    shouldPreserveScroll = _useState1[0],
-    setShouldPreserveScroll = _useState1[1];
+  var _useState7 = useState(''),
+    lastVisibleMessageId = _useState7[0],
+    _setLastVisibleMessageId = _useState7[1];
+  var _useState8 = useState(null),
+    scrollToReply = _useState8[0],
+    setScrollToReply = _useState8[1];
+  var _useState9 = useState(0),
+    previousScrollTop = _useState9[0],
+    setPreviousScrollTop = _useState9[1];
+  var _useState0 = useState(false),
+    shouldPreserveScroll = _useState0[0],
+    setShouldPreserveScroll = _useState0[1];
   var messageForReply = {};
   var attachmentsSelected = false;
-  var _useState10 = useState(''),
-    topDateLabel = _useState10[0],
-    setTopDateLabel = _useState10[1];
+  var _useState1 = useState(''),
+    topDateLabel = _useState1[0],
+    setTopDateLabel = _useState1[1];
   var scrollRef = useRef(null);
   var loadFromServerRef = useRef(false);
   var loadDirectionRef = useRef('');
@@ -39515,7 +39632,7 @@ var MessageList = function MessageList(_ref2) {
       var visibleMessagesIds = Object.keys(visibleMessages);
       var messageId = visibleMessagesIds[visibleMessagesIds.length - 1];
       dispatch(getMessagesAC(channel, undefined, messageId, undefined, undefined, 'instant'));
-      setUnreadMessageId(messageId);
+      dispatch(setUnreadMessageIdAC(messageId));
     } else {
       if (!channel.isLinkedChannel) {
         clearVisibleMessagesMap();
@@ -39525,9 +39642,9 @@ var MessageList = function MessageList(_ref2) {
       }
       if (channel.id) {
         if (channel.newMessageCount && channel.newMessageCount > 0) {
-          setUnreadMessageId(channel.lastDisplayedMessageId);
+          dispatch(setUnreadMessageIdAC(channel.lastDisplayedMessageId));
         } else {
-          setUnreadMessageId('');
+          dispatch(setUnreadMessageIdAC(''));
         }
       }
     }
@@ -39551,7 +39668,7 @@ var MessageList = function MessageList(_ref2) {
     if (messages.length > 0 && hiddenMessagesProperties !== null && hiddenMessagesProperties !== void 0 && hiddenMessagesProperties.includes(HiddenMessageProperty.hideAfterSendMessage)) {
       var lastMessage = messages[messages.length - 1];
       if (lastMessage.user.id === user.id) {
-        setUnreadMessageId('');
+        dispatch(setUnreadMessageIdAC(''));
       }
     }
   }, [messages, hiddenMessagesProperties, user === null || user === void 0 ? void 0 : user.id]);
@@ -39672,12 +39789,14 @@ var MessageList = function MessageList(_ref2) {
   useEffect(function () {
     log.info('connection status is changed.. .... ', connectionStatus, 'channel  ... ', channel);
     if (connectionStatus === CONNECTION_STATUS.CONNECTED && channel !== null && channel !== void 0 && channel.id) {
+      var _channel$lastMessage4;
       loadingRef.current = false;
       prevDisableRef.current = false;
       nextDisableRef.current = false;
       clearMessagesMap();
       removeAllMessages();
-      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, 'instant', false, true));
+      var isWithLastVisibleMessageId = lastVisibleMessageId !== ((_channel$lastMessage4 = channel.lastMessage) === null || _channel$lastMessage4 === void 0 ? void 0 : _channel$lastMessage4.id) && lastVisibleMessageId ? lastVisibleMessageId : '';
+      dispatch(getMessagesAC(channel, false, isWithLastVisibleMessageId, 0, false, 'instant', false, true));
     }
   }, [connectionStatus]);
   useEffect(function () {