sceyt-chat-react-uikit 1.7.9-beta.1 → 1.7.9-beta.10

package/index.modern.js

@@ -3,7 +3,7 @@ import { createSelectorHook, createDispatchHook, createStoreHook, shallowEqual,
 import log from 'loglevel';
 import createSagaMiddleware, { eventChannel } from 'redux-saga';
 import FileSaver from 'file-saver';
-import { select, put, call, take, takeLatest, takeEvery, spawn, all } from 'redux-saga/effects';
+import { select, put, call, take, takeLatest, takeEvery, spawn, delay, all } from 'redux-saga/effects';
 import { v4 } from 'uuid';
 import styled, { createGlobalStyle, keyframes } from 'styled-components';
 import LinkifyIt from 'linkify-it';
@@ -8989,11 +8989,11 @@ var handleVoteDetails = function handleVoteDetails(voteDetails, message) {
     return undefined;
   }
   var existingPollDetails = message.pollDetails;
-  var existingVoteDetails = existingPollDetails.voteDetails || {
+  var existingVoteDetails = JSON.parse(JSON.stringify(existingPollDetails.voteDetails || {
     votesPerOption: {},
     votes: [],
     ownVotes: []
-  };
+  }));
   if (voteDetails.type === 'close') {
     return _extends({}, existingPollDetails, {
       closed: true
@@ -9005,19 +9005,32 @@ var handleVoteDetails = function handleVoteDetails(voteDetails, message) {
   var vote = voteDetails.vote;
   var optionId = vote.optionId;
   var currentVotesPerOption = existingVoteDetails.votesPerOption || {};
-  var optionVotesCount = (currentVotesPerOption[optionId] || 0) + voteDetails.incrementVotesPerOptionCount;
-  var newVotesPerOption = _extends({}, currentVotesPerOption, (_extends2 = {}, _extends2[optionId] = optionVotesCount >= 0 ? optionVotesCount : 0, _extends2));
+  var optionVotesCount = currentVotesPerOption[optionId] || 0;
   var newVotes = existingVoteDetails.votes || [];
   var newOwnVotes = existingVoteDetails.ownVotes || [];
   if (voteDetails.type === 'add') {
     newVotes = [].concat(newVotes, [vote]);
+    optionVotesCount++;
   } else if (voteDetails.type === 'delete') {
     newVotes = deleteVoteFromPollDetails(newVotes, vote);
+    optionVotesCount--;
   } else if (voteDetails.type === 'addOwn') {
-    newOwnVotes = [].concat(newOwnVotes, [vote]);
+    var existingOwnVote = existingVoteDetails.ownVotes.find(function (v) {
+      return v.optionId === vote.optionId && v.user.id === vote.user.id;
+    });
+    if (!existingOwnVote) {
+      optionVotesCount++;
+      if (existingPollDetails.allowMultipleVotes) {
+        newOwnVotes = [].concat(newOwnVotes, [vote]);
+      } else {
+        newOwnVotes = [vote];
+      }
+    }
   } else if (voteDetails.type === 'deleteOwn') {
     newOwnVotes = deleteVoteFromPollDetails(newOwnVotes, vote);
+    optionVotesCount--;
   }
+  var newVotesPerOption = _extends({}, currentVotesPerOption, (_extends2 = {}, _extends2[optionId] = optionVotesCount >= 0 ? optionVotesCount : 0, _extends2));
   var newVoteDetails = {
     votesPerOption: newVotesPerOption,
     votes: newVotes,
@@ -9058,6 +9071,8 @@ var baseUrlForInviteMembers = '';
 var autoSelectFitsChannel = false;
 var allChannels = [];
 var channelsMap = {};
+var allChannelsMap = {};
+var pendingDeleteChannelMap = {};
 var channelTypesMemberDisplayTextMap;
 var defaultRolesByChannelTypesMap;
 var activeChannelId = '';
@@ -9090,6 +9105,7 @@ function getInviteLinkOptions() {
 }
 function setChannelInMap(channel) {
   channelsMap[channel.id] = _extends({}, channel);
+  allChannelsMap[channel.id] = _extends({}, channel);
 }
 function setActiveChannelId(id) {
   activeChannelId = id;
@@ -9105,6 +9121,7 @@ function setChannelsInMap(channels) {
       channelsForUpdateLastReactionMessage.push(channel);
     }
     channelsMap[channel.id] = _extends({}, channel);
+    allChannelsMap[channel.id] = _extends({}, channel);
     return channel;
   });
   return {
@@ -9115,11 +9132,24 @@ 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];
+  delete allChannelsMap[channelId];
 }
 function checkChannelExists(channelId) {
   return !!channelsMap[channelId];
@@ -9206,6 +9236,9 @@ function getChannelFromAllChannels(channelId) {
     return channel.id === channelId;
   });
 }
+function getChannelFromAllChannelsMap(channelId) {
+  return allChannelsMap[channelId];
+}
 function deleteChannelFromAllChannels(channelId) {
   allChannels = allChannels.filter(function (channel) {
     return channel.id !== channelId;
@@ -9223,6 +9256,9 @@ function updateChannelLastMessageOnAllChannels(channelId, message) {
           channelsMap[channelId] = _extends({}, chan, {
             lastMessage: message
           });
+          allChannelsMap[channelId] = _extends({}, chan, {
+            lastMessage: message
+          });
           return _extends({}, chan, {
             lastMessage: message
           });
@@ -9245,6 +9281,7 @@ function updateChannelLastMessageOnAllChannels(channelId, message) {
         lastMessage: updateMessage
       });
       channelsMap[channelId] = updateChannel;
+      allChannelsMap[channelId] = updateChannel;
       allChannels = [updateChannel].concat(updatedChannels);
     }
   }
@@ -9267,6 +9304,7 @@ function updateChannelOnAllChannels(channelId, config, messageUpdateData) {
   });
   if (channelsMap[channelId]) {
     channelsMap[channelId] = _extends({}, channelsMap[channelId], config);
+    allChannelsMap[channelId] = _extends({}, channelsMap[channelId], config);
   }
 }
 var getChannelGroupName = function getChannelGroupName(channel) {
@@ -9315,6 +9353,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,
@@ -9373,7 +9423,7 @@ var channelSlice = createSlice({
       }
     },
     setChannels: function setChannels(state, action) {
-      state.channels = [].concat(action.payload.channels);
+      state.channels = sortChannelByLastMessage([].concat(action.payload.channels));
     },
     setSearchedChannels: function setSearchedChannels(state, action) {
       state.searchedChannels = action.payload.searchedChannels;
@@ -9546,7 +9596,7 @@ var channelSlice = createSlice({
           })
         });
       }
-      state.channels = [].concat(updatedChannels);
+      state.channels = sortChannelByLastMessage([].concat(updatedChannels));
     },
     updateChannelLastMessage: function updateChannelLastMessage(state, action) {
       var _action$payload5 = action.payload,
@@ -9566,6 +9616,7 @@ var channelSlice = createSlice({
             }
             return chan;
           });
+          state.channels = sortChannelByLastMessage(state.channels);
         }
       } else {
         var updatedChannels = state.channels.filter(function (chan) {
@@ -9595,6 +9646,7 @@ var channelSlice = createSlice({
         }
         return chan;
       });
+      state.channels = sortChannelByLastMessage(state.channels);
     },
     setChannelInfoOpenClose: function setChannelInfoOpenClose(state, action) {
       state.channelInfoIsOpen = action.payload.open;
@@ -10809,6 +10861,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;
@@ -10999,6 +11056,9 @@ function setMessagesToMap(channelId, messages, firstMessageId, lastMessageId) {
     }
   }
   messages.forEach(function (msg) {
+    if (msg.tid && messagesMap[channelId][msg.tid]) {
+      delete messagesMap[channelId][msg.tid];
+    }
     messagesMap[channelId][msg.id || msg.tid] = msg;
   });
 }
@@ -11326,6 +11386,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,
@@ -11372,7 +11457,8 @@ var initialState$1 = {
   pollVotesInitialCount: null,
   pendingPollActions: {},
   pendingMessagesMap: {},
-  unreadScrollTo: true
+  unreadScrollTo: true,
+  unreadMessageId: ''
 };
 var messageSlice = createSlice({
   name: 'messages',
@@ -11948,6 +12034,9 @@ var messageSlice = createSlice({
     },
     clearPendingMessagesMap: function clearPendingMessagesMap(state) {
       state.pendingMessagesMap = {};
+    },
+    setUnreadMessageId: function setUnreadMessageId(state, action) {
+      state.unreadMessageId = action.payload.messageId;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -12012,7 +12101,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 = {
@@ -15726,16 +15816,14 @@ function watchForEvents() {
                   vote = _step2.value;
                   objs.push({
                     type: vote.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
-                    vote: vote,
-                    incrementVotesPerOptionCount: -1
+                    vote: vote
                   });
                 }
                 for (_iterator3 = _createForOfIteratorHelperLoose(addedVotes); !(_step3 = _iterator3()).done;) {
                   _vote = _step3.value;
                   objs.push({
                     type: _vote.user.id === SceytChatClient.user.id ? 'addOwn' : 'add',
-                    vote: _vote,
-                    incrementVotesPerOptionCount: 1
+                    vote: _vote
                   });
                 }
                 _i = 0, _objs = objs;
@@ -15780,8 +15868,7 @@ function watchForEvents() {
                   params: {}
                 }, {
                   type: _obj.type,
-                  vote: _obj.vote,
-                  incrementVotesPerOptionCount: _obj.incrementVotesPerOptionCount
+                  vote: _obj.vote
                 });
                 if (!(_channel10.id === _activeChannelId0)) {
                   _context.n = 107;
@@ -15810,8 +15897,7 @@ function watchForEvents() {
                   _vote2 = _step4.value;
                   _objs3.push({
                     type: _vote2.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
-                    vote: _vote2,
-                    incrementVotesPerOptionCount: -1
+                    vote: _vote2
                   });
                 }
                 _i3 = 0, _objs4 = _objs3;
@@ -15870,8 +15956,7 @@ function watchForEvents() {
                   _vote4 = _step5.value;
                   _objs6.push({
                     type: _vote4.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
-                    vote: _vote4,
-                    incrementVotesPerOptionCount: -1
+                    vote: _vote4
                   });
                 }
                 _i5 = 0, _objs7 = _objs6;
@@ -15923,8 +16008,7 @@ function watchForEvents() {
               case 126:
                 _activeChannelId11 = _context.v;
                 _obj5 = {
-                  type: 'close',
-                  incrementVotesPerOptionCount: 0
+                  type: 'close'
                 };
                 updateMessageOnMap(_channel13.id, {
                   messageId: _messageId4,
@@ -16302,6 +16386,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),
@@ -16322,28 +16456,29 @@ 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, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
+  var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, whoDoesNotAdded, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.p = _context.n) {
       case 0:
@@ -16435,26 +16570,38 @@ function createChannel(action) {
       case 7:
         createdChannel = _context.v;
       case 8:
+        whoDoesNotAdded = channelData.members.filter(function (mem) {
+          return !createdChannel.members.some(function (addedMem) {
+            return addedMem.id === mem.id;
+          });
+        });
+        if (!whoDoesNotAdded.length) {
+          _context.n = 9;
+          break;
+        }
+        _context.n = 9;
+        return put(setActionIsRestrictedAC(true, false, whoDoesNotAdded));
+      case 9:
         checkChannelExist = false;
         if (!(createdChannel.type === DEFAULT_CHANNEL_TYPE.DIRECT)) {
-          _context.n = 10;
+          _context.n = 11;
           break;
         }
-        _context.n = 9;
+        _context.n = 10;
         return call(checkChannelExists, createdChannel.id);
-      case 9:
-        checkChannelExist = _context.v;
       case 10:
+        checkChannelExist = _context.v;
+      case 11:
         createdChannel.metadata = isJSON(createdChannel.metadata) ? JSON.parse(createdChannel.metadata) : createdChannel.metadata;
         if (checkChannelExist) {
-          _context.n = 13;
+          _context.n = 14;
           break;
         }
-        _context.n = 11;
+        _context.n = 12;
         return call(setChannelInMap, createdChannel);
-      case 11:
+      case 12:
         if (!(createdChannel.type !== DEFAULT_CHANNEL_TYPE.DIRECT)) {
-          _context.n = 12;
+          _context.n = 13;
           break;
         }
         messageToSend = {
@@ -16463,21 +16610,21 @@ function createChannel(action) {
           attachments: [],
           type: 'system'
         };
-        _context.n = 12;
+        _context.n = 13;
         return put(sendTextMessageAC(messageToSend, createdChannel.id, CONNECTION_STATUS.CONNECTED));
-      case 12:
+      case 13:
         if (!(!dontCreateIfNotExists || channelIsExistOnAllChannels)) {
-          _context.n = 13;
+          _context.n = 14;
           break;
         }
-        _context.n = 13;
-        return put(setChannelToAddAC(JSON.parse(JSON.stringify(createdChannel))));
-      case 13:
         _context.n = 14;
+        return put(setChannelToAddAC(JSON.parse(JSON.stringify(createdChannel))));
+      case 14:
+        _context.n = 15;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(_extends({}, createdChannel, {
           isLinkedChannel: dontCreateIfNotExists
         }))), !callback));
-      case 14:
+      case 15:
         if (dontCreateIfNotExists) {
           if (!channelIsExistOnAllChannels) {
             addChannelToAllChannels(createdChannel);
@@ -16507,60 +16654,56 @@ function createChannel(action) {
           }
         }
         if (!callback) {
-          _context.n = 15;
+          _context.n = 16;
           break;
         }
         callback(createdChannel);
-        _context.n = 16;
+        _context.n = 17;
         break;
-      case 15:
-        _context.n = 16;
-        return call(setActiveChannelId, createdChannel.id);
       case 16:
+        _context.n = 17;
+        return call(setActiveChannelId, createdChannel.id);
+      case 17:
         _context.n = 19;
         break;
-      case 17:
-        _context.p = 17;
-        _t = _context.v;
-        if (!(_t.code === 1041)) {
-          _context.n = 18;
-          break;
-        }
-        _context.n = 18;
-        return put(setActionIsRestrictedAC(true, false, null));
       case 18:
+        _context.p = 18;
+        _t = _context.v;
         log.error(_t, 'Error on create channel');
       case 19:
         return _context.a(2);
     }
-  }, _marked$2, null, [[0, 17]]);
+  }, _marked$2, null, [[0, 18]]);
 }
 function getChannels(action) {
-  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
+  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _Object$keys2, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
-        log.info('[getChannels] start get channels');
+        log.info(new Date().toISOString() + " [getChannels] start get channels");
         _context2.p = 1;
         payload = action.payload;
         params = payload.params;
-        log.info('[getChannels] input params:', JSON.stringify(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('[getChannels] connection status:', connectionStatus);
+        log.info(new Date().toISOString() + " [getChannels] connection status: " + connectionStatus);
         if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
-          _context2.n = 2;
+          _context2.n = 3;
           break;
         }
-        log.warn('[getChannels] connection not ready, aborting. Status:', connectionStatus);
+        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('[getChannels] channelTypesFilter:', JSON.stringify(channelTypesFilter));
+        log.info(new Date().toISOString() + " [getChannels] channelTypesFilter: " + JSON.stringify(channelTypesFilter));
         types = [];
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
           types = channelTypesFilter;
@@ -16568,77 +16711,77 @@ function getChannels(action) {
         if (params !== null && params !== void 0 && (_params$filter = params.filter) !== null && _params$filter !== void 0 && _params$filter.channelType) {
           types.push(params.filter.channelType);
         }
-        log.info('[getChannels] final types array:', JSON.stringify(types));
+        log.info(new Date().toISOString() + " [getChannels] final types array: " + JSON.stringify(types));
         if ((_types = types) !== null && _types !== void 0 && _types.length) {
           channelQueryBuilder.types(types);
         }
         if (params.memberCount) {
-          log.info('[getChannels] setting memberCount filter:', params === null || params === void 0 ? void 0 : params.memberCount);
+          log.info(new Date().toISOString() + " [getChannels] setting memberCount filter: " + (params === null || params === void 0 ? void 0 : params.memberCount));
           channelQueryBuilder.memberCount(params.memberCount);
         }
         channelQueryBuilder.order('lastMessage');
         limit = params.limit || 50;
-        log.info('[getChannels] query limit:', limit);
+        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('[getChannels] query built successfully');
-        _context2.n = 5;
+        log.info(new Date().toISOString() + " [getChannels] query built successfully");
+        _context2.n = 6;
         return call(channelQuery.loadNextPage);
-      case 5:
+      case 6:
         channelsData = _context2.v;
         channelList = channelsData.channels;
-        log.info('[getChannels] channelsData received:', JSON.stringify({
+        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('[getChannels] active channelId:', channelId);
+        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:
-        activeChannel = _t2;
-        log.info('[getChannels] activeChannel from map:', activeChannel ? (_activeChannel = activeChannel) === null || _activeChannel === void 0 ? void 0 : _activeChannel.id : 'null');
-        _context2.n = 11;
-        return call(destroyChannelsMap);
+        _t2 = null;
       case 11:
-        log.info('[getChannels] channels map destroyed');
+        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 = 12;
-        return call(setChannelsInMap, channelList);
+        return call(destroyChannelsMap);
       case 12:
+        log.info(new Date().toISOString() + " [getChannels] channels map destroyed");
+        _context2.n = 13;
+        return call(setChannelsInMap, channelList);
+      case 13:
         _yield$call = _context2.v;
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
-        log.info('[getChannels] setChannelsInMap result:', JSON.stringify({
+        log.info(new Date().toISOString() + " [getChannels] setChannelsInMap result: " + JSON.stringify({
           mappedChannelsCount: ((_mappedChannels = mappedChannels) === null || _mappedChannels === void 0 ? void 0 : _mappedChannels.length) || 0,
           channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
         }));
-        log.info('channelsForUpdateLastReactionMessage', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        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('[getChannels] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        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) {
@@ -16646,10 +16789,10 @@ function getChannels(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id] = messages[0];
-                    log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.info(new Date().toISOString() + " [getChannels] successfully fetched reaction message for channel: " + (channel === null || channel === void 0 ? void 0 : channel.id));
                     resolve(true);
                   })["catch"](function (e) {
-                    log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.error(e, "Error on getMessagesById for channel: " + (channel === null || channel === void 0 ? void 0 : channel.id));
                     resolve(true);
                   });
                 }));
@@ -16661,133 +16804,133 @@ function getChannels(action) {
             return Promise.reject(e);
           }
         });
-      case 13:
-        log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
+      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]) {
             channel.lastReactedMessage = channelMessageMap[channel === null || channel === void 0 ? void 0 : channel.id];
           }
           return channel;
         });
-        log.info('[getChannels] mappedChannels updated with reaction messages, final count:', ((_mappedChannels2 = mappedChannels) === null || _mappedChannels2 === void 0 ? void 0 : _mappedChannels2.length) || 0);
-      case 14:
-        log.info('[getChannels] setting channels in state, count:', ((_mappedChannels3 = mappedChannels) === null || _mappedChannels3 === void 0 ? void 0 : _mappedChannels3.length) || 0);
-        _context2.n = 15;
-        return put(setChannelsAC(mappedChannels));
+        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 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 = 16;
+        return put(setChannelsAC(mappedChannels));
+      case 16:
         if (!channelId) {
           activeChannel = channelList[0];
-          log.info('[getChannels] no active channelId, setting first channel as active:', (_activeChannel2 = activeChannel) === null || _activeChannel2 === void 0 ? void 0 : _activeChannel2.id);
+          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('[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:
+        log.info(new Date().toISOString() + " [getChannels] auto-selecting channel: " + ((_activeChannel3 = activeChannel) === null || _activeChannel3 === void 0 ? void 0 : _activeChannel3.id));
         _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('[getChannels] hiddenList state:', hiddenList);
+        log.info(new Date().toISOString() + " [getChannels] hiddenList state: " + hiddenList);
         if (hiddenList) {
-          _context2.n = 28;
+          _context2.n = 29;
           break;
         }
-        log.info('[getChannels] starting all channels query (hiddenList is false)');
+        log.info(new Date().toISOString() + " [getChannels] starting all channels query (hiddenList is false)");
         allChannelsQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
         allChannelsQueryBuilder.order('lastMessage');
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
           allChannelsQueryBuilder.types(channelTypesFilter);
-          log.info('[getChannels] allChannelsQuery types:', JSON.stringify(channelTypesFilter));
+          log.info(new Date().toISOString() + " [getChannels] allChannelsQuery types: " + JSON.stringify(channelTypesFilter));
         }
         if (params !== null && params !== void 0 && params.memberCount) {
           allChannelsQueryBuilder.memberCount(params.memberCount);
-          log.info('[getChannels] allChannelsQuery memberCount:', params === null || params === void 0 ? void 0 : params.memberCount);
+          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('[getChannels] allChannelsQuery built');
+        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('[getChannels] connection not ready, aborting. Status:', _connectionStatus);
-        return _context2.a(3, 27);
-      case 21:
-        log.info('[getChannels] loading all channels page:', i + 1);
-        _context2.n = 22;
-        return call(allChannelsQuery.loadNextPage);
+        log.warn(new Date().toISOString() + " [getChannels] connection not ready, aborting. Status: " + _connectionStatus);
+        return _context2.a(3, 28);
       case 22:
+        log.info(new Date().toISOString() + " [getChannels] loading all channels page: " + (i + 1));
+        _context2.n = 23;
+        return call(allChannelsQuery.loadNextPage);
+      case 23:
         allChannelsData = _context2.v;
         hasNext = allChannelsData.hasNext;
         allChannelList = allChannelsData.channels;
-        log.info('[getChannels] all channels page', i + 1, 'loaded:', JSON.stringify({
+        log.info(new Date().toISOString() + " [getChannels] all channels page: " + (i + 1), i + 1, 'loaded:', JSON.stringify({
           channelsCount: (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0,
           hasNext: hasNext
         }));
         addChannelsToAllChannels(allChannelList);
         totalAllChannelsAdded += (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0;
-        log.info('[getChannels] total all channels added so far:', totalAllChannelsAdded);
-        _context2.n = 24;
+        log.info(new Date().toISOString() + " [getChannels] total all channels added so far: " + totalAllChannelsAdded);
+        _context2.n = 25;
         break;
-      case 23:
-        _context2.p = 23;
-        _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;
+        _context2.p = 24;
+        _t3 = _context2.v;
+        log.error(_t3, "Error on get all channels page: " + (i + 1));
+        return _context2.a(3, 28);
       case 25:
-        log.info('[getChannels] no more pages available, stopping at iteration:', i);
-      case 26:
-        i++;
-        _context2.n = 19;
+        _context2.n = 27;
         break;
+      case 26:
+        log.info(new Date().toISOString() + " [getChannels] no more pages available, stopping at iteration: " + i);
       case 27:
-        log.info('[getChannels] all channels query completed, total channels added:', totalAllChannelsAdded);
-        _context2.n = 29;
+        i++;
+        _context2.n = 20;
         break;
       case 28:
-        log.info('[getChannels] skipping all channels query (hiddenList is true)');
-      case 29:
-        log.info('[getChannels] completed successfully. Final mapped channels count:', ((_mappedChannels4 = mappedChannels) === null || _mappedChannels4 === void 0 ? void 0 : _mappedChannels4.length) || 0);
-        _context2.n = 31;
+        log.info(new Date().toISOString() + " [getChannels] all channels query completed, total channels added: " + totalAllChannelsAdded);
+        _context2.n = 30;
         break;
+      case 29:
+        log.info(new Date().toISOString() + " [getChannels] skipping all channels query (hiddenList is true)");
       case 30:
-        _context2.p = 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 = 32;
+        break;
+      case 31:
+        _context2.p = 31;
         _t4 = _context2.v;
-        log.error('[getChannels] error occurred:', JSON.stringify(_t4), 'Error on get channels');
-        log.error('[getChannels] error details:', {
+        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({
           message: _t4.message,
           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;
@@ -17110,56 +17253,56 @@ function searchChannelsForForward(action) {
   }, _marked5, null, [[0, 7]]);
 }
 function channelsLoadMore(action) {
-  var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys2, _mappedChannels6, channelMessageMap, _t8;
+  var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys3, _mappedChannels6, channelMessageMap, _t8;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
-        log.info('[channelsLoadMore] start load more channels');
+        log.info(new Date().toISOString() + " [channelsLoadMore] start load more channels");
         _context6.p = 1;
         payload = action.payload;
         limit = payload.limit;
-        log.info('[channelsLoadMore] input payload:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] input payload:", JSON.stringify({
           limit: limit
         }));
         channelQuery = query.channelQuery;
-        log.info('[channelsLoadMore] channelQuery exists:', !!channelQuery);
+        log.info(new Date().toISOString() + " [channelsLoadMore] channelQuery exists:", !!channelQuery);
         if (channelQuery) {
           _context6.n = 2;
           break;
         }
-        log.error('[channelsLoadMore] channelQuery is null or undefined, cannot load more');
+        log.error(new Date().toISOString() + " [channelsLoadMore] channelQuery is null or undefined, cannot load more");
         return _context6.a(2);
       case 2:
         if (limit) {
-          log.info('[channelsLoadMore] setting query limit to:', limit);
+          log.info(new Date().toISOString() + " [channelsLoadMore] setting query limit to:", limit);
           channelQuery.limit = limit;
         } else {
-          log.info('[channelsLoadMore] no limit provided, using existing query limit');
+          log.info(new Date().toISOString() + " [channelsLoadMore] no limit provided, using existing query limit");
         }
         _context6.n = 3;
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
       case 3:
-        log.info('[channelsLoadMore] loading next page...');
+        log.info(new Date().toISOString() + " [channelsLoadMore] loading next page...");
         _context6.n = 4;
         return call(channelQuery.loadNextPage);
       case 4:
         channelsData = _context6.v;
         channelList = channelsData.channels;
-        log.info('[channelsLoadMore] channelsData received:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] channelsData received:", JSON.stringify({
           channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
           hasNext: channelsData.hasNext
         }));
         _context6.n = 5;
         return put(channelHasNextAC(channelsData.hasNext));
       case 5:
-        log.info('[channelsLoadMore] hasNext set to:', channelsData.hasNext);
+        log.info(new Date().toISOString() + " [channelsLoadMore] hasNext set to:", channelsData.hasNext);
         _context6.n = 6;
         return call(setChannelsInMap, channelsData.channels);
       case 6:
         _yield$call3 = _context6.v;
         mappedChannels = _yield$call3.channels;
         channelsForUpdateLastReactionMessage = _yield$call3.channelsForUpdateLastReactionMessage;
-        log.info('[channelsLoadMore] setChannelsInMap result:', JSON.stringify({
+        log.info(new Date().toISOString() + " [channelsLoadMore] setChannelsInMap result:", JSON.stringify({
           mappedChannelsCount: ((_mappedChannels5 = mappedChannels) === null || _mappedChannels5 === void 0 ? void 0 : _mappedChannels5.length) || 0,
           channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
         }));
@@ -17167,7 +17310,7 @@ function channelsLoadMore(action) {
           _context6.n = 8;
           break;
         }
-        log.info('[channelsLoadMore] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        log.info(new Date().toISOString() + " [channelsLoadMore] processing channels for reaction message update:", channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
         channelMessageMap = {};
         _context6.n = 7;
         return call(function () {
@@ -17177,7 +17320,7 @@ function channelsLoadMore(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel.id] = messages[0];
-                    log.info('[channelsLoadMore] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
+                    log.info(new Date().toISOString() + " [channelsLoadMore] successfully fetched reaction message for channel:", channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
                     log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
@@ -17193,34 +17336,34 @@ function channelsLoadMore(action) {
           }
         });
       case 7:
-        log.info('[channelsLoadMore] reaction messages fetched:', channelMessageMap ? (_Object$keys2 = Object.keys(channelMessageMap)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length : 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] reaction messages fetched:", channelMessageMap ? (_Object$keys3 = Object.keys(channelMessageMap)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel.id]) {
             channel.lastReactedMessage = channelMessageMap[channel.id];
           }
           return channel;
         });
-        log.info('[channelsLoadMore] mappedChannels updated with reaction messages, final count:', ((_mappedChannels6 = mappedChannels) === null || _mappedChannels6 === void 0 ? void 0 : _mappedChannels6.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] mappedChannels updated with reaction messages, final count:", ((_mappedChannels6 = mappedChannels) === null || _mappedChannels6 === void 0 ? void 0 : _mappedChannels6.length) || 0);
         _context6.n = 9;
         break;
       case 8:
-        log.info('[channelsLoadMore] no channels need reaction message update');
+        log.info(new Date().toISOString() + " [channelsLoadMore] no channels need reaction message update");
       case 9:
-        log.info('[channelsLoadMore] adding channels to state, count:', ((_mappedChannels7 = mappedChannels) === null || _mappedChannels7 === void 0 ? void 0 : _mappedChannels7.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] adding channels to state, count:", ((_mappedChannels7 = mappedChannels) === null || _mappedChannels7 === void 0 ? void 0 : _mappedChannels7.length) || 0);
         _context6.n = 10;
         return put(addChannelsAC(mappedChannels));
       case 10:
         _context6.n = 11;
         return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
       case 11:
-        log.info('[channelsLoadMore] completed successfully. Total channels added:', ((_mappedChannels8 = mappedChannels) === null || _mappedChannels8 === void 0 ? void 0 : _mappedChannels8.length) || 0);
+        log.info(new Date().toISOString() + " [channelsLoadMore] completed successfully. Total channels added:", ((_mappedChannels8 = mappedChannels) === null || _mappedChannels8 === void 0 ? void 0 : _mappedChannels8.length) || 0);
         _context6.n = 13;
         break;
       case 12:
         _context6.p = 12;
         _t8 = _context6.v;
-        log.error('[channelsLoadMore] error occurred:', _t8);
-        log.error('[channelsLoadMore] error details:', JSON.stringify({
+        log.error(new Date().toISOString() + " [channelsLoadMore] error occurred:", _t8);
+        log.error(new Date().toISOString() + " [channelsLoadMore] error details:", JSON.stringify({
           message: _t8 === null || _t8 === void 0 ? void 0 : _t8.message,
           code: _t8 === null || _t8 === void 0 ? void 0 : _t8.code,
           stack: _t8 === null || _t8 === void 0 ? void 0 : _t8.stack
@@ -17391,7 +17534,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:
@@ -17409,25 +17552,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:
@@ -17445,23 +17617,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;
@@ -17858,50 +18059,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:
@@ -17915,39 +18118,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:
+        return _context20.a(2);
+      case 5:
+        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 5:
-        _context20.p = 5;
+      case 10:
+        _context20.p = 10;
         _t21 = _context20.v;
-        log.error('ERROR in block channel - ', _t21.message);
-      case 6:
+        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:
@@ -17955,6 +18182,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,
@@ -17962,7 +18229,7 @@ function updateChannel(action) {
           avatarUrl: channel.avatarUrl
         };
         if (!config.avatar) {
-          _context21.n = 3;
+          _context22.n = 3;
           break;
         }
         fileToUpload = {
@@ -17971,10 +18238,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;
@@ -17985,14 +18252,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,
@@ -18006,7 +18273,7 @@ function updateChannel(action) {
         });
         onUpdateChannel = getOnUpdateChannel();
         if (!onUpdateChannel) {
-          _context21.n = 7;
+          _context22.n = 7;
           break;
         }
         fields = [];
@@ -18019,35 +18286,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) {
@@ -18059,149 +18326,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,
@@ -18214,64 +18481,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,
@@ -18284,230 +18551,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) {
@@ -18517,14 +18784,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,
@@ -18533,88 +18800,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 = {
@@ -18623,47 +18890,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
         }));
@@ -18680,264 +18947,265 @@ 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();
         channelsQueryBuilder = new _SceytChatClient10.ChannelListQueryBuilder();
         channelsQueryBuilder.memberCount(0);
         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) {
@@ -19337,56 +19605,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),
@@ -19582,7 +19800,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);
       }
@@ -19610,6 +19828,9 @@ function sendMessage(action) {
           if (channel) {
             setChannelInMap(channel);
           }
+          if (!channel) {
+            channel = getChannelFromAllChannelsMap(channelId);
+          }
         }
         if (!channel.isMockChannel) {
           _context4.n = 6;
@@ -19796,7 +20017,7 @@ function sendMessage(action) {
         messagesToSend.push(messageToSend);
       case 12:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, isErrorResendable, _t;
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, stringifiedMessageUpdateData, activeChannelId, messageToUpdate, channelUpdateParam, _channel, _messageToSend2, _channel2, isErrorResendable, _t;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
@@ -19882,22 +20103,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)) {
@@ -19940,7 +20149,7 @@ function sendMessage(action) {
                 _context3.p = 15;
                 _t = _context3.v;
                 isErrorResendable = isResendableError(_t === null || _t === void 0 ? void 0 : _t.type);
-                if (isErrorResendable) {
+                if (!(!isErrorResendable && (_channel = channel) !== null && _channel !== void 0 && _channel.id && (_messageToSend2 = messageToSend) !== null && _messageToSend2 !== void 0 && _messageToSend2.tid)) {
                   _context3.n = 17;
                   break;
                 }
@@ -19950,6 +20159,10 @@ function sendMessage(action) {
                 _context3.n = 19;
                 break;
               case 17:
+                if (!((_channel2 = channel) !== null && _channel2 !== void 0 && _channel2.id)) {
+                  _context3.n = 19;
+                  break;
+                }
                 log.error('Error on uploading attachment', messageToSend.tid, _t);
                 if (!(messageToSend.attachments && messageToSend.attachments.length)) {
                   _context3.n = 18;
@@ -20006,7 +20219,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, 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:
@@ -20024,6 +20237,9 @@ function sendTextMessage(action) {
           if (channel) {
             setChannelInMap(channel);
           }
+          if (!channel) {
+            channel = getChannelFromAllChannelsMap(channelId);
+          }
         }
         sendMessageTid = null;
         pendingMessage = null;
@@ -20113,23 +20329,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;
@@ -20179,7 +20381,7 @@ function sendTextMessage(action) {
         _t3 = _context5.v;
         log.error('error on send text message ... ', _t3 === null || _t3 === void 0 ? void 0 : _t3.type);
         isErrorResendable = isResendableError(_t3 === null || _t3 === void 0 ? void 0 : _t3.type);
-        if (!(!isErrorResendable && channel.id && sendMessageTid)) {
+        if (!(!isErrorResendable && (_channel3 = channel) !== null && _channel3 !== void 0 && _channel3.id && sendMessageTid)) {
           _context5.n = 22;
           break;
         }
@@ -20189,7 +20391,7 @@ function sendTextMessage(action) {
         _context5.n = 23;
         break;
       case 22:
-        if (!(channel.id && sendMessageTid)) {
+        if (!((_channel4 = channel) !== null && _channel4 !== void 0 && _channel4.id && sendMessageTid)) {
           _context5.n = 23;
           break;
         }
@@ -20223,7 +20425,7 @@ function sendTextMessage(action) {
   }, _marked2$2, null, [[3, 20, 23, 25]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, isErrorResendable, _activeChannelId2, _t4;
+  var payload, message, channelId, connectionState, isForward, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _channel5, isErrorResendable, _channel6, _activeChannelId2, _t4;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
@@ -20259,6 +20461,9 @@ function forwardMessage(action) {
         if (channel) {
           setChannelInMap(channel);
         }
+        if (!channel) {
+          channel = getChannelFromAllChannelsMap(channelId);
+        }
       case 6:
         if (channel) {
           _context6.n = 7;
@@ -20349,20 +20554,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;
@@ -20408,7 +20602,7 @@ function forwardMessage(action) {
         _context6.p = 18;
         _t4 = _context6.v;
         isErrorResendable = isResendableError(_t4 === null || _t4 === void 0 ? void 0 : _t4.type);
-        if (isErrorResendable) {
+        if (!(!isErrorResendable && (_channel5 = channel) !== null && _channel5 !== void 0 && _channel5.id && messageTid)) {
           _context6.n = 20;
           break;
         }
@@ -20418,7 +20612,7 @@ function forwardMessage(action) {
         _context6.n = 21;
         break;
       case 20:
-        if (!(channel && messageTid)) {
+        if (!((_channel6 = channel) !== null && _channel6 !== void 0 && _channel6.id && messageTid)) {
           _context6.n = 21;
           break;
         }
@@ -20764,7 +20958,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, _updatedMessages$, _parsedMessages$, _parsedMessages, parsedMessages, _filteredPendingMessages, updatedMessages, messageIdForLoad, 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:
@@ -20773,29 +20967,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 = 84;
+          _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);
@@ -20805,161 +21039,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 = 77;
+        _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;
@@ -20970,234 +21169,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 = 77;
+      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 = 77;
+      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 = 66;
+          _context10.n = 57;
           break;
         }
-        parsedMessages = getFromAllMessagesByMessageId('', '', true);
-        setMessagesToMap(channel.id, parsedMessages, (_parsedMessages$ = parsedMessages[0]) === null || _parsedMessages$ === void 0 ? void 0 : _parsedMessages$.id, (_parsedMessages = parsedMessages[parsedMessages.length - 1]) === null || _parsedMessages === void 0 ? void 0 : _parsedMessages.id);
-        _context10.n = 65;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(parsedMessages))));
-      case 65:
-        _filteredPendingMessages = getFilteredPendingMessages(parsedMessages);
-        _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 56:
+        _filteredPendingMessages = getFilteredPendingMessages(_messages);
+        _context10.n = 57;
         return put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 66:
+      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 = 70;
+          _context10.n = 61;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 68;
+          _context10.n = 59;
           break;
         }
-        _context10.n = 67;
+        _context10.n = 58;
         return call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
-      case 67:
-        _t18 = _context10.v;
-        _context10.n = 69;
+      case 58:
+        _t16 = _context10.v;
+        _context10.n = 60;
         break;
-      case 68:
-        _t18 = {
+      case 59:
+        _t16 = {
           messages: [],
           hasNext: false
         };
-      case 69:
-        result = _t18;
-        _context10.n = 74;
+      case 60:
+        result = _t16;
+        _context10.n = 65;
         break;
-      case 70:
+      case 61:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 72;
+          _context10.n = 63;
           break;
         }
-        _context10.n = 71;
+        _context10.n = 62;
         return call(messageQuery.loadPrevious);
-      case 71:
-        _t19 = _context10.v;
-        _context10.n = 73;
+      case 62:
+        _t17 = _context10.v;
+        _context10.n = 64;
         break;
-      case 72:
-        _t19 = {
+      case 63:
+        _t17 = {
           messages: [],
           hasNext: false
         };
-      case 73:
-        result = _t19;
-      case 74:
+      case 64:
+        result = _t17;
+      case 65:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -21208,72 +21358,86 @@ function getMessagesQuery(action) {
           updatedMessages.push(updatedMessage || msg);
         });
         messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
-        _context10.n = 75;
+        if (!updatedMessages.length) {
+          _context10.n = 69;
+          break;
+        }
+        _context10.n = 66;
         return call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
-      case 75:
-        _context10.n = 76;
+      case 66:
+        _context10.n = 67;
         return put(setMessagesHasPrevAC(true));
-      case 76:
-        _context10.n = 77;
+      case 67:
+        _context10.n = 68;
         return put(setMessagesHasNextAC(false));
-      case 77:
+      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 = 78;
+        _context10.n = 71;
         return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 78:
+      case 71:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 80;
+          _context10.n = 73;
           break;
         }
-        _context10.n = 79;
+        _context10.n = 72;
         return put(setWaitToSendPendingMessagesAC(false));
-      case 79:
-        _context10.n = 80;
+      case 72:
+        _context10.n = 73;
         return spawn(sendPendingMessages, connectionState);
-      case 80:
-        _context10.n = 81;
+      case 73:
+        _context10.n = 74;
         return call(SceytChatClient.getChannel, channel.id, true);
-      case 81:
+      case 74:
         updatedChannel = _context10.v;
-        if (!updatedChannel) {
-          _context10.n = 83;
+        if (!(updatedChannel && updatedChannel !== null && updatedChannel !== void 0 && updatedChannel.lastMessage)) {
+          _context10.n = 76;
           break;
         }
-        _context10.n = 82;
+        _context10.n = 75;
         return put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
-      case 82:
+      case 75:
         updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
-      case 83:
-        _context10.n = 85;
+      case 76:
+        _context10.n = 78;
         break;
-      case 84:
+      case 77:
         if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
-          _context10.n = 85;
+          _context10.n = 78;
           break;
         }
-        _context10.n = 85;
+        _context10.n = 78;
         return put(setMessagesAC([]));
-      case 85:
-        _context10.n = 87;
+      case 78:
+        _context10.n = 80;
         break;
-      case 86:
-        _context10.p = 86;
-        _t20 = _context10.v;
-        log.error('error in message query', _t20);
-      case 87:
-        _context10.p = 87;
-        _context10.n = 88;
+      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 88:
-        return _context10.f(87);
-      case 89:
+      case 81:
+        return _context10.f(80);
+      case 82:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 86, 87, 89]]);
+  }, _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:
@@ -21323,15 +21487,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:
@@ -21375,7 +21539,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));
@@ -21403,7 +21567,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));
@@ -21444,15 +21608,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:
@@ -21505,15 +21669,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:
@@ -21561,15 +21725,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:
@@ -21604,15 +21768,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:
@@ -21640,15 +21804,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:
@@ -21726,15 +21890,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:
@@ -21778,15 +21942,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:
@@ -21808,15 +21972,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:
@@ -21839,15 +22003,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:
@@ -21877,8 +22041,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;
@@ -21891,8 +22055,7 @@ function getMessageMarkers(action) {
   }, _marked16$1, null, [[0, 5, 6, 8]]);
 }
 function executeAddPollVote(channelId, pollId, optionId, message) {
-  var _user$presence, _message$pollDetails, _message$pollDetails2, _message$pollDetails3, _message$pollDetails4;
-  var channel, user, vote, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7;
+  var channel;
   return _regenerator().w(function (_context22) {
     while (1) switch (_context22.n) {
       case 0:
@@ -21906,41 +22069,6 @@ function executeAddPollVote(channelId, pollId, optionId, message) {
         }
         return _context22.a(2);
       case 2:
-        user = getClient().user;
-        vote = {
-          optionId: optionId,
-          createdAt: new Date().getTime(),
-          user: {
-            id: user.id,
-            presence: {
-              status: ((_user$presence = user.presence) === null || _user$presence === void 0 ? void 0 : _user$presence.status) || 'online'
-            },
-            profile: {
-              avatar: user.avatarUrl || '',
-              firstName: user.firstName,
-              lastName: user.lastName,
-              metadata: user.metadata || '',
-              metadataMap: user.metadataMap || {},
-              updatedAt: new Date().getTime(),
-              username: user.username || '',
-              createdAt: new Date().getTime()
-            },
-            createdAt: new Date().getTime()
-          }
-        };
-        objs = [];
-        if (!((_message$pollDetails = message.pollDetails) !== null && _message$pollDetails !== void 0 && _message$pollDetails.allowMultipleVotes) && ((_message$pollDetails2 = message.pollDetails) === null || _message$pollDetails2 === void 0 ? void 0 : (_message$pollDetails3 = _message$pollDetails2.voteDetails) === null || _message$pollDetails3 === void 0 ? void 0 : (_message$pollDetails4 = _message$pollDetails3.ownVotes) === null || _message$pollDetails4 === void 0 ? void 0 : _message$pollDetails4.length) > 0) {
-          objs.push({
-            type: 'deleteOwn',
-            vote: (_message$pollDetails5 = message.pollDetails) === null || _message$pollDetails5 === void 0 ? void 0 : (_message$pollDetails6 = _message$pollDetails5.voteDetails) === null || _message$pollDetails6 === void 0 ? void 0 : (_message$pollDetails7 = _message$pollDetails6.ownVotes) === null || _message$pollDetails7 === void 0 ? void 0 : _message$pollDetails7[0],
-            incrementVotesPerOptionCount: -1
-          });
-        }
-        objs.push({
-          type: 'addOwn',
-          vote: vote,
-          incrementVotesPerOptionCount: 1
-        });
         if (!(channel && message.id)) {
           _context22.n = 4;
           break;
@@ -21956,7 +22084,8 @@ function executeAddPollVote(channelId, pollId, optionId, message) {
   }, _marked17$1);
 }
 function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
-  var channel, obj;
+  var _message$pollDetails, _message$pollDetails2, _message$pollDetails3, _message$pollDetails4;
+  var channel, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7, _i2, _objs, obj;
   return _regenerator().w(function (_context23) {
     while (1) switch (_context23.n) {
       case 0:
@@ -21976,25 +22105,42 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
         }
         return _context23.a(2);
       case 3:
-        obj = {
+        objs = [];
+        if (!((_message$pollDetails = message.pollDetails) !== null && _message$pollDetails !== void 0 && _message$pollDetails.allowMultipleVotes) && ((_message$pollDetails2 = message.pollDetails) === null || _message$pollDetails2 === void 0 ? void 0 : (_message$pollDetails3 = _message$pollDetails2.voteDetails) === null || _message$pollDetails3 === void 0 ? void 0 : (_message$pollDetails4 = _message$pollDetails3.ownVotes) === null || _message$pollDetails4 === void 0 ? void 0 : _message$pollDetails4.length) > 0) {
+          objs.push({
+            type: 'deleteOwn',
+            vote: (_message$pollDetails5 = message.pollDetails) === null || _message$pollDetails5 === void 0 ? void 0 : (_message$pollDetails6 = _message$pollDetails5.voteDetails) === null || _message$pollDetails6 === void 0 ? void 0 : (_message$pollDetails7 = _message$pollDetails6.ownVotes) === null || _message$pollDetails7 === void 0 ? void 0 : _message$pollDetails7[0]
+          });
+        }
+        objs.push({
           type: 'addOwn',
-          vote: vote,
-          incrementVotesPerOptionCount: 1
-        };
+          vote: vote
+        });
+        _i2 = 0, _objs = objs;
+      case 4:
+        if (!(_i2 < _objs.length)) {
+          _context23.n = 6;
+          break;
+        }
+        obj = _objs[_i2];
         updateMessageOnMap(channel.id, {
           messageId: message.id,
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context23.n = 4;
+        _context23.n = 5;
         return put(updateMessageAC(message.id, {}, undefined, obj));
-      case 4:
+      case 5:
+        _i2++;
+        _context23.n = 4;
+        break;
+      case 6:
         return _context23.a(2);
     }
   }, _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$presence, 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:
@@ -22013,7 +22159,7 @@ function addPollVote(action) {
           user: {
             id: user.id,
             presence: {
-              status: ((_user$presence2 = user.presence) === null || _user$presence2 === void 0 ? void 0 : _user$presence2.status) || 'online'
+              status: ((_user$presence = user.presence) === null || _user$presence === void 0 ? void 0 : _user$presence.status) || 'online'
             },
             profile: {
               avatar: user.avatarUrl || '',
@@ -22057,8 +22203,7 @@ function addPollVote(action) {
       case 2:
         obj = {
           type: 'addOwn',
-          vote: vote,
-          incrementVotesPerOptionCount: 1
+          vote: vote
         };
         updateMessageOnMap(channel.id, {
           messageId: message.id,
@@ -22075,19 +22220,21 @@ function addPollVote(action) {
           _context24.n = 5;
           break;
         }
-        return _context24.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, message, vote)), 5);
+        _context24.n = 5;
+        return call(updateMessageOptimisticallyForAddPollVote, channelId, message, vote);
       case 5:
         if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        return _context24.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message)), 6);
+        _context24.n = 6;
+        return call(executeAddPollVote, channelId, pollId, optionId, message);
       case 6:
         _context24.n = 8;
         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);
     }
@@ -22155,8 +22302,7 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
       case 3:
         obj = {
           type: 'deleteOwn',
-          vote: vote,
-          incrementVotesPerOptionCount: -1
+          vote: vote
         };
         updateMessageOnMap(channel.id, {
           messageId: message.id,
@@ -22171,7 +22317,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:
@@ -22220,8 +22366,7 @@ function deletePollVote(action) {
       case 3:
         obj = {
           type: 'deleteOwn',
-          vote: vote,
-          incrementVotesPerOptionCount: -1
+          vote: vote
         };
         updateMessageOnMap(channel.id, {
           messageId: message.id,
@@ -22238,19 +22383,21 @@ function deletePollVote(action) {
           _context27.n = 6;
           break;
         }
-        return _context27.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)), 6);
+        _context27.n = 6;
+        return call(updateMessageOptimisticallyForDeletePollVote, channelId, message, vote);
       case 6:
         if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        return _context27.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message)), 7);
+        _context27.n = 7;
+        return call(executeDeletePollVote, channelId, pollId, optionId, message);
       case 7:
         _context27.n = 9;
         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);
     }
@@ -22266,8 +22413,7 @@ function executeClosePoll(channelId, pollId, message) {
       case 1:
         channel = _context28.v;
         obj = {
-          type: 'close',
-          incrementVotesPerOptionCount: 0
+          type: 'close'
         };
         updateMessageOnMap(channel.id, {
           messageId: message.id,
@@ -22328,7 +22474,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:
@@ -22345,7 +22491,8 @@ function closePoll(action) {
           _context30.n = 2;
           break;
         }
-        return _context30.d(_regeneratorValues(updateMessageOptimisticallyForClosePoll(channelId, message)), 1);
+        _context30.n = 1;
+        return call(updateMessageOptimisticallyForClosePoll, channelId, message);
       case 1:
         setPendingPollAction({
           type: 'CLOSE_POLL',
@@ -22355,14 +22502,15 @@ function closePoll(action) {
         });
         return _context30.a(2);
       case 2:
-        return _context30.d(_regeneratorValues(executeClosePoll(channelId, pollId, message)), 3);
+        _context30.n = 3;
+        return call(executeClosePoll, channelId, pollId, message);
       case 3:
         _context30.n = 5;
         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);
     }
@@ -22451,7 +22599,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:
@@ -22469,15 +22617,15 @@ function retractPollVote(action) {
           vote = _step4.value;
           objs.push({
             type: 'deleteOwn',
-            vote: vote,
-            incrementVotesPerOptionCount: -1
+            vote: vote
           });
         }
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
           _context33.n = 2;
           break;
         }
-        return _context33.d(_regeneratorValues(updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)), 1);
+        _context33.n = 1;
+        return call(updateMessageOptimisticallyForRetractPollVote, channelId, message, objs);
       case 1:
         setPendingPollAction({
           type: 'RETRACT_POLL_VOTE',
@@ -22487,21 +22635,22 @@ function retractPollVote(action) {
         });
         return _context33.a(2);
       case 2:
-        return _context33.d(_regeneratorValues(executeRetractPollVote(channelId, pollId, message, objs, isResend)), 3);
+        _context33.n = 3;
+        return call(executeRetractPollVote, channelId, pollId, message, objs, isResend);
       case 3:
         _context33.n = 5;
         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:
@@ -22550,15 +22699,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:
@@ -22624,8 +22773,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:
@@ -22634,7 +22783,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:
@@ -22692,8 +22841,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:
@@ -22909,7 +23058,7 @@ function loadMoreMembers(action) {
   }, _marked2$3, null, [[0, 7, 8, 10]]);
 }
 function addMembers(action) {
-  var payload, members, channelId, channel, membersToAdd, addedMembers, membersIds, messageToSend, updateChannelData, _action$payload, _t3;
+  var payload, members, channelId, channel, membersToAdd, addedMembers, whoDoesNotAdded, membersIds, messageToSend, updateChannelData, _t3;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -22921,7 +23070,7 @@ function addMembers(action) {
       case 1:
         channel = _context3.v;
         if (!channel) {
-          _context3.n = 6;
+          _context3.n = 7;
           break;
         }
         membersToAdd = members.map(function (mem) {
@@ -22932,14 +23081,30 @@ function addMembers(action) {
         return call(channel.addMembers, membersToAdd);
       case 2:
         addedMembers = _context3.v;
-        if (!(channel.type === DEFAULT_CHANNEL_TYPE.GROUP || channel.type === DEFAULT_CHANNEL_TYPE.PRIVATE)) {
+        whoDoesNotAdded = members.filter(function (mem) {
+          return !addedMembers.some(function (addedMem) {
+            return addedMem.id === mem.id;
+          });
+        });
+        if (!whoDoesNotAdded.length) {
           _context3.n = 3;
           break;
         }
+        _context3.n = 3;
+        return put(setActionIsRestrictedAC(true, true, whoDoesNotAdded));
+      case 3:
+        if (!(channel.type === DEFAULT_CHANNEL_TYPE.GROUP || channel.type === DEFAULT_CHANNEL_TYPE.PRIVATE)) {
+          _context3.n = 4;
+          break;
+        }
         membersIds = [];
         addedMembers.forEach(function (mem) {
           membersIds.push(mem.id);
         });
+        if (!membersIds.length) {
+          _context3.n = 4;
+          break;
+        }
         messageToSend = {
           metadata: {
             m: membersIds
@@ -22949,41 +23114,34 @@ function addMembers(action) {
           attachments: [],
           type: 'system'
         };
-        _context3.n = 3;
-        return put(sendTextMessageAC(messageToSend, channelId, CONNECTION_STATUS.CONNECTED));
-      case 3:
         _context3.n = 4;
-        return put(addMembersToListAC(addedMembers));
+        return put(sendTextMessageAC(messageToSend, channelId, CONNECTION_STATUS.CONNECTED));
       case 4:
+        _context3.n = 5;
+        return put(addMembersToListAC(addedMembers));
+      case 5:
         updateChannelOnAllChannels(channel.id, {
           memberCount: channel.memberCount + addedMembers.length
         });
-        _context3.n = 5;
+        _context3.n = 6;
         return call(updateActiveChannelMembersAdd, addedMembers) || {};
-      case 5:
+      case 6:
         updateChannelData = _context3.v;
-        _context3.n = 6;
+        _context3.n = 7;
         return put(updateChannelDataAC(channel.id, _extends({
           memberCount: channel.memberCount + addedMembers.length
         }, updateChannelData)));
-      case 6:
+      case 7:
         _context3.n = 9;
         break;
-      case 7:
-        _context3.p = 7;
-        _t3 = _context3.v;
-        if (!(_t3.code === 1041)) {
-          _context3.n = 8;
-          break;
-        }
-        _context3.n = 8;
-        return put(setActionIsRestrictedAC(true, true, (action === null || action === void 0 ? void 0 : (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.members) || []));
       case 8:
+        _context3.p = 8;
+        _t3 = _context3.v;
         log.error('error on add members... ', _t3);
       case 9:
         return _context3.a(2);
     }
-  }, _marked3$2, null, [[0, 7]]);
+  }, _marked3$2, null, [[0, 8]]);
 }
 function kickMemberFromChannel(action) {
   var payload, memberId, channelId, channel, removedMembers, membersIds, messageToSend, updateChannelData;
@@ -23138,11 +23296,11 @@ function reportMember(action) {
   }, _marked7$2, null, [[1, 3]]);
 }
 function getRoles(action) {
-  var _action$payload2, timeout, attempts, SceytChatClient, roles, _t8;
+  var _action$payload, timeout, attempts, SceytChatClient, roles, _t8;
   return _regenerator().w(function (_context8) {
     while (1) switch (_context8.p = _context8.n) {
       case 0:
-        _action$payload2 = action.payload, timeout = _action$payload2.timeout, attempts = _action$payload2.attempts;
+        _action$payload = action.payload, timeout = _action$payload.timeout, attempts = _action$payload.attempts;
         _context8.p = 1;
         SceytChatClient = getClient();
         if (!(store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
@@ -24291,7 +24449,9 @@ var MembersText = styled.div(_templateObject7$1 || (_templateObject7$1 = _tagged
 var Center = styled.div(_templateObject8$1 || (_templateObject8$1 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  margin-top: 24px;\n"])));
 
 var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
-  var fromChannel = _ref.fromChannel;
+  var fromChannel = _ref.fromChannel,
+    members = _ref.members,
+    contactsMap = _ref.contactsMap;
   var dispatch = useDispatch();
   var _useColor = useColors(),
     background = _useColor[THEME_COLORS.BACKGROUND],
@@ -24308,6 +24468,29 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
     dispatch(setOpenInviteModalAC(true));
     handleClose();
   };
+  var getExcludedContactsMessage = function getExcludedContactsMessage(fromChannel) {
+    var excludedContacts = members || [];
+    var count = excludedContacts.length;
+    var fromContact = getShowOnlyContactUsers() || false;
+    var makeName = function makeName(member) {
+      return makeUsername(contactsMap[member.id], member, fromContact, false);
+    };
+    var prefix = fromChannel ? '' : 'The group was created, but ';
+    var suffix = fromChannel ? " couldn't be added to the group. You can share an invite link with them." : " couldn't be added. You can share an invite link with them.";
+    if (count === 1) {
+      var name = makeName(excludedContacts[0]);
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, name), suffix);
+    } else if (count === 2) {
+      var name1 = makeName(excludedContacts[0]);
+      var name2 = makeName(excludedContacts[1]);
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, name1), " and ", /*#__PURE__*/React__default.createElement(BoltText, null, name2), suffix);
+    } else if (count > 2) {
+      var firstName = makeName(excludedContacts[0]);
+      var othersCount = count - 1;
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, prefix, /*#__PURE__*/React__default.createElement(BoltText, null, firstName, " and ", othersCount, " others"), suffix);
+    }
+    return null;
+  };
   return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
     backgroundColor: background,
     maxWidth: '520px',
@@ -24322,23 +24505,23 @@ var ActionRestrictedPopup = function ActionRestrictedPopup(_ref) {
   }), /*#__PURE__*/React__default.createElement(PopupName, {
     color: textPrimary,
     marginBottom: '20px'
-  }, fromChannel ? 'Privacy note' : "Can't create group"), /*#__PURE__*/React__default.createElement(PopupDescription, {
+  }, "Privacy note"), /*#__PURE__*/React__default.createElement(PopupDescription, {
     color: textPrimary,
     highlightColor: linkColor
-  }, fromChannel ? 'Couldn’t add the user. Please invite them directly instead.' : 'Not everyone can be added to this group.')), /*#__PURE__*/React__default.createElement(PopupFooter, {
+  }, getExcludedContactsMessage(fromChannel))), /*#__PURE__*/React__default.createElement(PopupFooter, {
     backgroundColor: surface1
-  }, fromChannel && (/*#__PURE__*/React__default.createElement(Button, {
+  }, /*#__PURE__*/React__default.createElement(Button, {
     type: 'button',
     color: textPrimary,
     backgroundColor: 'transparent',
     onClick: handleClose
-  }, "Cancel")), /*#__PURE__*/React__default.createElement(Button, {
+  }, "Cancel"), /*#__PURE__*/React__default.createElement(Button, {
     type: 'button',
     backgroundColor: accentColor,
     color: textOnPrimary,
     borderRadius: '8px',
-    onClick: fromChannel ? handleInvite : handleClose
-  }, fromChannel ? 'Invite' : 'Cancel'))));
+    onClick: handleInvite
+  }, "Invite"))));
 };
 
 var UnavailableInviteKeyPopup = function UnavailableInviteKeyPopup() {
@@ -24671,9 +24854,11 @@ var SceytChat = function SceytChat(_ref) {
     highlightedBackground: highlightedBackground,
     id: 'sceyt_chat_container',
     chatMinWidth: chatMinWidth
-  }, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && /*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
-    fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel
-  }), !channelInviteKeyAvailable && /*#__PURE__*/React__default.createElement(UnavailableInviteKeyPopup, null))) : '', !embeddedJoinGroupPopup && joinPopup);
+  }, children, embeddedJoinGroupPopup && joinPopup && /*#__PURE__*/React__default.createElement(EmbeddedPopupWrapper, null, joinPopup), (restricted === null || restricted === void 0 ? void 0 : restricted.isRestricted) && (/*#__PURE__*/React__default.createElement(ActionRestrictedPopup, {
+    fromChannel: restricted === null || restricted === void 0 ? void 0 : restricted.fromChannel,
+    members: restricted === null || restricted === void 0 ? void 0 : restricted.members,
+    contactsMap: contactsMap
+  })), !channelInviteKeyAvailable && /*#__PURE__*/React__default.createElement(UnavailableInviteKeyPopup, null))) : '', !embeddedJoinGroupPopup && joinPopup);
 };
 var Container$2 = styled.div(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  height: 100vh;\n"])));
 var ChatContainer = styled.div(_templateObject2$4 || (_templateObject2$4 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  height: 100%;\n  max-height: 100vh;\n  min-width: ", ";\n  background-color: ", ";\n  position: relative;\n\n  /* Global highlighted background styles */\n  ::selection {\n    background-color: ", ";\n  }\n\n  ::-moz-selection {\n    background-color: ", ";\n  }\n\n  /* For text selection highlighting */\n  *::selection {\n    background-color: ", ";\n  }\n\n  *::-moz-selection {\n    background-color: ", ";\n  }\n"])), function (props) {
@@ -27799,7 +27984,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
@@ -27832,7 +28017,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
@@ -28516,6 +28701,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() {
@@ -31061,6 +31249,10 @@ var _templateObject$t, _templateObject2$p, _templateObject3$k;
 function MessageActions(_ref) {
   var _ref$isPollMessage = _ref.isPollMessage,
     isPollMessage = _ref$isPollMessage === void 0 ? false : _ref$isPollMessage,
+    _ref$allowVoteRetract = _ref.allowVoteRetract,
+    allowVoteRetract = _ref$allowVoteRetract === void 0 ? false : _ref$allowVoteRetract,
+    _ref$pollClosed = _ref.pollClosed,
+    pollClosed = _ref$pollClosed === void 0 ? false : _ref$pollClosed,
     editModeToggle = _ref.editModeToggle,
     channel = _ref.channel,
     handleResendMessage = _ref.handleResendMessage,
@@ -31153,7 +31345,7 @@ function MessageActions(_ref) {
   }, /*#__PURE__*/React__default.createElement(EditMessageContainer, {
     backgroundColor: backgroundSections,
     className: 'message_actions_cont '
-  }, showMessageReaction && !isPollMessage && messageStatus !== MESSAGE_DELIVERY_STATUS.PENDING && checkActionPermission('addMessageReaction') && (/*#__PURE__*/React__default.createElement(Action, {
+  }, showMessageReaction && messageStatus !== MESSAGE_DELIVERY_STATUS.PENDING && checkActionPermission('addMessageReaction') && (/*#__PURE__*/React__default.createElement(Action, {
     order: reactionIconOrder || 0,
     iconColor: messageActionIconsColor || iconInactive,
     hoverBackgroundColor: backgroundHovered,
@@ -31222,7 +31414,7 @@ function MessageActions(_ref) {
     disabledColor: textSecondary,
     bgColor: tooltipBackground,
     direction: 'top'
-  }, copyIconTooltipText || 'Copy', /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), copyIcon || /*#__PURE__*/React__default.createElement(SvgCopyIcon, null))), isPollMessage && (/*#__PURE__*/React__default.createElement(Action, {
+  }, copyIconTooltipText || 'Copy', /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), copyIcon || /*#__PURE__*/React__default.createElement(SvgCopyIcon, null))), isPollMessage && allowVoteRetract && !pollClosed && (/*#__PURE__*/React__default.createElement(Action, {
     onClick: handleRetractVote,
     iconColor: messageActionIconsColor || iconInactive,
     hoverBackgroundColor: backgroundHovered,
@@ -31231,7 +31423,7 @@ function MessageActions(_ref) {
     disabledColor: textSecondary,
     bgColor: tooltipBackground,
     direction: 'top'
-  }, "Retract Vote", /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), retractVoteIcon || /*#__PURE__*/React__default.createElement(SvgRetractVote, null))), !isPollMessage && (/*#__PURE__*/React__default.createElement(Action, {
+  }, "Retract Vote", /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), retractVoteIcon || /*#__PURE__*/React__default.createElement(SvgRetractVote, null))), isPollMessage && !isIncoming && !pollClosed && (/*#__PURE__*/React__default.createElement(Action, {
     onClick: handleEndVote,
     iconColor: messageActionIconsColor || iconInactive,
     hoverBackgroundColor: backgroundHovered,
@@ -31240,7 +31432,7 @@ function MessageActions(_ref) {
     disabledColor: textSecondary,
     bgColor: tooltipBackground,
     direction: 'top'
-  }, "End Vote", /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), endVoteIcon || /*#__PURE__*/React__default.createElement(SvgEndVote, null))), showForwardMessage && forwardMessagePermitted && messageStatus !== MESSAGE_DELIVERY_STATUS.PENDING && (/*#__PURE__*/React__default.createElement(Action, {
+  }, "End Vote", /*#__PURE__*/React__default.createElement(SvgArrowDown, null)), endVoteIcon || /*#__PURE__*/React__default.createElement(SvgEndVote, null))), showForwardMessage && forwardMessagePermitted && messageStatus !== MESSAGE_DELIVERY_STATUS.PENDING && !isPollMessage && (/*#__PURE__*/React__default.createElement(Action, {
     order: forwardIconOrder || 5,
     iconColor: messageActionIconsColor || iconInactive,
     hoverBackgroundColor: backgroundHovered,
@@ -36124,11 +36316,11 @@ var PollMessage = function PollMessage(_ref) {
       onClick: handleResultsClick,
       cursor: poll.anonymous ? 'default' : 'pointer'
     }, optionVotesUsers.map(function (vote) {
-      var _vote$user, _vote$user2, _vote$user2$profile, _vote$user3, _vote$user3$profile;
+      var _vote$user, _vote$user2, _vote$user2$profile, _vote$user3, _vote$user3$profile, _vote$user4;
       return /*#__PURE__*/React__default.createElement(Avatar, {
         key: vote === null || vote === void 0 ? void 0 : (_vote$user = vote.user) === null || _vote$user === void 0 ? void 0 : _vote$user.id,
         image: vote === null || vote === void 0 ? void 0 : (_vote$user2 = vote.user) === null || _vote$user2 === void 0 ? void 0 : (_vote$user2$profile = _vote$user2.profile) === null || _vote$user2$profile === void 0 ? void 0 : _vote$user2$profile.avatar,
-        name: vote === null || vote === void 0 ? void 0 : (_vote$user3 = vote.user) === null || _vote$user3 === void 0 ? void 0 : (_vote$user3$profile = _vote$user3.profile) === null || _vote$user3$profile === void 0 ? void 0 : _vote$user3$profile.firstName,
+        name: (vote === null || vote === void 0 ? void 0 : (_vote$user3 = vote.user) === null || _vote$user3 === void 0 ? void 0 : (_vote$user3$profile = _vote$user3.profile) === null || _vote$user3$profile === void 0 ? void 0 : _vote$user3$profile.firstName) || (vote === null || vote === void 0 ? void 0 : (_vote$user4 = vote.user) === null || _vote$user4 === void 0 ? void 0 : _vote$user4.id),
         size: 18,
         textSize: 12,
         setDefaultAvatar: true,
@@ -36674,6 +36866,7 @@ var FaviconImg = styled.img(_templateObject1$a || (_templateObject1$a = _taggedT
 
 var _templateObject$H, _templateObject2$C, _templateObject3$w, _templateObject4$r, _templateObject5$m, _templateObject6$k, _templateObject7$j;
 var MessageBody = function MessageBody(_ref) {
+  var _message$pollDetails, _message$pollDetails2;
   var message = _ref.message,
     channel = _ref.channel,
     MessageActionsMenu = _ref.MessageActionsMenu,
@@ -37049,6 +37242,8 @@ var MessageBody = function MessageBody(_ref) {
     handleEndVote: handleEndVote
   })) : (/*#__PURE__*/React__default.createElement(MessageActions, {
     isPollMessage: (message === null || message === void 0 ? void 0 : message.type) === MESSAGE_TYPE.POLL,
+    allowVoteRetract: message === null || message === void 0 ? void 0 : (_message$pollDetails = message.pollDetails) === null || _message$pollDetails === void 0 ? void 0 : _message$pollDetails.allowVoteRetract,
+    pollClosed: message === null || message === void 0 ? void 0 : (_message$pollDetails2 = message.pollDetails) === null || _message$pollDetails2 === void 0 ? void 0 : _message$pollDetails2.closed,
     messageFrom: message.user,
     channel: channel,
     editModeToggle: toggleEditMode,
@@ -39070,42 +39265,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('');
@@ -39440,7 +39633,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();
@@ -39450,9 +39643,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(''));
         }
       }
     }
@@ -39476,7 +39669,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]);
@@ -39597,12 +39790,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 () {
@@ -45696,7 +45891,8 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
     background = _useColor[THEME_COLORS.BACKGROUND],
     iconPrimary = _useColor[THEME_COLORS.ICON_PRIMARY],
-    backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED];
+    backgroundHovered = _useColor[THEME_COLORS.BACKGROUND_HOVERED],
+    surface2 = _useColor[THEME_COLORS.SURFACE_2];
   var contactsMap = useSelector(contactsMapSelector);
   var getFromContacts = getShowOnlyContactUsers();
   var dispatch = useDispatch();
@@ -45761,7 +45957,7 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     onMouseLeave: function onMouseLeave() {
       return setIsScrolling(false);
     },
-    thumbColor: background
+    thumbColor: surface2
   }, isLoadingInitial ? (/*#__PURE__*/React__default.createElement(LoadingText$1, {
     color: textSecondary
   }, "Loading...")) : mutualChannels.length > 0 ? mutualChannels.map(function (channel) {
@@ -45784,7 +45980,7 @@ var GroupsInCommonPopup = function GroupsInCommonPopup(_ref2) {
     color: textSecondary
   }, "Loading more...")))));
 };
-var ChannelsList$1 = styled.div(_templateObject$U || (_templateObject$U = _taggedTemplateLiteralLoose(["\n  max-height: 400px;\n  overflow-y: auto;\n  overflow-x: hidden;\n\n  &::-webkit-scrollbar {\n    width: 6px;\n  }\n\n  &::-webkit-scrollbar-track {\n    background: transparent;\n  }\n\n  &::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 3px;\n    opacity: 0.3;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    opacity: 0.6;\n  }\n"])), function (props) {
+var ChannelsList$1 = styled.div(_templateObject$U || (_templateObject$U = _taggedTemplateLiteralLoose(["\n  max-height: 400px;\n  overflow-y: auto;\n  overflow-x: hidden;\n\n  &::-webkit-scrollbar {\n    width: 8px;\n    background: transparent;\n  }\n  &::-webkit-scrollbar-thumb {\n    background: transparent;\n  }\n\n  &.show-scrollbar::-webkit-scrollbar-thumb {\n    background: ", ";\n    border-radius: 4px;\n  }\n  &.show-scrollbar::-webkit-scrollbar-track {\n    background: transparent;\n  }\n"])), function (props) {
   return props.thumbColor;
 });
 var ChannelItem$1 = styled.div(_templateObject2$P || (_templateObject2$P = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  padding: 6px 2px 6px 6px;\n  border-radius: 8px;\n  cursor: pointer;\n  transition: background-color 0.2s;\n\n  &:hover {\n    background-color: ", ";\n  }\n"])), function (props) {
@@ -48774,6 +48970,12 @@ var Details = function Details(_ref) {
       return Promise.reject(e);
     }
   };
+  var channelMetadata = useMemo(function () {
+    if (isJSON(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata)) {
+      return JSON.parse(activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata);
+    }
+    return activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.metadata;
+  }, [activeChannel]);
   return /*#__PURE__*/React__default.createElement(Container$v, {
     backgroundColor: backgroundColor,
     mounted: mounted,
@@ -48859,11 +49061,11 @@ var Details = function Details(_ref) {
     color: textSecondary,
     fontSize: channelMembersFontSize,
     lineHeight: channelMembersLineHeight
-  }, activeChannel && activeChannel.memberCount, " ", displayMemberText)))), showAboutChannel && activeChannel && activeChannel.metadata && activeChannel.metadata.d && (/*#__PURE__*/React__default.createElement(AboutChannel, null, showAboutChannelTitle && /*#__PURE__*/React__default.createElement(AboutChannelTitle, {
+  }, activeChannel && activeChannel.memberCount, " ", displayMemberText)))), showAboutChannel && activeChannel && channelMetadata && (channelMetadata === null || channelMetadata === void 0 ? void 0 : channelMetadata.d) && (/*#__PURE__*/React__default.createElement(AboutChannel, null, showAboutChannelTitle && /*#__PURE__*/React__default.createElement(AboutChannelTitle, {
     color: textFootnote
   }, "About"), /*#__PURE__*/React__default.createElement(AboutChannelText, {
     color: textPrimary
-  }, activeChannel && activeChannel.metadata && activeChannel.metadata.d ? activeChannel.metadata.d : '')))), activeChannel && activeChannel.userRole && (/*#__PURE__*/React__default.createElement(Actions, {
+  }, channelMetadata !== null && channelMetadata !== void 0 && channelMetadata.d ? channelMetadata === null || channelMetadata === void 0 ? void 0 : channelMetadata.d : '')))), activeChannel && activeChannel.userRole && (/*#__PURE__*/React__default.createElement(Actions, {
     setActionsHeight: setActionsHeight,
     theme: theme,
     showMuteUnmuteNotifications: showMuteUnmuteNotifications,