sceyt-chat-react-uikit 1.8.6-beta.1 → 1.8.6-beta.3

package/index.js

@@ -10491,6 +10491,7 @@ var RELOAD_ACTIVE_CHANNEL_AFTER_RECONNECT = 'RELOAD_ACTIVE_CHANNEL_AFTER_RECONNE
 var GET_MESSAGE = 'GET_MESSAGE';
 var GET_MESSAGE_MARKERS = 'GET_MESSAGE_MARKERS';
 var LOAD_MORE_MESSAGES = 'LOAD_MORE_MESSAGES';
+var PREFETCH_MESSAGES = 'PREFETCH_MESSAGES';
 var SEND_MESSAGE = 'SEND_MESSAGE';
 var SEND_TEXT_MESSAGE = 'SEND_TEXT_MESSAGE';
 var FORWARD_MESSAGE = 'FORWARD_MESSAGE';
@@ -10978,6 +10979,17 @@ function loadMoreMessagesAC(channelId, limit, direction, messageId, hasNext, req
   };
   return action;
 }
+function prefetchMessagesAC(channelId, fromMessageId, direction, pages) {
+  return {
+    type: PREFETCH_MESSAGES,
+    payload: {
+      channelId: channelId,
+      fromMessageId: fromMessageId,
+      direction: direction,
+      pages: pages
+    }
+  };
+}
 function setActivePaginationIntentAC(channelId, direction, requestId, anchorId) {
   return setActivePaginationIntent({
     channelId: channelId,
@@ -21225,34 +21237,35 @@ var _marked$3 = /*#__PURE__*/_regenerator().m(setMessageListLoading),
   _marked24$1 = /*#__PURE__*/_regenerator().m(getMessagesQuery),
   _marked25$1 = /*#__PURE__*/_regenerator().m(getMessageQuery),
   _marked26$1 = /*#__PURE__*/_regenerator().m(prefetchMessages),
-  _marked27$1 = /*#__PURE__*/_regenerator().m(loadMoreMessages),
-  _marked28$1 = /*#__PURE__*/_regenerator().m(addReaction),
-  _marked29$1 = /*#__PURE__*/_regenerator().m(deleteReaction),
-  _marked30$1 = /*#__PURE__*/_regenerator().m(getReactions),
-  _marked31$1 = /*#__PURE__*/_regenerator().m(loadMoreReactions),
-  _marked32$1 = /*#__PURE__*/_regenerator().m(getMessageAttachments),
-  _marked33$1 = /*#__PURE__*/_regenerator().m(loadMoreMessageAttachments),
-  _marked34$1 = /*#__PURE__*/_regenerator().m(pauseAttachmentUploading),
-  _marked35$1 = /*#__PURE__*/_regenerator().m(resumeAttachmentUploading),
-  _marked36$1 = /*#__PURE__*/_regenerator().m(getMessageMarkers),
-  _marked37$1 = /*#__PURE__*/_regenerator().m(executeAddPollVote),
-  _marked38$1 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForAddPollVote),
-  _marked39$1 = /*#__PURE__*/_regenerator().m(addPollVote),
-  _marked40$1 = /*#__PURE__*/_regenerator().m(executeDeletePollVote),
-  _marked41$1 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForDeletePollVote),
-  _marked42 = /*#__PURE__*/_regenerator().m(deletePollVote),
-  _marked43 = /*#__PURE__*/_regenerator().m(executeClosePoll),
-  _marked44 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForClosePoll),
-  _marked45 = /*#__PURE__*/_regenerator().m(closePoll),
-  _marked46 = /*#__PURE__*/_regenerator().m(executeRetractPollVote),
-  _marked47 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForRetractPollVote),
-  _marked48 = /*#__PURE__*/_regenerator().m(retractPollVote),
-  _marked49 = /*#__PURE__*/_regenerator().m(resendPendingPollActions),
-  _marked50 = /*#__PURE__*/_regenerator().m(resendPendingMessageMutations),
-  _marked51 = /*#__PURE__*/_regenerator().m(getPollVotes),
-  _marked52 = /*#__PURE__*/_regenerator().m(loadMorePollVotes),
-  _marked53 = /*#__PURE__*/_regenerator().m(refreshCacheAroundMessage),
-  _marked54 = /*#__PURE__*/_regenerator().m(MessageSaga);
+  _marked27$1 = /*#__PURE__*/_regenerator().m(prefetchMessagesFromAction),
+  _marked28$1 = /*#__PURE__*/_regenerator().m(loadMoreMessages),
+  _marked29$1 = /*#__PURE__*/_regenerator().m(addReaction),
+  _marked30$1 = /*#__PURE__*/_regenerator().m(deleteReaction),
+  _marked31$1 = /*#__PURE__*/_regenerator().m(getReactions),
+  _marked32$1 = /*#__PURE__*/_regenerator().m(loadMoreReactions),
+  _marked33$1 = /*#__PURE__*/_regenerator().m(getMessageAttachments),
+  _marked34$1 = /*#__PURE__*/_regenerator().m(loadMoreMessageAttachments),
+  _marked35$1 = /*#__PURE__*/_regenerator().m(pauseAttachmentUploading),
+  _marked36$1 = /*#__PURE__*/_regenerator().m(resumeAttachmentUploading),
+  _marked37$1 = /*#__PURE__*/_regenerator().m(getMessageMarkers),
+  _marked38$1 = /*#__PURE__*/_regenerator().m(executeAddPollVote),
+  _marked39$1 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForAddPollVote),
+  _marked40$1 = /*#__PURE__*/_regenerator().m(addPollVote),
+  _marked41$1 = /*#__PURE__*/_regenerator().m(executeDeletePollVote),
+  _marked42 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForDeletePollVote),
+  _marked43 = /*#__PURE__*/_regenerator().m(deletePollVote),
+  _marked44 = /*#__PURE__*/_regenerator().m(executeClosePoll),
+  _marked45 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForClosePoll),
+  _marked46 = /*#__PURE__*/_regenerator().m(closePoll),
+  _marked47 = /*#__PURE__*/_regenerator().m(executeRetractPollVote),
+  _marked48 = /*#__PURE__*/_regenerator().m(updateMessageOptimisticallyForRetractPollVote),
+  _marked49 = /*#__PURE__*/_regenerator().m(retractPollVote),
+  _marked50 = /*#__PURE__*/_regenerator().m(resendPendingPollActions),
+  _marked51 = /*#__PURE__*/_regenerator().m(resendPendingMessageMutations),
+  _marked52 = /*#__PURE__*/_regenerator().m(getPollVotes),
+  _marked53 = /*#__PURE__*/_regenerator().m(loadMorePollVotes),
+  _marked54 = /*#__PURE__*/_regenerator().m(refreshCacheAroundMessage),
+  _marked55 = /*#__PURE__*/_regenerator().m(MessageSaga);
 var loadMoreMessagesInFlight = new Set();
 var prefetchInFlight = new Set();
 var queuedPrefetchRequests = new Map();
@@ -21570,7 +21583,9 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
     }));
     updateChannelLastMessageOnAllChannels(channelId, nextLastMessage);
   }
-  store.dispatch(addMessagesAC([messageToAdd], 'next'));
+  if (getActiveChannelId() === channelId) {
+    store.dispatch(addMessagesAC([messageToAdd], 'next'));
+  }
 };
 var addConfirmedMessageToCache = function addConfirmedMessageToCache(channelId, message) {
   addMessageToMap(channelId, message);
@@ -25097,35 +25112,54 @@ function prefetchMessages(channelId, fromMessageId, direction, pages) {
     }
   }, _marked26$1, null, [[2, 20, 21, 22]]);
 }
+function prefetchMessagesFromAction(action) {
+  var _action$payload7, channelId, fromMessageId, direction, pages;
+  return _regenerator().w(function (_context33) {
+    while (1) switch (_context33.n) {
+      case 0:
+        _action$payload7 = action.payload, channelId = _action$payload7.channelId, fromMessageId = _action$payload7.fromMessageId, direction = _action$payload7.direction, pages = _action$payload7.pages;
+        if (!(!channelId || !fromMessageId || !direction || !pages)) {
+          _context33.n = 1;
+          break;
+        }
+        return _context33.a(2);
+      case 1:
+        _context33.n = 2;
+        return effects.call(prefetchMessages, channelId, fromMessageId, direction, pages);
+      case 2:
+        return _context33.a(2);
+    }
+  }, _marked27$1);
+}
 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, _t35;
-  return _regenerator().w(function (_context33) {
-    while (1) switch (_context33.p = _context33.n) {
+  return _regenerator().w(function (_context34) {
+    while (1) switch (_context34.p = _context34.n) {
       case 0:
         acquiredLock = false;
         loadingScope = 'both';
-        _context33.p = 1;
+        _context34.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)) {
-          _context33.n = 2;
+          _context34.n = 2;
           break;
         }
-        return _context33.a(2);
+        return _context34.a(2);
       case 2:
         loadMoreMessagesInFlight.add(inFlightKey);
         acquiredLock = true;
         SceytChatClient = getClient();
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channelId);
         messageQueryBuilder.reverse(true);
-        _context33.n = 3;
+        _context34.n = 3;
         return effects.call(messageQueryBuilder.build);
       case 3:
-        messageQuery = _context33.v;
+        messageQuery = _context34.v;
         messageQuery.limit = 20;
         loadingScope = direction === MESSAGE_LOAD_DIRECTION.PREV ? 'previous' : 'next';
-        _context33.n = 4;
+        _context34.n = 4;
         return effects.call(setMessageListLoading, loadingScope, LOADING_STATE.LOADING);
       case 4:
         connectionState = store.getState().UserReducer.connectionStatus;
@@ -25139,17 +25173,17 @@ function loadMoreMessages(action) {
         });
         prefetchKey = channelId + ":" + direction;
         if (!(direction === MESSAGE_LOAD_DIRECTION.PREV)) {
-          _context33.n = 14;
+          _context34.n = 14;
           break;
         }
         mapCached = getContiguousPrevMessages(channelId, {
           id: messageId
         }, limit || 30);
         if (!(!mapCached.length && hasNext && prefetchInFlight.has(prefetchKey))) {
-          _context33.n = 6;
+          _context34.n = 6;
           break;
         }
-        _context33.n = 5;
+        _context34.n = 5;
         return effects.call(waitForPrefetchCompletion, prefetchKey);
       case 5:
         mapCached = getContiguousPrevMessages(channelId, {
@@ -25157,7 +25191,7 @@ function loadMoreMessages(action) {
         }, limit || 30);
       case 6:
         if (!(mapCached.length > 0)) {
-          _context33.n = 8;
+          _context34.n = 8;
           break;
         }
         result.messages = mapCached;
@@ -25165,39 +25199,39 @@ function loadMoreMessages(action) {
         nextHasPrevState = aheadCached.length > 0 || hasNext;
         pagesToFetch = 2 - Math.floor(aheadCached.length / LOAD_MAX_MESSAGE_COUNT_PREFETCH);
         if (!(pagesToFetch > 0 && hasNext)) {
-          _context33.n = 7;
+          _context34.n = 7;
           break;
         }
         fromId = aheadCached.length > 0 ? aheadCached[0].id : mapCached[0].id;
-        _context33.n = 7;
+        _context34.n = 7;
         return effects.spawn(prefetchMessages, channelId, fromId, MESSAGE_LOAD_DIRECTION.PREV, pagesToFetch);
       case 7:
-        _context33.n = 13;
+        _context34.n = 13;
         break;
       case 8:
         if (!hasNext) {
-          _context33.n = 13;
+          _context34.n = 13;
           break;
         }
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context33.n = 9;
+          _context34.n = 9;
           break;
         }
         loadMoreMessagesInFlight["delete"](getLoadMoreInFlightKey(action.payload.channelId, action.payload.direction));
         store.dispatch(setLoadingPrevMessagesStateAC(LOADING_STATE.LOADED));
-        return _context33.a(2);
+        return _context34.a(2);
       case 9:
-        _context33.n = 10;
+        _context34.n = 10;
         return effects.call(messageQuery.loadPreviousMessageId, messageId);
       case 10:
-        result = _context33.v;
+        result = _context34.v;
         if (!result.messages.length) {
-          _context33.n = 12;
+          _context34.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);
-        _context33.n = 11;
+        _context34.n = 11;
         return effects.spawn(prefetchMessages, channelId, result.messages[0].id, MESSAGE_LOAD_DIRECTION.PREV, 2);
       case 11:
         result.messages = getContiguousPrevMessages(channelId, {
@@ -25212,17 +25246,17 @@ function loadMoreMessages(action) {
         if (nextWindowConfirmedCount > MESSAGES_MAX_PAGE_COUNT) {
           nextHasNextState = true;
         }
-        _context33.n = 25;
+        _context34.n = 25;
         break;
       case 14:
         _mapCached = getContiguousNextMessages(channelId, {
           id: messageId
         }, limit || 30);
         if (!(!_mapCached.length && hasNext && prefetchInFlight.has(prefetchKey))) {
-          _context33.n = 16;
+          _context34.n = 16;
           break;
         }
-        _context33.n = 15;
+        _context34.n = 15;
         return effects.call(waitForPrefetchCompletion, prefetchKey);
       case 15:
         _mapCached = getContiguousNextMessages(channelId, {
@@ -25230,7 +25264,7 @@ function loadMoreMessages(action) {
         }, limit || 30);
       case 16:
         if (!(_mapCached.length > 0)) {
-          _context33.n = 18;
+          _context34.n = 18;
           break;
         }
         result.messages = _mapCached;
@@ -25248,7 +25282,7 @@ function loadMoreMessages(action) {
         nextHasNextState = hasCachedNext || canLoadServerNext;
         _pagesToFetch = 2 - Math.floor(confirmedAheadCount / LOAD_MAX_MESSAGE_COUNT_PREFETCH);
         if (!(_pagesToFetch > 0 && hasNext)) {
-          _context33.n = 17;
+          _context34.n = 17;
           break;
         }
         lastAheadConfirmedId = (_reverse$find = [].concat(_aheadCached).reverse().find(function (m) {
@@ -25256,39 +25290,39 @@ function loadMoreMessages(action) {
         })) === null || _reverse$find === void 0 ? void 0 : _reverse$find.id;
         _fromId = lastAheadConfirmedId || lastConfirmedId;
         if (!_fromId) {
-          _context33.n = 17;
+          _context34.n = 17;
           break;
         }
-        _context33.n = 17;
+        _context34.n = 17;
         return effects.spawn(prefetchMessages, channelId, _fromId, MESSAGE_LOAD_DIRECTION.NEXT, _pagesToFetch);
       case 17:
-        _context33.n = 24;
+        _context34.n = 24;
         break;
       case 18:
         if (!hasNext) {
-          _context33.n = 23;
+          _context34.n = 23;
           break;
         }
         messageQuery.reverse = false;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context33.n = 19;
+          _context34.n = 19;
           break;
         }
         loadMoreMessagesInFlight["delete"](getLoadMoreInFlightKey(action.payload.channelId, action.payload.direction));
         store.dispatch(setLoadingNextMessagesStateAC(LOADING_STATE.LOADED));
-        return _context33.a(2);
+        return _context34.a(2);
       case 19:
-        _context33.n = 20;
+        _context34.n = 20;
         return effects.call(messageQuery.loadNextMessageId, messageId);
       case 20:
-        result = _context33.v;
+        result = _context34.v;
         if (!result.messages.length) {
-          _context33.n = 22;
+          _context34.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);
-        _context33.n = 21;
+        _context34.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, {
@@ -25297,7 +25331,7 @@ function loadMoreMessages(action) {
       case 22:
         reachedLatestConfirmedEdge = !result.hasNext;
         nextHasNextState = result.hasNext;
-        _context33.n = 24;
+        _context34.n = 24;
         break;
       case 23:
         reachedLatestConfirmedEdge = true;
@@ -25307,64 +25341,64 @@ function loadMoreMessages(action) {
       case 25:
         shouldApplyVisibleResult = isCurrentPaginationIntent(channelId, direction === MESSAGE_LOAD_DIRECTION.PREV ? 'prev' : 'next', requestId);
         if (!(shouldApplyVisibleResult && nextHasPrevState !== undefined)) {
-          _context33.n = 26;
+          _context34.n = 26;
           break;
         }
-        _context33.n = 26;
+        _context34.n = 26;
         return effects.put(setMessagesHasPrevAC(nextHasPrevState));
       case 26:
         if (!(shouldApplyVisibleResult && nextHasNextState !== undefined)) {
-          _context33.n = 27;
+          _context34.n = 27;
           break;
         }
-        _context33.n = 27;
+        _context34.n = 27;
         return effects.put(setMessagesHasNextAC(nextHasNextState));
       case 27:
         if (!(shouldApplyVisibleResult && result.messages && result.messages.length && result.messages.length > 0)) {
-          _context33.n = 30;
+          _context34.n = 30;
           break;
         }
-        _context33.n = 28;
+        _context34.n = 28;
         return effects.call(loadOGMetadataForLinkMessages, result.messages, true, false, false);
       case 28:
-        _context33.n = 29;
+        _context34.n = 29;
         return effects.put(addMessagesAC(JSON.parse(JSON.stringify(result.messages)), direction));
       case 29:
-        _context33.n = 31;
+        _context34.n = 31;
         break;
       case 30:
         if (!shouldApplyVisibleResult) {
-          _context33.n = 31;
+          _context34.n = 31;
           break;
         }
-        _context33.n = 31;
+        _context34.n = 31;
         return effects.put(addMessagesAC([], direction));
       case 31:
         if (!(shouldApplyVisibleResult && direction === MESSAGE_LOAD_DIRECTION.NEXT && reachedLatestConfirmedEdge)) {
-          _context33.n = 33;
+          _context34.n = 33;
           break;
         }
         filteredPendingMessages = getFilteredPendingMessages(channelId, result.messages, {
           hasNext: false
         });
         if (!filteredPendingMessages.length) {
-          _context33.n = 33;
+          _context34.n = 33;
           break;
         }
-        _context33.n = 32;
+        _context34.n = 32;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 32:
-        _context33.n = 33;
+        _context34.n = 33;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
       case 33:
-        _context33.n = 35;
+        _context34.n = 35;
         break;
       case 34:
-        _context33.p = 34;
-        _t35 = _context33.v;
+        _context34.p = 34;
+        _t35 = _context34.v;
         log.error('[MESSAGE_LIST] loadMoreMessages ERROR:', _t35 === null || _t35 === void 0 ? void 0 : _t35.type);
       case 35:
-        _context33.p = 35;
+        _context34.p = 35;
         if (acquiredLock) {
           loadMoreMessagesInFlight["delete"](getLoadMoreInFlightKey(action.payload.channelId, action.payload.direction));
           if (loadingScope === 'previous') {
@@ -25373,39 +25407,39 @@ function loadMoreMessages(action) {
             store.dispatch(setLoadingNextMessagesStateAC(LOADING_STATE.LOADED));
           }
         }
-        return _context33.f(35);
+        return _context34.f(35);
       case 36:
-        return _context33.a(2);
+        return _context34.a(2);
     }
-  }, _marked27$1, null, [[1, 34, 35, 36]]);
+  }, _marked28$1, null, [[1, 34, 35, 36]]);
 }
 function addReaction(action) {
   var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t36;
-  return _regenerator().w(function (_context34) {
-    while (1) switch (_context34.p = _context34.n) {
+  return _regenerator().w(function (_context35) {
+    while (1) switch (_context35.p = _context35.n) {
       case 0:
-        _context34.p = 0;
+        _context35.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;
-        _context34.n = 1;
+        _context35.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context34.v;
+        channel = _context35.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context34.n = 2;
+        _context35.n = 2;
         return effects.call(channel.addReaction, messageId, key, score, reason, enforceUnique);
       case 2:
-        _yield$call = _context34.v;
+        _yield$call = _context35.v;
         message = _yield$call.message;
         reaction = _yield$call.reaction;
         if (!(user.id === message.user.id)) {
-          _context34.n = 4;
+          _context35.n = 4;
           break;
         }
         channelUpdateParam = {
@@ -25413,18 +25447,18 @@ function addReaction(action) {
           lastReactedMessage: message,
           newReactions: [reaction]
         };
-        _context34.n = 3;
+        _context35.n = 3;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam));
       case 3:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 4:
-        _context34.n = 5;
+        _context35.n = 5;
         return effects.put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 5:
-        _context34.n = 6;
+        _context35.n = 6;
         return effects.put(addReactionToListAC(reaction));
       case 6:
-        _context34.n = 7;
+        _context35.n = 7;
         return effects.put(addReactionToMessageAC(message, reaction, true));
       case 7:
         addReactionToMessageOnMap(channelId, message, reaction, true);
@@ -25433,82 +25467,82 @@ function addReaction(action) {
             navigateToLatest(true);
           }, 200);
         }
-        _context34.n = 9;
+        _context35.n = 9;
         break;
       case 8:
-        _context34.p = 8;
-        _t36 = _context34.v;
+        _context35.p = 8;
+        _t36 = _context35.v;
         log.error('ERROR in add reaction', _t36.message);
       case 9:
-        return _context34.a(2);
+        return _context35.a(2);
     }
-  }, _marked28$1, null, [[0, 8]]);
+  }, _marked29$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
   var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t37;
-  return _regenerator().w(function (_context35) {
-    while (1) switch (_context35.p = _context35.n) {
+  return _regenerator().w(function (_context36) {
+    while (1) switch (_context36.p = _context36.n) {
       case 0:
-        _context35.p = 0;
+        _context36.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId, key = payload.key, isLastReaction = payload.isLastReaction;
-        _context35.n = 1;
+        _context36.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context35.v;
+        channel = _context36.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context35.n = 2;
+        _context36.n = 2;
         return effects.call(channel.deleteReaction, messageId, key);
       case 2:
-        _yield$call2 = _context35.v;
+        _yield$call2 = _context36.v;
         message = _yield$call2.message;
         reaction = _yield$call2.reaction;
         if (!isLastReaction) {
-          _context35.n = 4;
+          _context36.n = 4;
           break;
         }
         channelUpdateParam = {
           userMessageReactions: [],
           lastReactedMessage: null
         };
-        _context35.n = 3;
+        _context36.n = 3;
         return effects.put(updateChannelDataAC(channel.id, channelUpdateParam));
       case 3:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 4:
-        _context35.n = 5;
+        _context36.n = 5;
         return effects.put(deleteReactionFromListAC(reaction));
       case 5:
-        _context35.n = 6;
+        _context36.n = 6;
         return effects.put(deleteReactionFromMessageAC(message, reaction, true));
       case 6:
         removeReactionToMessageOnMap(channelId, message, reaction, true);
-        _context35.n = 8;
+        _context36.n = 8;
         break;
       case 7:
-        _context35.p = 7;
-        _t37 = _context35.v;
+        _context36.p = 7;
+        _t37 = _context36.v;
         log.error('ERROR in delete reaction', _t37.message);
       case 8:
-        return _context35.a(2);
+        return _context36.a(2);
     }
-  }, _marked29$1, null, [[0, 7]]);
+  }, _marked30$1, null, [[0, 7]]);
 }
 function getReactions(action) {
   var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t38;
-  return _regenerator().w(function (_context36) {
-    while (1) switch (_context36.p = _context36.n) {
+  return _regenerator().w(function (_context37) {
+    while (1) switch (_context37.p = _context37.n) {
       case 0:
-        _context36.p = 0;
+        _context37.p = 0;
         payload = action.payload;
         messageId = payload.messageId, key = payload.key, limit = payload.limit;
         SceytChatClient = getClient();
-        _context36.n = 1;
+        _context37.n = 1;
         return effects.put(setReactionsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         reactionQueryBuilder = new SceytChatClient.ReactionListQueryBuilder(messageId);
@@ -25516,76 +25550,76 @@ function getReactions(action) {
         if (key) {
           reactionQueryBuilder.setKey(key);
         }
-        _context36.n = 2;
+        _context37.n = 2;
         return effects.call(reactionQueryBuilder.build);
       case 2:
-        reactionQuery = _context36.v;
-        _context36.n = 3;
+        reactionQuery = _context37.v;
+        _context37.n = 3;
         return effects.call(reactionQuery.loadNext);
       case 3:
-        result = _context36.v;
+        result = _context37.v;
         query.ReactionsQuery = reactionQuery;
-        _context36.n = 4;
+        _context37.n = 4;
         return effects.put(setReactionsListAC(result.reactions, result.hasNext));
       case 4:
-        _context36.n = 5;
+        _context37.n = 5;
         return effects.put(setReactionsLoadingStateAC(LOADING_STATE.LOADED));
       case 5:
-        _context36.n = 7;
+        _context37.n = 7;
         break;
       case 6:
-        _context36.p = 6;
-        _t38 = _context36.v;
+        _context37.p = 6;
+        _t38 = _context37.v;
         log.error('ERROR in get reactions', _t38.message);
       case 7:
-        return _context36.a(2);
+        return _context37.a(2);
     }
-  }, _marked30$1, null, [[0, 6]]);
+  }, _marked31$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
   var payload, limit, ReactionQuery, result, _t39;
-  return _regenerator().w(function (_context37) {
-    while (1) switch (_context37.p = _context37.n) {
+  return _regenerator().w(function (_context38) {
+    while (1) switch (_context38.p = _context38.n) {
       case 0:
-        _context37.p = 0;
+        _context38.p = 0;
         payload = action.payload;
         limit = payload.limit;
-        _context37.n = 1;
+        _context38.n = 1;
         return effects.put(setReactionsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         ReactionQuery = query.ReactionsQuery;
         if (limit) {
           ReactionQuery.limit = limit;
         }
-        _context37.n = 2;
+        _context38.n = 2;
         return effects.call(ReactionQuery.loadNext);
       case 2:
-        result = _context37.v;
-        _context37.n = 3;
+        result = _context38.v;
+        _context38.n = 3;
         return effects.put(addReactionsToListAC(result.reactions, result.hasNext));
       case 3:
-        _context37.n = 4;
+        _context38.n = 4;
         return effects.put(setReactionsLoadingStateAC(LOADING_STATE.LOADED));
       case 4:
-        _context37.n = 6;
+        _context38.n = 6;
         break;
       case 5:
-        _context37.p = 5;
-        _t39 = _context37.v;
+        _context38.p = 5;
+        _t39 = _context38.v;
         log.error('ERROR in load more reactions', _t39.message);
       case 6:
-        return _context37.a(2);
+        return _context38.a(2);
     }
-  }, _marked31$1, null, [[0, 5]]);
+  }, _marked32$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload7, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, attachments, attachmentIndex, hasPrev, hasNext, _t40;
-  return _regenerator().w(function (_context38) {
-    while (1) switch (_context38.p = _context38.n) {
+  var _action$payload8, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, attachments, attachmentIndex, hasPrev, hasNext, _t40;
+  return _regenerator().w(function (_context39) {
+    while (1) switch (_context39.p = _context39.n) {
       case 0:
-        _action$payload7 = action.payload, channelId = _action$payload7.channelId, attachmentType = _action$payload7.attachmentType, limit = _action$payload7.limit, direction = _action$payload7.direction, attachmentId = _action$payload7.attachmentId, forPopup = _action$payload7.forPopup;
-        _context38.p = 1;
-        _context38.n = 2;
+        _action$payload8 = action.payload, channelId = _action$payload8.channelId, attachmentType = _action$payload8.attachmentType, limit = _action$payload8.limit, direction = _action$payload8.direction, attachmentId = _action$payload8.attachmentId, forPopup = _action$payload8.forPopup;
+        _context39.p = 1;
+        _context39.n = 2;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADING, forPopup));
       case 2:
         SceytChatClient = getClient();
@@ -25601,49 +25635,49 @@ function getMessageAttachments(action) {
         }
         AttachmentByTypeQueryBuilder = new SceytChatClient.AttachmentListQueryBuilder(channelId, typeList);
         AttachmentByTypeQueryBuilder.limit(limit || 34);
-        _context38.n = 3;
+        _context39.n = 3;
         return effects.call(AttachmentByTypeQueryBuilder.build);
       case 3:
-        AttachmentByTypeQuery = _context38.v;
+        AttachmentByTypeQuery = _context39.v;
         if (forPopup) {
           AttachmentByTypeQuery.reverse = true;
         }
         if (!(direction === queryDirection.NEXT)) {
-          _context38.n = 5;
+          _context39.n = 5;
           break;
         }
-        _context38.n = 4;
+        _context39.n = 4;
         return effects.call(AttachmentByTypeQuery.loadPrevious);
       case 4:
-        result = _context38.v;
-        _context38.n = 9;
+        result = _context39.v;
+        _context39.n = 9;
         break;
       case 5:
         if (!(direction === queryDirection.NEAR)) {
-          _context38.n = 7;
+          _context39.n = 7;
           break;
         }
-        _context38.n = 6;
+        _context39.n = 6;
         return effects.call(AttachmentByTypeQuery.loadNearMessageId, attachmentId);
       case 6:
-        result = _context38.v;
-        _context38.n = 9;
+        result = _context39.v;
+        _context39.n = 9;
         break;
       case 7:
-        _context38.n = 8;
+        _context39.n = 8;
         return effects.call(AttachmentByTypeQuery.loadPrevious);
       case 8:
-        result = _context38.v;
+        result = _context39.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) {
-          _context38.n = 12;
+          _context39.n = 12;
           break;
         }
         query.AttachmentByTypeQueryForPopup = AttachmentByTypeQuery;
-        _context38.n = 10;
+        _context39.n = 10;
         return effects.put(setAttachmentsForPopupAC(JSON.parse(JSON.stringify(attachments))));
       case 10:
         attachmentIndex = attachments.findIndex(function (attachment) {
@@ -25661,55 +25695,55 @@ function getMessageAttachments(action) {
         } else {
           hasNext = false;
         }
-        _context38.n = 11;
+        _context39.n = 11;
         return effects.put(setAttachmentsCompleteForPopupAC(hasPrev, hasNext));
       case 11:
-        _context38.n = 14;
+        _context39.n = 14;
         break;
       case 12:
         query.AttachmentByTypeQuery = AttachmentByTypeQuery;
-        _context38.n = 13;
+        _context39.n = 13;
         return effects.put(setAttachmentsCompleteAC(result.hasNext));
       case 13:
-        _context38.n = 14;
+        _context39.n = 14;
         return effects.put(setAttachmentsAC(JSON.parse(JSON.stringify(attachments))));
       case 14:
-        _context38.n = 16;
+        _context39.n = 16;
         break;
       case 15:
-        _context38.p = 15;
-        _t40 = _context38.v;
+        _context39.p = 15;
+        _t40 = _context39.v;
         log.error('error in message attachment query', _t40);
       case 16:
-        _context38.p = 16;
-        _context38.n = 17;
+        _context39.p = 16;
+        _context39.n = 17;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADED, forPopup));
       case 17:
-        return _context38.f(16);
+        return _context39.f(16);
       case 18:
-        return _context38.a(2);
+        return _context39.a(2);
     }
-  }, _marked32$1, null, [[1, 15, 16, 18]]);
+  }, _marked33$1, null, [[1, 15, 16, 18]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload8, limit, direction, forPopup, attachmentId, AttachmentQuery, result, _result2, attachments, hasNext, _t41;
-  return _regenerator().w(function (_context39) {
-    while (1) switch (_context39.p = _context39.n) {
+  var _action$payload9, limit, direction, forPopup, attachmentId, AttachmentQuery, result, _result2, attachments, hasNext, _t41;
+  return _regenerator().w(function (_context40) {
+    while (1) switch (_context40.p = _context40.n) {
       case 0:
-        _action$payload8 = action.payload, limit = _action$payload8.limit, direction = _action$payload8.direction, forPopup = _action$payload8.forPopup, attachmentId = _action$payload8.attachmentId;
-        _context39.p = 1;
+        _action$payload9 = action.payload, limit = _action$payload9.limit, direction = _action$payload9.direction, forPopup = _action$payload9.forPopup, attachmentId = _action$payload9.attachmentId;
+        _context40.p = 1;
         if (forPopup) {
           AttachmentQuery = query.AttachmentByTypeQueryForPopup;
         } else {
           AttachmentQuery = query.AttachmentByTypeQuery;
         }
         if (AttachmentQuery) {
-          _context39.n = 2;
+          _context40.n = 2;
           break;
         }
-        return _context39.a(2);
+        return _context40.a(2);
       case 2:
-        _context39.n = 3;
+        _context40.n = 3;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADING, forPopup));
       case 3:
         AttachmentQuery.limit = limit;
@@ -25718,172 +25752,172 @@ function loadMoreMessageAttachments(action) {
           hasNext: false
         };
         if (!attachmentId) {
-          _context39.n = 8;
+          _context40.n = 8;
           break;
         }
         if (!(direction === queryDirection.NEXT)) {
-          _context39.n = 5;
+          _context40.n = 5;
           break;
         }
-        _context39.n = 4;
+        _context40.n = 4;
         return effects.call(AttachmentQuery.loadNextAttachmentId, attachmentId);
       case 4:
-        result = _context39.v;
-        _context39.n = 7;
+        result = _context40.v;
+        _context40.n = 7;
         break;
       case 5:
-        _context39.n = 6;
+        _context40.n = 6;
         return effects.call(AttachmentQuery.loadPreviousAttachmentId, attachmentId);
       case 6:
-        result = _context39.v;
+        result = _context40.v;
       case 7:
-        _context39.n = 12;
+        _context40.n = 12;
         break;
       case 8:
         if (!(direction === queryDirection.NEXT)) {
-          _context39.n = 10;
+          _context40.n = 10;
           break;
         }
-        _context39.n = 9;
+        _context40.n = 9;
         return effects.call(AttachmentQuery.loadNext);
       case 9:
-        result = _context39.v;
-        _context39.n = 12;
+        result = _context40.v;
+        _context40.n = 12;
         break;
       case 10:
-        _context39.n = 11;
+        _context40.n = 11;
         return effects.call(AttachmentQuery.loadPrevious);
       case 11:
-        result = _context39.v;
+        result = _context40.v;
       case 12:
         _result2 = result, attachments = _result2.attachments, hasNext = _result2.hasNext;
         if (!forPopup) {
-          _context39.n = 17;
+          _context40.n = 17;
           break;
         }
-        _context39.n = 13;
+        _context40.n = 13;
         return effects.put(addAttachmentsForPopupAC(attachments, direction));
       case 13:
         if (!(attachmentId && direction === queryDirection.NEXT)) {
-          _context39.n = 15;
+          _context40.n = 15;
           break;
         }
-        _context39.n = 14;
+        _context40.n = 14;
         return effects.put(setAttachmentsCompleteForPopupAC(undefined, result.hasNext));
       case 14:
-        _context39.n = 16;
+        _context40.n = 16;
         break;
       case 15:
         if (!(attachmentId && direction === queryDirection.PREV)) {
-          _context39.n = 16;
+          _context40.n = 16;
           break;
         }
-        _context39.n = 16;
+        _context40.n = 16;
         return effects.put(setAttachmentsCompleteForPopupAC(result.hasNext, undefined));
       case 16:
-        _context39.n = 20;
+        _context40.n = 20;
         break;
       case 17:
-        _context39.n = 18;
+        _context40.n = 18;
         return effects.put(setAttachmentsCompleteAC(hasNext));
       case 18:
-        _context39.n = 19;
+        _context40.n = 19;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADED, forPopup));
       case 19:
-        _context39.n = 20;
+        _context40.n = 20;
         return effects.put(addAttachmentsAC(attachments));
       case 20:
-        _context39.n = 22;
+        _context40.n = 22;
         break;
       case 21:
-        _context39.p = 21;
-        _t41 = _context39.v;
+        _context40.p = 21;
+        _t41 = _context40.v;
         log.error('error in message attachment query', _t41);
       case 22:
-        _context39.p = 22;
-        _context39.n = 23;
+        _context40.p = 22;
+        _context40.n = 23;
         return effects.put(setAttachmentsLoadingStateAC(LOADING_STATE.LOADED, forPopup));
       case 23:
-        return _context39.f(22);
+        return _context40.f(22);
       case 24:
-        return _context39.a(2);
+        return _context40.a(2);
     }
-  }, _marked33$1, null, [[1, 21, 22, 24]]);
+  }, _marked34$1, null, [[1, 21, 22, 24]]);
 }
 function pauseAttachmentUploading(action) {
   var attachmentId, isPaused, _t42;
-  return _regenerator().w(function (_context40) {
-    while (1) switch (_context40.p = _context40.n) {
+  return _regenerator().w(function (_context41) {
+    while (1) switch (_context41.p = _context41.n) {
       case 0:
-        _context40.p = 0;
+        _context41.p = 0;
         attachmentId = action.payload.attachmentId;
         if (!getCustomUploader()) {
-          _context40.n = 1;
+          _context41.n = 1;
           break;
         }
         isPaused = pauseUpload(attachmentId);
         if (!isPaused) {
-          _context40.n = 1;
+          _context41.n = 1;
           break;
         }
-        _context40.n = 1;
+        _context41.n = 1;
         return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.PAUSED, attachmentId));
       case 1:
-        _context40.n = 3;
+        _context41.n = 3;
         break;
       case 2:
-        _context40.p = 2;
-        _t42 = _context40.v;
+        _context41.p = 2;
+        _t42 = _context41.v;
         log.error('error in pause attachment uploading', _t42);
       case 3:
-        return _context40.a(2);
+        return _context41.a(2);
     }
-  }, _marked34$1, null, [[0, 2]]);
+  }, _marked35$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
   var attachmentId, isResumed, _t43;
-  return _regenerator().w(function (_context41) {
-    while (1) switch (_context41.p = _context41.n) {
+  return _regenerator().w(function (_context42) {
+    while (1) switch (_context42.p = _context42.n) {
       case 0:
-        _context41.p = 0;
+        _context42.p = 0;
         attachmentId = action.payload.attachmentId;
         log.info('resume for attachment ... ', attachmentId);
         if (!getCustomUploader()) {
-          _context41.n = 1;
+          _context42.n = 1;
           break;
         }
         isResumed = resumeUpload(attachmentId);
         if (!isResumed) {
-          _context41.n = 1;
+          _context42.n = 1;
           break;
         }
-        _context41.n = 1;
+        _context42.n = 1;
         return effects.put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, attachmentId));
       case 1:
-        _context41.n = 3;
+        _context42.n = 3;
         break;
       case 2:
-        _context41.p = 2;
-        _t43 = _context41.v;
+        _context42.p = 2;
+        _t43 = _context42.v;
         log.error('error in resume attachment uploading', _t43);
       case 3:
-        return _context41.a(2);
+        return _context42.a(2);
     }
-  }, _marked35$1, null, [[0, 2]]);
+  }, _marked36$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
-  var _action$payload9, messageId, channelId, deliveryStatuses, sceytChatClient, deliveryStatusesArray, messageMarkers, _iterator4, _step4, deliveryStatus, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkersResult, _t44;
-  return _regenerator().w(function (_context42) {
-    while (1) switch (_context42.p = _context42.n) {
+  var _action$payload0, messageId, channelId, deliveryStatuses, sceytChatClient, deliveryStatusesArray, messageMarkers, _iterator4, _step4, deliveryStatus, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkersResult, _t44;
+  return _regenerator().w(function (_context43) {
+    while (1) switch (_context43.p = _context43.n) {
       case 0:
-        _context42.p = 0;
-        _context42.n = 1;
+        _context43.p = 0;
+        _context43.n = 1;
         return effects.put(setMessagesMarkersLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload9 = action.payload, messageId = _action$payload9.messageId, channelId = _action$payload9.channelId, deliveryStatuses = _action$payload9.deliveryStatuses;
+        _action$payload0 = action.payload, messageId = _action$payload0.messageId, channelId = _action$payload0.channelId, deliveryStatuses = _action$payload0.deliveryStatuses;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context42.n = 7;
+          _context43.n = 7;
           break;
         }
         deliveryStatusesArray = deliveryStatuses.split(',');
@@ -25891,98 +25925,98 @@ function getMessageMarkers(action) {
         _iterator4 = _createForOfIteratorHelperLoose(deliveryStatusesArray);
       case 2:
         if ((_step4 = _iterator4()).done) {
-          _context42.n = 6;
+          _context43.n = 6;
           break;
         }
         deliveryStatus = _step4.value;
         messageMarkerListQueryBuilder = new sceytChatClient.MessageMarkerListQueryBuilder(channelId, String(messageId), deliveryStatus);
-        _context42.n = 3;
+        _context43.n = 3;
         return effects.call(messageMarkerListQueryBuilder.build);
       case 3:
-        messageMarkerListQuery = _context42.v;
-        _context42.n = 4;
+        messageMarkerListQuery = _context43.v;
+        _context43.n = 4;
         return effects.call(messageMarkerListQuery.loadNext);
       case 4:
-        messageMarkersResult = _context42.v;
+        messageMarkersResult = _context43.v;
         messageMarkers[deliveryStatus] = messageMarkersResult.markers;
       case 5:
-        _context42.n = 2;
+        _context43.n = 2;
         break;
       case 6:
         if (!(Object.keys(messageMarkers).length > 0)) {
-          _context42.n = 7;
+          _context43.n = 7;
           break;
         }
-        _context42.n = 7;
+        _context43.n = 7;
         return effects.put(setMessageMarkersAC(channelId, messageId, messageMarkers, deliveryStatusesArray));
       case 7:
-        _context42.n = 9;
+        _context43.n = 9;
         break;
       case 8:
-        _context42.p = 8;
-        _t44 = _context42.v;
+        _context43.p = 8;
+        _t44 = _context43.v;
         log.error('error in get message markers', _t44);
       case 9:
-        _context42.p = 9;
-        _context42.n = 10;
+        _context43.p = 9;
+        _context43.n = 10;
         return effects.put(setMessagesMarkersLoadingStateAC(LOADING_STATE.LOADED));
       case 10:
-        return _context42.f(9);
+        return _context43.f(9);
       case 11:
-        return _context42.a(2);
+        return _context43.a(2);
     }
-  }, _marked36$1, null, [[0, 8, 9, 11]]);
+  }, _marked37$1, null, [[0, 8, 9, 11]]);
 }
 function executeAddPollVote(channelId, pollId, optionId, message) {
   var channel;
-  return _regenerator().w(function (_context43) {
-    while (1) switch (_context43.n) {
+  return _regenerator().w(function (_context44) {
+    while (1) switch (_context44.n) {
       case 0:
-        _context43.n = 1;
+        _context44.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context43.v;
+        channel = _context44.v;
         if (message.pollDetails) {
-          _context43.n = 2;
+          _context44.n = 2;
           break;
         }
-        return _context43.a(2);
+        return _context44.a(2);
       case 2:
         if (!(channel && message.id)) {
-          _context43.n = 4;
+          _context44.n = 4;
           break;
         }
-        _context43.n = 3;
+        _context44.n = 3;
         return effects.call(channel.addVote, message.id, pollId, [optionId]);
       case 3:
-        _context43.n = 4;
+        _context44.n = 4;
         return effects.put(removePendingPollActionAC(message.id, 'ADD_POLL_VOTE', optionId));
       case 4:
-        return _context43.a(2);
+        return _context44.a(2);
     }
-  }, _marked37$1);
+  }, _marked38$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 (_context44) {
-    while (1) switch (_context44.n) {
+  return _regenerator().w(function (_context45) {
+    while (1) switch (_context45.n) {
       case 0:
-        _context44.n = 1;
+        _context45.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context44.v;
+        channel = _context45.v;
         if (channel) {
-          _context44.n = 2;
+          _context45.n = 2;
           break;
         }
-        return _context44.a(2);
+        return _context45.a(2);
       case 2:
         if (message.pollDetails) {
-          _context44.n = 3;
+          _context45.n = 3;
           break;
         }
-        return _context44.a(2);
+        return _context45.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) {
@@ -25998,7 +26032,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
         _i2 = 0, _objs = objs;
       case 4:
         if (!(_i2 < _objs.length)) {
-          _context44.n = 6;
+          _context45.n = 6;
           break;
         }
         obj = _objs[_i2];
@@ -26006,28 +26040,28 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context44.n = 5;
+        _context45.n = 5;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 5:
         _i2++;
-        _context44.n = 4;
+        _context45.n = 4;
         break;
       case 6:
-        return _context44.a(2);
+        return _context45.a(2);
     }
-  }, _marked38$1);
+  }, _marked39$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, _t45;
-  return _regenerator().w(function (_context45) {
-    while (1) switch (_context45.p = _context45.n) {
+  return _regenerator().w(function (_context46) {
+    while (1) switch (_context46.p = _context46.n) {
       case 0:
-        _context45.p = 0;
+        _context46.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 = 6;
+          _context46.n = 6;
           break;
         }
         user = sceytChatClient.user;
@@ -26061,20 +26095,20 @@ function addPollVote(action) {
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && !conflictCheck.shouldSkip)) {
-          _context45.n = 4;
+          _context46.n = 4;
           break;
         }
-        _context45.n = 1;
+        _context46.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context45.v;
+        channel = _context46.v;
         if (!channel) {
-          _context45.n = 3;
+          _context46.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;
-        _context45.n = 2;
+        _context46.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 = {
@@ -26085,95 +26119,95 @@ function addPollVote(action) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context45.n = 3;
+        _context46.n = 3;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 3:
-        _context45.n = 5;
+        _context46.n = 5;
         break;
       case 4:
         if (conflictCheck.shouldSkip) {
-          _context45.n = 5;
+          _context46.n = 5;
           break;
         }
-        _context45.n = 5;
+        _context46.n = 5;
         return effects.call(updateMessageOptimisticallyForAddPollVote, channelId, message, vote);
       case 5:
         if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        _context45.n = 6;
+        _context46.n = 6;
         return effects.call(executeAddPollVote, channelId, pollId, optionId, message);
       case 6:
-        _context45.n = 8;
+        _context46.n = 8;
         break;
       case 7:
-        _context45.p = 7;
-        _t45 = _context45.v;
+        _context46.p = 7;
+        _t45 = _context46.v;
         log.error('error in add poll vote', _t45);
       case 8:
-        return _context45.a(2);
+        return _context46.a(2);
     }
-  }, _marked39$1, null, [[0, 7]]);
+  }, _marked40$1, null, [[0, 7]]);
 }
 function executeDeletePollVote(channelId, pollId, optionId, message) {
   var _message$pollDetails8, _message$pollDetails9, _message$pollDetails0;
   var channel, vote;
-  return _regenerator().w(function (_context46) {
-    while (1) switch (_context46.n) {
+  return _regenerator().w(function (_context47) {
+    while (1) switch (_context47.n) {
       case 0:
-        _context46.n = 1;
+        _context47.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context46.v;
+        channel = _context47.v;
         if (message.pollDetails) {
-          _context46.n = 2;
+          _context47.n = 2;
           break;
         }
-        return _context46.a(2);
+        return _context47.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) {
-          _context46.n = 3;
+          _context47.n = 3;
           break;
         }
-        return _context46.a(2);
+        return _context47.a(2);
       case 3:
         if (!(channel && message.id)) {
-          _context46.n = 5;
+          _context47.n = 5;
           break;
         }
-        _context46.n = 4;
+        _context47.n = 4;
         return effects.call(channel.deleteVote, message.id, pollId, [optionId]);
       case 4:
-        _context46.n = 5;
+        _context47.n = 5;
         return effects.put(removePendingPollActionAC(message.id, 'DELETE_POLL_VOTE', optionId));
       case 5:
-        return _context46.a(2);
+        return _context47.a(2);
     }
-  }, _marked40$1);
+  }, _marked41$1);
 }
 function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote) {
   var channel, obj;
-  return _regenerator().w(function (_context47) {
-    while (1) switch (_context47.n) {
+  return _regenerator().w(function (_context48) {
+    while (1) switch (_context48.n) {
       case 0:
-        _context47.n = 1;
+        _context48.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context47.v;
+        channel = _context48.v;
         if (channel) {
-          _context47.n = 2;
+          _context48.n = 2;
           break;
         }
-        return _context47.a(2);
+        return _context48.a(2);
       case 2:
         if (message.pollDetails) {
-          _context47.n = 3;
+          _context48.n = 3;
           break;
         }
-        return _context47.a(2);
+        return _context48.a(2);
       case 3:
         obj = {
           type: 'deleteOwn',
@@ -26183,34 +26217,34 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
           messageId: message.id,
           params: {}
         }, obj);
-        _context47.n = 4;
+        _context48.n = 4;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        return _context47.a(2);
+        return _context48.a(2);
     }
-  }, _marked41$1);
+  }, _marked42);
 }
 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, _t46;
-  return _regenerator().w(function (_context48) {
-    while (1) switch (_context48.p = _context48.n) {
+  return _regenerator().w(function (_context49) {
+    while (1) switch (_context49.p = _context49.n) {
       case 0:
-        _context48.p = 0;
+        _context49.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context48.n = 7;
+          _context49.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) {
-          _context48.n = 1;
+          _context49.n = 1;
           break;
         }
-        return _context48.a(2);
+        return _context49.a(2);
       case 1:
         pendingAction = {
           type: 'DELETE_POLL_VOTE',
@@ -26221,19 +26255,19 @@ function deletePollVote(action) {
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && conflictCheck.shouldSkip)) {
-          _context48.n = 5;
+          _context49.n = 5;
           break;
         }
-        _context48.n = 2;
+        _context49.n = 2;
         return effects.call(getChannelFromMap, channelId);
       case 2:
-        channel = _context48.v;
+        channel = _context49.v;
         if (!channel) {
-          _context48.n = 4;
+          _context49.n = 4;
           break;
         }
         currentMessage = getMessageFromMap(channelId, message.id) || message;
-        _context48.n = 3;
+        _context49.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 = {
@@ -26244,45 +26278,45 @@ function deletePollVote(action) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context48.n = 4;
+        _context49.n = 4;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        _context48.n = 6;
+        _context49.n = 6;
         break;
       case 5:
         if (conflictCheck.shouldSkip) {
-          _context48.n = 6;
+          _context49.n = 6;
           break;
         }
-        _context48.n = 6;
+        _context49.n = 6;
         return effects.call(updateMessageOptimisticallyForDeletePollVote, channelId, message, vote);
       case 6:
         if (!conflictCheck.shouldSkip && !isResend) {
           setPendingPollAction(pendingAction);
         }
-        _context48.n = 7;
+        _context49.n = 7;
         return effects.call(executeDeletePollVote, channelId, pollId, optionId, message);
       case 7:
-        _context48.n = 9;
+        _context49.n = 9;
         break;
       case 8:
-        _context48.p = 8;
-        _t46 = _context48.v;
+        _context49.p = 8;
+        _t46 = _context49.v;
         log.error('error in delete poll vote', _t46);
       case 9:
-        return _context48.a(2);
+        return _context49.a(2);
     }
-  }, _marked42, null, [[0, 8]]);
+  }, _marked43, null, [[0, 8]]);
 }
 function executeClosePoll(channelId, pollId, message) {
   var channel, obj;
-  return _regenerator().w(function (_context49) {
-    while (1) switch (_context49.n) {
+  return _regenerator().w(function (_context50) {
+    while (1) switch (_context50.n) {
       case 0:
-        _context49.n = 1;
+        _context50.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context49.v;
+        channel = _context50.v;
         obj = {
           type: 'close'
         };
@@ -26290,37 +26324,37 @@ function executeClosePoll(channelId, pollId, message) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context49.n = 2;
+        _context50.n = 2;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 2:
         if (!(channel && message.id)) {
-          _context49.n = 4;
+          _context50.n = 4;
           break;
         }
-        _context49.n = 3;
+        _context50.n = 3;
         return effects.call(channel.closePoll, message.id, pollId);
       case 3:
-        _context49.n = 4;
+        _context50.n = 4;
         return effects.put(removePendingPollActionAC(message.id, 'CLOSE_POLL'));
       case 4:
-        return _context49.a(2);
+        return _context50.a(2);
     }
-  }, _marked43);
+  }, _marked44);
 }
 function updateMessageOptimisticallyForClosePoll(channelId, message) {
   var channel, pollDetails;
-  return _regenerator().w(function (_context50) {
-    while (1) switch (_context50.n) {
+  return _regenerator().w(function (_context51) {
+    while (1) switch (_context51.n) {
       case 0:
-        _context50.n = 1;
+        _context51.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context50.v;
+        channel = _context51.v;
         if (channel) {
-          _context50.n = 2;
+          _context51.n = 2;
           break;
         }
-        return _context50.a(2);
+        return _context51.a(2);
       case 2:
         pollDetails = JSON.parse(JSON.stringify(message.pollDetails));
         pollDetails.closed = true;
@@ -26331,34 +26365,34 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
             pollDetails: pollDetails
           }
         });
-        _context50.n = 3;
+        _context51.n = 3;
         return effects.put(updateMessageAC(message.id, {
           pollDetails: pollDetails
         }));
       case 3:
-        return _context50.a(2);
+        return _context51.a(2);
     }
-  }, _marked44);
+  }, _marked45);
 }
 function closePoll(action) {
   var payload, channelId, pollId, message, sceytChatClient, connectionState, _t47;
-  return _regenerator().w(function (_context51) {
-    while (1) switch (_context51.p = _context51.n) {
+  return _regenerator().w(function (_context52) {
+    while (1) switch (_context52.p = _context52.n) {
       case 0:
-        _context51.p = 0;
+        _context52.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, message = payload.message;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context51.n = 3;
+          _context52.n = 3;
           break;
         }
         connectionState = sceytChatClient.connectionState;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context51.n = 2;
+          _context52.n = 2;
           break;
         }
-        _context51.n = 1;
+        _context52.n = 1;
         return effects.call(updateMessageOptimisticallyForClosePoll, channelId, message);
       case 1:
         setPendingPollAction({
@@ -26367,39 +26401,39 @@ function closePoll(action) {
           pollId: pollId,
           message: message
         });
-        return _context51.a(2);
+        return _context52.a(2);
       case 2:
-        _context51.n = 3;
+        _context52.n = 3;
         return effects.call(executeClosePoll, channelId, pollId, message);
       case 3:
-        _context51.n = 5;
+        _context52.n = 5;
         break;
       case 4:
-        _context51.p = 4;
-        _t47 = _context51.v;
+        _context52.p = 4;
+        _t47 = _context52.v;
         log.error('error in close poll', _t47);
       case 5:
-        return _context51.a(2);
+        return _context52.a(2);
     }
-  }, _marked45, null, [[0, 4]]);
+  }, _marked46, null, [[0, 4]]);
 }
 function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
   var channel, _iterator5, _step5, obj;
-  return _regenerator().w(function (_context52) {
-    while (1) switch (_context52.n) {
+  return _regenerator().w(function (_context53) {
+    while (1) switch (_context53.n) {
       case 0:
-        _context52.n = 1;
+        _context53.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context52.v;
+        channel = _context53.v;
         if (isResend) {
-          _context52.n = 4;
+          _context53.n = 4;
           break;
         }
         _iterator5 = _createForOfIteratorHelperLoose(objs);
       case 2:
         if ((_step5 = _iterator5()).done) {
-          _context52.n = 4;
+          _context53.n = 4;
           break;
         }
         obj = _step5.value;
@@ -26407,45 +26441,45 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
           messageId: message.id,
           params: {}
         }, obj);
-        _context52.n = 3;
+        _context53.n = 3;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 3:
-        _context52.n = 2;
+        _context53.n = 2;
         break;
       case 4:
         if (!(channel && message.id)) {
-          _context52.n = 6;
+          _context53.n = 6;
           break;
         }
-        _context52.n = 5;
+        _context53.n = 5;
         return effects.call(channel.retractVote, message.id, pollId);
       case 5:
-        _context52.n = 6;
+        _context53.n = 6;
         return effects.put(removePendingPollActionAC(message.id || '', 'RETRACT_POLL_VOTE'));
       case 6:
-        return _context52.a(2);
+        return _context53.a(2);
     }
-  }, _marked46);
+  }, _marked47);
 }
 function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs) {
   var channel, _iterator6, _step6, obj;
-  return _regenerator().w(function (_context53) {
-    while (1) switch (_context53.n) {
+  return _regenerator().w(function (_context54) {
+    while (1) switch (_context54.n) {
       case 0:
-        _context53.n = 1;
+        _context54.n = 1;
         return effects.call(getChannelFromMap, channelId);
       case 1:
-        channel = _context53.v;
+        channel = _context54.v;
         if (channel) {
-          _context53.n = 2;
+          _context54.n = 2;
           break;
         }
-        return _context53.a(2);
+        return _context54.a(2);
       case 2:
         _iterator6 = _createForOfIteratorHelperLoose(objs);
       case 3:
         if ((_step6 = _iterator6()).done) {
-          _context53.n = 5;
+          _context54.n = 5;
           break;
         }
         obj = _step6.value;
@@ -26453,27 +26487,27 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
           messageId: message.id,
           params: {}
         });
-        _context53.n = 4;
+        _context54.n = 4;
         return effects.put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        _context53.n = 3;
+        _context54.n = 3;
         break;
       case 5:
-        return _context53.a(2);
+        return _context54.a(2);
     }
-  }, _marked47);
+  }, _marked48);
 }
 function retractPollVote(action) {
   var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator7, _step7, _message$pollDetails12, _message$pollDetails13, vote, _t48;
-  return _regenerator().w(function (_context54) {
-    while (1) switch (_context54.p = _context54.n) {
+  return _regenerator().w(function (_context55) {
+    while (1) switch (_context55.p = _context55.n) {
       case 0:
-        _context54.p = 0;
+        _context55.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context54.n = 3;
+          _context55.n = 3;
           break;
         }
         connectionState = sceytChatClient.connectionState;
@@ -26486,10 +26520,10 @@ function retractPollVote(action) {
           });
         }
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context54.n = 2;
+          _context55.n = 2;
           break;
         }
-        _context54.n = 1;
+        _context55.n = 1;
         return effects.call(updateMessageOptimisticallyForRetractPollVote, channelId, message, objs);
       case 1:
         setPendingPollAction({
@@ -26498,36 +26532,36 @@ function retractPollVote(action) {
           pollId: pollId,
           message: message
         });
-        return _context54.a(2);
+        return _context55.a(2);
       case 2:
-        _context54.n = 3;
+        _context55.n = 3;
         return effects.call(executeRetractPollVote, channelId, pollId, message, objs, isResend);
       case 3:
-        _context54.n = 5;
+        _context55.n = 5;
         break;
       case 4:
-        _context54.p = 4;
-        _t48 = _context54.v;
+        _context55.p = 4;
+        _t48 = _context55.v;
         log.error('error in retract poll vote', _t48);
       case 5:
-        return _context54.a(2);
+        return _context55.a(2);
     }
-  }, _marked48, null, [[0, 4]]);
+  }, _marked49, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
   var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t49;
-  return _regenerator().w(function (_context55) {
-    while (1) switch (_context55.p = _context55.n) {
+  return _regenerator().w(function (_context56) {
+    while (1) switch (_context56.p = _context56.n) {
       case 0:
-        _context55.p = 0;
+        _context56.p = 0;
         payload = action.payload;
         connectionState = payload.connectionState;
         sceytChatClient = getClient();
         if (!(!sceytChatClient || connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context55.n = 1;
+          _context56.n = 1;
           break;
         }
-        return _context55.a(2);
+        return _context56.a(2);
       case 1:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         pendingPollActionsMapCopy = JSON.parse(JSON.stringify(pendingPollActionsMap));
@@ -26560,30 +26594,30 @@ function resendPendingPollActions(action) {
             }
           });
         });
-        _context55.n = 3;
+        _context56.n = 3;
         break;
       case 2:
-        _context55.p = 2;
-        _t49 = _context55.v;
+        _context56.p = 2;
+        _t49 = _context56.v;
         log.error('error in resend pending poll actions', _t49);
       case 3:
-        return _context55.a(2);
+        return _context56.a(2);
     }
-  }, _marked49, null, [[0, 2]]);
+  }, _marked50, null, [[0, 2]]);
 }
 function resendPendingMessageMutations(action) {
   var payload, connectionState, pendingMutations, _iterator8, _step8, mutation, currentMutation, channel, _t50, _t51;
-  return _regenerator().w(function (_context56) {
-    while (1) switch (_context56.p = _context56.n) {
+  return _regenerator().w(function (_context57) {
+    while (1) switch (_context57.p = _context57.n) {
       case 0:
-        _context56.p = 0;
+        _context57.p = 0;
         payload = action.payload;
         connectionState = payload.connectionState;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED || !isMessageMutationConnected())) {
-          _context56.n = 1;
+          _context57.n = 1;
           break;
         }
-        return _context56.a(2);
+        return _context57.a(2);
       case 1:
         pendingMutations = Object.values(getPendingMessageMutations()).sort(function (left, right) {
           return left.queuedAt - right.queuedAt;
@@ -26591,98 +26625,98 @@ function resendPendingMessageMutations(action) {
         _iterator8 = _createForOfIteratorHelperLoose(pendingMutations);
       case 2:
         if ((_step8 = _iterator8()).done) {
-          _context56.n = 16;
+          _context57.n = 16;
           break;
         }
         mutation = _step8.value;
         currentMutation = getPendingMessageMutations()[mutation.messageId];
         if (!(!currentMutation || currentMutation.queuedAt !== mutation.queuedAt || currentMutation.type !== mutation.type)) {
-          _context56.n = 3;
+          _context57.n = 3;
           break;
         }
-        return _context56.a(3, 15);
+        return _context57.a(3, 15);
       case 3:
         if (isMessageMutationConnected()) {
-          _context56.n = 4;
+          _context57.n = 4;
           break;
         }
-        return _context56.a(2);
+        return _context57.a(2);
       case 4:
-        _context56.n = 5;
+        _context57.n = 5;
         return effects.call(getChannelForMessageMutation, mutation.channelId);
       case 5:
-        channel = _context56.v;
+        channel = _context57.v;
         if (channel) {
-          _context56.n = 7;
+          _context57.n = 7;
           break;
         }
-        _context56.n = 6;
+        _context57.n = 6;
         return effects.put(removePendingMessageMutationAC(mutation.messageId));
       case 6:
-        return _context56.a(3, 15);
+        return _context57.a(3, 15);
       case 7:
-        _context56.p = 7;
+        _context57.p = 7;
         if (!(mutation.type === 'DELETE_MESSAGE')) {
-          _context56.n = 9;
+          _context57.n = 9;
           break;
         }
-        _context56.n = 8;
+        _context57.n = 8;
         return effects.call(executeDeleteMessageMutation, channel, mutation.messageId, mutation.deleteOption);
       case 8:
-        _context56.n = 10;
+        _context57.n = 10;
         break;
       case 9:
-        _context56.n = 10;
+        _context57.n = 10;
         return effects.call(executeEditMessageMutation, channel, mutation.message);
       case 10:
-        _context56.n = 15;
+        _context57.n = 15;
         break;
       case 11:
-        _context56.p = 11;
-        _t50 = _context56.v;
+        _context57.p = 11;
+        _t50 = _context57.v;
         if (isMessageMutationConnected()) {
-          _context56.n = 12;
+          _context57.n = 12;
           break;
         }
-        return _context56.a(2);
+        return _context57.a(2);
       case 12:
-        _context56.n = 13;
+        _context57.n = 13;
         return effects.call(applyLocalMessageUpdate, mutation.channelId, mutation.messageId, cloneSerializable(mutation.originalMessage));
       case 13:
-        _context56.n = 14;
+        _context57.n = 14;
         return effects.put(removePendingMessageMutationAC(mutation.messageId));
       case 14:
         log.error('error in resend pending message mutations', _t50);
       case 15:
-        _context56.n = 2;
+        _context57.n = 2;
         break;
       case 16:
-        _context56.n = 18;
+        _context57.n = 18;
         break;
       case 17:
-        _context56.p = 17;
-        _t51 = _context56.v;
+        _context57.p = 17;
+        _t51 = _context57.v;
         log.error('error in resend pending message mutations', _t51);
       case 18:
-        return _context56.a(2);
+        return _context57.a(2);
     }
-  }, _marked50, null, [[7, 11], [0, 17]]);
+  }, _marked51, null, [[7, 11], [0, 17]]);
 }
 function getPollVotes(action) {
   var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t52;
-  return _regenerator().w(function (_context57) {
-    while (1) switch (_context57.p = _context57.n) {
+  return _regenerator().w(function (_context58) {
+    while (1) switch (_context58.p = _context58.n) {
       case 0:
-        _context57.p = 0;
+        _context58.p = 0;
         payload = action.payload;
         messageId = payload.messageId, pollId = payload.pollId, optionId = payload.optionId, limit = payload.limit;
         key = pollId + "_" + optionId;
-        _context57.n = 1;
+        _context58.n = 1;
         return effects.put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADING));
       case 1:
         SceytChatClient = getClient();
         if (!(!SceytChatClient || !SceytChatClient.PollVotesQueryBuilder)) {
-          _context57.n = 2;
+          _context58.n = 2;
           break;
         }
         throw new Error('SceytChatClient or PollVotesQueryBuilder not available');
@@ -26690,14 +26724,14 @@ function getPollVotes(action) {
         queryBuilder = new SceytChatClient.PollVotesQueryBuilder(messageId, pollId);
         queryBuilder.setOptionId(optionId);
         queryBuilder.limit(limit || 20);
-        _context57.n = 3;
+        _context58.n = 3;
         return effects.call(queryBuilder.build);
       case 3:
-        pollVotesQuery = _context57.v;
-        _context57.n = 4;
+        pollVotesQuery = _context58.v;
+        _context58.n = 4;
         return effects.call(pollVotesQuery.loadNext);
       case 4:
-        result = _context57.v;
+        result = _context58.v;
         if (!query.PollVotesQueries) {
           query.PollVotesQueries = {};
         }
@@ -26725,39 +26759,39 @@ function getPollVotes(action) {
             }
           };
         });
-        _context57.n = 5;
+        _context58.n = 5;
         return effects.put(setPollVotesListAC(pollId, optionId, formattedVotes, result.hasNext || false));
       case 5:
-        _context57.n = 6;
+        _context58.n = 6;
         return effects.put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADED));
       case 6:
-        _context57.n = 8;
+        _context58.n = 8;
         break;
       case 7:
-        _context57.p = 7;
-        _t52 = _context57.v;
+        _context58.p = 7;
+        _t52 = _context58.v;
         log.error('ERROR in get poll votes', _t52);
-        _context57.n = 8;
+        _context58.n = 8;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
-        return _context57.a(2);
+        return _context58.a(2);
     }
-  }, _marked51, null, [[0, 7]]);
+  }, _marked52, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
   var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t53;
-  return _regenerator().w(function (_context58) {
-    while (1) switch (_context58.p = _context58.n) {
+  return _regenerator().w(function (_context59) {
+    while (1) switch (_context59.p = _context59.n) {
       case 0:
-        _context58.p = 0;
+        _context59.p = 0;
         payload = action.payload;
         pollId = payload.pollId, optionId = payload.optionId, limit = payload.limit;
         key = pollId + "_" + optionId;
-        _context58.n = 1;
+        _context59.n = 1;
         return effects.put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADING));
       case 1:
         if (!(!query.PollVotesQueries || !query.PollVotesQueries[key])) {
-          _context58.n = 2;
+          _context59.n = 2;
           break;
         }
         throw new Error('Poll votes query not found');
@@ -26766,10 +26800,10 @@ function loadMorePollVotes(action) {
         if (limit && pollVotesQuery.limit < limit) {
           pollVotesQuery.limit = limit;
         }
-        _context58.n = 3;
+        _context59.n = 3;
         return effects.call(pollVotesQuery.loadNext);
       case 3:
-        result = _context58.v;
+        result = _context59.v;
         formattedVotes = (result.votes || []).map(function (vote) {
           return {
             optionId: vote.optionId || optionId,
@@ -26793,64 +26827,64 @@ function loadMorePollVotes(action) {
             }
           };
         });
-        _context58.n = 4;
+        _context59.n = 4;
         return effects.put(addPollVotesToListAC(pollId, optionId, formattedVotes, result.hasNext || false));
       case 4:
-        _context58.n = 5;
+        _context59.n = 5;
         return effects.put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADED));
       case 5:
-        _context58.n = 7;
+        _context59.n = 7;
         break;
       case 6:
-        _context58.p = 6;
-        _t53 = _context58.v;
+        _context59.p = 6;
+        _t53 = _context59.v;
         log.error('ERROR in load more poll votes', _t53);
-        _context58.n = 7;
+        _context59.n = 7;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
-        return _context58.a(2);
+        return _context59.a(2);
     }
-  }, _marked52, null, [[0, 6]]);
+  }, _marked53, null, [[0, 6]]);
 }
 var REFRESH_WINDOW_HALF = 30;
 function refreshCacheAroundMessage(action) {
-  var _action$payload0, channelId, messageId, _action$payload0$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 (_context59) {
-    while (1) switch (_context59.p = _context59.n) {
+  var _action$payload1, channelId, messageId, _action$payload1$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 (_context60) {
+    while (1) switch (_context60.p = _context60.n) {
       case 0:
-        _context59.p = 0;
-        _action$payload0 = action.payload, channelId = _action$payload0.channelId, messageId = _action$payload0.messageId, _action$payload0$appl = _action$payload0.applyVisibleWindow, applyVisibleWindow = _action$payload0$appl === void 0 ? true : _action$payload0$appl;
+        _context60.p = 0;
+        _action$payload1 = action.payload, channelId = _action$payload1.channelId, messageId = _action$payload1.messageId, _action$payload1$appl = _action$payload1.applyVisibleWindow, applyVisibleWindow = _action$payload1$appl === void 0 ? true : _action$payload1$appl;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context59.n = 1;
+          _context60.n = 1;
           break;
         }
-        return _context59.a(2);
+        return _context60.a(2);
       case 1:
         activeChannelId = getActiveChannelId();
         if (!(activeChannelId !== channelId)) {
-          _context59.n = 2;
+          _context60.n = 2;
           break;
         }
-        return _context59.a(2);
+        return _context60.a(2);
       case 2:
         activeMessages = store.getState().MessageReducer.activeChannelMessages || [];
         activeConfirmedMessages = activeMessages.filter(function (message) {
           return !!message.id;
         });
         if (activeConfirmedMessages.length) {
-          _context59.n = 3;
+          _context60.n = 3;
           break;
         }
-        return _context59.a(2);
+        return _context60.a(2);
       case 3:
         centerMessageIndex = getCenterTwoMessages(activeConfirmedMessages);
         refreshAnchorId = centerMessageIndex.mid2.messageId || messageId;
         if (refreshAnchorId) {
-          _context59.n = 4;
+          _context60.n = 4;
           break;
         }
-        return _context59.a(2);
+        return _context60.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));
@@ -26858,20 +26892,20 @@ function refreshCacheAroundMessage(action) {
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channelId);
         messageQueryBuilder.limit(REFRESH_WINDOW_HALF);
         messageQueryBuilder.reverse(true);
-        _context59.n = 5;
+        _context60.n = 5;
         return effects.call(messageQueryBuilder.build);
       case 5:
-        messageQuery = _context59.v;
+        messageQuery = _context60.v;
         messageQuery.limit = previousLimit;
         if (!(previousLimit > 0)) {
-          _context59.n = 7;
+          _context60.n = 7;
           break;
         }
-        _context59.n = 6;
+        _context60.n = 6;
         return effects.call(messageQuery.loadPreviousMessageId, refreshAnchorId);
       case 6:
-        _t54 = _context59.v;
-        _context59.n = 8;
+        _t54 = _context60.v;
+        _context60.n = 8;
         break;
       case 7:
         _t54 = {
@@ -26884,14 +26918,14 @@ function refreshCacheAroundMessage(action) {
         messageQuery.reverse = false;
         messageQuery.limit = nextLimit;
         if (!(nextLimit > 0 && pivotId)) {
-          _context59.n = 10;
+          _context60.n = 10;
           break;
         }
-        _context59.n = 9;
+        _context60.n = 9;
         return effects.call(messageQuery.loadNextMessageId, pivotId);
       case 9:
-        _t55 = _context59.v;
-        _context59.n = 11;
+        _t55 = _context60.v;
+        _context60.n = 11;
         break;
       case 10:
         _t55 = {
@@ -26902,10 +26936,10 @@ function refreshCacheAroundMessage(action) {
         nextResult = _t55;
         loadedMessages = [].concat(prevResult.messages, nextResult.messages);
         if (!(loadedMessages.length === 0)) {
-          _context59.n = 12;
+          _context60.n = 12;
           break;
         }
-        return _context59.a(2);
+        return _context60.a(2);
       case 12:
         firstId = getFirstConfirmedMessageId(loadedMessages);
         lastId = getLastConfirmedMessageId(loadedMessages);
@@ -26913,11 +26947,11 @@ function refreshCacheAroundMessage(action) {
           setMessagesToMap(channelId, loadedMessages, firstId, lastId);
           setActiveSegment(channelId, firstId, lastId);
         }
-        _context59.n = 13;
+        _context60.n = 13;
         return effects.call(loadOGMetadataForLinkMessages, loadedMessages, true, false, false);
       case 13:
         if (!sameConfirmedWindow(activeConfirmedMessages, loadedMessages)) {
-          _context59.n = 15;
+          _context60.n = 15;
           break;
         }
         activeById = new Map(activeConfirmedMessages.map(function (currentMessage) {
@@ -26930,151 +26964,154 @@ function refreshCacheAroundMessage(action) {
           return JSON.stringify(existing) !== JSON.stringify(loaded);
         });
         if (!(changed.length > 0)) {
-          _context59.n = 14;
+          _context60.n = 14;
           break;
         }
-        _context59.n = 14;
+        _context60.n = 14;
         return effects.put(patchMessagesAC(changed));
       case 14:
-        return _context59.a(2);
+        return _context60.a(2);
       case 15:
         if (applyVisibleWindow) {
-          _context59.n = 16;
+          _context60.n = 16;
           break;
         }
-        return _context59.a(2);
+        return _context60.a(2);
       case 16:
-        _context59.n = 17;
+        _context60.n = 17;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(loadedMessages)), channelId));
       case 17:
         filteredPendingMessages = getFilteredPendingMessages(channelId, loadedMessages);
         if (!(filteredPendingMessages.length > 0)) {
-          _context59.n = 19;
+          _context60.n = 19;
           break;
         }
-        _context59.n = 18;
+        _context60.n = 18;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 18:
-        _context59.n = 19;
+        _context60.n = 19;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true, false, false);
       case 19:
-        _context59.n = 21;
+        _context60.n = 21;
         break;
       case 20:
-        _context59.p = 20;
-        _t56 = _context59.v;
+        _context60.p = 20;
+        _t56 = _context60.v;
         log.error('error in refreshCacheAroundMessage', _t56);
       case 21:
-        return _context59.a(2);
+        return _context60.a(2);
     }
-  }, _marked53, null, [[0, 20]]);
+  }, _marked54, null, [[0, 20]]);
 }
 function MessageSaga() {
-  return _regenerator().w(function (_context60) {
-    while (1) switch (_context60.n) {
+  return _regenerator().w(function (_context61) {
+    while (1) switch (_context61.n) {
       case 0:
-        _context60.n = 1;
+        _context61.n = 1;
         return effects.takeEvery(SEND_MESSAGE, sendMessage);
       case 1:
-        _context60.n = 2;
+        _context61.n = 2;
         return effects.takeEvery(SEND_TEXT_MESSAGE, sendTextMessage);
       case 2:
-        _context60.n = 3;
+        _context61.n = 3;
         return effects.takeEvery(FORWARD_MESSAGE, forwardMessage);
       case 3:
-        _context60.n = 4;
+        _context61.n = 4;
         return effects.takeEvery(RESEND_MESSAGE, resendMessage);
       case 4:
-        _context60.n = 5;
+        _context61.n = 5;
         return effects.takeLatest(EDIT_MESSAGE, editMessage);
       case 5:
-        _context60.n = 6;
+        _context61.n = 6;
         return effects.takeEvery(DELETE_MESSAGE, deleteMessage);
       case 6:
-        _context60.n = 7;
+        _context61.n = 7;
         return effects.takeLatest(RELOAD_ACTIVE_CHANNEL_AFTER_RECONNECT, reloadActiveChannelAfterReconnect);
       case 7:
-        _context60.n = 8;
+        _context61.n = 8;
         return effects.takeLatest(LOAD_LATEST_MESSAGES, getMessagesQuery);
       case 8:
-        _context60.n = 9;
+        _context61.n = 9;
         return effects.takeLatest(LOAD_AROUND_MESSAGE, loadAroundMessage);
       case 9:
-        _context60.n = 10;
+        _context61.n = 10;
         return effects.takeLatest(REFRESH_CACHE_AROUND_MESSAGE, refreshCacheAroundMessage);
       case 10:
-        _context60.n = 11;
+        _context61.n = 11;
         return effects.takeLatest(LOAD_NEAR_UNREAD, loadNearUnread);
       case 11:
-        _context60.n = 12;
+        _context61.n = 12;
         return effects.takeLatest(LOAD_DEFAULT_MESSAGES, loadDefaultMessages);
       case 12:
-        _context60.n = 13;
+        _context61.n = 13;
         return effects.takeEvery(GET_MESSAGE, getMessageQuery);
       case 13:
-        _context60.n = 14;
+        _context61.n = 14;
         return effects.takeLatest(GET_MESSAGE_MARKERS, getMessageMarkers);
       case 14:
-        _context60.n = 15;
+        _context61.n = 15;
         return effects.takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);
       case 15:
-        _context60.n = 16;
+        _context61.n = 16;
         return effects.takeLatest(LOAD_MORE_MESSAGES_ATTACHMENTS, loadMoreMessageAttachments);
       case 16:
-        _context60.n = 17;
+        _context61.n = 17;
         return effects.takeLatest(ADD_REACTION, addReaction);
       case 17:
-        _context60.n = 18;
+        _context61.n = 18;
         return effects.takeLatest(DELETE_REACTION, deleteReaction);
       case 18:
-        _context60.n = 19;
+        _context61.n = 19;
         return effects.takeEvery(LOAD_MORE_MESSAGES, loadMoreMessages);
       case 19:
-        _context60.n = 20;
-        return effects.takeEvery(GET_REACTIONS, getReactions);
+        _context61.n = 20;
+        return effects.takeEvery(PREFETCH_MESSAGES, prefetchMessagesFromAction);
       case 20:
-        _context60.n = 21;
-        return effects.takeEvery(LOAD_MORE_REACTIONS, loadMoreReactions);
+        _context61.n = 21;
+        return effects.takeEvery(GET_REACTIONS, getReactions);
       case 21:
-        _context60.n = 22;
-        return effects.takeEvery(PAUSE_ATTACHMENT_UPLOADING, pauseAttachmentUploading);
+        _context61.n = 22;
+        return effects.takeEvery(LOAD_MORE_REACTIONS, loadMoreReactions);
       case 22:
-        _context60.n = 23;
-        return effects.takeEvery(RESUME_ATTACHMENT_UPLOADING, resumeAttachmentUploading);
+        _context61.n = 23;
+        return effects.takeEvery(PAUSE_ATTACHMENT_UPLOADING, pauseAttachmentUploading);
       case 23:
-        _context60.n = 24;
-        return effects.takeEvery(ADD_POLL_VOTE, addPollVote);
+        _context61.n = 24;
+        return effects.takeEvery(RESUME_ATTACHMENT_UPLOADING, resumeAttachmentUploading);
       case 24:
-        _context60.n = 25;
-        return effects.takeEvery(DELETE_POLL_VOTE, deletePollVote);
+        _context61.n = 25;
+        return effects.takeEvery(ADD_POLL_VOTE, addPollVote);
       case 25:
-        _context60.n = 26;
-        return effects.takeEvery(CLOSE_POLL, closePoll);
+        _context61.n = 26;
+        return effects.takeEvery(DELETE_POLL_VOTE, deletePollVote);
       case 26:
-        _context60.n = 27;
-        return effects.takeEvery(RETRACT_POLL_VOTE, retractPollVote);
+        _context61.n = 27;
+        return effects.takeEvery(CLOSE_POLL, closePoll);
       case 27:
-        _context60.n = 28;
-        return effects.takeEvery(GET_POLL_VOTES, getPollVotes);
+        _context61.n = 28;
+        return effects.takeEvery(RETRACT_POLL_VOTE, retractPollVote);
       case 28:
-        _context60.n = 29;
-        return effects.takeEvery(LOAD_MORE_POLL_VOTES, loadMorePollVotes);
+        _context61.n = 29;
+        return effects.takeEvery(GET_POLL_VOTES, getPollVotes);
       case 29:
-        _context60.n = 30;
-        return effects.takeEvery(RESEND_PENDING_POLL_ACTIONS, resendPendingPollActions);
+        _context61.n = 30;
+        return effects.takeEvery(LOAD_MORE_POLL_VOTES, loadMorePollVotes);
       case 30:
-        _context60.n = 31;
-        return effects.takeLatest(RESEND_PENDING_MESSAGE_MUTATIONS, resendPendingMessageMutations);
+        _context61.n = 31;
+        return effects.takeEvery(RESEND_PENDING_POLL_ACTIONS, resendPendingPollActions);
       case 31:
-        _context60.n = 32;
-        return effects.takeEvery(LOAD_OG_METADATA_FOR_LINK, loadOGMetadataForLinkSaga);
+        _context61.n = 32;
+        return effects.takeLatest(RESEND_PENDING_MESSAGE_MUTATIONS, resendPendingMessageMutations);
       case 32:
-        _context60.n = 33;
-        return effects.takeEvery(FETCH_OG_METADATA, fetchOGMetadata);
+        _context61.n = 33;
+        return effects.takeEvery(LOAD_OG_METADATA_FOR_LINK, loadOGMetadataForLinkSaga);
       case 33:
-        return _context60.a(2);
+        _context61.n = 34;
+        return effects.takeEvery(FETCH_OG_METADATA, fetchOGMetadata);
+      case 34:
+        return _context61.a(2);
     }
-  }, _marked54);
+  }, _marked55);
 }
 
 var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
@@ -43518,6 +43555,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 PREFETCH_CACHE_MESSAGE_THRESHOLD = LOAD_MAX_MESSAGE_COUNT_PREFETCH * 2;
 var channelRestoreWindowMap = new Map();
 var formatMessageDateLabel = function formatMessageDateLabel(message) {
   var current = new Date(message.createdAt);
@@ -43555,13 +43593,23 @@ var scrollToLatestEdge = function scrollToLatestEdge(container, behavior) {
 var getMaxScrollTop = function getMaxScrollTop(container) {
   return Math.max(0, container.scrollHeight - container.clientHeight);
 };
-var scrollItemIntoView = function scrollItemIntoView(container, target, smooth, isInView) {
+var scrollToHistoryEdge = function scrollToHistoryEdge(container, behavior) {
+  if (behavior === void 0) {
+    behavior = 'auto';
+  }
+  setScrollTop(container, Math.max(LATEST_EDGE_GAP_PX, getMaxScrollTop(container) - LATEST_EDGE_GAP_PX), behavior);
+};
+var scrollItemIntoView = function scrollItemIntoView(container, target, smooth, isInView, direction) {
   if (isInView === void 0) {
     isInView = false;
   }
   if (smooth) {
     if (!isInView) {
-      scrollToLatestEdge(container, 'auto');
+      if (direction === 'next') {
+        scrollToHistoryEdge(container, 'auto');
+      } else if (direction === 'previous') {
+        scrollToLatestEdge(container, 'auto');
+      }
     }
     requestAnimationFrame(function () {
       requestAnimationFrame(function () {
@@ -43611,6 +43659,27 @@ var getTopViewportAnchor = function getTopViewportAnchor(container, itemElements
     offsetFromTop: anchor.rect.top - containerRect.top
   };
 };
+var getCenterViewportAnchorId = function getCenterViewportAnchorId(container, itemElements) {
+  var _candidates$;
+  var containerRect = container.getBoundingClientRect();
+  var viewportCenterY = containerRect.top + containerRect.height / 2;
+  var candidates = Array.from(itemElements.entries()).map(function (_ref3) {
+    var itemId = _ref3[0],
+      element = _ref3[1];
+    var rect = element.getBoundingClientRect();
+    return {
+      itemId: itemId,
+      rect: rect,
+      distanceFromCenter: Math.abs(rect.top + rect.height / 2 - viewportCenterY)
+    };
+  }).filter(function (_ref4) {
+    var rect = _ref4.rect;
+    return rect.bottom > containerRect.top && rect.top < containerRect.bottom;
+  }).sort(function (left, right) {
+    return left.distanceFromCenter - right.distanceFromCenter;
+  });
+  return ((_candidates$ = candidates[0]) === null || _candidates$ === void 0 ? void 0 : _candidates$.itemId) || '';
+};
 var isPinnedToLatest = function isPinnedToLatest(container) {
   if (!container) {
     return true;
@@ -43666,25 +43735,25 @@ var getUnreadDividerIndex = function getUnreadDividerIndex(messages, unreadAncho
 var getUnreadTrackingStartIndex = function getUnreadTrackingStartIndex(messages) {
   return messages.findIndex(isUnreadIncomingMessage);
 };
-function useChatController(_ref3) {
+function useChatController(_ref5) {
   var _channel$lastMessage;
-  var messages = _ref3.messages,
-    channel = _ref3.channel,
-    hasPrevMessages = _ref3.hasPrevMessages,
-    hasNextMessages = _ref3.hasNextMessages,
-    loadingPrevMessages = _ref3.loadingPrevMessages,
-    loadingNextMessages = _ref3.loadingNextMessages,
-    connectionStatus = _ref3.connectionStatus,
-    scrollToNewMessage = _ref3.scrollToNewMessage,
-    scrollToMentionedMessage = _ref3.scrollToMentionedMessage,
-    showScrollToNewMessageButton = _ref3.showScrollToNewMessageButton,
-    unreadScrollTo = _ref3.unreadScrollTo,
-    unreadMessageId = _ref3.unreadMessageId,
-    selectedMessagesMap = _ref3.selectedMessagesMap,
-    allowEditDeleteIncomingMessage = _ref3.allowEditDeleteIncomingMessage,
-    _ref3$tabIsActive = _ref3.tabIsActive,
-    tabIsActive = _ref3$tabIsActive === void 0 ? true : _ref3$tabIsActive,
-    dispatch = _ref3.dispatch;
+  var messages = _ref5.messages,
+    channel = _ref5.channel,
+    hasPrevMessages = _ref5.hasPrevMessages,
+    hasNextMessages = _ref5.hasNextMessages,
+    loadingPrevMessages = _ref5.loadingPrevMessages,
+    loadingNextMessages = _ref5.loadingNextMessages,
+    connectionStatus = _ref5.connectionStatus,
+    scrollToNewMessage = _ref5.scrollToNewMessage,
+    scrollToMentionedMessage = _ref5.scrollToMentionedMessage,
+    showScrollToNewMessageButton = _ref5.showScrollToNewMessageButton,
+    unreadScrollTo = _ref5.unreadScrollTo,
+    unreadMessageId = _ref5.unreadMessageId,
+    selectedMessagesMap = _ref5.selectedMessagesMap,
+    allowEditDeleteIncomingMessage = _ref5.allowEditDeleteIncomingMessage,
+    _ref5$tabIsActive = _ref5.tabIsActive,
+    tabIsActive = _ref5$tabIsActive === void 0 ? true : _ref5$tabIsActive,
+    dispatch = _ref5.dispatch;
   var scrollRef = React.useRef(null);
   var itemElementsRef = React.useRef(new Map());
   var messagesIndexMapRef = React.useRef({});
@@ -44184,6 +44253,39 @@ function useChatController(_ref3) {
     }
     return sortedLocalMessages.slice(Math.max(0, fromIndex - LOAD_MAX_MESSAGE_COUNT), fromIndex);
   }, [channel.id]);
+  var requestDirectionalPrefetchIfNeeded = React.useCallback(function (direction, fromMessage) {
+    if (!channel.id || !(fromMessage !== null && fromMessage !== void 0 && fromMessage.id) || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+      return;
+    }
+    var cachedMessages = direction === 'previous' ? getContiguousPrevMessages(channel.id, fromMessage, PREFETCH_CACHE_MESSAGE_THRESHOLD) : getContiguousNextMessages(channel.id, fromMessage, PREFETCH_CACHE_MESSAGE_THRESHOLD);
+    var cachedConfirmedCount = cachedMessages.filter(function (message) {
+      return !!message.id;
+    }).length;
+    if (cachedConfirmedCount >= PREFETCH_CACHE_MESSAGE_THRESHOLD) {
+      return;
+    }
+    var messageId = cachedMessages && cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length ? direction === 'previous' ? cachedMessages[0].id : cachedMessages[(cachedMessages === null || cachedMessages === void 0 ? void 0 : cachedMessages.length) - 1].id : fromMessage.id;
+    dispatch(prefetchMessagesAC(channel.id, messageId, direction === 'previous' ? MESSAGE_LOAD_DIRECTION.PREV : MESSAGE_LOAD_DIRECTION.NEXT, 2));
+  }, [channel.id, dispatch]);
+  var getJumpDirection = React.useCallback(function (itemId) {
+    var currentMessages = messagesRef.current || [];
+    var targetIndex = currentMessages.findIndex(function (message) {
+      return getMessageLocalRef(message) === itemId;
+    });
+    var container = scrollRef.current;
+    var viewportCenterAnchorId = container ? getCenterViewportAnchorId(container, itemElementsRef.current) : '';
+    var anchorId = viewportCenterAnchorId || getClosestConfirmedMessageId(currentMessages, Math.floor(currentMessages.length / 2), 'nearest');
+    var anchorIndex = anchorId ? currentMessages.findIndex(function (message) {
+      return getMessageLocalRef(message) === anchorId || message.id === anchorId;
+    }) : -1;
+    if (targetIndex >= 0 && anchorIndex >= 0 && targetIndex !== anchorIndex) {
+      return targetIndex < anchorIndex ? 'previous' : 'next';
+    }
+    if (!anchorId || itemId === anchorId) {
+      return null;
+    }
+    return compareMessageIds(itemId, anchorId) < 0 ? 'previous' : 'next';
+  }, []);
   var jumpToLatest = React.useCallback(function (smooth) {
     if (smooth === void 0) {
       smooth = true;
@@ -44283,10 +44385,11 @@ function useChatController(_ref3) {
         pendingWindowLoadRef.current = null;
         clearJumpBlur();
       }
+      var jumpDirection = getJumpDirection(itemId);
       var length = (_messagesRef$current = messagesRef.current) === null || _messagesRef$current === void 0 ? void 0 : _messagesRef$current.length;
       var loadIndex = connectionStatus === CONNECTION_STATUS.CONNECTED ? 10 : 0;
-      var isLoaded = messagesRef.current.some(function (message, index) {
-        return index < length - loadIndex && index >= loadIndex && getMessageLocalRef(message) === itemId;
+      var isLoaded = !jumpDirection || jumpDirection === 'next' && !hasNext || jumpDirection === 'previous' && !hasPrevious ? true : messagesRef.current.some(function (message, index) {
+        return index < length - (jumpDirection === 'next' ? loadIndex : 0) && index >= (jumpDirection === 'next' ? 0 : loadIndex) && getMessageLocalRef(message) === itemId;
       });
       setTimeout(function () {
         try {
@@ -44298,7 +44401,8 @@ function useChatController(_ref3) {
           restoreRef.current = {
             mode: 'reveal-message',
             messageId: itemId,
-            smooth: smooth
+            smooth: smooth,
+            direction: jumpDirection
           };
           if (isLoaded) {
             var container = scrollRef.current;
@@ -44367,7 +44471,7 @@ function useChatController(_ref3) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [beginWindowPagedRequest, clearJumpBlur, clearPendingLatestJump, dispatch, invalidateEdgeDirection, lockJumpScrolling, setHighlight, connectionStatus]);
+  }, [beginWindowPagedRequest, clearJumpBlur, clearPendingLatestJump, dispatch, getJumpDirection, invalidateEdgeDirection, lockJumpScrolling, setHighlight, connectionStatus, hasPrevious, hasNext]);
   var notifyIncomingItems = React.useCallback(function (incomingItems) {
     var nextIsViewingLatest = !hasNext && isPinnedToLatest(scrollRef.current);
     viewIsAtLatestRef.current = nextIsViewingLatest;
@@ -44462,6 +44566,7 @@ function useChatController(_ref3) {
         }
         suppressNextMessageChange();
         dispatch(addMessagesAC(cachedPreviousMessages, MESSAGE_LOAD_DIRECTION.PREV));
+        requestDirectionalPrefetchIfNeeded('previous', cachedPreviousMessages[0]);
         historyLoadArmedRef.current = true;
         if (loadPrevFrameRef.current !== null) {
           cancelAnimationFrame(loadPrevFrameRef.current);
@@ -44527,7 +44632,7 @@ function useChatController(_ref3) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [channel.id, clearPreserveAnchorForRequest, consumeSuppressedMessageChange, createEdgeRequestId, clearPendingLatestJump, dispatch, getCachedPreviousMessages, suppressNextMessageChange, hasNext, hasPrevious, isActiveEdgeRequestCurrent, isLoadingPrevious, loadPrevious, messages]);
+  }, [channel.id, clearPreserveAnchorForRequest, consumeSuppressedMessageChange, createEdgeRequestId, clearPendingLatestJump, dispatch, getCachedPreviousMessages, suppressNextMessageChange, hasNext, hasPrevious, isActiveEdgeRequestCurrent, isLoadingPrevious, loadPrevious, messages, requestDirectionalPrefetchIfNeeded]);
   var loadNextItems = React.useCallback(function () {
     try {
       if (isJumping.current) {
@@ -44565,6 +44670,9 @@ function useChatController(_ref3) {
         }
         suppressNextMessageChange();
         dispatch(addMessagesAC(cachedNextMessages, MESSAGE_LOAD_DIRECTION.NEXT));
+        requestDirectionalPrefetchIfNeeded('next', [].concat(cachedNextMessages).reverse().find(function (message) {
+          return !!message.id;
+        }));
         latestLoadArmedRef.current = true;
         if (loadNextFrameRef.current !== null) {
           cancelAnimationFrame(loadNextFrameRef.current);
@@ -44630,7 +44738,7 @@ function useChatController(_ref3) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [channel.id, clearPreserveAnchorForRequest, consumeSuppressedMessageChange, createEdgeRequestId, clearPendingLatestJump, dispatch, suppressNextMessageChange, hasNext, hasPrevious, isActiveEdgeRequestCurrent, isLoadingNext, loadNext, messages]);
+  }, [channel.id, clearPreserveAnchorForRequest, consumeSuppressedMessageChange, createEdgeRequestId, clearPendingLatestJump, dispatch, suppressNextMessageChange, hasNext, hasPrevious, isActiveEdgeRequestCurrent, isLoadingNext, loadNext, messages, requestDirectionalPrefetchIfNeeded]);
   var handleTimelineScroll = React.useCallback(function () {
     var _restoreRef$current4, _restoreRef$current5;
     var container = scrollRef.current;
@@ -44939,7 +45047,7 @@ function useChatController(_ref3) {
       restoreRef.current = null;
       viewIsAtLatestRef.current = false;
       setIsViewingLatest(false);
-      scrollItemIntoView(container, target, !!restoreState.smooth);
+      scrollItemIntoView(container, target, !!restoreState.smooth, false, restoreState.direction);
       if (jumpTargetIdRef.current === restoreState.messageId) {
         if (jumpObserverRef.current) {
           jumpObserverRef.current.disconnect();