sceyt-chat-react-uikit 1.8.5-beta.3 → 1.8.5-beta.5

package/index.js

@@ -10817,13 +10817,14 @@ function loadLatestMessagesAC(channel, messageId, networkChanged, applyVisibleWi
     }
   };
 }
-function loadAroundMessageAC(channel, messageId, networkChanged) {
+function loadAroundMessageAC(channel, messageId, networkChanged, restoreWindow) {
   return {
     type: LOAD_AROUND_MESSAGE,
     payload: {
       channel: channel,
       messageId: messageId,
-      networkChanged: networkChanged
+      networkChanged: networkChanged,
+      restoreWindow: restoreWindow
     }
   };
 }
@@ -11768,6 +11769,42 @@ function getCachedNearMessages(channelId, boundaryMessageId, limit) {
     hasPrevMessages: (firstMessageId ? compareMessageIds(firstMessageId, containingSegment.startId) > 0 : false) || hasOlderSegmentBefore(containingSegment.startId)
   };
 }
+function getCachedWindowInterval(channelId, startId, endId) {
+  var segments = loadedSegmentsMap[channelId] || [];
+  var channelMessages = messagesMap[channelId] || {};
+  var containingSegment = segments.find(function (s) {
+    return compareMessageIds(s.startId, startId) <= 0 && compareMessageIds(s.endId, endId) >= 0;
+  });
+  if (!containingSegment) {
+    return {
+      messages: [],
+      isFullyCached: false,
+      hasPrevMessages: false,
+      hasNextMessages: false
+    };
+  }
+  var messages = Object.values(channelMessages).filter(function (m) {
+    return !!m.id && compareMessageIds(m.id, startId) >= 0 && compareMessageIds(m.id, endId) <= 0;
+  }).sort(compareMessagesForList);
+  var hasStart = messages.some(function (m) {
+    return compareMessageIds(m.id, startId) === 0;
+  });
+  var hasEnd = messages.some(function (m) {
+    return compareMessageIds(m.id, endId) === 0;
+  });
+  var hasOlderSegmentBefore = segments.some(function (s) {
+    return compareMessageIds(s.endId, containingSegment.startId) < 0;
+  });
+  var hasNewerSegmentAfter = segments.some(function (s) {
+    return compareMessageIds(s.startId, containingSegment.endId) > 0;
+  });
+  return {
+    messages: messages,
+    isFullyCached: hasStart && hasEnd,
+    hasPrevMessages: compareMessageIds(startId, containingSegment.startId) > 0 || hasOlderSegmentBefore,
+    hasNextMessages: compareMessageIds(endId, containingSegment.endId) < 0 || hasNewerSegmentAfter
+  };
+}
 var getMessageSortKey = function getMessageSortKey(message) {
   if (message.id) {
     return BigInt(message.id);
@@ -17650,7 +17687,7 @@ function createChannel(action) {
         allChannels = getAllChannels();
         memberId = channelData.members[0].id;
         allChannels.forEach(function (channel) {
-          if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
+          if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT && !channel.hidden) {
             if (isSelfChannel) {
               var _channel$members;
               if (((_channel$members = channel.members) === null || _channel$members === void 0 ? void 0 : _channel$members.length) === 1 && channel.members[0].id === memberId) {
@@ -17681,7 +17718,7 @@ function createChannel(action) {
           isMockChannel: true,
           avatarUrl: '',
           createdAt: new Date(Date.now()),
-          hidden: false,
+          hidden: true,
           id: uuid.v4(),
           lastMessage: null,
           memberCount: 2,
@@ -18599,7 +18636,6 @@ function markMessagesRead(action) {
       case 0:
         payload = action.payload;
         channelId = payload.channelId, messageIds = payload.messageIds;
-        console.log(messageIds, 'messageIds');
         connectionStatus = store.getState().UserReducer.connectionStatus;
         if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
           _context9.n = 1;
@@ -19677,7 +19713,7 @@ function sendRecording(action) {
           _context27.n = 5;
           break;
         }
-        if (!state) {
+        if (!(state && channel !== null && channel !== void 0 && channel.startRecording)) {
           _context27.n = 4;
           break;
         }
@@ -19687,6 +19723,10 @@ function sendRecording(action) {
         _context27.n = 5;
         break;
       case 4:
+        if (!(channel !== null && channel !== void 0 && channel.stopRecording)) {
+          _context27.n = 5;
+          break;
+        }
         _context27.n = 5;
         return effects.call(channel.stopRecording);
       case 5:
@@ -21162,41 +21202,43 @@ var _marked$3 = /*#__PURE__*/_regenerator().m(setMessageListLoading),
   _marked14$1 = /*#__PURE__*/_regenerator().m(fetchOGMetadata),
   _marked15$1 = /*#__PURE__*/_regenerator().m(loadOGMetadataForLinkSaga),
   _marked16$1 = /*#__PURE__*/_regenerator().m(reloadActiveChannelAfterReconnect),
-  _marked17$1 = /*#__PURE__*/_regenerator().m(loadAroundMessageWorker),
-  _marked18$1 = /*#__PURE__*/_regenerator().m(loadAroundMessage),
-  _marked19$1 = /*#__PURE__*/_regenerator().m(loadNearUnread),
-  _marked20$1 = /*#__PURE__*/_regenerator().m(loadDefaultMessages),
-  _marked21$1 = /*#__PURE__*/_regenerator().m(getMessagesQuery),
-  _marked22$1 = /*#__PURE__*/_regenerator().m(getMessageQuery),
-  _marked23$1 = /*#__PURE__*/_regenerator().m(prefetchMessages),
-  _marked24$1 = /*#__PURE__*/_regenerator().m(loadMoreMessages),
-  _marked25$1 = /*#__PURE__*/_regenerator().m(addReaction),
-  _marked26$1 = /*#__PURE__*/_regenerator().m(deleteReaction),
-  _marked27$1 = /*#__PURE__*/_regenerator().m(getReactions),
-  _marked28$1 = /*#__PURE__*/_regenerator().m(loadMoreReactions),
-  _marked29$1 = /*#__PURE__*/_regenerator().m(getMessageAttachments),
-  _marked30$1 = /*#__PURE__*/_regenerator().m(loadMoreMessageAttachments),
-  _marked31$1 = /*#__PURE__*/_regenerator().m(pauseAttachmentUploading),
-  _marked32$1 = /*#__PURE__*/_regenerator().m(resumeAttachmentUploading),
-  _marked33$1 = /*#__PURE__*/_regenerator().m(getMessageMarkers),
-  _marked34$1 = /*#__PURE__*/_regenerator().m(executeAddPollVote),
-  _marked35$1 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForAddPollVote),
-  _marked36$1 = /*#__PURE__*/_regenerator().m(addPollVote),
-  _marked37$1 = /*#__PURE__*/_regenerator().m(executeDeletePollVote),
-  _marked38$1 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForDeletePollVote),
-  _marked39$1 = /*#__PURE__*/_regenerator().m(deletePollVote),
-  _marked40$1 = /*#__PURE__*/_regenerator().m(executeClosePoll),
-  _marked41$1 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForClosePoll),
-  _marked42 = /*#__PURE__*/_regenerator().m(closePoll),
-  _marked43 = /*#__PURE__*/_regenerator().m(executeRetractPollVote),
-  _marked44 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForRetractPollVote),
-  _marked45 = /*#__PURE__*/_regenerator().m(retractPollVote),
-  _marked46 = /*#__PURE__*/_regenerator().m(resendPendingPollActions),
-  _marked47 = /*#__PURE__*/_regenerator().m(resendPendingMessageMutations),
-  _marked48 = /*#__PURE__*/_regenerator().m(getPollVotes),
-  _marked49 = /*#__PURE__*/_regenerator().m(loadMorePollVotes),
-  _marked50 = /*#__PURE__*/_regenerator().m(refreshCacheAroundMessage),
-  _marked51 = /*#__PURE__*/_regenerator().m(MessageSaga);
+  _marked17$1 = /*#__PURE__*/_regenerator().m(loadAroundMessageFromServer),
+  _marked18$1 = /*#__PURE__*/_regenerator().m(backgroundRefreshRestoreWindow),
+  _marked19$1 = /*#__PURE__*/_regenerator().m(loadAroundMessageWorker),
+  _marked20$1 = /*#__PURE__*/_regenerator().m(loadAroundMessage),
+  _marked21$1 = /*#__PURE__*/_regenerator().m(loadNearUnread),
+  _marked22$1 = /*#__PURE__*/_regenerator().m(loadDefaultMessages),
+  _marked23$1 = /*#__PURE__*/_regenerator().m(getMessagesQuery),
+  _marked24$1 = /*#__PURE__*/_regenerator().m(getMessageQuery),
+  _marked25$1 = /*#__PURE__*/_regenerator().m(prefetchMessages),
+  _marked26$1 = /*#__PURE__*/_regenerator().m(loadMoreMessages),
+  _marked27$1 = /*#__PURE__*/_regenerator().m(addReaction),
+  _marked28$1 = /*#__PURE__*/_regenerator().m(deleteReaction),
+  _marked29$1 = /*#__PURE__*/_regenerator().m(getReactions),
+  _marked30$1 = /*#__PURE__*/_regenerator().m(loadMoreReactions),
+  _marked31$1 = /*#__PURE__*/_regenerator().m(getMessageAttachments),
+  _marked32$1 = /*#__PURE__*/_regenerator().m(loadMoreMessageAttachments),
+  _marked33$1 = /*#__PURE__*/_regenerator().m(pauseAttachmentUploading),
+  _marked34$1 = /*#__PURE__*/_regenerator().m(resumeAttachmentUploading),
+  _marked35$1 = /*#__PURE__*/_regenerator().m(getMessageMarkers),
+  _marked36$1 = /*#__PURE__*/_regenerator().m(executeAddPollVote),
+  _marked37$1 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForAddPollVote),
+  _marked38$1 = /*#__PURE__*/_regenerator().m(addPollVote),
+  _marked39$1 = /*#__PURE__*/_regenerator().m(executeDeletePollVote),
+  _marked40$1 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForDeletePollVote),
+  _marked41$1 = /*#__PURE__*/_regenerator().m(deletePollVote),
+  _marked42 = /*#__PURE__*/_regenerator().m(executeClosePoll),
+  _marked43 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForClosePoll),
+  _marked44 = /*#__PURE__*/_regenerator().m(closePoll),
+  _marked45 = /*#__PURE__*/_regenerator().m(executeRetractPollVote),
+  _marked46 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForRetractPollVote),
+  _marked47 = /*#__PURE__*/_regenerator().m(retractPollVote),
+  _marked48 = /*#__PURE__*/_regenerator().m(resendPendingPollActions),
+  _marked49 = /*#__PURE__*/_regenerator().m(resendPendingMessageMutations),
+  _marked50 = /*#__PURE__*/_regenerator().m(getPollVotes),
+  _marked51 = /*#__PURE__*/_regenerator().m(loadMorePollVotes),
+  _marked52 = /*#__PURE__*/_regenerator().m(refreshCacheAroundMessage),
+  _marked53 = /*#__PURE__*/_regenerator().m(MessageSaga);
 var loadMoreMessagesInFlight = new Set();
 var prefetchInFlight = new Set();
 var queuedPrefetchRequests = new Map();
@@ -23588,40 +23630,327 @@ function reloadActiveChannelAfterReconnect(action) {
     }
   }, _marked16$1, null, [[0, 11]]);
 }
-function loadAroundMessageWorker(action) {
-  var _action$payload4, channel, messageId, networkChanged, connectionState, messages, SceytChatClient, messageQueryBuilder, messageQuery, loadNextMessageId, loadPreviousMessageId, nextLoadLimit, previousLoadLimit, centerMessageIndex, firstResult, secondResult, resultMessages, result, firstConfirmedMessageId, lastConfirmedMessageId, appliedMessages, filteredPendingMessages, waitToSendPendingMessages, _t14, _t15, _t16, _t17;
+function loadAroundMessageFromServer(channel, anchorId, prevCount, nextCount, connectionState) {
+  var SceytChatClient, messageQueryBuilder, messageQuery, firstResult, pivotId, secondResult, resultMessages, firstConfirmedMessageId, lastConfirmedMessageId, appliedMessages, filteredPendingMessages, waitToSendPendingMessages, _t14, _t15, _t16;
   return _regenerator().w(function (_context23) {
-    while (1) switch (_context23.p = _context23.n) {
+    while (1) switch (_context23.n) {
       case 0:
-        _context23.p = 0;
+        SceytChatClient = getClient();
+        messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channel.id);
+        messageQueryBuilder.limit(MESSAGES_MAX_LENGTH);
+        messageQueryBuilder.reverse(true);
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context23.n = 2;
+          break;
+        }
         _context23.n = 1;
-        return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADING);
+        return effects.call(messageQueryBuilder.build);
       case 1:
-        _action$payload4 = action.payload, channel = _action$payload4.channel, messageId = _action$payload4.messageId, networkChanged = _action$payload4.networkChanged;
+        _t14 = _context23.v;
+        _context23.n = 3;
+        break;
+      case 2:
+        _t14 = null;
+      case 3:
+        messageQuery = _t14;
+        query.messageQuery = messageQuery;
+        messageQuery.limit = prevCount || MESSAGES_MAX_PAGE_COUNT / 2;
+        if (!(anchorId && connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context23.n = 5;
+          break;
+        }
+        _context23.n = 4;
+        return effects.call(messageQuery.loadPreviousMessageId, anchorId);
+      case 4:
+        _t15 = _context23.v;
+        _context23.n = 6;
+        break;
+      case 5:
+        _t15 = {
+          messages: [],
+          hasNext: false
+        };
+      case 6:
+        firstResult = _t15;
+        pivotId = firstResult.messages.length > 0 ? getLastConfirmedMessageId(firstResult.messages) : anchorId || '0';
+        messageQuery.reverse = false;
+        messageQuery.limit = nextCount || MESSAGES_MAX_PAGE_COUNT / 2;
+        if (!(pivotId && connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context23.n = 8;
+          break;
+        }
+        _context23.n = 7;
+        return effects.call(messageQuery.loadNextMessageId, pivotId);
+      case 7:
+        _t16 = _context23.v;
+        _context23.n = 9;
+        break;
+      case 8:
+        _t16 = {
+          messages: [],
+          hasNext: false
+        };
+      case 9:
+        secondResult = _t16;
+        resultMessages = [].concat(firstResult.messages, secondResult.messages);
+        firstConfirmedMessageId = getFirstConfirmedMessageId(resultMessages);
+        lastConfirmedMessageId = getLastConfirmedMessageId(resultMessages);
+        if (!(firstConfirmedMessageId && lastConfirmedMessageId)) {
+          _context23.n = 11;
+          break;
+        }
+        setMessagesToMap(channel.id, resultMessages, firstConfirmedMessageId, lastConfirmedMessageId);
+        setActiveSegment(channel.id, firstConfirmedMessageId, lastConfirmedMessageId);
+        _context23.n = 10;
+        return effects.spawn(prefetchMessages, channel.id, firstConfirmedMessageId, MESSAGE_LOAD_DIRECTION.PREV, 2);
+      case 10:
+        _context23.n = 11;
+        return effects.spawn(prefetchMessages, channel.id, lastConfirmedMessageId, MESSAGE_LOAD_DIRECTION.NEXT, 2);
+      case 11:
+        appliedMessages = getCachedMessagesForResult(channel.id, resultMessages);
+        _context23.n = 12;
+        return effects.call(loadOGMetadataForLinkMessages, appliedMessages, true, false, false);
+      case 12:
+        _context23.n = 13;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(appliedMessages)), channel.id));
+      case 13:
+        _context23.n = 14;
+        return effects.put(setMessagesHasNextAC(true));
+      case 14:
+        filteredPendingMessages = getFilteredPendingMessages(channel, appliedMessages);
+        _context23.n = 15;
+        return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 15:
+        _context23.n = 16;
+        return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
+      case 16:
+        waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
+          _context23.n = 18;
+          break;
+        }
+        _context23.n = 17;
+        return effects.put(setWaitToSendPendingMessagesAC(false));
+      case 17:
+        _context23.n = 18;
+        return effects.spawn(sendPendingMessages, connectionState);
+      case 18:
+        return _context23.a(2);
+    }
+  }, _marked17$1);
+}
+function backgroundRefreshRestoreWindow(channel, restoreWindow, cachedMessages) {
+  var connectionState, SceytChatClient, messageQueryBuilder, messageQuery, prevResult, pivotId, nextResult, refreshedMessages, firstId, lastId, cachedConfirmed, changedMessages, appliedMessages, filteredPendingMessages, _t17, _t18, _t19;
+  return _regenerator().w(function (_context24) {
+    while (1) switch (_context24.p = _context24.n) {
+      case 0:
+        _context24.p = 0;
+        connectionState = store.getState().UserReducer.connectionStatus;
+        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
+          _context24.n = 1;
+          break;
+        }
+        return _context24.a(2);
+      case 1:
+        if (isChannelStillActive(channel.id)) {
+          _context24.n = 2;
+          break;
+        }
+        return _context24.a(2);
+      case 2:
+        SceytChatClient = getClient();
+        messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channel.id);
+        messageQueryBuilder.limit(MESSAGES_MAX_LENGTH);
+        messageQueryBuilder.reverse(true);
+        _context24.n = 3;
+        return effects.call(messageQueryBuilder.build);
+      case 3:
+        messageQuery = _context24.v;
+        messageQuery.limit = restoreWindow.prevCount || MESSAGES_MAX_PAGE_COUNT / 2;
+        if (!restoreWindow.anchorId) {
+          _context24.n = 5;
+          break;
+        }
+        _context24.n = 4;
+        return effects.call(messageQuery.loadPreviousMessageId, restoreWindow.anchorId);
+      case 4:
+        _t17 = _context24.v;
+        _context24.n = 6;
+        break;
+      case 5:
+        _t17 = {
+          messages: [],
+          hasNext: false
+        };
+      case 6:
+        prevResult = _t17;
+        pivotId = prevResult.messages.length > 0 ? getLastConfirmedMessageId(prevResult.messages) : restoreWindow.anchorId || '0';
+        messageQuery.reverse = false;
+        messageQuery.limit = restoreWindow.nextCount || MESSAGES_MAX_PAGE_COUNT / 2;
+        if (!pivotId) {
+          _context24.n = 8;
+          break;
+        }
+        _context24.n = 7;
+        return effects.call(messageQuery.loadNextMessageId, pivotId);
+      case 7:
+        _t18 = _context24.v;
+        _context24.n = 9;
+        break;
+      case 8:
+        _t18 = {
+          messages: [],
+          hasNext: false
+        };
+      case 9:
+        nextResult = _t18;
+        refreshedMessages = [].concat(prevResult.messages, nextResult.messages);
+        if (refreshedMessages.length) {
+          _context24.n = 10;
+          break;
+        }
+        return _context24.a(2);
+      case 10:
+        firstId = getFirstConfirmedMessageId(refreshedMessages);
+        lastId = getLastConfirmedMessageId(refreshedMessages);
+        if (firstId && lastId) {
+          setMessagesToMap(channel.id, refreshedMessages, firstId, lastId);
+          setActiveSegment(channel.id, firstId, lastId);
+        }
+        _context24.n = 11;
+        return effects.call(loadOGMetadataForLinkMessages, refreshedMessages, true, false, false);
+      case 11:
+        if (isChannelStillActive(channel.id)) {
+          _context24.n = 12;
+          break;
+        }
+        return _context24.a(2);
+      case 12:
+        cachedConfirmed = cachedMessages.filter(function (m) {
+          return !!m.id;
+        });
+        if (!sameConfirmedWindow(cachedConfirmed, refreshedMessages)) {
+          _context24.n = 14;
+          break;
+        }
+        changedMessages = getChangedActiveMessages(cachedConfirmed, refreshedMessages);
+        if (!(changedMessages.length > 0)) {
+          _context24.n = 13;
+          break;
+        }
+        _context24.n = 13;
+        return effects.put(patchMessagesAC(changedMessages));
+      case 13:
+        _context24.n = 18;
+        break;
+      case 14:
+        appliedMessages = getCachedMessagesForResult(channel.id, refreshedMessages);
+        _context24.n = 15;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(appliedMessages)), channel.id));
+      case 15:
+        _context24.n = 16;
+        return effects.put(setMessagesHasNextAC(true));
+      case 16:
+        filteredPendingMessages = getFilteredPendingMessages(channel, appliedMessages);
+        _context24.n = 17;
+        return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 17:
+        _context24.n = 18;
+        return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
+      case 18:
+        _context24.n = 20;
+        break;
+      case 19:
+        _context24.p = 19;
+        _t19 = _context24.v;
+        log.error('error in backgroundRefreshRestoreWindow', _t19);
+      case 20:
+        return _context24.a(2);
+    }
+  }, _marked18$1, null, [[0, 19]]);
+}
+function loadAroundMessageWorker(action) {
+  var _action$payload4, channel, messageId, networkChanged, restoreWindow, connectionState, messages, cachedWindow, _filteredPendingMessages, SceytChatClient, messageQueryBuilder, messageQuery, loadNextMessageId, loadPreviousMessageId, nextLoadLimit, previousLoadLimit, centerMessageIndex, firstResult, secondResult, resultMessages, result, firstConfirmedMessageId, lastConfirmedMessageId, appliedMessages, filteredPendingMessages, waitToSendPendingMessages, _t20, _t21, _t22, _t23;
+  return _regenerator().w(function (_context25) {
+    while (1) switch (_context25.p = _context25.n) {
+      case 0:
+        _context25.p = 0;
+        _action$payload4 = action.payload, channel = _action$payload4.channel, messageId = _action$payload4.messageId, networkChanged = _action$payload4.networkChanged, restoreWindow = _action$payload4.restoreWindow;
         connectionState = store.getState().UserReducer.connectionStatus;
         messages = store.getState().MessageReducer.activeChannelMessages;
         if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
-          _context23.n = 19;
+          _context25.n = 30;
+          break;
+        }
+        if (!(restoreWindow !== null && restoreWindow !== void 0 && restoreWindow.preferCache)) {
+          _context25.n = 11;
+          break;
+        }
+        cachedWindow = getCachedWindowInterval(channel.id, restoreWindow.startId, restoreWindow.endId);
+        if (!cachedWindow.isFullyCached) {
+          _context25.n = 8;
+          break;
+        }
+        setActiveSegment(channel.id, restoreWindow.startId, restoreWindow.endId);
+        _context25.n = 1;
+        return effects.call(loadOGMetadataForLinkMessages, cachedWindow.messages, true, false, false);
+      case 1:
+        _context25.n = 2;
+        return effects.put(setMessagesHasPrevAC(cachedWindow.hasPrevMessages));
+      case 2:
+        _context25.n = 3;
+        return effects.put(setMessagesHasNextAC(cachedWindow.hasNextMessages));
+      case 3:
+        _context25.n = 4;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(cachedWindow.messages)), channel.id));
+      case 4:
+        _filteredPendingMessages = getFilteredPendingMessages(channel, cachedWindow.messages, {
+          hasNext: cachedWindow.hasNextMessages
+        });
+        _context25.n = 5;
+        return effects.put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+      case 5:
+        _context25.n = 6;
+        return effects.call(loadOGMetadataForLinkMessages, _filteredPendingMessages, true, false, false);
+      case 6:
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context25.n = 7;
           break;
         }
+        _context25.n = 7;
+        return effects.spawn(backgroundRefreshRestoreWindow, channel, restoreWindow, cachedWindow.messages);
+      case 7:
+        return _context25.a(2);
+      case 8:
+        _context25.n = 9;
+        return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADING);
+      case 9:
+        _context25.n = 10;
+        return effects.call(loadAroundMessageFromServer, channel, restoreWindow.anchorId, restoreWindow.prevCount, restoreWindow.nextCount, connectionState);
+      case 10:
+        return _context25.a(2);
+      case 11:
+        _context25.n = 12;
+        return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADING);
+      case 12:
         SceytChatClient = getClient();
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channel.id);
         messageQueryBuilder.limit(MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context23.n = 3;
+          _context25.n = 14;
           break;
         }
-        _context23.n = 2;
+        _context25.n = 13;
         return effects.call(messageQueryBuilder.build);
-      case 2:
-        _t14 = _context23.v;
-        _context23.n = 4;
+      case 13:
+        _t20 = _context25.v;
+        _context25.n = 15;
         break;
-      case 3:
-        _t14 = null;
-      case 4:
-        messageQuery = _t14;
+      case 14:
+        _t20 = null;
+      case 15:
+        messageQuery = _t20;
         query.messageQuery = messageQuery;
         loadNextMessageId = '';
         loadPreviousMessageId = '';
@@ -23638,22 +23967,22 @@ function loadAroundMessageWorker(action) {
         }
         messageQuery.limit = previousLoadLimit;
         if (!(loadPreviousMessageId && connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context23.n = 6;
+          _context25.n = 17;
           break;
         }
-        _context23.n = 5;
+        _context25.n = 16;
         return effects.call(messageQuery.loadPreviousMessageId, loadPreviousMessageId);
-      case 5:
-        _t15 = _context23.v;
-        _context23.n = 7;
+      case 16:
+        _t21 = _context25.v;
+        _context25.n = 18;
         break;
-      case 6:
-        _t15 = {
+      case 17:
+        _t21 = {
           messages: [],
           hasNext: false
         };
-      case 7:
-        firstResult = _t15;
+      case 18:
+        firstResult = _t21;
         if (!loadNextMessageId && firstResult.messages.length > 0) {
           loadNextMessageId = getLastConfirmedMessageId(firstResult.messages);
         } else if (!networkChanged && !loadNextMessageId && !firstResult.messages.length) {
@@ -23662,22 +23991,22 @@ function loadAroundMessageWorker(action) {
         messageQuery.reverse = false;
         messageQuery.limit = nextLoadLimit;
         if (!(loadNextMessageId && connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context23.n = 9;
+          _context25.n = 20;
           break;
         }
-        _context23.n = 8;
+        _context25.n = 19;
         return effects.call(messageQuery.loadNextMessageId, loadNextMessageId);
-      case 8:
-        _t16 = _context23.v;
-        _context23.n = 10;
+      case 19:
+        _t22 = _context25.v;
+        _context25.n = 21;
         break;
-      case 9:
-        _t16 = {
+      case 20:
+        _t22 = {
           messages: [],
           hasNext: false
         };
-      case 10:
-        secondResult = _t16;
+      case 21:
+        secondResult = _t22;
         resultMessages = networkChanged && !firstResult.messages.length && !secondResult.messages.length ? messages : [].concat(firstResult.messages, secondResult.messages);
         result = {
           messages: resultMessages,
@@ -23686,86 +24015,86 @@ function loadAroundMessageWorker(action) {
         firstConfirmedMessageId = getFirstConfirmedMessageId(result.messages);
         lastConfirmedMessageId = getLastConfirmedMessageId(result.messages);
         if (!(firstConfirmedMessageId && lastConfirmedMessageId)) {
-          _context23.n = 12;
+          _context25.n = 23;
           break;
         }
         setMessagesToMap(channel.id, result.messages, firstConfirmedMessageId, lastConfirmedMessageId);
         setActiveSegment(channel.id, firstConfirmedMessageId, lastConfirmedMessageId);
-        _context23.n = 11;
+        _context25.n = 22;
         return effects.spawn(prefetchMessages, channel.id, firstConfirmedMessageId, MESSAGE_LOAD_DIRECTION.PREV, 2);
-      case 11:
-        _context23.n = 12;
+      case 22:
+        _context25.n = 23;
         return effects.spawn(prefetchMessages, channel.id, lastConfirmedMessageId, MESSAGE_LOAD_DIRECTION.NEXT, 2);
-      case 12:
+      case 23:
         appliedMessages = getCachedMessagesForResult(channel.id, result.messages);
-        _context23.n = 13;
+        _context25.n = 24;
         return effects.call(loadOGMetadataForLinkMessages, appliedMessages, true, false, false);
-      case 13:
-        _context23.n = 14;
+      case 24:
+        _context25.n = 25;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(appliedMessages)), channel.id));
-      case 14:
-        _context23.n = 15;
+      case 25:
+        _context25.n = 26;
         return effects.put(setMessagesHasNextAC(true));
-      case 15:
+      case 26:
         filteredPendingMessages = getFilteredPendingMessages(channel, appliedMessages);
-        _context23.n = 16;
+        _context25.n = 27;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 16:
-        _context23.n = 17;
+      case 27:
+        _context25.n = 28;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
-      case 17:
+      case 28:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context23.n = 19;
+          _context25.n = 30;
           break;
         }
-        _context23.n = 18;
+        _context25.n = 29;
         return effects.put(setWaitToSendPendingMessagesAC(false));
-      case 18:
-        _context23.n = 19;
+      case 29:
+        _context25.n = 30;
         return effects.spawn(sendPendingMessages, connectionState);
-      case 19:
-        _context23.n = 21;
+      case 30:
+        _context25.n = 32;
         break;
-      case 20:
-        _context23.p = 20;
-        _t17 = _context23.v;
-        log.error('error in loadAroundMessage', _t17);
-      case 21:
-        _context23.p = 21;
-        _context23.n = 22;
+      case 31:
+        _context25.p = 31;
+        _t23 = _context25.v;
+        log.error('error in loadAroundMessage', _t23);
+      case 32:
+        _context25.p = 32;
+        _context25.n = 33;
         return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADED);
-      case 22:
-        return _context23.f(21);
-      case 23:
-        return _context23.a(2);
+      case 33:
+        return _context25.f(32);
+      case 34:
+        return _context25.a(2);
     }
-  }, _marked17$1, null, [[0, 20, 21, 23]]);
+  }, _marked19$1, null, [[0, 31, 32, 34]]);
 }
 function loadAroundMessage(action) {
-  return _regenerator().w(function (_context24) {
-    while (1) switch (_context24.n) {
+  return _regenerator().w(function (_context26) {
+    while (1) switch (_context26.n) {
       case 0:
-        _context24.n = 1;
+        _context26.n = 1;
         return effects.race({
           load: effects.call(loadAroundMessageWorker, action),
           cancel: effects.take(CANCEL_WINDOW_LOAD)
         });
       case 1:
-        return _context24.a(2);
+        return _context26.a(2);
     }
-  }, _marked18$1);
+  }, _marked20$1);
 }
 function loadNearUnread(action) {
-  var channel, connectionState, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, cachedNearWindow, cacheWasShown, cachedLastConfirmedMessageId, cachedHasPrevMessages, cachedHasNextMessages, filteredPendingMessages, SceytChatClient, messageQueryBuilder, messageQuery, result, firstConfirmedMessageId, lastConfirmedMessageId, refreshedCachedNearWindow, lastAppliedWindow, appliedMessages, hasPrevMessages, refreshedLastConfirmedMessageId, hasNextMessages, changedMessages, _filteredPendingMessages, waitToSendPendingMessages, _t18;
-  return _regenerator().w(function (_context25) {
-    while (1) switch (_context25.p = _context25.n) {
+  var channel, connectionState, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, cachedNearWindow, cacheWasShown, cachedLastConfirmedMessageId, cachedHasPrevMessages, cachedHasNextMessages, filteredPendingMessages, SceytChatClient, messageQueryBuilder, messageQuery, result, firstConfirmedMessageId, lastConfirmedMessageId, refreshedCachedNearWindow, lastAppliedWindow, appliedMessages, hasPrevMessages, refreshedLastConfirmedMessageId, hasNextMessages, changedMessages, _filteredPendingMessages2, waitToSendPendingMessages, _t24;
+  return _regenerator().w(function (_context27) {
+    while (1) switch (_context27.p = _context27.n) {
       case 0:
-        _context25.p = 0;
+        _context27.p = 0;
         channel = action.payload.channel;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
-          _context25.n = 30;
+          _context27.n = 30;
           break;
         }
         cachedNearWindow = getCachedNearMessages(channel.id, channel.lastDisplayedMessageId, MESSAGES_MAX_LENGTH);
@@ -23774,76 +24103,76 @@ function loadNearUnread(action) {
         cachedHasPrevMessages = !!channel.lastDisplayedMessageId || cachedNearWindow.hasPrevMessages;
         cachedHasNextMessages = cachedNearWindow.hasNextMessages || !!((_channel$lastMessage4 = channel.lastMessage) !== null && _channel$lastMessage4 !== void 0 && _channel$lastMessage4.id) && !!cachedLastConfirmedMessageId && compareMessageIds(channel.lastMessage.id, cachedLastConfirmedMessageId) > 0;
         if (!cacheWasShown) {
-          _context25.n = 10;
+          _context27.n = 10;
           break;
         }
-        _context25.n = 1;
+        _context27.n = 1;
         return effects.put(setUnreadMessageIdAC(channel.lastDisplayedMessageId));
       case 1:
-        _context25.n = 2;
+        _context27.n = 2;
         return effects.put(setMessagesHasPrevAC(cachedHasPrevMessages));
       case 2:
-        _context25.n = 3;
+        _context27.n = 3;
         return effects.put(setMessagesHasNextAC(cachedHasNextMessages));
       case 3:
-        _context25.n = 4;
+        _context27.n = 4;
         return effects.call(loadOGMetadataForLinkMessages, cachedNearWindow.messages, true, false, false);
       case 4:
-        _context25.n = 5;
+        _context27.n = 5;
         return effects.put(setMessagesAC(cachedNearWindow.messages, channel.id));
       case 5:
-        _context25.n = 6;
+        _context27.n = 6;
         return effects.put(scrollToNewMessageAC(false));
       case 6:
-        _context25.n = 7;
+        _context27.n = 7;
         return effects.put(setUnreadScrollToAC(true));
       case 7:
         filteredPendingMessages = getFilteredPendingMessages(channel, cachedNearWindow.messages, {
           hasNext: cachedHasNextMessages
         });
-        _context25.n = 8;
+        _context27.n = 8;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 8:
-        _context25.n = 9;
+        _context27.n = 9;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
       case 9:
-        _context25.n = 11;
+        _context27.n = 11;
         break;
       case 10:
-        _context25.n = 11;
+        _context27.n = 11;
         return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADING);
       case 11:
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context25.n = 12;
+          _context27.n = 12;
           break;
         }
-        return _context25.a(2);
+        return _context27.a(2);
       case 12:
         SceytChatClient = getClient();
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channel.id);
         messageQueryBuilder.limit(MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
-        _context25.n = 13;
+        _context27.n = 13;
         return effects.call(messageQueryBuilder.build);
       case 13:
-        messageQuery = _context25.v;
+        messageQuery = _context27.v;
         query.messageQuery = messageQuery;
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context25.n = 15;
+          _context27.n = 15;
           break;
         }
-        _context25.n = 14;
+        _context27.n = 14;
         return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
       case 14:
-        result = _context25.v;
-        _context25.n = 17;
+        result = _context27.v;
+        _context27.n = 17;
         break;
       case 15:
-        _context25.n = 16;
+        _context27.n = 16;
         return effects.call(messageQuery.loadPrevious);
       case 16:
-        result = _context25.v;
+        result = _context27.v;
       case 17:
         firstConfirmedMessageId = getFirstConfirmedMessageId(result.messages);
         lastConfirmedMessageId = getLastConfirmedMessageId(result.messages);
@@ -23859,89 +24188,89 @@ function loadNearUnread(action) {
         hasPrevMessages = refreshedCachedNearWindow.hasEnoughCache && refreshedCachedNearWindow.messages.length ? !!channel.lastDisplayedMessageId || refreshedCachedNearWindow.hasPrevMessages : true;
         refreshedLastConfirmedMessageId = getLastConfirmedMessageId(appliedMessages);
         hasNextMessages = refreshedCachedNearWindow.hasEnoughCache && refreshedCachedNearWindow.messages.length ? refreshedCachedNearWindow.hasNextMessages || !!((_channel$lastMessage5 = channel.lastMessage) !== null && _channel$lastMessage5 !== void 0 && _channel$lastMessage5.id) && !!refreshedLastConfirmedMessageId && compareMessageIds(channel.lastMessage.id, refreshedLastConfirmedMessageId) > 0 : !!((_channel$lastMessage6 = channel.lastMessage) !== null && _channel$lastMessage6 !== void 0 && _channel$lastMessage6.id) && !!refreshedLastConfirmedMessageId && compareMessageIds(channel.lastMessage.id, refreshedLastConfirmedMessageId) > 0;
-        _context25.n = 18;
+        _context27.n = 18;
         return effects.put(setMessagesHasPrevAC(hasPrevMessages));
       case 18:
-        _context25.n = 19;
+        _context27.n = 19;
         return effects.put(setMessagesHasNextAC(hasNextMessages));
       case 19:
-        _context25.n = 20;
+        _context27.n = 20;
         return effects.put(setUnreadMessageIdAC(channel.lastDisplayedMessageId));
       case 20:
-        _context25.n = 21;
+        _context27.n = 21;
         return effects.call(loadOGMetadataForLinkMessages, appliedMessages, true, false, false);
       case 21:
         if (!(cacheWasShown && sameConfirmedWindow(lastAppliedWindow, appliedMessages))) {
-          _context25.n = 23;
+          _context27.n = 23;
           break;
         }
         changedMessages = getChangedActiveMessages(lastAppliedWindow, appliedMessages);
         if (!(changedMessages.length > 0)) {
-          _context25.n = 22;
+          _context27.n = 22;
           break;
         }
-        _context25.n = 22;
+        _context27.n = 22;
         return effects.put(patchMessagesAC(changedMessages));
       case 22:
-        _context25.n = 28;
+        _context27.n = 28;
         break;
       case 23:
-        _context25.n = 24;
+        _context27.n = 24;
         return effects.put(setMessagesAC(appliedMessages, channel.id));
       case 24:
-        _context25.n = 25;
+        _context27.n = 25;
         return effects.put(scrollToNewMessageAC(false));
       case 25:
-        _context25.n = 26;
+        _context27.n = 26;
         return effects.put(setUnreadScrollToAC(true));
       case 26:
-        _filteredPendingMessages = getFilteredPendingMessages(channel, appliedMessages, {
+        _filteredPendingMessages2 = getFilteredPendingMessages(channel, appliedMessages, {
           hasNext: hasNextMessages
         });
-        _context25.n = 27;
-        return effects.put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+        _context27.n = 27;
+        return effects.put(addMessagesAC(_filteredPendingMessages2, MESSAGE_LOAD_DIRECTION.NEXT));
       case 27:
-        _context25.n = 28;
-        return effects.call(loadOGMetadataForLinkMessages, _filteredPendingMessages, true, false, false);
+        _context27.n = 28;
+        return effects.call(loadOGMetadataForLinkMessages, _filteredPendingMessages2, true, false, false);
       case 28:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!waitToSendPendingMessages) {
-          _context25.n = 30;
+          _context27.n = 30;
           break;
         }
-        _context25.n = 29;
+        _context27.n = 29;
         return effects.put(setWaitToSendPendingMessagesAC(false));
       case 29:
-        _context25.n = 30;
+        _context27.n = 30;
         return effects.spawn(sendPendingMessages, connectionState);
       case 30:
-        _context25.n = 32;
+        _context27.n = 32;
         break;
       case 31:
-        _context25.p = 31;
-        _t18 = _context25.v;
-        log.error('error in loadNearUnread', _t18);
+        _context27.p = 31;
+        _t24 = _context27.v;
+        log.error('error in loadNearUnread', _t24);
       case 32:
-        _context25.p = 32;
-        _context25.n = 33;
+        _context27.p = 32;
+        _context27.n = 33;
         return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADED);
       case 33:
-        return _context25.f(32);
+        return _context27.f(32);
       case 34:
-        return _context25.a(2);
+        return _context27.a(2);
     }
-  }, _marked19$1, null, [[0, 31, 32, 34]]);
+  }, _marked21$1, null, [[0, 31, 32, 34]]);
 }
 function loadDefaultMessages(action) {
-  var channel, connectionState, _channel$lastMessage7, _channel$lastMessage8, _channel$lastMessage9, _result$messages, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, messages, _filteredPendingMessages2, result, updatedMessages, appliedMessages, messageIdForLoad, firstConfirmedMessageId, lastConfirmedMessageId, changedMessages, _iterator3, _step3, message, filteredPendingMessages, waitToSendPendingMessages, _t19, _t20, _t21, _t22;
-  return _regenerator().w(function (_context26) {
-    while (1) switch (_context26.p = _context26.n) {
+  var channel, connectionState, _channel$lastMessage7, _channel$lastMessage8, _channel$lastMessage9, _result$messages, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, messages, _filteredPendingMessages3, result, updatedMessages, appliedMessages, messageIdForLoad, firstConfirmedMessageId, lastConfirmedMessageId, changedMessages, _iterator3, _step3, message, filteredPendingMessages, waitToSendPendingMessages, _t25, _t26, _t27, _t28;
+  return _regenerator().w(function (_context28) {
+    while (1) switch (_context28.p = _context28.n) {
       case 0:
-        _context26.p = 0;
+        _context28.p = 0;
         channel = action.payload.channel;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
-          _context26.n = 32;
+          _context28.n = 32;
           break;
         }
         SceytChatClient = getClient();
@@ -23949,45 +24278,45 @@ function loadDefaultMessages(action) {
         messageQueryBuilder.limit(MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context26.n = 2;
+          _context28.n = 2;
           break;
         }
-        _context26.n = 1;
+        _context28.n = 1;
         return effects.call(messageQueryBuilder.build);
       case 1:
-        _t19 = _context26.v;
-        _context26.n = 3;
+        _t25 = _context28.v;
+        _context28.n = 3;
         break;
       case 2:
-        _t19 = null;
+        _t25 = null;
       case 3:
-        messageQuery = _t19;
+        messageQuery = _t25;
         query.messageQuery = messageQuery;
         cachedMessages = getLatestMessagesFromMap(channel.id, MESSAGES_MAX_PAGE_COUNT);
         if (!(cachedMessages && cachedMessages.length)) {
-          _context26.n = 8;
+          _context28.n = 8;
           break;
         }
         messages = cachedMessages;
-        _context26.n = 4;
+        _context28.n = 4;
         return effects.call(loadOGMetadataForLinkMessages, messages, true, false, false);
       case 4:
-        _context26.n = 5;
+        _context28.n = 5;
         return effects.put(setMessagesAC(messages, channel.id));
       case 5:
-        _filteredPendingMessages2 = getFilteredPendingMessages(channel, messages, {
+        _filteredPendingMessages3 = getFilteredPendingMessages(channel, messages, {
           isLatestWindow: true
         });
-        _context26.n = 6;
-        return effects.put(addMessagesAC(_filteredPendingMessages2, MESSAGE_LOAD_DIRECTION.NEXT));
+        _context28.n = 6;
+        return effects.put(addMessagesAC(_filteredPendingMessages3, MESSAGE_LOAD_DIRECTION.NEXT));
       case 6:
-        _context26.n = 7;
-        return effects.call(loadOGMetadataForLinkMessages, _filteredPendingMessages2, true, false, false);
+        _context28.n = 7;
+        return effects.call(loadOGMetadataForLinkMessages, _filteredPendingMessages3, true, false, false);
       case 7:
-        _context26.n = 9;
+        _context28.n = 9;
         break;
       case 8:
-        _context26.n = 9;
+        _context28.n = 9;
         return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADING);
       case 9:
         result = {
@@ -23995,46 +24324,46 @@ function loadDefaultMessages(action) {
           hasNext: false
         };
         if (!(compareMessageIds(channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage7 = channel.lastMessage) === null || _channel$lastMessage7 === void 0 ? void 0 : _channel$lastMessage7.id) > 0)) {
-          _context26.n = 13;
+          _context28.n = 13;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context26.n = 11;
+          _context28.n = 11;
           break;
         }
-        _context26.n = 10;
+        _context28.n = 10;
         return effects.call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
       case 10:
-        _t20 = _context26.v;
-        _context26.n = 12;
+        _t26 = _context28.v;
+        _context28.n = 12;
         break;
       case 11:
-        _t20 = {
+        _t26 = {
           messages: [],
           hasNext: false
         };
       case 12:
-        result = _t20;
-        _context26.n = 17;
+        result = _t26;
+        _context28.n = 17;
         break;
       case 13:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context26.n = 15;
+          _context28.n = 15;
           break;
         }
-        _context26.n = 14;
+        _context28.n = 14;
         return effects.call(messageQuery.loadPrevious);
       case 14:
-        _t21 = _context26.v;
-        _context26.n = 16;
+        _t27 = _context28.v;
+        _context28.n = 16;
         break;
       case 15:
-        _t21 = {
+        _t27 = {
           messages: [],
           hasNext: false
         };
       case 16:
-        result = _t21;
+        result = _t27;
       case 17:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
@@ -24047,146 +24376,146 @@ function loadDefaultMessages(action) {
         appliedMessages = updatedMessages;
         messageIdForLoad = compareMessageIds(channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage8 = channel.lastMessage) === null || _channel$lastMessage8 === void 0 ? void 0 : _channel$lastMessage8.id) > 0 ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage9 = channel.lastMessage) === null || _channel$lastMessage9 === void 0 ? void 0 : _channel$lastMessage9.id) || '0';
         if (!updatedMessages.length) {
-          _context26.n = 27;
+          _context28.n = 27;
           break;
         }
         firstConfirmedMessageId = getFirstConfirmedMessageId(updatedMessages);
         lastConfirmedMessageId = getLastConfirmedMessageId(updatedMessages);
         setMessagesToMap(channel.id, updatedMessages, firstConfirmedMessageId || '0', messageIdForLoad);
         if (!(firstConfirmedMessageId && lastConfirmedMessageId)) {
-          _context26.n = 18;
+          _context28.n = 18;
           break;
         }
         setActiveSegment(channel.id, firstConfirmedMessageId, lastConfirmedMessageId);
-        _context26.n = 18;
+        _context28.n = 18;
         return effects.spawn(prefetchMessages, channel.id, firstConfirmedMessageId, MESSAGE_LOAD_DIRECTION.PREV, 2);
       case 18:
         appliedMessages = getCachedMessagesForResult(channel.id, updatedMessages);
-        _context26.n = 19;
+        _context28.n = 19;
         return effects.call(loadOGMetadataForLinkMessages, appliedMessages, true, false, false);
       case 19:
-        _context26.n = 20;
+        _context28.n = 20;
         return effects.put(setMessagesHasPrevAC(true));
       case 20:
-        _context26.n = 21;
+        _context28.n = 21;
         return effects.put(setMessagesHasNextAC(false));
       case 21:
         if (!(cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length && sameConfirmedWindow(cachedMessages, appliedMessages))) {
-          _context26.n = 25;
+          _context28.n = 25;
           break;
         }
         changedMessages = getChangedActiveMessages(cachedMessages, appliedMessages);
         _iterator3 = _createForOfIteratorHelperLoose(changedMessages);
       case 22:
         if ((_step3 = _iterator3()).done) {
-          _context26.n = 24;
+          _context28.n = 24;
           break;
         }
         message = _step3.value;
-        _context26.n = 23;
+        _context28.n = 23;
         return effects.put(updateMessageAC(message.id, message));
       case 23:
-        _context26.n = 22;
+        _context28.n = 22;
         break;
       case 24:
-        _context26.n = 26;
+        _context28.n = 26;
         break;
       case 25:
-        _context26.n = 26;
+        _context28.n = 26;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(appliedMessages))));
       case 26:
-        _context26.n = 28;
+        _context28.n = 28;
         break;
       case 27:
         if (!(!(cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length) && !((_result$messages = result.messages) !== null && _result$messages !== void 0 && _result$messages.length))) {
-          _context26.n = 28;
+          _context28.n = 28;
           break;
         }
-        _context26.n = 28;
+        _context28.n = 28;
         return effects.put(setMessagesAC([]));
       case 28:
         filteredPendingMessages = getFilteredPendingMessages(channel, appliedMessages, {
           isLatestWindow: true
         });
-        _context26.n = 29;
+        _context28.n = 29;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 29:
-        _context26.n = 30;
+        _context28.n = 30;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
       case 30:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context26.n = 32;
+          _context28.n = 32;
           break;
         }
-        _context26.n = 31;
+        _context28.n = 31;
         return effects.put(setWaitToSendPendingMessagesAC(false));
       case 31:
-        _context26.n = 32;
+        _context28.n = 32;
         return effects.spawn(sendPendingMessages, connectionState);
       case 32:
-        _context26.n = 34;
+        _context28.n = 34;
         break;
       case 33:
-        _context26.p = 33;
-        _t22 = _context26.v;
-        log.error('error in loadDefaultMessages', _t22);
+        _context28.p = 33;
+        _t28 = _context28.v;
+        log.error('error in loadDefaultMessages', _t28);
       case 34:
-        _context26.p = 34;
-        _context26.n = 35;
+        _context28.p = 34;
+        _context28.n = 35;
         return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADED);
       case 35:
-        return _context26.f(34);
+        return _context28.f(34);
       case 36:
-        return _context26.a(2);
+        return _context28.a(2);
     }
-  }, _marked20$1, null, [[0, 33, 34, 36]]);
+  }, _marked22$1, null, [[0, 33, 34, 36]]);
 }
 function getMessagesQuery(action) {
-  var _action$payload5, channel, limit, networkChanged, _action$payload5$appl, applyVisibleWindow, channelNewMessageCount, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, result, appliedMessages, firstConfirmedMessageId, lastConfirmedMessageId, _channel$lastMessage0, cachedMessages, cacheIsCurrent, _firstConfirmedMessageId, _lastConfirmedMessageId, activeMessages, activeConfirmedMessages, sameVisibleWindow, filteredPendingMessages, activeById, changedMessages, waitToSendPendingMessages, _t23, _t24, _t25, _t26;
-  return _regenerator().w(function (_context27) {
-    while (1) switch (_context27.p = _context27.n) {
+  var _action$payload5, channel, limit, networkChanged, _action$payload5$appl, applyVisibleWindow, channelNewMessageCount, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, result, appliedMessages, firstConfirmedMessageId, lastConfirmedMessageId, _channel$lastMessage0, cachedMessages, cacheIsCurrent, _firstConfirmedMessageId, _lastConfirmedMessageId, activeMessages, activeConfirmedMessages, sameVisibleWindow, filteredPendingMessages, activeById, changedMessages, waitToSendPendingMessages, _t29, _t30, _t31, _t32;
+  return _regenerator().w(function (_context29) {
+    while (1) switch (_context29.p = _context29.n) {
       case 0:
-        _context27.p = 0;
-        _context27.n = 1;
+        _context29.p = 0;
+        _context29.n = 1;
         return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADING);
       case 1:
         _action$payload5 = action.payload, channel = _action$payload5.channel, limit = _action$payload5.limit, networkChanged = _action$payload5.networkChanged, _action$payload5$appl = _action$payload5.applyVisibleWindow, applyVisibleWindow = _action$payload5$appl === void 0 ? true : _action$payload5$appl;
         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))) {
-          _context27.n = 33;
+          _context29.n = 33;
           break;
         }
         SceytChatClient = getClient();
         if (!networkChanged) {
-          _context27.n = 2;
+          _context29.n = 2;
           break;
         }
         if (!channel.newMessageCount) {
-          _context27.n = 2;
+          _context29.n = 2;
           break;
         }
-        _context27.n = 2;
+        _context29.n = 2;
         return effects.put(setUnreadMessageIdAC(channel.lastDisplayedMessageId));
       case 2:
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channel.id);
         messageQueryBuilder.limit(limit || MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context27.n = 4;
+          _context29.n = 4;
           break;
         }
-        _context27.n = 3;
+        _context29.n = 3;
         return effects.call(messageQueryBuilder.build);
       case 3:
-        _t23 = _context27.v;
-        _context27.n = 5;
+        _t29 = _context29.v;
+        _context29.n = 5;
         break;
       case 4:
-        _t23 = null;
+        _t29 = null;
       case 5:
-        messageQuery = _t23;
+        messageQuery = _t29;
         query.messageQuery = messageQuery;
         result = {
           messages: [],
@@ -24194,56 +24523,56 @@ function getMessagesQuery(action) {
         };
         appliedMessages = [];
         if (!(!networkChanged && channelNewMessageCount && channelNewMessageCount > 0)) {
-          _context27.n = 17;
+          _context29.n = 17;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context27.n = 9;
+          _context29.n = 9;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context27.n = 7;
+          _context29.n = 7;
           break;
         }
-        _context27.n = 6;
+        _context29.n = 6;
         return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
       case 6:
-        _t24 = _context27.v;
-        _context27.n = 8;
+        _t30 = _context29.v;
+        _context29.n = 8;
         break;
       case 7:
-        _t24 = {
+        _t30 = {
           messages: [],
           hasNext: false
         };
       case 8:
-        result = _t24;
-        _context27.n = 13;
+        result = _t30;
+        _context29.n = 13;
         break;
       case 9:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context27.n = 11;
+          _context29.n = 11;
           break;
         }
-        _context27.n = 10;
+        _context29.n = 10;
         return effects.call(messageQuery.loadPrevious);
       case 10:
-        _t25 = _context27.v;
-        _context27.n = 12;
+        _t31 = _context29.v;
+        _context29.n = 12;
         break;
       case 11:
-        _t25 = {
+        _t31 = {
           messages: [],
           hasNext: false
         };
       case 12:
-        result = _t25;
+        result = _t31;
       case 13:
-        _context27.n = 14;
+        _context29.n = 14;
         return effects.call(loadOGMetadataForLinkMessages, result.messages, true, false, false);
       case 14:
-        _context27.n = 15;
+        _context29.n = 15;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages)), channel.id));
       case 15:
         firstConfirmedMessageId = getFirstConfirmedMessageId(result.messages);
@@ -24253,31 +24582,31 @@ function getMessagesQuery(action) {
           setActiveSegment(channel.id, firstConfirmedMessageId, lastConfirmedMessageId);
         }
         appliedMessages = getCachedMessagesForResult(channel.id, result.messages);
-        _context27.n = 16;
+        _context29.n = 16;
         return effects.put(setMessagesHasPrevAC(true));
       case 16:
-        _context27.n = 22;
+        _context29.n = 22;
         break;
       case 17:
         cachedMessages = getLatestMessagesFromMap(channel.id, MESSAGES_MAX_PAGE_COUNT);
         cacheIsCurrent = cachedMessages.length > 0 && getLastConfirmedMessageId(cachedMessages) === ((_channel$lastMessage0 = channel.lastMessage) === null || _channel$lastMessage0 === void 0 ? void 0 : _channel$lastMessage0.id);
         if (!cacheIsCurrent) {
-          _context27.n = 18;
+          _context29.n = 18;
           break;
         }
         result.messages = cachedMessages;
-        _context27.n = 21;
+        _context29.n = 21;
         break;
       case 18:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context27.n = 20;
+          _context29.n = 20;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH;
-        _context27.n = 19;
+        _context29.n = 19;
         return effects.call(messageQuery.loadPrevious);
       case 19:
-        result = _context27.v;
+        result = _context29.v;
         if (result.messages.length) {
           _firstConfirmedMessageId = getFirstConfirmedMessageId(result.messages);
           _lastConfirmedMessageId = getLastConfirmedMessageId(result.messages);
@@ -24286,19 +24615,19 @@ function getMessagesQuery(action) {
             setActiveSegment(channel.id, _firstConfirmedMessageId, _lastConfirmedMessageId);
           }
         }
-        _context27.n = 21;
+        _context29.n = 21;
         break;
       case 20:
         result.messages = cachedMessages;
       case 21:
         appliedMessages = connectionState === CONNECTION_STATUS.CONNECTED ? getCachedMessagesForResult(channel.id, result.messages) : result.messages;
-        _context27.n = 22;
+        _context29.n = 22;
         return effects.put(setMessagesHasPrevAC(true));
       case 22:
         if (!appliedMessages.length) {
           appliedMessages = result.messages;
         }
-        _context27.n = 23;
+        _context29.n = 23;
         return effects.call(loadOGMetadataForLinkMessages, appliedMessages, true, false, false);
       case 23:
         activeMessages = store.getState().MessageReducer.activeChannelMessages || [];
@@ -24307,29 +24636,29 @@ function getMessagesQuery(action) {
         });
         sameVisibleWindow = sameConfirmedWindow(activeConfirmedMessages, appliedMessages);
         if (!applyVisibleWindow) {
-          _context27.n = 28;
+          _context29.n = 28;
           break;
         }
-        _context27.n = 24;
+        _context29.n = 24;
         return effects.put(setMessagesAC(appliedMessages, channel.id));
       case 24:
-        _context27.n = 25;
+        _context29.n = 25;
         return effects.put(setMessagesHasNextAC(false));
       case 25:
         filteredPendingMessages = getFilteredPendingMessages(channel, appliedMessages, {
           hasNext: false
         });
-        _context27.n = 26;
+        _context29.n = 26;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 26:
-        _context27.n = 27;
+        _context29.n = 27;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
       case 27:
-        _context27.n = 30;
+        _context29.n = 30;
         break;
       case 28:
         if (!sameVisibleWindow) {
-          _context27.n = 30;
+          _context29.n = 30;
           break;
         }
         activeById = new Map(activeConfirmedMessages.map(function (currentMessage) {
@@ -24346,82 +24675,82 @@ function getMessagesQuery(action) {
           return JSON.stringify(existingMessage) !== JSON.stringify(loadedMessage);
         });
         if (!(changedMessages.length > 0)) {
-          _context27.n = 29;
+          _context29.n = 29;
           break;
         }
-        _context27.n = 29;
+        _context29.n = 29;
         return effects.put(patchMessagesAC(changedMessages));
       case 29:
-        _context27.n = 30;
+        _context29.n = 30;
         return effects.put(setMessagesHasNextAC(false));
       case 30:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context27.n = 32;
+          _context29.n = 32;
           break;
         }
-        _context27.n = 31;
+        _context29.n = 31;
         return effects.put(setWaitToSendPendingMessagesAC(false));
       case 31:
-        _context27.n = 32;
+        _context29.n = 32;
         return effects.spawn(sendPendingMessages, connectionState);
       case 32:
-        _context27.n = 34;
+        _context29.n = 34;
         break;
       case 33:
         if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
-          _context27.n = 34;
+          _context29.n = 34;
           break;
         }
-        _context27.n = 34;
+        _context29.n = 34;
         return effects.put(setMessagesAC([]));
       case 34:
-        _context27.n = 36;
+        _context29.n = 36;
         break;
       case 35:
-        _context27.p = 35;
-        _t26 = _context27.v;
-        log.error('error in message query', _t26);
+        _context29.p = 35;
+        _t32 = _context29.v;
+        log.error('error in message query', _t32);
       case 36:
-        _context27.p = 36;
-        _context27.n = 37;
+        _context29.p = 36;
+        _context29.n = 37;
         return effects.call(setMessageListLoading, 'both', LOADING_STATE.LOADED);
       case 37:
-        return _context27.f(36);
+        return _context29.f(36);
       case 38:
-        return _context27.a(2);
+        return _context29.a(2);
     }
-  }, _marked21$1, null, [[0, 35, 36, 38]]);
+  }, _marked23$1, null, [[0, 35, 36, 38]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t27;
-  return _regenerator().w(function (_context28) {
-    while (1) switch (_context28.p = _context28.n) {
+  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t33;
+  return _regenerator().w(function (_context30) {
+    while (1) switch (_context30.p = _context30.n) {
       case 0:
-        _context28.p = 0;
+        _context30.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId;
-        _context28.n = 1;
+        _context30.n = 1;
         return effects.call(getChannelFromAllChannels, channelId);
       case 1:
-        channel = _context28.v;
+        channel = _context30.v;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(!channel || connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context28.n = 2;
+          _context30.n = 2;
           break;
         }
-        return _context28.a(2);
+        return _context30.a(2);
       case 2:
-        _context28.n = 3;
+        _context30.n = 3;
         return effects.call(channel.getMessagesById, [messageId]);
       case 3:
-        messages = _context28.v;
+        messages = _context30.v;
         fetchedMessage = messages && messages[0] ? JSON.parse(JSON.stringify(messages[0])) : null;
         if (!fetchedMessage) {
-          _context28.n = 5;
+          _context30.n = 5;
           break;
         }
-        _context28.n = 4;
+        _context30.n = 4;
         return effects.put(updateMessageAC(messageId, fetchedMessage));
       case 4:
         updateMessageOnMap(channel.id, {
@@ -24429,39 +24758,39 @@ function getMessageQuery(action) {
           params: fetchedMessage
         });
         if (!(channel.lastMessage && channel.lastMessage.id === messageId)) {
-          _context28.n = 5;
+          _context30.n = 5;
           break;
         }
         updateChannelLastMessageOnAllChannels(channel.id, fetchedMessage);
-        _context28.n = 5;
+        _context30.n = 5;
         return effects.put(updateChannelLastMessageAC(fetchedMessage, channel));
       case 5:
-        _context28.n = 7;
+        _context30.n = 7;
         break;
       case 6:
-        _context28.p = 6;
-        _t27 = _context28.v;
-        log.error('error in message query', _t27);
+        _context30.p = 6;
+        _t33 = _context30.v;
+        log.error('error in message query', _t33);
       case 7:
-        return _context28.a(2);
+        return _context30.a(2);
     }
-  }, _marked22$1, null, [[0, 6]]);
+  }, _marked24$1, null, [[0, 6]]);
 }
 function prefetchMessages(channelId, fromMessageId, direction, pages) {
-  var key, SceytChatClient, request, currentFromId, i, cached, mqb, mq, result, _cached, _mqb, _mq, _result, _t28;
-  return _regenerator().w(function (_context29) {
-    while (1) switch (_context29.p = _context29.n) {
+  var key, SceytChatClient, request, currentFromId, i, cached, mqb, mq, result, _cached, _mqb, _mq, _result, _t34;
+  return _regenerator().w(function (_context31) {
+    while (1) switch (_context31.p = _context31.n) {
       case 0:
         key = channelId + ":" + direction;
         if (!prefetchInFlight.has(key)) {
-          _context29.n = 1;
+          _context31.n = 1;
           break;
         }
         queuePrefetchRequest(key, direction, fromMessageId, pages);
-        return _context29.a(2);
+        return _context31.a(2);
       case 1:
         prefetchInFlight.add(key);
-        _context29.p = 2;
+        _context31.p = 2;
         SceytChatClient = getClient();
         request = {
           fromMessageId: fromMessageId,
@@ -24469,170 +24798,170 @@ function prefetchMessages(channelId, fromMessageId, direction, pages) {
         };
       case 3:
         if (!request) {
-          _context29.n = 19;
+          _context31.n = 19;
           break;
         }
         currentFromId = request.fromMessageId;
         i = 0;
       case 4:
         if (!(i < request.pages)) {
-          _context29.n = 18;
+          _context31.n = 18;
           break;
         }
         if (!(direction === MESSAGE_LOAD_DIRECTION.PREV)) {
-          _context29.n = 11;
+          _context31.n = 11;
           break;
         }
         if (!hasPrevContiguousInMap(channelId, {
           id: currentFromId
         })) {
-          _context29.n = 5;
+          _context31.n = 5;
           break;
         }
         cached = getContiguousPrevMessages(channelId, {
           id: currentFromId
         }, LOAD_MAX_MESSAGE_COUNT_PREFETCH);
         if (!(cached.length > 0)) {
-          _context29.n = 5;
+          _context31.n = 5;
           break;
         }
         currentFromId = cached[0].id;
-        return _context29.a(3, 17);
+        return _context31.a(3, 17);
       case 5:
         mqb = new SceytChatClient.MessageListQueryBuilder(channelId);
         mqb.limit(LOAD_MAX_MESSAGE_COUNT_PREFETCH);
         mqb.reverse(true);
-        _context29.n = 6;
+        _context31.n = 6;
         return effects.call(mqb.build);
       case 6:
-        mq = _context29.v;
-        _context29.n = 7;
+        mq = _context31.v;
+        _context31.n = 7;
         return effects.call(mq.loadPreviousMessageId, currentFromId);
       case 7:
-        result = _context29.v;
+        result = _context31.v;
         if (result.messages.length) {
-          _context29.n = 8;
+          _context31.n = 8;
           break;
         }
-        return _context29.a(3, 18);
+        return _context31.a(3, 18);
       case 8:
         setMessagesToMap(channelId, result.messages, result.messages[0].id, result.messages[result.messages.length - 1].id);
         extendActiveSegment(channelId, result.messages[0].id, result.messages[result.messages.length - 1].id, MESSAGE_LOAD_DIRECTION.PREV);
-        _context29.n = 9;
+        _context31.n = 9;
         return effects.call(patchActiveMessagesFromCacheRange, channelId, result.messages[0].id, result.messages[result.messages.length - 1].id);
       case 9:
         currentFromId = result.messages[0].id;
         if (result.hasNext) {
-          _context29.n = 10;
+          _context31.n = 10;
           break;
         }
-        return _context29.a(3, 18);
+        return _context31.a(3, 18);
       case 10:
-        _context29.n = 17;
+        _context31.n = 17;
         break;
       case 11:
         if (!hasNextContiguousInMap(channelId, {
           id: currentFromId
         })) {
-          _context29.n = 12;
+          _context31.n = 12;
           break;
         }
         _cached = getContiguousNextMessages(channelId, {
           id: currentFromId
         }, LOAD_MAX_MESSAGE_COUNT_PREFETCH);
         if (!(_cached.length > 0)) {
-          _context29.n = 12;
+          _context31.n = 12;
           break;
         }
         currentFromId = _cached[_cached.length - 1].id;
-        return _context29.a(3, 17);
+        return _context31.a(3, 17);
       case 12:
         _mqb = new SceytChatClient.MessageListQueryBuilder(channelId);
         _mqb.limit(LOAD_MAX_MESSAGE_COUNT_PREFETCH);
         _mqb.reverse(false);
-        _context29.n = 13;
+        _context31.n = 13;
         return effects.call(_mqb.build);
       case 13:
-        _mq = _context29.v;
-        _context29.n = 14;
+        _mq = _context31.v;
+        _context31.n = 14;
         return effects.call(_mq.loadNextMessageId, currentFromId);
       case 14:
-        _result = _context29.v;
+        _result = _context31.v;
         if (_result.messages.length) {
-          _context29.n = 15;
+          _context31.n = 15;
           break;
         }
-        return _context29.a(3, 18);
+        return _context31.a(3, 18);
       case 15:
         setMessagesToMap(channelId, _result.messages, _result.messages[0].id, _result.messages[_result.messages.length - 1].id);
         extendActiveSegment(channelId, _result.messages[0].id, _result.messages[_result.messages.length - 1].id, MESSAGE_LOAD_DIRECTION.NEXT);
-        _context29.n = 16;
+        _context31.n = 16;
         return effects.call(patchActiveMessagesFromCacheRange, channelId, _result.messages[0].id, _result.messages[_result.messages.length - 1].id);
       case 16:
         currentFromId = _result.messages[_result.messages.length - 1].id;
         if (_result.hasNext) {
-          _context29.n = 17;
+          _context31.n = 17;
           break;
         }
-        return _context29.a(3, 18);
+        return _context31.a(3, 18);
       case 17:
         i++;
-        _context29.n = 4;
+        _context31.n = 4;
         break;
       case 18:
         request = queuedPrefetchRequests.get(key) || null;
         if (request) {
           queuedPrefetchRequests["delete"](key);
         }
-        _context29.n = 3;
+        _context31.n = 3;
         break;
       case 19:
-        _context29.n = 21;
+        _context31.n = 21;
         break;
       case 20:
-        _context29.p = 20;
-        _t28 = _context29.v;
-        log.error('[PREFETCH] prefetchMessages error:', _t28);
+        _context31.p = 20;
+        _t34 = _context31.v;
+        log.error('[PREFETCH] prefetchMessages error:', _t34);
       case 21:
-        _context29.p = 21;
+        _context31.p = 21;
         queuedPrefetchRequests["delete"](key);
         prefetchInFlight["delete"](key);
         notifyPrefetchCompletion(key);
-        return _context29.f(21);
+        return _context31.f(21);
       case 22:
-        return _context29.a(2);
+        return _context31.a(2);
     }
-  }, _marked23$1, null, [[2, 20, 21, 22]]);
+  }, _marked25$1, null, [[2, 20, 21, 22]]);
 }
 function loadMoreMessages(action) {
-  var acquiredLock, loadingScope, payload, limit, direction, channelId, messageId, hasNext, requestId, inFlightKey, SceytChatClient, messageQueryBuilder, messageQuery, connectionState, result, reachedLatestConfirmedEdge, nextHasPrevState, nextHasNextState, currentConfirmedMessages, prefetchKey, mapCached, aheadCached, pagesToFetch, fromId, _result$messages$, _result$messages2, nextWindowConfirmedCount, _mapCached, lastConfirmedMsg, lastConfirmedId, _aheadCached, confirmedAheadCount, hasCachedNext, canLoadServerNext, _pagesToFetch, _reverse$find, lastAheadConfirmedId, _fromId, _result$messages$2, _result$messages3, shouldApplyVisibleResult, filteredPendingMessages, _t29;
-  return _regenerator().w(function (_context30) {
-    while (1) switch (_context30.p = _context30.n) {
+  var acquiredLock, loadingScope, payload, limit, direction, channelId, messageId, hasNext, requestId, inFlightKey, SceytChatClient, messageQueryBuilder, messageQuery, connectionState, result, reachedLatestConfirmedEdge, nextHasPrevState, nextHasNextState, currentConfirmedMessages, prefetchKey, mapCached, aheadCached, pagesToFetch, fromId, _result$messages$, _result$messages2, nextWindowConfirmedCount, _mapCached, lastConfirmedMsg, lastConfirmedId, _aheadCached, confirmedAheadCount, hasCachedNext, canLoadServerNext, _pagesToFetch, _reverse$find, lastAheadConfirmedId, _fromId, _result$messages$2, _result$messages3, shouldApplyVisibleResult, filteredPendingMessages, _t35;
+  return _regenerator().w(function (_context32) {
+    while (1) switch (_context32.p = _context32.n) {
       case 0:
         acquiredLock = false;
         loadingScope = 'both';
-        _context30.p = 1;
+        _context32.p = 1;
         payload = action.payload;
         limit = payload.limit, direction = payload.direction, channelId = payload.channelId, messageId = payload.messageId, hasNext = payload.hasNext, requestId = payload.requestId;
         inFlightKey = getLoadMoreInFlightKey(channelId, direction);
         if (!loadMoreMessagesInFlight.has(inFlightKey)) {
-          _context30.n = 2;
+          _context32.n = 2;
           break;
         }
-        return _context30.a(2);
+        return _context32.a(2);
       case 2:
         loadMoreMessagesInFlight.add(inFlightKey);
         acquiredLock = true;
         SceytChatClient = getClient();
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channelId);
         messageQueryBuilder.reverse(true);
-        _context30.n = 3;
+        _context32.n = 3;
         return effects.call(messageQueryBuilder.build);
       case 3:
-        messageQuery = _context30.v;
+        messageQuery = _context32.v;
         messageQuery.limit = 20;
         loadingScope = direction === MESSAGE_LOAD_DIRECTION.PREV ? 'previous' : 'next';
-        _context30.n = 4;
+        _context32.n = 4;
         return effects.call(setMessageListLoading, loadingScope, LOADING_STATE.LOADING);
       case 4:
         connectionState = store.getState().UserReducer.connectionStatus;
@@ -24646,17 +24975,17 @@ function loadMoreMessages(action) {
         });
         prefetchKey = channelId + ":" + direction;
         if (!(direction === MESSAGE_LOAD_DIRECTION.PREV)) {
-          _context30.n = 14;
+          _context32.n = 14;
           break;
         }
         mapCached = getContiguousPrevMessages(channelId, {
           id: messageId
         }, limit || 30);
         if (!(!mapCached.length && hasNext && prefetchInFlight.has(prefetchKey))) {
-          _context30.n = 6;
+          _context32.n = 6;
           break;
         }
-        _context30.n = 5;
+        _context32.n = 5;
         return effects.call(waitForPrefetchCompletion, prefetchKey);
       case 5:
         mapCached = getContiguousPrevMessages(channelId, {
@@ -24664,7 +24993,7 @@ function loadMoreMessages(action) {
         }, limit || 30);
       case 6:
         if (!(mapCached.length > 0)) {
-          _context30.n = 8;
+          _context32.n = 8;
           break;
         }
         result.messages = mapCached;
@@ -24672,39 +25001,39 @@ function loadMoreMessages(action) {
         nextHasPrevState = aheadCached.length > 0 || hasNext;
         pagesToFetch = 2 - Math.floor(aheadCached.length / LOAD_MAX_MESSAGE_COUNT_PREFETCH);
         if (!(pagesToFetch > 0 && hasNext)) {
-          _context30.n = 7;
+          _context32.n = 7;
           break;
         }
         fromId = aheadCached.length > 0 ? aheadCached[0].id : mapCached[0].id;
-        _context30.n = 7;
+        _context32.n = 7;
         return effects.spawn(prefetchMessages, channelId, fromId, MESSAGE_LOAD_DIRECTION.PREV, pagesToFetch);
       case 7:
-        _context30.n = 13;
+        _context32.n = 13;
         break;
       case 8:
         if (!hasNext) {
-          _context30.n = 13;
+          _context32.n = 13;
           break;
         }
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context30.n = 9;
+          _context32.n = 9;
           break;
         }
         loadMoreMessagesInFlight["delete"](getLoadMoreInFlightKey(action.payload.channelId, action.payload.direction));
         store.dispatch(setLoadingPrevMessagesStateAC(LOADING_STATE.LOADED));
-        return _context30.a(2);
+        return _context32.a(2);
       case 9:
-        _context30.n = 10;
+        _context32.n = 10;
         return effects.call(messageQuery.loadPreviousMessageId, messageId);
       case 10:
-        result = _context30.v;
+        result = _context32.v;
         if (!result.messages.length) {
-          _context30.n = 12;
+          _context32.n = 12;
           break;
         }
         setMessagesToMap(channelId, result.messages, (_result$messages$ = result.messages[0]) === null || _result$messages$ === void 0 ? void 0 : _result$messages$.id, (_result$messages2 = result.messages[result.messages.length - 1]) === null || _result$messages2 === void 0 ? void 0 : _result$messages2.id);
         extendActiveSegment(channelId, result.messages[0].id, result.messages[result.messages.length - 1].id, MESSAGE_LOAD_DIRECTION.PREV);
-        _context30.n = 11;
+        _context32.n = 11;
         return effects.spawn(prefetchMessages, channelId, result.messages[0].id, MESSAGE_LOAD_DIRECTION.PREV, 2);
       case 11:
         result.messages = getContiguousPrevMessages(channelId, {
@@ -24719,17 +25048,17 @@ function loadMoreMessages(action) {
         if (nextWindowConfirmedCount > MESSAGES_MAX_PAGE_COUNT) {
           nextHasNextState = true;
         }
-        _context30.n = 25;
+        _context32.n = 25;
         break;
       case 14:
         _mapCached = getContiguousNextMessages(channelId, {
           id: messageId
         }, limit || 30);
         if (!(!_mapCached.length && hasNext && prefetchInFlight.has(prefetchKey))) {
-          _context30.n = 16;
+          _context32.n = 16;
           break;
         }
-        _context30.n = 15;
+        _context32.n = 15;
         return effects.call(waitForPrefetchCompletion, prefetchKey);
       case 15:
         _mapCached = getContiguousNextMessages(channelId, {
@@ -24737,7 +25066,7 @@ function loadMoreMessages(action) {
         }, limit || 30);
       case 16:
         if (!(_mapCached.length > 0)) {
-          _context30.n = 18;
+          _context32.n = 18;
           break;
         }
         result.messages = _mapCached;
@@ -24755,7 +25084,7 @@ function loadMoreMessages(action) {
         nextHasNextState = hasCachedNext || canLoadServerNext;
         _pagesToFetch = 2 - Math.floor(confirmedAheadCount / LOAD_MAX_MESSAGE_COUNT_PREFETCH);
         if (!(_pagesToFetch > 0 && hasNext)) {
-          _context30.n = 17;
+          _context32.n = 17;
           break;
         }
         lastAheadConfirmedId = (_reverse$find = [].concat(_aheadCached).reverse().find(function (m) {
@@ -24763,39 +25092,39 @@ function loadMoreMessages(action) {
         })) === null || _reverse$find === void 0 ? void 0 : _reverse$find.id;
         _fromId = lastAheadConfirmedId || lastConfirmedId;
         if (!_fromId) {
-          _context30.n = 17;
+          _context32.n = 17;
           break;
         }
-        _context30.n = 17;
+        _context32.n = 17;
         return effects.spawn(prefetchMessages, channelId, _fromId, MESSAGE_LOAD_DIRECTION.NEXT, _pagesToFetch);
       case 17:
-        _context30.n = 24;
+        _context32.n = 24;
         break;
       case 18:
         if (!hasNext) {
-          _context30.n = 23;
+          _context32.n = 23;
           break;
         }
         messageQuery.reverse = false;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context30.n = 19;
+          _context32.n = 19;
           break;
         }
         loadMoreMessagesInFlight["delete"](getLoadMoreInFlightKey(action.payload.channelId, action.payload.direction));
         store.dispatch(setLoadingNextMessagesStateAC(LOADING_STATE.LOADED));
-        return _context30.a(2);
+        return _context32.a(2);
       case 19:
-        _context30.n = 20;
+        _context32.n = 20;
         return effects.call(messageQuery.loadNextMessageId, messageId);
       case 20:
-        result = _context30.v;
+        result = _context32.v;
         if (!result.messages.length) {
-          _context30.n = 22;
+          _context32.n = 22;
           break;
         }
         setMessagesToMap(channelId, result.messages, (_result$messages$2 = result.messages[0]) === null || _result$messages$2 === void 0 ? void 0 : _result$messages$2.id, (_result$messages3 = result.messages[result.messages.length - 1]) === null || _result$messages3 === void 0 ? void 0 : _result$messages3.id);
         extendActiveSegment(channelId, result.messages[0].id, result.messages[result.messages.length - 1].id, MESSAGE_LOAD_DIRECTION.NEXT);
-        _context30.n = 21;
+        _context32.n = 21;
         return effects.spawn(prefetchMessages, channelId, result.messages[result.messages.length - 1].id, MESSAGE_LOAD_DIRECTION.NEXT, 2);
       case 21:
         result.messages = getContiguousNextMessages(channelId, {
@@ -24804,7 +25133,7 @@ function loadMoreMessages(action) {
       case 22:
         reachedLatestConfirmedEdge = !result.hasNext;
         nextHasNextState = result.hasNext;
-        _context30.n = 24;
+        _context32.n = 24;
         break;
       case 23:
         reachedLatestConfirmedEdge = true;
@@ -24814,64 +25143,64 @@ function loadMoreMessages(action) {
       case 25:
         shouldApplyVisibleResult = isCurrentPaginationIntent(channelId, direction === MESSAGE_LOAD_DIRECTION.PREV ? 'prev' : 'next', requestId);
         if (!(shouldApplyVisibleResult && nextHasPrevState !== undefined)) {
-          _context30.n = 26;
+          _context32.n = 26;
           break;
         }
-        _context30.n = 26;
+        _context32.n = 26;
         return effects.put(setMessagesHasPrevAC(nextHasPrevState));
       case 26:
         if (!(shouldApplyVisibleResult && nextHasNextState !== undefined)) {
-          _context30.n = 27;
+          _context32.n = 27;
           break;
         }
-        _context30.n = 27;
+        _context32.n = 27;
         return effects.put(setMessagesHasNextAC(nextHasNextState));
       case 27:
         if (!(shouldApplyVisibleResult && result.messages && result.messages.length && result.messages.length > 0)) {
-          _context30.n = 30;
+          _context32.n = 30;
           break;
         }
-        _context30.n = 28;
+        _context32.n = 28;
         return effects.call(loadOGMetadataForLinkMessages, result.messages, true, false, false);
       case 28:
-        _context30.n = 29;
+        _context32.n = 29;
         return effects.put(addMessagesAC(JSON.parse(JSON.stringify(result.messages)), direction));
       case 29:
-        _context30.n = 31;
+        _context32.n = 31;
         break;
       case 30:
         if (!shouldApplyVisibleResult) {
-          _context30.n = 31;
+          _context32.n = 31;
           break;
         }
-        _context30.n = 31;
+        _context32.n = 31;
         return effects.put(addMessagesAC([], direction));
       case 31:
         if (!(shouldApplyVisibleResult && direction === MESSAGE_LOAD_DIRECTION.NEXT && reachedLatestConfirmedEdge)) {
-          _context30.n = 33;
+          _context32.n = 33;
           break;
         }
         filteredPendingMessages = getFilteredPendingMessages(channelId, result.messages, {
           hasNext: false
         });
         if (!filteredPendingMessages.length) {
-          _context30.n = 33;
+          _context32.n = 33;
           break;
         }
-        _context30.n = 32;
+        _context32.n = 32;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 32:
-        _context30.n = 33;
+        _context32.n = 33;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
       case 33:
-        _context30.n = 35;
+        _context32.n = 35;
         break;
       case 34:
-        _context30.p = 34;
-        _t29 = _context30.v;
-        log.error('[MESSAGE_LIST] loadMoreMessages ERROR:', _t29 === null || _t29 === void 0 ? void 0 : _t29.type);
+        _context32.p = 34;
+        _t35 = _context32.v;
+        log.error('[MESSAGE_LIST] loadMoreMessages ERROR:', _t35 === null || _t35 === void 0 ? void 0 : _t35.type);
       case 35:
-        _context30.p = 35;
+        _context32.p = 35;
         if (acquiredLock) {
           loadMoreMessagesInFlight["delete"](getLoadMoreInFlightKey(action.payload.channelId, action.payload.direction));
           if (loadingScope === 'previous') {
@@ -24880,39 +25209,39 @@ function loadMoreMessages(action) {
             store.dispatch(setLoadingNextMessagesStateAC(LOADING_STATE.LOADED));
           }
         }
-        return _context30.f(35);
+        return _context32.f(35);
       case 36:
-        return _context30.a(2);
+        return _context32.a(2);
     }
-  }, _marked24$1, null, [[1, 34, 35, 36]]);
+  }, _marked26$1, null, [[1, 34, 35, 36]]);
 }
 function addReaction(action) {
-  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t30;
-  return _regenerator().w(function (_context31) {
-    while (1) switch (_context31.p = _context31.n) {
+  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t36;
+  return _regenerator().w(function (_context33) {
+    while (1) switch (_context33.p = _context33.n) {
       case 0:
-        _context31.p = 0;
+        _context33.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId, key = payload.key, score = payload.score, reason = payload.reason, enforceUnique = payload.enforceUnique;
         user = getClient().user;
-        _context31.n = 1;
+        _context33.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context31.v;
+        channel = _context33.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context31.n = 2;
+        _context33.n = 2;
         return effects.call(channel.addReaction, messageId, key, score, reason, enforceUnique);
       case 2:
-        _yield$call = _context31.v;
+        _yield$call = _context33.v;
         message = _yield$call.message;
         reaction = _yield$call.reaction;
         if (!(user.id === message.user.id)) {
-          _context31.n = 4;
+          _context33.n = 4;
           break;
         }
         channelUpdateParam = {
@@ -24920,97 +25249,97 @@ function addReaction(action) {
           lastReactedMessage: message,
           newReactions: [reaction]
         };
-        _context31.n = 3;
+        _context33.n = 3;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam));
       case 3:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 4:
-        _context31.n = 5;
+        _context33.n = 5;
         return effects.put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 5:
-        _context31.n = 6;
+        _context33.n = 6;
         return effects.put(addReactionToListAC(reaction));
       case 6:
-        _context31.n = 7;
+        _context33.n = 7;
         return effects.put(addReactionToMessageAC(message, reaction, true));
       case 7:
         addReactionToMessageOnMap(channelId, message, reaction, true);
-        _context31.n = 9;
+        _context33.n = 9;
         break;
       case 8:
-        _context31.p = 8;
-        _t30 = _context31.v;
-        log.error('ERROR in add reaction', _t30.message);
+        _context33.p = 8;
+        _t36 = _context33.v;
+        log.error('ERROR in add reaction', _t36.message);
       case 9:
-        return _context31.a(2);
+        return _context33.a(2);
     }
-  }, _marked25$1, null, [[0, 8]]);
+  }, _marked27$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
-  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t31;
-  return _regenerator().w(function (_context32) {
-    while (1) switch (_context32.p = _context32.n) {
+  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t37;
+  return _regenerator().w(function (_context34) {
+    while (1) switch (_context34.p = _context34.n) {
       case 0:
-        _context32.p = 0;
+        _context34.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId, key = payload.key, isLastReaction = payload.isLastReaction;
-        _context32.n = 1;
+        _context34.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context32.v;
+        channel = _context34.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context32.n = 2;
+        _context34.n = 2;
         return effects.call(channel.deleteReaction, messageId, key);
       case 2:
-        _yield$call2 = _context32.v;
+        _yield$call2 = _context34.v;
         message = _yield$call2.message;
         reaction = _yield$call2.reaction;
         if (!isLastReaction) {
-          _context32.n = 4;
+          _context34.n = 4;
           break;
         }
         channelUpdateParam = {
           userMessageReactions: [],
           lastReactedMessage: null
         };
-        _context32.n = 3;
+        _context34.n = 3;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam));
       case 3:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 4:
-        _context32.n = 5;
+        _context34.n = 5;
         return effects.put(deleteReactionFromListAC(reaction));
       case 5:
-        _context32.n = 6;
+        _context34.n = 6;
         return effects.put(deleteReactionFromMessageAC(message, reaction, true));
       case 6:
         removeReactionToMessageOnMap(channelId, message, reaction, true);
-        _context32.n = 8;
+        _context34.n = 8;
         break;
       case 7:
-        _context32.p = 7;
-        _t31 = _context32.v;
-        log.error('ERROR in delete reaction', _t31.message);
+        _context34.p = 7;
+        _t37 = _context34.v;
+        log.error('ERROR in delete reaction', _t37.message);
       case 8:
-        return _context32.a(2);
+        return _context34.a(2);
     }
-  }, _marked26$1, null, [[0, 7]]);
+  }, _marked28$1, null, [[0, 7]]);
 }
 function getReactions(action) {
-  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t32;
-  return _regenerator().w(function (_context33) {
-    while (1) switch (_context33.p = _context33.n) {
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t38;
+  return _regenerator().w(function (_context35) {
+    while (1) switch (_context35.p = _context35.n) {
       case 0:
-        _context33.p = 0;
+        _context35.p = 0;
         payload = action.payload;
         messageId = payload.messageId, key = payload.key, limit = payload.limit;
         SceytChatClient = getClient();
-        _context33.n = 1;
+        _context35.n = 1;
         return effects.put(setReactionsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         reactionQueryBuilder = new SceytChatClient.ReactionListQueryBuilder(messageId);
@@ -25018,76 +25347,76 @@ function getReactions(action) {
         if (key) {
           reactionQueryBuilder.setKey(key);
         }
-        _context33.n = 2;
+        _context35.n = 2;
         return effects.call(reactionQueryBuilder.build);
       case 2:
-        reactionQuery = _context33.v;
-        _context33.n = 3;
+        reactionQuery = _context35.v;
+        _context35.n = 3;
         return effects.call(reactionQuery.loadNext);
       case 3:
-        result = _context33.v;
+        result = _context35.v;
         query.ReactionsQuery = reactionQuery;
-        _context33.n = 4;
+        _context35.n = 4;
         return effects.put(setReactionsListAC(result.reactions, result.hasNext));
       case 4:
-        _context33.n = 5;
+        _context35.n = 5;
         return effects.put(setReactionsLoadingStateAC(LOADING_STATE.LOADED));
       case 5:
-        _context33.n = 7;
+        _context35.n = 7;
         break;
       case 6:
-        _context33.p = 6;
-        _t32 = _context33.v;
-        log.error('ERROR in get reactions', _t32.message);
+        _context35.p = 6;
+        _t38 = _context35.v;
+        log.error('ERROR in get reactions', _t38.message);
       case 7:
-        return _context33.a(2);
+        return _context35.a(2);
     }
-  }, _marked27$1, null, [[0, 6]]);
+  }, _marked29$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
-  var payload, limit, ReactionQuery, result, _t33;
-  return _regenerator().w(function (_context34) {
-    while (1) switch (_context34.p = _context34.n) {
+  var payload, limit, ReactionQuery, result, _t39;
+  return _regenerator().w(function (_context36) {
+    while (1) switch (_context36.p = _context36.n) {
       case 0:
-        _context34.p = 0;
+        _context36.p = 0;
         payload = action.payload;
         limit = payload.limit;
-        _context34.n = 1;
+        _context36.n = 1;
         return effects.put(setReactionsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         ReactionQuery = query.ReactionsQuery;
         if (limit) {
           ReactionQuery.limit = limit;
         }
-        _context34.n = 2;
+        _context36.n = 2;
         return effects.call(ReactionQuery.loadNext);
       case 2:
-        result = _context34.v;
-        _context34.n = 3;
+        result = _context36.v;
+        _context36.n = 3;
         return effects.put(addReactionsToListAC(result.reactions, result.hasNext));
       case 3:
-        _context34.n = 4;
+        _context36.n = 4;
         return effects.put(setReactionsLoadingStateAC(LOADING_STATE.LOADED));
       case 4:
-        _context34.n = 6;
+        _context36.n = 6;
         break;
       case 5:
-        _context34.p = 5;
-        _t33 = _context34.v;
-        log.error('ERROR in load more reactions', _t33.message);
+        _context36.p = 5;
+        _t39 = _context36.v;
+        log.error('ERROR in load more reactions', _t39.message);
       case 6:
-        return _context34.a(2);
+        return _context36.a(2);
     }
-  }, _marked28$1, null, [[0, 5]]);
+  }, _marked30$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload6, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, attachments, attachmentIndex, hasPrev, hasNext, _t34;
-  return _regenerator().w(function (_context35) {
-    while (1) switch (_context35.p = _context35.n) {
+  var _action$payload6, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, attachments, attachmentIndex, hasPrev, hasNext, _t40;
+  return _regenerator().w(function (_context37) {
+    while (1) switch (_context37.p = _context37.n) {
       case 0:
         _action$payload6 = action.payload, channelId = _action$payload6.channelId, attachmentType = _action$payload6.attachmentType, limit = _action$payload6.limit, direction = _action$payload6.direction, attachmentId = _action$payload6.attachmentId, forPopup = _action$payload6.forPopup;
-        _context35.p = 1;
-        _context35.n = 2;
+        _context37.p = 1;
+        _context37.n = 2;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADING, forPopup));
       case 2:
         SceytChatClient = getClient();
@@ -25103,49 +25432,49 @@ function getMessageAttachments(action) {
         }
         AttachmentByTypeQueryBuilder = new SceytChatClient.AttachmentListQueryBuilder(channelId, typeList);
         AttachmentByTypeQueryBuilder.limit(limit || 34);
-        _context35.n = 3;
+        _context37.n = 3;
         return effects.call(AttachmentByTypeQueryBuilder.build);
       case 3:
-        AttachmentByTypeQuery = _context35.v;
+        AttachmentByTypeQuery = _context37.v;
         if (forPopup) {
           AttachmentByTypeQuery.reverse = true;
         }
         if (!(direction === queryDirection.NEXT)) {
-          _context35.n = 5;
+          _context37.n = 5;
           break;
         }
-        _context35.n = 4;
+        _context37.n = 4;
         return effects.call(AttachmentByTypeQuery.loadPrevious);
       case 4:
-        result = _context35.v;
-        _context35.n = 9;
+        result = _context37.v;
+        _context37.n = 9;
         break;
       case 5:
         if (!(direction === queryDirection.NEAR)) {
-          _context35.n = 7;
+          _context37.n = 7;
           break;
         }
-        _context35.n = 6;
+        _context37.n = 6;
         return effects.call(AttachmentByTypeQuery.loadNearMessageId, attachmentId);
       case 6:
-        result = _context35.v;
-        _context35.n = 9;
+        result = _context37.v;
+        _context37.n = 9;
         break;
       case 7:
-        _context35.n = 8;
+        _context37.n = 8;
         return effects.call(AttachmentByTypeQuery.loadPrevious);
       case 8:
-        result = _context35.v;
+        result = _context37.v;
       case 9:
         attachments = result.attachments.sort(function (a, b) {
           return forPopup ? Number(a.id || 0) - Number(b.id || 0) : Number(b.id || 0) - Number(a.id || 0);
         });
         if (!forPopup) {
-          _context35.n = 12;
+          _context37.n = 12;
           break;
         }
         query.AttachmentByTypeQueryForPopup = AttachmentByTypeQuery;
-        _context35.n = 10;
+        _context37.n = 10;
         return effects.put(setAttachmentsForPopupAC(JSON.parse(JSON.stringify(attachments))));
       case 10:
         attachmentIndex = attachments.findIndex(function (attachment) {
@@ -25163,55 +25492,55 @@ function getMessageAttachments(action) {
         } else {
           hasNext = false;
         }
-        _context35.n = 11;
+        _context37.n = 11;
         return effects.put(setAttachmentsCompleteForPopupAC(hasPrev, hasNext));
       case 11:
-        _context35.n = 14;
+        _context37.n = 14;
         break;
       case 12:
         query.AttachmentByTypeQuery = AttachmentByTypeQuery;
-        _context35.n = 13;
+        _context37.n = 13;
         return effects.put(setAttachmentsCompleteAC(result.hasNext));
       case 13:
-        _context35.n = 14;
+        _context37.n = 14;
         return effects.put(setAttachmentsAC(JSON.parse(JSON.stringify(attachments))));
       case 14:
-        _context35.n = 16;
+        _context37.n = 16;
         break;
       case 15:
-        _context35.p = 15;
-        _t34 = _context35.v;
-        log.error('error in message attachment query', _t34);
+        _context37.p = 15;
+        _t40 = _context37.v;
+        log.error('error in message attachment query', _t40);
       case 16:
-        _context35.p = 16;
-        _context35.n = 17;
+        _context37.p = 16;
+        _context37.n = 17;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADED, forPopup));
       case 17:
-        return _context35.f(16);
+        return _context37.f(16);
       case 18:
-        return _context35.a(2);
+        return _context37.a(2);
     }
-  }, _marked29$1, null, [[1, 15, 16, 18]]);
+  }, _marked31$1, null, [[1, 15, 16, 18]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload7, limit, direction, forPopup, attachmentId, AttachmentQuery, result, _result2, attachments, hasNext, _t35;
-  return _regenerator().w(function (_context36) {
-    while (1) switch (_context36.p = _context36.n) {
+  var _action$payload7, limit, direction, forPopup, attachmentId, AttachmentQuery, result, _result2, attachments, hasNext, _t41;
+  return _regenerator().w(function (_context38) {
+    while (1) switch (_context38.p = _context38.n) {
       case 0:
         _action$payload7 = action.payload, limit = _action$payload7.limit, direction = _action$payload7.direction, forPopup = _action$payload7.forPopup, attachmentId = _action$payload7.attachmentId;
-        _context36.p = 1;
+        _context38.p = 1;
         if (forPopup) {
           AttachmentQuery = query.AttachmentByTypeQueryForPopup;
         } else {
           AttachmentQuery = query.AttachmentByTypeQuery;
         }
         if (AttachmentQuery) {
-          _context36.n = 2;
+          _context38.n = 2;
           break;
         }
-        return _context36.a(2);
+        return _context38.a(2);
       case 2:
-        _context36.n = 3;
+        _context38.n = 3;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADING, forPopup));
       case 3:
         AttachmentQuery.limit = limit;
@@ -25220,172 +25549,172 @@ function loadMoreMessageAttachments(action) {
           hasNext: false
         };
         if (!attachmentId) {
-          _context36.n = 8;
+          _context38.n = 8;
           break;
         }
         if (!(direction === queryDirection.NEXT)) {
-          _context36.n = 5;
+          _context38.n = 5;
           break;
         }
-        _context36.n = 4;
+        _context38.n = 4;
         return effects.call(AttachmentQuery.loadNextAttachmentId, attachmentId);
       case 4:
-        result = _context36.v;
-        _context36.n = 7;
+        result = _context38.v;
+        _context38.n = 7;
         break;
       case 5:
-        _context36.n = 6;
+        _context38.n = 6;
         return effects.call(AttachmentQuery.loadPreviousAttachmentId, attachmentId);
       case 6:
-        result = _context36.v;
+        result = _context38.v;
       case 7:
-        _context36.n = 12;
+        _context38.n = 12;
         break;
       case 8:
         if (!(direction === queryDirection.NEXT)) {
-          _context36.n = 10;
+          _context38.n = 10;
           break;
         }
-        _context36.n = 9;
+        _context38.n = 9;
         return effects.call(AttachmentQuery.loadNext);
       case 9:
-        result = _context36.v;
-        _context36.n = 12;
+        result = _context38.v;
+        _context38.n = 12;
         break;
       case 10:
-        _context36.n = 11;
+        _context38.n = 11;
         return effects.call(AttachmentQuery.loadPrevious);
       case 11:
-        result = _context36.v;
+        result = _context38.v;
       case 12:
         _result2 = result, attachments = _result2.attachments, hasNext = _result2.hasNext;
         if (!forPopup) {
-          _context36.n = 17;
+          _context38.n = 17;
           break;
         }
-        _context36.n = 13;
+        _context38.n = 13;
         return effects.put(addAttachmentsForPopupAC(attachments, direction));
       case 13:
         if (!(attachmentId && direction === queryDirection.NEXT)) {
-          _context36.n = 15;
+          _context38.n = 15;
           break;
         }
-        _context36.n = 14;
+        _context38.n = 14;
         return effects.put(setAttachmentsCompleteForPopupAC(undefined, result.hasNext));
       case 14:
-        _context36.n = 16;
+        _context38.n = 16;
         break;
       case 15:
         if (!(attachmentId && direction === queryDirection.PREV)) {
-          _context36.n = 16;
+          _context38.n = 16;
           break;
         }
-        _context36.n = 16;
+        _context38.n = 16;
         return effects.put(setAttachmentsCompleteForPopupAC(result.hasNext, undefined));
       case 16:
-        _context36.n = 20;
+        _context38.n = 20;
         break;
       case 17:
-        _context36.n = 18;
+        _context38.n = 18;
         return effects.put(setAttachmentsCompleteAC(hasNext));
       case 18:
-        _context36.n = 19;
+        _context38.n = 19;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADED, forPopup));
       case 19:
-        _context36.n = 20;
+        _context38.n = 20;
         return effects.put(addAttachmentsAC(attachments));
       case 20:
-        _context36.n = 22;
+        _context38.n = 22;
         break;
       case 21:
-        _context36.p = 21;
-        _t35 = _context36.v;
-        log.error('error in message attachment query', _t35);
+        _context38.p = 21;
+        _t41 = _context38.v;
+        log.error('error in message attachment query', _t41);
       case 22:
-        _context36.p = 22;
-        _context36.n = 23;
+        _context38.p = 22;
+        _context38.n = 23;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADED, forPopup));
       case 23:
-        return _context36.f(22);
+        return _context38.f(22);
       case 24:
-        return _context36.a(2);
+        return _context38.a(2);
     }
-  }, _marked30$1, null, [[1, 21, 22, 24]]);
+  }, _marked32$1, null, [[1, 21, 22, 24]]);
 }
 function pauseAttachmentUploading(action) {
-  var attachmentId, isPaused, _t36;
-  return _regenerator().w(function (_context37) {
-    while (1) switch (_context37.p = _context37.n) {
+  var attachmentId, isPaused, _t42;
+  return _regenerator().w(function (_context39) {
+    while (1) switch (_context39.p = _context39.n) {
       case 0:
-        _context37.p = 0;
+        _context39.p = 0;
         attachmentId = action.payload.attachmentId;
         if (!getCustomUploader()) {
-          _context37.n = 1;
+          _context39.n = 1;
           break;
         }
         isPaused = pauseUpload(attachmentId);
         if (!isPaused) {
-          _context37.n = 1;
+          _context39.n = 1;
           break;
         }
-        _context37.n = 1;
+        _context39.n = 1;
         return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.PAUSED, attachmentId));
       case 1:
-        _context37.n = 3;
+        _context39.n = 3;
         break;
       case 2:
-        _context37.p = 2;
-        _t36 = _context37.v;
-        log.error('error in pause attachment uploading', _t36);
+        _context39.p = 2;
+        _t42 = _context39.v;
+        log.error('error in pause attachment uploading', _t42);
       case 3:
-        return _context37.a(2);
+        return _context39.a(2);
     }
-  }, _marked31$1, null, [[0, 2]]);
+  }, _marked33$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t37;
-  return _regenerator().w(function (_context38) {
-    while (1) switch (_context38.p = _context38.n) {
+  var attachmentId, isResumed, _t43;
+  return _regenerator().w(function (_context40) {
+    while (1) switch (_context40.p = _context40.n) {
       case 0:
-        _context38.p = 0;
+        _context40.p = 0;
         attachmentId = action.payload.attachmentId;
         log.info('resume for attachment ... ', attachmentId);
         if (!getCustomUploader()) {
-          _context38.n = 1;
+          _context40.n = 1;
           break;
         }
         isResumed = resumeUpload(attachmentId);
         if (!isResumed) {
-          _context38.n = 1;
+          _context40.n = 1;
           break;
         }
-        _context38.n = 1;
+        _context40.n = 1;
         return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, attachmentId));
       case 1:
-        _context38.n = 3;
+        _context40.n = 3;
         break;
       case 2:
-        _context38.p = 2;
-        _t37 = _context38.v;
-        log.error('error in resume attachment uploading', _t37);
+        _context40.p = 2;
+        _t43 = _context40.v;
+        log.error('error in resume attachment uploading', _t43);
       case 3:
-        return _context38.a(2);
+        return _context40.a(2);
     }
-  }, _marked32$1, null, [[0, 2]]);
+  }, _marked34$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
-  var _action$payload8, messageId, channelId, deliveryStatuses, sceytChatClient, deliveryStatusesArray, messageMarkers, _iterator4, _step4, deliveryStatus, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkersResult, _t38;
-  return _regenerator().w(function (_context39) {
-    while (1) switch (_context39.p = _context39.n) {
+  var _action$payload8, messageId, channelId, deliveryStatuses, sceytChatClient, deliveryStatusesArray, messageMarkers, _iterator4, _step4, deliveryStatus, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkersResult, _t44;
+  return _regenerator().w(function (_context41) {
+    while (1) switch (_context41.p = _context41.n) {
       case 0:
-        _context39.p = 0;
-        _context39.n = 1;
+        _context41.p = 0;
+        _context41.n = 1;
         return effects.put(setMessagesMarkersLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         _action$payload8 = action.payload, messageId = _action$payload8.messageId, channelId = _action$payload8.channelId, deliveryStatuses = _action$payload8.deliveryStatuses;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context39.n = 7;
+          _context41.n = 7;
           break;
         }
         deliveryStatusesArray = deliveryStatuses.split(',');
@@ -25393,98 +25722,98 @@ function getMessageMarkers(action) {
         _iterator4 = _createForOfIteratorHelperLoose(deliveryStatusesArray);
       case 2:
         if ((_step4 = _iterator4()).done) {
-          _context39.n = 6;
+          _context41.n = 6;
           break;
         }
         deliveryStatus = _step4.value;
         messageMarkerListQueryBuilder = new sceytChatClient.MessageMarkerListQueryBuilder(channelId, String(messageId), deliveryStatus);
-        _context39.n = 3;
+        _context41.n = 3;
         return effects.call(messageMarkerListQueryBuilder.build);
       case 3:
-        messageMarkerListQuery = _context39.v;
-        _context39.n = 4;
+        messageMarkerListQuery = _context41.v;
+        _context41.n = 4;
         return effects.call(messageMarkerListQuery.loadNext);
       case 4:
-        messageMarkersResult = _context39.v;
+        messageMarkersResult = _context41.v;
         messageMarkers[deliveryStatus] = messageMarkersResult.markers;
       case 5:
-        _context39.n = 2;
+        _context41.n = 2;
         break;
       case 6:
         if (!(Object.keys(messageMarkers).length > 0)) {
-          _context39.n = 7;
+          _context41.n = 7;
           break;
         }
-        _context39.n = 7;
+        _context41.n = 7;
         return effects.put(setMessageMarkersAC(channelId, messageId, messageMarkers, deliveryStatusesArray));
       case 7:
-        _context39.n = 9;
+        _context41.n = 9;
         break;
       case 8:
-        _context39.p = 8;
-        _t38 = _context39.v;
-        log.error('error in get message markers', _t38);
+        _context41.p = 8;
+        _t44 = _context41.v;
+        log.error('error in get message markers', _t44);
       case 9:
-        _context39.p = 9;
-        _context39.n = 10;
+        _context41.p = 9;
+        _context41.n = 10;
         return effects.put(setMessagesMarkersLoadingStateAC(LOADING_STATE.LOADED));
       case 10:
-        return _context39.f(9);
+        return _context41.f(9);
       case 11:
-        return _context39.a(2);
+        return _context41.a(2);
     }
-  }, _marked33$1, null, [[0, 8, 9, 11]]);
+  }, _marked35$1, null, [[0, 8, 9, 11]]);
 }
 function executeAddPollVote(channelId, pollId, optionId, message) {
   var channel;
-  return _regenerator().w(function (_context40) {
-    while (1) switch (_context40.n) {
+  return _regenerator().w(function (_context42) {
+    while (1) switch (_context42.n) {
       case 0:
-        _context40.n = 1;
+        _context42.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context40.v;
+        channel = _context42.v;
         if (message.pollDetails) {
-          _context40.n = 2;
+          _context42.n = 2;
           break;
         }
-        return _context40.a(2);
+        return _context42.a(2);
       case 2:
         if (!(channel && message.id)) {
-          _context40.n = 4;
+          _context42.n = 4;
           break;
         }
-        _context40.n = 3;
+        _context42.n = 3;
         return effects.call(channel.addVote, message.id, pollId, [optionId]);
       case 3:
-        _context40.n = 4;
+        _context42.n = 4;
         return effects.put(removePendingPollActionAC(message.id, 'ADD_POLL_VOTE', optionId));
       case 4:
-        return _context40.a(2);
+        return _context42.a(2);
     }
-  }, _marked34$1);
+  }, _marked36$1);
 }
 function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   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 (_context41) {
-    while (1) switch (_context41.n) {
+  return _regenerator().w(function (_context43) {
+    while (1) switch (_context43.n) {
       case 0:
-        _context41.n = 1;
+        _context43.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context41.v;
+        channel = _context43.v;
         if (channel) {
-          _context41.n = 2;
+          _context43.n = 2;
           break;
         }
-        return _context41.a(2);
+        return _context43.a(2);
       case 2:
         if (message.pollDetails) {
-          _context41.n = 3;
+          _context43.n = 3;
           break;
         }
-        return _context41.a(2);
+        return _context43.a(2);
       case 3:
         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) {
@@ -25500,7 +25829,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
         _i2 = 0, _objs = objs;
       case 4:
         if (!(_i2 < _objs.length)) {
-          _context41.n = 6;
+          _context43.n = 6;
           break;
         }
         obj = _objs[_i2];
@@ -25508,28 +25837,28 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context41.n = 5;
+        _context43.n = 5;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 5:
         _i2++;
-        _context41.n = 4;
+        _context43.n = 4;
         break;
       case 6:
-        return _context41.a(2);
+        return _context43.a(2);
     }
-  }, _marked35$1);
+  }, _marked37$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence, user, vote, pendingAction, conflictCheck, channel, _store$getState$Messa2, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t39;
-  return _regenerator().w(function (_context42) {
-    while (1) switch (_context42.p = _context42.n) {
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence, user, vote, pendingAction, conflictCheck, channel, _store$getState$Messa2, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t45;
+  return _regenerator().w(function (_context44) {
+    while (1) switch (_context44.p = _context44.n) {
       case 0:
-        _context42.p = 0;
+        _context44.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context42.n = 6;
+          _context44.n = 6;
           break;
         }
         user = sceytChatClient.user;
@@ -25563,20 +25892,20 @@ function addPollVote(action) {
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && !conflictCheck.shouldSkip)) {
-          _context42.n = 4;
+          _context44.n = 4;
           break;
         }
-        _context42.n = 1;
+        _context44.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context42.v;
+        channel = _context44.v;
         if (!channel) {
-          _context42.n = 3;
+          _context44.n = 3;
           break;
         }
         currentMessage = getMessageFromMap(channelId, message.id) || message;
         hasNext = ((_store$getState$Messa2 = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa2 === void 0 ? void 0 : _store$getState$Messa2[pollId]) || false;
-        _context42.n = 2;
+        _context44.n = 2;
         return effects.put(addPollVotesToListAC(pollId, optionId, [(_currentMessage$pollD = currentMessage.pollDetails) === null || _currentMessage$pollD === void 0 ? void 0 : (_currentMessage$pollD2 = _currentMessage$pollD.voteDetails) === null || _currentMessage$pollD2 === void 0 ? void 0 : (_currentMessage$pollD3 = _currentMessage$pollD2.ownVotes) === null || _currentMessage$pollD3 === void 0 ? void 0 : _currentMessage$pollD3[0]], hasNext, message.id));
       case 2:
         obj = {
@@ -25587,95 +25916,95 @@ function addPollVote(action) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context42.n = 3;
+        _context44.n = 3;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 3:
-        _context42.n = 5;
+        _context44.n = 5;
         break;
       case 4:
         if (conflictCheck.shouldSkip) {
-          _context42.n = 5;
+          _context44.n = 5;
           break;
         }
-        _context42.n = 5;
+        _context44.n = 5;
         return effects.call(updateMessageOptimisticallyForAddPollVote, channelId, message, vote);
       case 5:
         if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        _context42.n = 6;
+        _context44.n = 6;
         return effects.call(executeAddPollVote, channelId, pollId, optionId, message);
       case 6:
-        _context42.n = 8;
+        _context44.n = 8;
         break;
       case 7:
-        _context42.p = 7;
-        _t39 = _context42.v;
-        log.error('error in add poll vote', _t39);
+        _context44.p = 7;
+        _t45 = _context44.v;
+        log.error('error in add poll vote', _t45);
       case 8:
-        return _context42.a(2);
+        return _context44.a(2);
     }
-  }, _marked36$1, null, [[0, 7]]);
+  }, _marked38$1, null, [[0, 7]]);
 }
 function executeDeletePollVote(channelId, pollId, optionId, message) {
   var _message$pollDetails8, _message$pollDetails9, _message$pollDetails0;
   var channel, vote;
-  return _regenerator().w(function (_context43) {
-    while (1) switch (_context43.n) {
+  return _regenerator().w(function (_context45) {
+    while (1) switch (_context45.n) {
       case 0:
-        _context43.n = 1;
+        _context45.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context43.v;
+        channel = _context45.v;
         if (message.pollDetails) {
-          _context43.n = 2;
+          _context45.n = 2;
           break;
         }
-        return _context43.a(2);
+        return _context45.a(2);
       case 2:
         vote = (_message$pollDetails8 = message.pollDetails) === null || _message$pollDetails8 === void 0 ? void 0 : (_message$pollDetails9 = _message$pollDetails8.voteDetails) === null || _message$pollDetails9 === void 0 ? void 0 : (_message$pollDetails0 = _message$pollDetails9.ownVotes) === null || _message$pollDetails0 === void 0 ? void 0 : _message$pollDetails0.find(function (vote) {
           return vote.optionId === optionId;
         });
         if (vote) {
-          _context43.n = 3;
+          _context45.n = 3;
           break;
         }
-        return _context43.a(2);
+        return _context45.a(2);
       case 3:
         if (!(channel && message.id)) {
-          _context43.n = 5;
+          _context45.n = 5;
           break;
         }
-        _context43.n = 4;
+        _context45.n = 4;
         return effects.call(channel.deleteVote, message.id, pollId, [optionId]);
       case 4:
-        _context43.n = 5;
+        _context45.n = 5;
         return effects.put(removePendingPollActionAC(message.id, 'DELETE_POLL_VOTE', optionId));
       case 5:
-        return _context43.a(2);
+        return _context45.a(2);
     }
-  }, _marked37$1);
+  }, _marked39$1);
 }
 function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote) {
   var channel, obj;
-  return _regenerator().w(function (_context44) {
-    while (1) switch (_context44.n) {
+  return _regenerator().w(function (_context46) {
+    while (1) switch (_context46.n) {
       case 0:
-        _context44.n = 1;
+        _context46.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context44.v;
+        channel = _context46.v;
         if (channel) {
-          _context44.n = 2;
+          _context46.n = 2;
           break;
         }
-        return _context44.a(2);
+        return _context46.a(2);
       case 2:
         if (message.pollDetails) {
-          _context44.n = 3;
+          _context46.n = 3;
           break;
         }
-        return _context44.a(2);
+        return _context46.a(2);
       case 3:
         obj = {
           type: 'deleteOwn',
@@ -25685,34 +26014,34 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
           messageId: message.id,
           params: {}
         }, obj);
-        _context44.n = 4;
+        _context46.n = 4;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        return _context44.a(2);
+        return _context46.a(2);
     }
-  }, _marked38$1);
+  }, _marked40$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t40;
-  return _regenerator().w(function (_context45) {
-    while (1) switch (_context45.p = _context45.n) {
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, vote, pendingAction, conflictCheck, channel, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t46;
+  return _regenerator().w(function (_context47) {
+    while (1) switch (_context47.p = _context47.n) {
       case 0:
-        _context45.p = 0;
+        _context47.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context45.n = 7;
+          _context47.n = 7;
           break;
         }
         vote = (_message$pollDetails1 = message.pollDetails) === null || _message$pollDetails1 === void 0 ? void 0 : (_message$pollDetails10 = _message$pollDetails1.voteDetails) === null || _message$pollDetails10 === void 0 ? void 0 : (_message$pollDetails11 = _message$pollDetails10.ownVotes) === null || _message$pollDetails11 === void 0 ? void 0 : _message$pollDetails11.find(function (vote) {
           return vote.optionId === optionId;
         });
         if (vote) {
-          _context45.n = 1;
+          _context47.n = 1;
           break;
         }
-        return _context45.a(2);
+        return _context47.a(2);
       case 1:
         pendingAction = {
           type: 'DELETE_POLL_VOTE',
@@ -25723,19 +26052,19 @@ function deletePollVote(action) {
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && conflictCheck.shouldSkip)) {
-          _context45.n = 5;
+          _context47.n = 5;
           break;
         }
-        _context45.n = 2;
+        _context47.n = 2;
         return effects.call(getChannelFromMap, channelId);
       case 2:
-        channel = _context45.v;
+        channel = _context47.v;
         if (!channel) {
-          _context45.n = 4;
+          _context47.n = 4;
           break;
         }
         currentMessage = getMessageFromMap(channelId, message.id) || message;
-        _context45.n = 3;
+        _context47.n = 3;
         return effects.put(deletePollVotesFromListAC(pollId, optionId, [(_currentMessage$pollD4 = currentMessage.pollDetails) === null || _currentMessage$pollD4 === void 0 ? void 0 : (_currentMessage$pollD5 = _currentMessage$pollD4.voteDetails) === null || _currentMessage$pollD5 === void 0 ? void 0 : (_currentMessage$pollD6 = _currentMessage$pollD5.ownVotes) === null || _currentMessage$pollD6 === void 0 ? void 0 : _currentMessage$pollD6[0]], message.id));
       case 3:
         obj = {
@@ -25746,45 +26075,45 @@ function deletePollVote(action) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context45.n = 4;
+        _context47.n = 4;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        _context45.n = 6;
+        _context47.n = 6;
         break;
       case 5:
         if (conflictCheck.shouldSkip) {
-          _context45.n = 6;
+          _context47.n = 6;
           break;
         }
-        _context45.n = 6;
+        _context47.n = 6;
         return effects.call(updateMessageOptimisticallyForDeletePollVote, channelId, message, vote);
       case 6:
         if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        _context45.n = 7;
+        _context47.n = 7;
         return effects.call(executeDeletePollVote, channelId, pollId, optionId, message);
       case 7:
-        _context45.n = 9;
+        _context47.n = 9;
         break;
       case 8:
-        _context45.p = 8;
-        _t40 = _context45.v;
-        log.error('error in delete poll vote', _t40);
+        _context47.p = 8;
+        _t46 = _context47.v;
+        log.error('error in delete poll vote', _t46);
       case 9:
-        return _context45.a(2);
+        return _context47.a(2);
     }
-  }, _marked39$1, null, [[0, 8]]);
+  }, _marked41$1, null, [[0, 8]]);
 }
 function executeClosePoll(channelId, pollId, message) {
   var channel, obj;
-  return _regenerator().w(function (_context46) {
-    while (1) switch (_context46.n) {
+  return _regenerator().w(function (_context48) {
+    while (1) switch (_context48.n) {
       case 0:
-        _context46.n = 1;
+        _context48.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context46.v;
+        channel = _context48.v;
         obj = {
           type: 'close'
         };
@@ -25792,37 +26121,37 @@ function executeClosePoll(channelId, pollId, message) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context46.n = 2;
+        _context48.n = 2;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 2:
         if (!(channel && message.id)) {
-          _context46.n = 4;
+          _context48.n = 4;
           break;
         }
-        _context46.n = 3;
+        _context48.n = 3;
         return effects.call(channel.closePoll, message.id, pollId);
       case 3:
-        _context46.n = 4;
+        _context48.n = 4;
         return effects.put(removePendingPollActionAC(message.id, 'CLOSE_POLL'));
       case 4:
-        return _context46.a(2);
+        return _context48.a(2);
     }
-  }, _marked40$1);
+  }, _marked42);
 }
 function updateMessageOptimisticallyForClosePoll(channelId, message) {
   var channel, pollDetails;
-  return _regenerator().w(function (_context47) {
-    while (1) switch (_context47.n) {
+  return _regenerator().w(function (_context49) {
+    while (1) switch (_context49.n) {
       case 0:
-        _context47.n = 1;
+        _context49.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context47.v;
+        channel = _context49.v;
         if (channel) {
-          _context47.n = 2;
+          _context49.n = 2;
           break;
         }
-        return _context47.a(2);
+        return _context49.a(2);
       case 2:
         pollDetails = JSON.parse(JSON.stringify(message.pollDetails));
         pollDetails.closed = true;
@@ -25833,34 +26162,34 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
             pollDetails: pollDetails
           }
         });
-        _context47.n = 3;
+        _context49.n = 3;
         return effects.put(updateMessageAC(message.id, {
           pollDetails: pollDetails
         }));
       case 3:
-        return _context47.a(2);
+        return _context49.a(2);
     }
-  }, _marked41$1);
+  }, _marked43);
 }
 function closePoll(action) {
-  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t41;
-  return _regenerator().w(function (_context48) {
-    while (1) switch (_context48.p = _context48.n) {
+  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t47;
+  return _regenerator().w(function (_context50) {
+    while (1) switch (_context50.p = _context50.n) {
       case 0:
-        _context48.p = 0;
+        _context50.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, message = payload.message;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context48.n = 3;
+          _context50.n = 3;
           break;
         }
         connectionState = sceytChatClient.connectionState;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context48.n = 2;
+          _context50.n = 2;
           break;
         }
-        _context48.n = 1;
+        _context50.n = 1;
         return effects.call(updateMessageOptimisticallyForClosePoll, channelId, message);
       case 1:
         setPendingPollAction({
@@ -25869,39 +26198,39 @@ function closePoll(action) {
           pollId: pollId,
           message: message
         });
-        return _context48.a(2);
+        return _context50.a(2);
       case 2:
-        _context48.n = 3;
+        _context50.n = 3;
         return effects.call(executeClosePoll, channelId, pollId, message);
       case 3:
-        _context48.n = 5;
+        _context50.n = 5;
         break;
       case 4:
-        _context48.p = 4;
-        _t41 = _context48.v;
-        log.error('error in close poll', _t41);
+        _context50.p = 4;
+        _t47 = _context50.v;
+        log.error('error in close poll', _t47);
       case 5:
-        return _context48.a(2);
+        return _context50.a(2);
     }
-  }, _marked42, null, [[0, 4]]);
+  }, _marked44, null, [[0, 4]]);
 }
 function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
   var channel, _iterator5, _step5, obj;
-  return _regenerator().w(function (_context49) {
-    while (1) switch (_context49.n) {
+  return _regenerator().w(function (_context51) {
+    while (1) switch (_context51.n) {
       case 0:
-        _context49.n = 1;
+        _context51.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context49.v;
+        channel = _context51.v;
         if (isResend) {
-          _context49.n = 4;
+          _context51.n = 4;
           break;
         }
         _iterator5 = _createForOfIteratorHelperLoose(objs);
       case 2:
         if ((_step5 = _iterator5()).done) {
-          _context49.n = 4;
+          _context51.n = 4;
           break;
         }
         obj = _step5.value;
@@ -25909,45 +26238,45 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context49.n = 3;
+        _context51.n = 3;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 3:
-        _context49.n = 2;
+        _context51.n = 2;
         break;
       case 4:
         if (!(channel && message.id)) {
-          _context49.n = 6;
+          _context51.n = 6;
           break;
         }
-        _context49.n = 5;
+        _context51.n = 5;
         return effects.call(channel.retractVote, message.id, pollId);
       case 5:
-        _context49.n = 6;
+        _context51.n = 6;
         return effects.put(removePendingPollActionAC(message.id || '', 'RETRACT_POLL_VOTE'));
       case 6:
-        return _context49.a(2);
+        return _context51.a(2);
     }
-  }, _marked43);
+  }, _marked45);
 }
 function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs) {
   var channel, _iterator6, _step6, obj;
-  return _regenerator().w(function (_context50) {
-    while (1) switch (_context50.n) {
+  return _regenerator().w(function (_context52) {
+    while (1) switch (_context52.n) {
       case 0:
-        _context50.n = 1;
+        _context52.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context50.v;
+        channel = _context52.v;
         if (channel) {
-          _context50.n = 2;
+          _context52.n = 2;
           break;
         }
-        return _context50.a(2);
+        return _context52.a(2);
       case 2:
         _iterator6 = _createForOfIteratorHelperLoose(objs);
       case 3:
         if ((_step6 = _iterator6()).done) {
-          _context50.n = 5;
+          _context52.n = 5;
           break;
         }
         obj = _step6.value;
@@ -25955,27 +26284,27 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
           messageId: message.id,
           params: {}
         });
-        _context50.n = 4;
+        _context52.n = 4;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        _context50.n = 3;
+        _context52.n = 3;
         break;
       case 5:
-        return _context50.a(2);
+        return _context52.a(2);
     }
-  }, _marked44);
+  }, _marked46);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator7, _step7, _message$pollDetails12, _message$pollDetails13, vote, _t42;
-  return _regenerator().w(function (_context51) {
-    while (1) switch (_context51.p = _context51.n) {
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator7, _step7, _message$pollDetails12, _message$pollDetails13, vote, _t48;
+  return _regenerator().w(function (_context53) {
+    while (1) switch (_context53.p = _context53.n) {
       case 0:
-        _context51.p = 0;
+        _context53.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context51.n = 3;
+          _context53.n = 3;
           break;
         }
         connectionState = sceytChatClient.connectionState;
@@ -25988,10 +26317,10 @@ function retractPollVote(action) {
           });
         }
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context51.n = 2;
+          _context53.n = 2;
           break;
         }
-        _context51.n = 1;
+        _context53.n = 1;
         return effects.call(updateMessageOptimisticallyForRetractPollVote, channelId, message, objs);
       case 1:
         setPendingPollAction({
@@ -26000,36 +26329,36 @@ function retractPollVote(action) {
           pollId: pollId,
           message: message
         });
-        return _context51.a(2);
+        return _context53.a(2);
       case 2:
-        _context51.n = 3;
+        _context53.n = 3;
         return effects.call(executeRetractPollVote, channelId, pollId, message, objs, isResend);
       case 3:
-        _context51.n = 5;
+        _context53.n = 5;
         break;
       case 4:
-        _context51.p = 4;
-        _t42 = _context51.v;
-        log.error('error in retract poll vote', _t42);
+        _context53.p = 4;
+        _t48 = _context53.v;
+        log.error('error in retract poll vote', _t48);
       case 5:
-        return _context51.a(2);
+        return _context53.a(2);
     }
-  }, _marked45, null, [[0, 4]]);
+  }, _marked47, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
-  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t43;
-  return _regenerator().w(function (_context52) {
-    while (1) switch (_context52.p = _context52.n) {
+  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t49;
+  return _regenerator().w(function (_context54) {
+    while (1) switch (_context54.p = _context54.n) {
       case 0:
-        _context52.p = 0;
+        _context54.p = 0;
         payload = action.payload;
         connectionState = payload.connectionState;
         sceytChatClient = getClient();
         if (!(!sceytChatClient || connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context52.n = 1;
+          _context54.n = 1;
           break;
         }
-        return _context52.a(2);
+        return _context54.a(2);
       case 1:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         pendingPollActionsMapCopy = JSON.parse(JSON.stringify(pendingPollActionsMap));
@@ -26062,30 +26391,30 @@ function resendPendingPollActions(action) {
             }
           });
         });
-        _context52.n = 3;
+        _context54.n = 3;
         break;
       case 2:
-        _context52.p = 2;
-        _t43 = _context52.v;
-        log.error('error in resend pending poll actions', _t43);
+        _context54.p = 2;
+        _t49 = _context54.v;
+        log.error('error in resend pending poll actions', _t49);
       case 3:
-        return _context52.a(2);
+        return _context54.a(2);
     }
-  }, _marked46, null, [[0, 2]]);
+  }, _marked48, null, [[0, 2]]);
 }
 function resendPendingMessageMutations(action) {
-  var payload, connectionState, pendingMutations, _iterator8, _step8, mutation, currentMutation, channel, _t44, _t45;
-  return _regenerator().w(function (_context53) {
-    while (1) switch (_context53.p = _context53.n) {
+  var payload, connectionState, pendingMutations, _iterator8, _step8, mutation, currentMutation, channel, _t50, _t51;
+  return _regenerator().w(function (_context55) {
+    while (1) switch (_context55.p = _context55.n) {
       case 0:
-        _context53.p = 0;
+        _context55.p = 0;
         payload = action.payload;
         connectionState = payload.connectionState;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED || !isMessageMutationConnected())) {
-          _context53.n = 1;
+          _context55.n = 1;
           break;
         }
-        return _context53.a(2);
+        return _context55.a(2);
       case 1:
         pendingMutations = Object.values(getPendingMessageMutations()).sort(function (left, right) {
           return left.queuedAt - right.queuedAt;
@@ -26093,98 +26422,98 @@ function resendPendingMessageMutations(action) {
         _iterator8 = _createForOfIteratorHelperLoose(pendingMutations);
       case 2:
         if ((_step8 = _iterator8()).done) {
-          _context53.n = 16;
+          _context55.n = 16;
           break;
         }
         mutation = _step8.value;
         currentMutation = getPendingMessageMutations()[mutation.messageId];
         if (!(!currentMutation || currentMutation.queuedAt !== mutation.queuedAt || currentMutation.type !== mutation.type)) {
-          _context53.n = 3;
+          _context55.n = 3;
           break;
         }
-        return _context53.a(3, 15);
+        return _context55.a(3, 15);
       case 3:
         if (isMessageMutationConnected()) {
-          _context53.n = 4;
+          _context55.n = 4;
           break;
         }
-        return _context53.a(2);
+        return _context55.a(2);
       case 4:
-        _context53.n = 5;
+        _context55.n = 5;
         return effects.call(getChannelForMessageMutation, mutation.channelId);
       case 5:
-        channel = _context53.v;
+        channel = _context55.v;
         if (channel) {
-          _context53.n = 7;
+          _context55.n = 7;
           break;
         }
-        _context53.n = 6;
+        _context55.n = 6;
         return effects.put(removePendingMessageMutationAC(mutation.messageId));
       case 6:
-        return _context53.a(3, 15);
+        return _context55.a(3, 15);
       case 7:
-        _context53.p = 7;
+        _context55.p = 7;
         if (!(mutation.type === 'DELETE_MESSAGE')) {
-          _context53.n = 9;
+          _context55.n = 9;
           break;
         }
-        _context53.n = 8;
+        _context55.n = 8;
         return effects.call(executeDeleteMessageMutation, channel, mutation.messageId, mutation.deleteOption);
       case 8:
-        _context53.n = 10;
+        _context55.n = 10;
         break;
       case 9:
-        _context53.n = 10;
+        _context55.n = 10;
         return effects.call(executeEditMessageMutation, channel, mutation.message);
       case 10:
-        _context53.n = 15;
+        _context55.n = 15;
         break;
       case 11:
-        _context53.p = 11;
-        _t44 = _context53.v;
+        _context55.p = 11;
+        _t50 = _context55.v;
         if (isMessageMutationConnected()) {
-          _context53.n = 12;
+          _context55.n = 12;
           break;
         }
-        return _context53.a(2);
+        return _context55.a(2);
       case 12:
-        _context53.n = 13;
+        _context55.n = 13;
         return effects.call(applyLocalMessageUpdate, mutation.channelId, mutation.messageId, cloneSerializable(mutation.originalMessage));
       case 13:
-        _context53.n = 14;
+        _context55.n = 14;
         return effects.put(removePendingMessageMutationAC(mutation.messageId));
       case 14:
-        log.error('error in resend pending message mutations', _t44);
+        log.error('error in resend pending message mutations', _t50);
       case 15:
-        _context53.n = 2;
+        _context55.n = 2;
         break;
       case 16:
-        _context53.n = 18;
+        _context55.n = 18;
         break;
       case 17:
-        _context53.p = 17;
-        _t45 = _context53.v;
-        log.error('error in resend pending message mutations', _t45);
+        _context55.p = 17;
+        _t51 = _context55.v;
+        log.error('error in resend pending message mutations', _t51);
       case 18:
-        return _context53.a(2);
+        return _context55.a(2);
     }
-  }, _marked47, null, [[7, 11], [0, 17]]);
+  }, _marked49, null, [[7, 11], [0, 17]]);
 }
 function getPollVotes(action) {
-  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t46;
-  return _regenerator().w(function (_context54) {
-    while (1) switch (_context54.p = _context54.n) {
+  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t52;
+  return _regenerator().w(function (_context56) {
+    while (1) switch (_context56.p = _context56.n) {
       case 0:
-        _context54.p = 0;
+        _context56.p = 0;
         payload = action.payload;
         messageId = payload.messageId, pollId = payload.pollId, optionId = payload.optionId, limit = payload.limit;
         key = pollId + "_" + optionId;
-        _context54.n = 1;
+        _context56.n = 1;
         return effects.put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADING));
       case 1:
         SceytChatClient = getClient();
         if (!(!SceytChatClient || !SceytChatClient.PollVotesQueryBuilder)) {
-          _context54.n = 2;
+          _context56.n = 2;
           break;
         }
         throw new Error('SceytChatClient or PollVotesQueryBuilder not available');
@@ -26192,14 +26521,14 @@ function getPollVotes(action) {
         queryBuilder = new SceytChatClient.PollVotesQueryBuilder(messageId, pollId);
         queryBuilder.setOptionId(optionId);
         queryBuilder.limit(limit || 20);
-        _context54.n = 3;
+        _context56.n = 3;
         return effects.call(queryBuilder.build);
       case 3:
-        pollVotesQuery = _context54.v;
-        _context54.n = 4;
+        pollVotesQuery = _context56.v;
+        _context56.n = 4;
         return effects.call(pollVotesQuery.loadNext);
       case 4:
-        result = _context54.v;
+        result = _context56.v;
         if (!query.PollVotesQueries) {
           query.PollVotesQueries = {};
         }
@@ -26227,39 +26556,39 @@ function getPollVotes(action) {
             }
           };
         });
-        _context54.n = 5;
+        _context56.n = 5;
         return effects.put(setPollVotesListAC(pollId, optionId, formattedVotes, result.hasNext || false));
       case 5:
-        _context54.n = 6;
+        _context56.n = 6;
         return effects.put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADED));
       case 6:
-        _context54.n = 8;
+        _context56.n = 8;
         break;
       case 7:
-        _context54.p = 7;
-        _t46 = _context54.v;
-        log.error('ERROR in get poll votes', _t46);
-        _context54.n = 8;
+        _context56.p = 7;
+        _t52 = _context56.v;
+        log.error('ERROR in get poll votes', _t52);
+        _context56.n = 8;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
-        return _context54.a(2);
+        return _context56.a(2);
     }
-  }, _marked48, null, [[0, 7]]);
+  }, _marked50, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
-  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t47;
-  return _regenerator().w(function (_context55) {
-    while (1) switch (_context55.p = _context55.n) {
+  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t53;
+  return _regenerator().w(function (_context57) {
+    while (1) switch (_context57.p = _context57.n) {
       case 0:
-        _context55.p = 0;
+        _context57.p = 0;
         payload = action.payload;
         pollId = payload.pollId, optionId = payload.optionId, limit = payload.limit;
         key = pollId + "_" + optionId;
-        _context55.n = 1;
+        _context57.n = 1;
         return effects.put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADING));
       case 1:
         if (!(!query.PollVotesQueries || !query.PollVotesQueries[key])) {
-          _context55.n = 2;
+          _context57.n = 2;
           break;
         }
         throw new Error('Poll votes query not found');
@@ -26268,10 +26597,10 @@ function loadMorePollVotes(action) {
         if (limit && pollVotesQuery.limit < limit) {
           pollVotesQuery.limit = limit;
         }
-        _context55.n = 3;
+        _context57.n = 3;
         return effects.call(pollVotesQuery.loadNext);
       case 3:
-        result = _context55.v;
+        result = _context57.v;
         formattedVotes = (result.votes || []).map(function (vote) {
           return {
             optionId: vote.optionId || optionId,
@@ -26295,64 +26624,64 @@ function loadMorePollVotes(action) {
             }
           };
         });
-        _context55.n = 4;
+        _context57.n = 4;
         return effects.put(addPollVotesToListAC(pollId, optionId, formattedVotes, result.hasNext || false));
       case 4:
-        _context55.n = 5;
+        _context57.n = 5;
         return effects.put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADED));
       case 5:
-        _context55.n = 7;
+        _context57.n = 7;
         break;
       case 6:
-        _context55.p = 6;
-        _t47 = _context55.v;
-        log.error('ERROR in load more poll votes', _t47);
-        _context55.n = 7;
+        _context57.p = 6;
+        _t53 = _context57.v;
+        log.error('ERROR in load more poll votes', _t53);
+        _context57.n = 7;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
-        return _context55.a(2);
+        return _context57.a(2);
     }
-  }, _marked49, null, [[0, 6]]);
+  }, _marked51, null, [[0, 6]]);
 }
 var REFRESH_WINDOW_HALF = 30;
 function refreshCacheAroundMessage(action) {
-  var _action$payload9, channelId, messageId, _action$payload9$appl, applyVisibleWindow, connectionState, activeChannelId, activeMessages, activeConfirmedMessages, centerMessageIndex, refreshAnchorId, previousLimit, nextLimit, SceytChatClient, messageQueryBuilder, messageQuery, prevResult, pivotId, nextResult, loadedMessages, firstId, lastId, activeById, changed, filteredPendingMessages, _t48, _t49, _t50;
-  return _regenerator().w(function (_context56) {
-    while (1) switch (_context56.p = _context56.n) {
+  var _action$payload9, channelId, messageId, _action$payload9$appl, applyVisibleWindow, connectionState, activeChannelId, activeMessages, activeConfirmedMessages, centerMessageIndex, refreshAnchorId, previousLimit, nextLimit, SceytChatClient, messageQueryBuilder, messageQuery, prevResult, pivotId, nextResult, loadedMessages, firstId, lastId, activeById, changed, filteredPendingMessages, _t54, _t55, _t56;
+  return _regenerator().w(function (_context58) {
+    while (1) switch (_context58.p = _context58.n) {
       case 0:
-        _context56.p = 0;
+        _context58.p = 0;
         _action$payload9 = action.payload, channelId = _action$payload9.channelId, messageId = _action$payload9.messageId, _action$payload9$appl = _action$payload9.applyVisibleWindow, applyVisibleWindow = _action$payload9$appl === void 0 ? true : _action$payload9$appl;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context56.n = 1;
+          _context58.n = 1;
           break;
         }
-        return _context56.a(2);
+        return _context58.a(2);
       case 1:
         activeChannelId = getActiveChannelId();
         if (!(activeChannelId !== channelId)) {
-          _context56.n = 2;
+          _context58.n = 2;
           break;
         }
-        return _context56.a(2);
+        return _context58.a(2);
       case 2:
         activeMessages = store.getState().MessageReducer.activeChannelMessages || [];
         activeConfirmedMessages = activeMessages.filter(function (message) {
           return !!message.id;
         });
         if (activeConfirmedMessages.length) {
-          _context56.n = 3;
+          _context58.n = 3;
           break;
         }
-        return _context56.a(2);
+        return _context58.a(2);
       case 3:
         centerMessageIndex = getCenterTwoMessages(activeConfirmedMessages);
         refreshAnchorId = centerMessageIndex.mid2.messageId || messageId;
         if (refreshAnchorId) {
-          _context56.n = 4;
+          _context58.n = 4;
           break;
         }
-        return _context56.a(2);
+        return _context58.a(2);
       case 4:
         previousLimit = activeConfirmedMessages.length === 1 ? 1 : Math.min(REFRESH_WINDOW_HALF, centerMessageIndex.mid2.index);
         nextLimit = Math.min(REFRESH_WINDOW_HALF, Math.max(0, activeConfirmedMessages.length - centerMessageIndex.mid1.index - 1));
@@ -26360,54 +26689,54 @@ function refreshCacheAroundMessage(action) {
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channelId);
         messageQueryBuilder.limit(REFRESH_WINDOW_HALF);
         messageQueryBuilder.reverse(true);
-        _context56.n = 5;
+        _context58.n = 5;
         return effects.call(messageQueryBuilder.build);
       case 5:
-        messageQuery = _context56.v;
+        messageQuery = _context58.v;
         messageQuery.limit = previousLimit;
         if (!(previousLimit > 0)) {
-          _context56.n = 7;
+          _context58.n = 7;
           break;
         }
-        _context56.n = 6;
+        _context58.n = 6;
         return effects.call(messageQuery.loadPreviousMessageId, refreshAnchorId);
       case 6:
-        _t48 = _context56.v;
-        _context56.n = 8;
+        _t54 = _context58.v;
+        _context58.n = 8;
         break;
       case 7:
-        _t48 = {
+        _t54 = {
           messages: [],
           hasNext: false
         };
       case 8:
-        prevResult = _t48;
+        prevResult = _t54;
         pivotId = prevResult.messages.length > 0 ? getLastConfirmedMessageId(prevResult.messages) : refreshAnchorId;
         messageQuery.reverse = false;
         messageQuery.limit = nextLimit;
         if (!(nextLimit > 0 && pivotId)) {
-          _context56.n = 10;
+          _context58.n = 10;
           break;
         }
-        _context56.n = 9;
+        _context58.n = 9;
         return effects.call(messageQuery.loadNextMessageId, pivotId);
       case 9:
-        _t49 = _context56.v;
-        _context56.n = 11;
+        _t55 = _context58.v;
+        _context58.n = 11;
         break;
       case 10:
-        _t49 = {
+        _t55 = {
           messages: [],
           hasNext: false
         };
       case 11:
-        nextResult = _t49;
+        nextResult = _t55;
         loadedMessages = [].concat(prevResult.messages, nextResult.messages);
         if (!(loadedMessages.length === 0)) {
-          _context56.n = 12;
+          _context58.n = 12;
           break;
         }
-        return _context56.a(2);
+        return _context58.a(2);
       case 12:
         firstId = getFirstConfirmedMessageId(loadedMessages);
         lastId = getLastConfirmedMessageId(loadedMessages);
@@ -26415,11 +26744,11 @@ function refreshCacheAroundMessage(action) {
           setMessagesToMap(channelId, loadedMessages, firstId, lastId);
           setActiveSegment(channelId, firstId, lastId);
         }
-        _context56.n = 13;
+        _context58.n = 13;
         return effects.call(loadOGMetadataForLinkMessages, loadedMessages, true, false, false);
       case 13:
         if (!sameConfirmedWindow(activeConfirmedMessages, loadedMessages)) {
-          _context56.n = 15;
+          _context58.n = 15;
           break;
         }
         activeById = new Map(activeConfirmedMessages.map(function (currentMessage) {
@@ -26432,151 +26761,151 @@ function refreshCacheAroundMessage(action) {
           return JSON.stringify(existing) !== JSON.stringify(loaded);
         });
         if (!(changed.length > 0)) {
-          _context56.n = 14;
+          _context58.n = 14;
           break;
         }
-        _context56.n = 14;
+        _context58.n = 14;
         return effects.put(patchMessagesAC(changed));
       case 14:
-        return _context56.a(2);
+        return _context58.a(2);
       case 15:
         if (applyVisibleWindow) {
-          _context56.n = 16;
+          _context58.n = 16;
           break;
         }
-        return _context56.a(2);
+        return _context58.a(2);
       case 16:
-        _context56.n = 17;
+        _context58.n = 17;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(loadedMessages)), channelId));
       case 17:
         filteredPendingMessages = getFilteredPendingMessages(channelId, loadedMessages);
         if (!(filteredPendingMessages.length > 0)) {
-          _context56.n = 19;
+          _context58.n = 19;
           break;
         }
-        _context56.n = 18;
+        _context58.n = 18;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 18:
-        _context56.n = 19;
+        _context58.n = 19;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
       case 19:
-        _context56.n = 21;
+        _context58.n = 21;
         break;
       case 20:
-        _context56.p = 20;
-        _t50 = _context56.v;
-        log.error('error in refreshCacheAroundMessage', _t50);
+        _context58.p = 20;
+        _t56 = _context58.v;
+        log.error('error in refreshCacheAroundMessage', _t56);
       case 21:
-        return _context56.a(2);
+        return _context58.a(2);
     }
-  }, _marked50, null, [[0, 20]]);
+  }, _marked52, null, [[0, 20]]);
 }
 function MessageSaga() {
-  return _regenerator().w(function (_context57) {
-    while (1) switch (_context57.n) {
+  return _regenerator().w(function (_context59) {
+    while (1) switch (_context59.n) {
       case 0:
-        _context57.n = 1;
+        _context59.n = 1;
         return effects.takeEvery(SEND_MESSAGE, sendMessage);
       case 1:
-        _context57.n = 2;
+        _context59.n = 2;
         return effects.takeEvery(SEND_TEXT_MESSAGE, sendTextMessage);
       case 2:
-        _context57.n = 3;
+        _context59.n = 3;
         return effects.takeEvery(FORWARD_MESSAGE, forwardMessage);
       case 3:
-        _context57.n = 4;
+        _context59.n = 4;
         return effects.takeEvery(RESEND_MESSAGE, resendMessage);
       case 4:
-        _context57.n = 5;
+        _context59.n = 5;
         return effects.takeLatest(EDIT_MESSAGE, editMessage);
       case 5:
-        _context57.n = 6;
+        _context59.n = 6;
         return effects.takeEvery(DELETE_MESSAGE, deleteMessage);
       case 6:
-        _context57.n = 7;
+        _context59.n = 7;
         return effects.takeLatest(RELOAD_ACTIVE_CHANNEL_AFTER_RECONNECT, reloadActiveChannelAfterReconnect);
       case 7:
-        _context57.n = 8;
+        _context59.n = 8;
         return effects.takeLatest(LOAD_LATEST_MESSAGES, getMessagesQuery);
       case 8:
-        _context57.n = 9;
+        _context59.n = 9;
         return effects.takeLatest(LOAD_AROUND_MESSAGE, loadAroundMessage);
       case 9:
-        _context57.n = 10;
+        _context59.n = 10;
         return effects.takeLatest(REFRESH_CACHE_AROUND_MESSAGE, refreshCacheAroundMessage);
       case 10:
-        _context57.n = 11;
+        _context59.n = 11;
         return effects.takeLatest(LOAD_NEAR_UNREAD, loadNearUnread);
       case 11:
-        _context57.n = 12;
+        _context59.n = 12;
         return effects.takeLatest(LOAD_DEFAULT_MESSAGES, loadDefaultMessages);
       case 12:
-        _context57.n = 13;
+        _context59.n = 13;
         return effects.takeEvery(GET_MESSAGE, getMessageQuery);
       case 13:
-        _context57.n = 14;
+        _context59.n = 14;
         return effects.takeLatest(GET_MESSAGE_MARKERS, getMessageMarkers);
       case 14:
-        _context57.n = 15;
+        _context59.n = 15;
         return effects.takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);
       case 15:
-        _context57.n = 16;
+        _context59.n = 16;
         return effects.takeLatest(LOAD_MORE_MESSAGES_ATTACHMENTS, loadMoreMessageAttachments);
       case 16:
-        _context57.n = 17;
+        _context59.n = 17;
         return effects.takeLatest(ADD_REACTION, addReaction);
       case 17:
-        _context57.n = 18;
+        _context59.n = 18;
         return effects.takeLatest(DELETE_REACTION, deleteReaction);
       case 18:
-        _context57.n = 19;
+        _context59.n = 19;
         return effects.takeEvery(LOAD_MORE_MESSAGES, loadMoreMessages);
       case 19:
-        _context57.n = 20;
+        _context59.n = 20;
         return effects.takeEvery(GET_REACTIONS, getReactions);
       case 20:
-        _context57.n = 21;
+        _context59.n = 21;
         return effects.takeEvery(LOAD_MORE_REACTIONS, loadMoreReactions);
       case 21:
-        _context57.n = 22;
+        _context59.n = 22;
         return effects.takeEvery(PAUSE_ATTACHMENT_UPLOADING, pauseAttachmentUploading);
       case 22:
-        _context57.n = 23;
+        _context59.n = 23;
         return effects.takeEvery(RESUME_ATTACHMENT_UPLOADING, resumeAttachmentUploading);
       case 23:
-        _context57.n = 24;
+        _context59.n = 24;
         return effects.takeEvery(ADD_POLL_VOTE, addPollVote);
       case 24:
-        _context57.n = 25;
+        _context59.n = 25;
         return effects.takeEvery(DELETE_POLL_VOTE, deletePollVote);
       case 25:
-        _context57.n = 26;
+        _context59.n = 26;
         return effects.takeEvery(CLOSE_POLL, closePoll);
       case 26:
-        _context57.n = 27;
+        _context59.n = 27;
         return effects.takeEvery(RETRACT_POLL_VOTE, retractPollVote);
       case 27:
-        _context57.n = 28;
+        _context59.n = 28;
         return effects.takeEvery(GET_POLL_VOTES, getPollVotes);
       case 28:
-        _context57.n = 29;
+        _context59.n = 29;
         return effects.takeEvery(LOAD_MORE_POLL_VOTES, loadMorePollVotes);
       case 29:
-        _context57.n = 30;
+        _context59.n = 30;
         return effects.takeEvery(RESEND_PENDING_POLL_ACTIONS, resendPendingPollActions);
       case 30:
-        _context57.n = 31;
+        _context59.n = 31;
         return effects.takeLatest(RESEND_PENDING_MESSAGE_MUTATIONS, resendPendingMessageMutations);
       case 31:
-        _context57.n = 32;
+        _context59.n = 32;
         return effects.takeEvery(LOAD_OG_METADATA_FOR_LINK, loadOGMetadataForLinkSaga);
       case 32:
-        _context57.n = 33;
+        _context59.n = 33;
         return effects.takeEvery(FETCH_OG_METADATA, fetchOGMetadata);
       case 33:
-        return _context57.a(2);
+        return _context59.a(2);
     }
-  }, _marked51);
+  }, _marked53);
 }
 
 var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
@@ -31998,7 +32327,7 @@ var ChannelList = function ChannelList(_ref) {
   }, [searchValue]);
   useDidUpdate(function () {
     if (getSelectedChannel) {
-      if (!(activeChannel !== null && activeChannel !== void 0 && activeChannel.mentionsIds) && activeChannel !== null && activeChannel !== void 0 && activeChannel.id && connectionStatus === CONNECTION_STATUS.CONNECTED) {
+      if (activeChannel.newMentionCount && !(activeChannel !== null && activeChannel !== void 0 && activeChannel.mentionsIds) && activeChannel !== null && activeChannel !== void 0 && activeChannel.id && connectionStatus === CONNECTION_STATUS.CONNECTED) {
         dispatch(getChannelMentionsAC(activeChannel.id));
       }
       getSelectedChannel(activeChannel);
@@ -42997,6 +43326,7 @@ var DEFAULT_UNREAD_VISIBILITY_THRESHOLD = 0.5;
 var JUMP_SCROLL_LOCK_MS = 1800;
 var PRESERVE_ANCHOR_SCROLL_EPSILON_PX = 1;
 var SCROLL_IDLE_MS = 800;
+var channelRestoreWindowMap = new Map();
 var formatMessageDateLabel = function formatMessageDateLabel(message) {
   var current = new Date(message.createdAt);
   var now = new Date();
@@ -44196,7 +44526,7 @@ function useChatController(_ref3) {
     return function () {
       return el.removeEventListener('scroll', onScroll);
     };
-  }, []);
+  }, [channel === null || channel === void 0 ? void 0 : channel.id]);
   React.useEffect(function () {
     var el = scrollRef.current;
     if (!el) {
@@ -44216,7 +44546,7 @@ function useChatController(_ref3) {
     return function () {
       return el.removeEventListener('wheel', onWheel);
     };
-  }, []);
+  }, [channel === null || channel === void 0 ? void 0 : channel.id]);
   React.useEffect(function () {
     var _pendingWindowLoadRef, _pendingEdgeLoadRefs$, _pendingEdgeLoadRefs$2;
     if (activeChannelIdRef.current === null) {
@@ -44226,6 +44556,32 @@ function useChatController(_ref3) {
     if (activeChannelIdRef.current === channel.id) {
       return;
     }
+    if (pendingVisibleUnreadFrameRef.current !== null) {
+      cancelAnimationFrame(pendingVisibleUnreadFrameRef.current);
+      pendingVisibleUnreadFrameRef.current = null;
+    }
+    if (jumpToLatestFrameRef.current !== null) {
+      cancelAnimationFrame(jumpToLatestFrameRef.current);
+      jumpToLatestFrameRef.current = null;
+    }
+    if (loadPrevFrameRef.current !== null) {
+      cancelAnimationFrame(loadPrevFrameRef.current);
+      loadPrevFrameRef.current = null;
+    }
+    if (loadNextFrameRef.current !== null) {
+      cancelAnimationFrame(loadNextFrameRef.current);
+      loadNextFrameRef.current = null;
+    }
+    if (highlightTimeoutRef.current !== null) {
+      clearTimeout(highlightTimeoutRef.current);
+      highlightTimeoutRef.current = null;
+    }
+    if (jumpUnlockTimeoutRef.current !== null) {
+      clearTimeout(jumpUnlockTimeoutRef.current);
+      jumpUnlockTimeoutRef.current = null;
+    }
+    isJumping.current = false;
+    currentJumpIdRef.current += 1;
     activeChannelIdRef.current = channel.id;
     lastBootKeyRef.current = null;
     restoreRef.current = null;
@@ -44271,12 +44627,55 @@ function useChatController(_ref3) {
     setHighlightedItemId(null);
     highlightedItemIdRef.current = null;
     dispatch(clearActivePaginationIntentAC());
+    if (channel !== null && channel !== void 0 && channel.hidden) {
+      dispatch(setMessagesAC([]));
+    }
   }, [channel.id, clearScrollIdleTimer, dispatch]);
+  var departingChannelId = activeChannelIdRef.current;
+  if (departingChannelId) {
+    var _scrollRef$current$sc, _scrollRef$current;
+    var currentMessages = messagesRef.current;
+    var startId = getFirstConfirmedMessageId(currentMessages);
+    var endId = getLastConfirmedMessageId(currentMessages);
+    var anchorId = lastVisibleAnchorIdRef.current;
+    var scrollTop = (_scrollRef$current$sc = (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollTop) != null ? _scrollRef$current$sc : 0;
+    if (startId && endId && anchorId) {
+      var confirmedMessages = currentMessages.filter(function (m) {
+        return !!m.id;
+      });
+      var anchorIndex = confirmedMessages.findIndex(function (m) {
+        return m.id === anchorId;
+      });
+      var prevCount = anchorIndex >= 0 ? anchorIndex : 0;
+      var nextCount = anchorIndex >= 0 ? confirmedMessages.length - anchorIndex - 1 : 0;
+      channelRestoreWindowMap.set(departingChannelId, {
+        startId: startId,
+        endId: endId,
+        scrollTop: scrollTop,
+        anchorId: anchorId,
+        prevCount: prevCount,
+        nextCount: nextCount
+      });
+    }
+  }
   React.useLayoutEffect(function () {
+    var _restoreRef$current6;
     var container = scrollRef.current;
     if (!container || !messages.length) {
       return;
     }
+    if (((_restoreRef$current6 = restoreRef.current) === null || _restoreRef$current6 === void 0 ? void 0 : _restoreRef$current6.mode) === 'restore-scroll-top') {
+      var savedScrollTop = restoreRef.current.scrollTop;
+      if (!lastBootKeyRef.current) {
+        lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
+      }
+      restoreRef.current = null;
+      viewIsAtLatestRef.current = false;
+      setIsViewingLatest(false);
+      var maxScrollTop = getMaxScrollTop(container);
+      setScrollTop(container, Math.min(savedScrollTop, maxScrollTop), 'auto');
+      return;
+    }
     if (!lastBootKeyRef.current) {
       lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
       restoreRef.current = unreadScrollTo && unreadMessageId ? {
@@ -44508,7 +44907,33 @@ function useChatController(_ref3) {
     cachedEdgeRequestRef.current = null;
     dispatch(clearActivePaginationIntentAC());
     previousMessagesRef.current = [];
-    if (channel.backToLinkedChannel && channel !== null && channel !== void 0 && channel.id) {
+    if (!(channel !== null && channel !== void 0 && channel.id)) {
+      return;
+    }
+    var savedRestoreWindow = channelRestoreWindowMap.get(channel.id);
+    if (savedRestoreWindow) {
+      if (!channel.isLinkedChannel) {
+        clearVisibleMessagesMap();
+      }
+      if (channel.backToLinkedChannel) {
+        restoreRef.current = {
+          mode: 'restore-scroll-top',
+          scrollTop: savedRestoreWindow.scrollTop
+        };
+        var restoreWindowPayload = {
+          startId: savedRestoreWindow.startId,
+          endId: savedRestoreWindow.endId,
+          anchorId: savedRestoreWindow.anchorId,
+          prevCount: savedRestoreWindow.prevCount,
+          nextCount: savedRestoreWindow.nextCount,
+          preferCache: true
+        };
+        suppressNextMessageChange();
+        dispatch(loadAroundMessageAC(channel, savedRestoreWindow.anchorId, undefined, restoreWindowPayload));
+        return;
+      }
+    }
+    if (channel.backToLinkedChannel) {
       var visibleMessages = getVisibleMessagesMap();
       var visibleMessagesIds = Object.values(visibleMessages).filter(function (message) {
         return !!message.id;
@@ -44522,19 +44947,17 @@ function useChatController(_ref3) {
         suppressNextMessageChange();
         dispatch(loadAroundMessageAC(channel, messageId));
       }
+      return;
+    }
+    if (!channel.isLinkedChannel) {
+      clearVisibleMessagesMap();
+    }
+    if (channel.newMessageCount && channel.lastDisplayedMessageId) {
+      suppressNextMessageChange();
+      dispatch(loadNearUnreadAC(channel));
     } else {
-      if (!channel.isLinkedChannel) {
-        clearVisibleMessagesMap();
-      }
-      if (channel !== null && channel !== void 0 && channel.id) {
-        if (channel.newMessageCount && channel.lastDisplayedMessageId) {
-          suppressNextMessageChange();
-          dispatch(loadNearUnreadAC(channel));
-        } else {
-          suppressNextMessageChange();
-          dispatch(loadDefaultMessagesAC(channel));
-        }
-      }
+      suppressNextMessageChange();
+      dispatch(loadDefaultMessagesAC(channel));
     }
   }, [dispatch, channel === null || channel === void 0 ? void 0 : channel.id, channel.backToLinkedChannel, channel.isLinkedChannel, suppressNextMessageChange]);
   React.useEffect(function () {