sceyt-chat-react-uikit 1.7.8-beta.2 → 1.7.8-beta.4

package/index.js

@@ -2840,93 +2840,6 @@ function _forOf(target, body, check) {
 
 const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";
 
-// Asynchronously implement a generic for loop
-function _for(test, update, body) {
-	var stage;
-	for (;;) {
-		var shouldContinue = test();
-		if (_isSettledPact(shouldContinue)) {
-			shouldContinue = shouldContinue.v;
-		}
-		if (!shouldContinue) {
-			return result;
-		}
-		if (shouldContinue.then) {
-			stage = 0;
-			break;
-		}
-		var result = body();
-		if (result && result.then) {
-			if (_isSettledPact(result)) {
-				result = result.s;
-			} else {
-				stage = 1;
-				break;
-			}
-		}
-		if (update) {
-			var updateValue = update();
-			if (updateValue && updateValue.then && !_isSettledPact(updateValue)) {
-				stage = 2;
-				break;
-			}
-		}
-	}
-	var pact = new _Pact();
-	var reject = _settle.bind(null, pact, 2);
-	(stage === 0 ? shouldContinue.then(_resumeAfterTest) : stage === 1 ? result.then(_resumeAfterBody) : updateValue.then(_resumeAfterUpdate)).then(void 0, reject);
-	return pact;
-	function _resumeAfterBody(value) {
-		result = value;
-		do {
-			if (update) {
-				updateValue = update();
-				if (updateValue && updateValue.then && !_isSettledPact(updateValue)) {
-					updateValue.then(_resumeAfterUpdate).then(void 0, reject);
-					return;
-				}
-			}
-			shouldContinue = test();
-			if (!shouldContinue || (_isSettledPact(shouldContinue) && !shouldContinue.v)) {
-				_settle(pact, 1, result);
-				return;
-			}
-			if (shouldContinue.then) {
-				shouldContinue.then(_resumeAfterTest).then(void 0, reject);
-				return;
-			}
-			result = body();
-			if (_isSettledPact(result)) {
-				result = result.v;
-			}
-		} while (!result || !result.then);
-		result.then(_resumeAfterBody).then(void 0, reject);
-	}
-	function _resumeAfterTest(shouldContinue) {
-		if (shouldContinue) {
-			result = body();
-			if (result && result.then) {
-				result.then(_resumeAfterBody).then(void 0, reject);
-			} else {
-				_resumeAfterBody(result);
-			}
-		} else {
-			_settle(pact, 1, result);
-		}
-	}
-	function _resumeAfterUpdate() {
-		if (shouldContinue = test()) {
-			if (shouldContinue.then) {
-				shouldContinue.then(_resumeAfterTest).then(void 0, reject);
-			} else {
-				_resumeAfterTest(shouldContinue);
-			}
-		} else {
-			_settle(pact, 1, result);
-		}
-	}
-}
-
 // Asynchronously call a function and send errors to recovery continuation
 function _catch(body, recover) {
 	try {
@@ -9302,7 +9215,9 @@ function updateChannelLastMessageOnAllChannels(channelId, message) {
     if (updateChannel) {
       var updateMessage = message;
       if (updateChannel.lastMessage && updateChannel.lastMessage.id === message.id && updateChannel.lastMessage.deliveryStatus === MESSAGE_DELIVERY_STATUS.READ) {
-        updateMessage.deliveryStatus = MESSAGE_DELIVERY_STATUS.READ;
+        updateMessage = _extends({}, message, {
+          deliveryStatus: MESSAGE_DELIVERY_STATUS.READ
+        });
       }
       updateChannel = _extends({}, updateChannel, {
         lastMessage: updateMessage
@@ -9319,7 +9234,9 @@ function updateChannelOnAllChannels(channelId, config, messageUpdateData) {
       if (messageUpdateData && channel.lastMessage && messageUpdateData.id === channel.lastMessage.id) {
         var updateMessage = messageUpdateData;
         if (channel.lastMessage.id === messageUpdateData.id && channel.lastMessage.deliveryStatus === MESSAGE_DELIVERY_STATUS.READ) {
-          updateMessage.deliveryStatus = MESSAGE_DELIVERY_STATUS.READ;
+          updateMessage = _extends({}, messageUpdateData, {
+            deliveryStatus: MESSAGE_DELIVERY_STATUS.READ
+          });
         }
         channel.lastMessage = _extends({}, channel.lastMessage, updateMessage);
       }
@@ -10326,13 +10243,16 @@ function setMessageToEditAC(message) {
     message: message
   });
 }
-function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage) {
+function getMessagesAC(channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged) {
   if (highlight === void 0) {
     highlight = true;
   }
   if (scrollToMessage === void 0) {
     scrollToMessage = true;
   }
+  if (networkChanged === void 0) {
+    networkChanged = false;
+  }
   return {
     type: GET_MESSAGES,
     payload: {
@@ -10340,10 +10260,10 @@ function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliv
       loadWithLastMessage: loadWithLastMessage,
       messageId: messageId,
       limit: limit,
-      withDeliveredMessages: withDeliveredMessages,
       highlight: highlight,
       behavior: behavior,
-      scrollToMessage: scrollToMessage
+      scrollToMessage: scrollToMessage,
+      networkChanged: networkChanged
     }
   };
 }
@@ -10840,7 +10760,8 @@ function updatePendingMessageAC(channelId, messageId, updatedMessage) {
   });
 }
 
-var MESSAGES_MAX_LENGTH = 80;
+var MESSAGES_MAX_PAGE_COUNT = 80;
+var MESSAGES_MAX_LENGTH = 50;
 var LOAD_MAX_MESSAGE_COUNT = 30;
 var MESSAGE_LOAD_DIRECTION = {
   PREV: 'prev',
@@ -10906,12 +10827,12 @@ var setAllMessages = function setAllMessages(messages) {
 var addAllMessages = function addAllMessages(messages, direction) {
   if (direction === MESSAGE_LOAD_DIRECTION.PREV) {
     activeChannelAllMessages = [].concat(messages, activeChannelAllMessages);
-    if (activeChannelAllMessages.length > MESSAGES_MAX_LENGTH) {
+    if (activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT) {
       setHasNextCached(true);
     }
   } else {
     activeChannelAllMessages = [].concat(activeChannelAllMessages, messages);
-    if (activeChannelAllMessages.length > MESSAGES_MAX_LENGTH) {
+    if (activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT) {
       setHasPrevCached(true);
     }
   }
@@ -10980,8 +10901,8 @@ var getHasNextCached = function getHasNextCached() {
 var getFromAllMessagesByMessageId = function getFromAllMessagesByMessageId(messageId, direction, getWithLastMessage) {
   var messagesForAdd = [];
   if (getWithLastMessage) {
-    messagesForAdd = [].concat(activeChannelAllMessages.slice(-MESSAGES_MAX_LENGTH));
-    setHasPrevCached(activeChannelAllMessages.length > MESSAGES_MAX_LENGTH);
+    messagesForAdd = [].concat(activeChannelAllMessages.slice(-MESSAGES_MAX_PAGE_COUNT));
+    setHasPrevCached(activeChannelAllMessages.length > MESSAGES_MAX_PAGE_COUNT);
     setHasNextCached(false);
   } else {
     var fromMessageIndex = activeChannelAllMessages.findIndex(function (mes) {
@@ -11009,14 +10930,25 @@ var getFromAllMessagesByMessageId = function getFromAllMessagesByMessageId(messa
   }
   return messagesForAdd;
 };
-function setMessagesToMap(channelId, messages) {
-  if (!messagesMap[channelId] || messages.length === 0) {
+function setMessagesToMap(channelId, messages, firstMessageId, lastMessageId) {
+  if (firstMessageId === void 0) {
+    firstMessageId = '0';
+  }
+  if (lastMessageId === void 0) {
+    lastMessageId = '0';
+  }
+  if (!messagesMap[channelId]) {
     messagesMap[channelId] = {};
   }
-  messages.forEach(function (msg) {
-    if (msg.tid && messagesMap[channelId][msg.tid]) {
-      delete messagesMap[channelId][msg.tid];
+  for (var key in messagesMap[channelId]) {
+    if (Object.prototype.hasOwnProperty.call(messagesMap[channelId], key)) {
+      var element = messagesMap[channelId][key];
+      if (element.id >= firstMessageId && element.id <= lastMessageId) {
+        delete messagesMap[channelId][key];
+      }
     }
+  }
+  messages.forEach(function (msg) {
     messagesMap[channelId][msg.id || msg.tid] = msg;
   });
 }
@@ -11442,42 +11374,36 @@ var messageSlice = createSlice({
         });
       });
       if (direction === MESSAGE_LOAD_DIRECTION.PREV && newMessagesLength > 0) {
-        if (currentMessagesLength + newMessagesLength >= MESSAGES_MAX_LENGTH) {
+        if (currentMessagesLength + newMessagesLength > MESSAGES_MAX_PAGE_COUNT) {
           var _state$activeChannelM;
           setHasNextCached(true);
           if (newMessagesLength > 0) {
-            if (currentMessagesLength >= MESSAGES_MAX_LENGTH) {
+            if (currentMessagesLength >= MESSAGES_MAX_PAGE_COUNT) {
               state.activeChannelMessages.splice(-newMessagesLength);
             } else {
-              state.activeChannelMessages.splice(-(newMessagesLength - (MESSAGES_MAX_LENGTH - currentMessagesLength)));
+              state.activeChannelMessages.splice(-(currentMessagesLength - currentMessagesLength + newMessagesLength - MESSAGES_MAX_PAGE_COUNT));
             }
           }
           (_state$activeChannelM = state.activeChannelMessages).splice.apply(_state$activeChannelM, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
-        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_LENGTH) {
+        } else {
           var _state$activeChannelM2;
-          var sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_LENGTH;
-          setHasNextCached(true);
-          state.activeChannelMessages.splice(-sliceElementCount);
           (_state$activeChannelM2 = state.activeChannelMessages).splice.apply(_state$activeChannelM2, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
-        } else {
-          var _state$activeChannelM3;
-          (_state$activeChannelM3 = state.activeChannelMessages).splice.apply(_state$activeChannelM3, [0, 0].concat(messagesIsNotIncludeInActiveChannelMessages));
         }
-      } else if (direction === 'next' && newMessagesLength > 0) {
-        if (currentMessagesLength >= MESSAGES_MAX_LENGTH) {
-          var _state$activeChannelM4;
+      } else if (direction === MESSAGE_LOAD_DIRECTION.NEXT && newMessagesLength > 0) {
+        if (currentMessagesLength >= MESSAGES_MAX_PAGE_COUNT) {
+          var _state$activeChannelM3;
           setHasPrevCached(true);
           state.activeChannelMessages.splice(0, messagesIsNotIncludeInActiveChannelMessages.length);
+          (_state$activeChannelM3 = state.activeChannelMessages).push.apply(_state$activeChannelM3, messagesIsNotIncludeInActiveChannelMessages);
+        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_PAGE_COUNT) {
+          var _state$activeChannelM4;
+          var sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_PAGE_COUNT;
+          setHasPrevCached(true);
+          state.activeChannelMessages.splice(0, sliceElementCount);
           (_state$activeChannelM4 = state.activeChannelMessages).push.apply(_state$activeChannelM4, messagesIsNotIncludeInActiveChannelMessages);
-        } else if (newMessagesLength + currentMessagesLength > MESSAGES_MAX_LENGTH) {
+        } else {
           var _state$activeChannelM5;
-          var _sliceElementCount = newMessagesLength + currentMessagesLength - MESSAGES_MAX_LENGTH;
-          setHasPrevCached(true);
-          state.activeChannelMessages.splice(0, _sliceElementCount);
           (_state$activeChannelM5 = state.activeChannelMessages).push.apply(_state$activeChannelM5, messagesIsNotIncludeInActiveChannelMessages);
-        } else {
-          var _state$activeChannelM6;
-          (_state$activeChannelM6 = state.activeChannelMessages).push.apply(_state$activeChannelM6, messagesIsNotIncludeInActiveChannelMessages);
         }
       }
     },
@@ -11501,6 +11427,9 @@ var messageSlice = createSlice({
           });
         }
       }
+      state.activeChannelMessages.sort(function (a, b) {
+        return !(a !== null && a !== void 0 && a.id) ? 1 : (a === null || a === void 0 ? void 0 : a.id) < (b === null || b === void 0 ? void 0 : b.id) ? -1 : 1;
+      });
     },
     updateMessage: function updateMessage(state, action) {
       var _action$payload3 = action.payload,
@@ -11546,6 +11475,9 @@ var messageSlice = createSlice({
       if (!messageFound && addIfNotExists) {
         state.activeChannelMessages.push(params);
       }
+      state.activeChannelMessages.sort(function (a, b) {
+        return !(a !== null && a !== void 0 && a.id) ? 1 : (a === null || a === void 0 ? void 0 : a.id) < (b === null || b === void 0 ? void 0 : b.id) ? -1 : 1;
+      });
     },
     updateMessageAttachment: function updateMessageAttachment(state, action) {
       var _action$payload4 = action.payload,
@@ -18971,111 +18903,6 @@ var getFrame = function getFrame(videoSrc, time) {
   }
 };
 
-var processQueue = function processQueue(channelId) {
-  try {
-    var _temp4 = function _temp4() {
-      queue.processing = false;
-      log.info(new Date().toISOString() + " [ChannelQueue] Finished processing queue for channel: " + channelId);
-    };
-    var queue = getChannelQueue(channelId);
-    if (queue.processing || queue.queue.length === 0) {
-      return Promise.resolve();
-    }
-    queue.processing = true;
-    log.info("[ChannelQueue] Starting to process queue for channel: " + channelId + ", queue length: " + queue.queue.length);
-    var _temp3 = _for(function () {
-      return queue.queue.length > 0;
-    }, void 0, function () {
-      var queuedTask = queue.queue.shift();
-      var task = queuedTask.task,
-        resolve = queuedTask.resolve,
-        reject = queuedTask.reject,
-        functionName = queuedTask.functionName,
-        queuedAt = queuedTask.queuedAt;
-      var waitTime = queuedAt ? Date.now() - queuedAt : 0;
-      var functionInfo = functionName || 'unknown';
-      log.info("[ChannelQueue] Executing request for channel: " + channelId + ", function: " + functionInfo + ", queue position: " + (queue.queue.length + 1) + ", waited: " + waitTime + "ms");
-      var startTime = Date.now();
-      return _catch(function () {
-        var result = task();
-        var _temp2 = function () {
-          if (result && typeof result.then === 'function') {
-            return Promise.resolve(result).then(function (value) {
-              var duration = Date.now() - startTime;
-              log.info(new Date().toISOString() + " [ChannelQueue] Request completed for channel: " + channelId + ", \n          function: " + functionInfo + ", duration: " + duration + "ms, remaining: " + queue.queue.length);
-              resolve(value);
-            });
-          } else {
-            var duration = Date.now() - startTime;
-            log.info(new Date().toISOString() + " [ChannelQueue] Request completed (sync) for channel: " + channelId + ", \n          function: " + functionInfo + ", duration: " + duration + "ms, remaining: " + queue.queue.length);
-            resolve(result);
-          }
-        }();
-        if (_temp2 && _temp2.then) return _temp2.then(function () {});
-      }, function (error) {
-        var duration = Date.now() - startTime;
-        log.error(new Date().toISOString() + " [ChannelQueue] Request failed for channel: " + channelId + ", \n        function: " + functionInfo + ", duration: " + duration + "ms, error:", error);
-        reject(error);
-      });
-    });
-    return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-var channelQueues = new Map();
-function getChannelQueue(channelId) {
-  if (!channelQueues.has(channelId)) {
-    channelQueues.set(channelId, {
-      channelId: channelId,
-      queue: [],
-      processing: false
-    });
-  }
-  return channelQueues.get(channelId);
-}
-function queueChannelRequest(channelId, task, functionName) {
-  return new Promise(function (resolve, reject) {
-    var queue = getChannelQueue(channelId);
-    var queuedTask = {
-      task: task,
-      resolve: resolve,
-      reject: reject,
-      functionName: functionName,
-      queuedAt: Date.now()
-    };
-    queue.queue.push(queuedTask);
-    log.info(new Date().toISOString() + " [ChannelQueue] Request queued for channel: " + channelId + ", \n      function: " + (functionName || 'unknown') + ", queue length: " + queue.queue.length + ", processing: " + queue.processing);
-    processQueue(channelId);
-  });
-}
-function queuedChannelCall(channelId, fn) {
-  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-    args[_key - 2] = arguments[_key];
-  }
-  var functionName = fn.name || fn.displayName || 'anonymous';
-  var functionInfo = functionName + "(" + args.length + " args)";
-  return queueChannelRequest(channelId, function () {
-    try {
-      var _exit = false;
-      var result = fn.apply(void 0, args);
-      var _temp = function () {
-        if (result && typeof result.then === 'function') {
-          return Promise.resolve(result).then(function (_await$result) {
-            _exit = true;
-            return _await$result;
-          });
-        }
-      }();
-      return Promise.resolve(_temp && _temp.then ? _temp.then(function (_result) {
-        return _exit ? _result : result;
-      }) : _exit ? _temp : result);
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  }, functionInfo);
-}
-
 var SDKErrorTypeEnum = {
   BadRequest: {
     value: 'BadRequest',
@@ -19119,6 +18946,9 @@ var fromValue = function fromValue(value) {
 };
 var isResendableError = function isResendableError(value) {
   var _errorType$isResendab;
+  if (!value) {
+    return true;
+  }
   var errorType = fromValue(value);
   return (_errorType$isResendab = errorType === null || errorType === void 0 ? void 0 : errorType.isResendable) != null ? _errorType$isResendab : true;
 };
@@ -19256,13 +19086,13 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
     scrollToNewMessage = true;
   }
   return /*#__PURE__*/_regenerator().m(function _callee() {
-    var activeChannelId;
+    var activeChannelId, channel, messages, _channel$lastMessage2, repliedMessage, scrollRef, _channel$lastMessage3;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           activeChannelId = getActiveChannelId();
           if (!(actionType !== RESEND_MESSAGE)) {
-            _context.n = 3;
+            _context.n = 7;
             break;
           }
           if (activeChannelId === channelId) {
@@ -19279,12 +19109,43 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
           return effects.call(addPendingMessage, message, pending, channelId);
         case 2:
           if (!scrollToNewMessage) {
-            _context.n = 3;
+            _context.n = 7;
             break;
           }
           _context.n = 3;
-          return effects.put(scrollToNewMessageAC(true, true));
+          return effects.call(getChannelFromAllChannels, channelId);
         case 3:
+          channel = _context.v;
+          messages = store.getState().MessageReducer.activeChannelMessages;
+          if (!(messages.findIndex(function (msg) {
+            var _channel$lastMessage;
+            return msg.id === (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage = channel.lastMessage) === null || _channel$lastMessage === void 0 ? void 0 : _channel$lastMessage.id);
+          }) >= 10)) {
+            _context.n = 6;
+            break;
+          }
+          _context.n = 4;
+          return effects.put(scrollToNewMessageAC(true, false, false));
+        case 4:
+          _context.n = 5;
+          return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
+        case 5:
+          repliedMessage = document.getElementById(channel === null || channel === void 0 ? void 0 : (_channel$lastMessage2 = channel.lastMessage) === null || _channel$lastMessage2 === void 0 ? void 0 : _channel$lastMessage2.id);
+          if (repliedMessage) {
+            scrollRef = document.getElementById('scrollableDiv');
+            if (scrollRef) {
+              scrollRef.scrollTo({
+                top: 1000,
+                behavior: 'smooth'
+              });
+            }
+          }
+          _context.n = 7;
+          break;
+        case 6:
+          _context.n = 7;
+          return effects.put(getMessagesAC(channel, false, channel === null || channel === void 0 ? void 0 : (_channel$lastMessage3 = channel.lastMessage) === null || _channel$lastMessage3 === void 0 ? void 0 : _channel$lastMessage3.id, undefined, false, 'smooth', true));
+        case 7:
           return _context.a(2);
       }
     }, _callee);
@@ -19436,7 +19297,7 @@ function sendMessage(action) {
                   break;
                 }
                 _context2.n = 1;
-                return effects.call(updateMessage$1, action.type, _pending, channel.id, false, message);
+                return effects.call(updateMessage$1, action.type, _pending, channel.id, true, message);
               case 1:
                 _context2.n = 3;
                 break;
@@ -19489,7 +19350,7 @@ function sendMessage(action) {
           break;
         }
         _context4.n = 11;
-        return effects.call(updateMessage$1, action.type, pending, channel.id, false, message);
+        return effects.call(updateMessage$1, action.type, pending, channel.id, true, message);
       case 11:
         messageToSend = _extends({}, messageToSend, {
           attachments: attachmentsToSend
@@ -19534,7 +19395,7 @@ function sendMessage(action) {
                   });
                 }
                 _context3.n = 4;
-                return effects.call(queuedChannelCall, channel.id, channel.sendMessage, messageToSend);
+                return effects.call(channel.sendMessage, messageToSend);
               case 4:
                 messageResponse = _context3.v;
                 if (!customUploader) {
@@ -19791,7 +19652,7 @@ function sendTextMessage(action) {
           break;
         }
         _context5.n = 8;
-        return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, false, message);
+        return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, true, message);
       case 8:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context5.n = 17;
@@ -19809,7 +19670,7 @@ function sendTextMessage(action) {
         break;
       case 10:
         _context5.n = 11;
-        return effects.call(queuedChannelCall, channel.id, channel.sendMessage, messageToSend);
+        return effects.call(channel.sendMessage, messageToSend);
       case 11:
         messageResponse = _context5.v;
       case 12:
@@ -20042,7 +19903,7 @@ function forwardMessage(action) {
           break;
         }
         _context6.n = 10;
-        return effects.call(queuedChannelCall, channel.id, channel.sendMessage, messageToSend);
+        return effects.call(channel.sendMessage, messageToSend);
       case 10:
         messageResponse = _context6.v;
         messageUpdateData = {
@@ -20231,7 +20092,7 @@ function deleteMessage(action) {
           }
         }
         _context8.n = 2;
-        return effects.call(queuedChannelCall, channel.id, channel.deleteMessageById, messageId, deleteOption === 'forMe');
+        return effects.call(channel.deleteMessageById, messageId, deleteOption === 'forMe');
       case 2:
         deletedMessage = _context8.v;
         _context8.n = 3;
@@ -20296,7 +20157,7 @@ function editMessage(action) {
           message.attachments = [].concat(anotherAttachments, linkAttachmentsToSend);
         }
         _context9.n = 2;
-        return effects.call(queuedChannelCall, channel.id, channel.editMessage, _extends({}, message, {
+        return effects.call(channel.editMessage, _extends({}, message, {
           metadata: isJSON(message.metadata) ? message.metadata : JSON.stringify(message.metadata),
           attachments: message.attachments.map(function (att) {
             return _extends({}, att, {
@@ -20429,13 +20290,13 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connec
     }
   }, _callee4, null, [[3, 9]]);
 });
-var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, updatedMessages) {
+var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, updatedMessages, firstMessageId, lastMessageId) {
   var messages;
   return _regenerator().w(function (_context1) {
     while (1) switch (_context1.n) {
       case 0:
         messages = [].concat(updatedMessages);
-        setMessagesToMap(channel.id, messages);
+        setMessagesToMap(channel.id, messages, firstMessageId, lastMessageId);
         setAllMessages(messages);
         _context1.n = 1;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(messages))));
@@ -20460,7 +20321,7 @@ var getFilteredPendingMessages = function getFilteredPendingMessages(messages) {
   return filteredPendingMessages;
 };
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, queueResult, parsedMessages, _filteredPendingMessages, updatedMessages, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1;
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, highlight, behavior, scrollToMessage, networkChanged, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, _result$messages$, _result$messages, _messages$Math$floor, messages, centerMessageId, loadWithMessageId, allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, secondResult, thirdResult, fourthResult, _fourthResult, _result$messages$3, _result$messages3, _channel$lastMessage4, _channel$lastMessage5, _channel$lastMessage6, _updatedMessages$, _parsedMessages$, _parsedMessages, parsedMessages, _filteredPendingMessages, updatedMessages, messageIdForLoad, filteredPendingMessages, waitToSendPendingMessages, updatedChannel, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
   return _regenerator().w(function (_context10) {
     while (1) switch (_context10.p = _context10.n) {
       case 0:
@@ -20468,10 +20329,10 @@ function getMessagesQuery(action) {
         _context10.n = 1;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior, scrollToMessage = _action$payload.scrollToMessage;
+        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, highlight = _action$payload.highlight, behavior = _action$payload.behavior, scrollToMessage = _action$payload.scrollToMessage, networkChanged = _action$payload.networkChanged;
         connectionState = store.getState().UserReducer.connectionStatus;
-        if (!(channel.id && !channel.isMockChannel)) {
-          _context10.n = 51;
+        if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
+          _context10.n = 84;
           break;
         }
         SceytChatClient = getClient();
@@ -20501,364 +20362,399 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context10.n = 15;
+          _context10.n = 22;
           break;
         }
-        allMessages = getAllMessages();
-        havLastMessage = allMessages && allMessages.length && channel.lastMessage && allMessages[allMessages.length - 1] && allMessages[allMessages.length - 1].id === channel.lastMessage.id;
-        if (!(channel.newMessageCount && channel.newMessageCount > 0 || !havLastMessage)) {
-          _context10.n = 10;
+        if (!(channel.newMessageCount && channel.newMessageCount > 0)) {
+          _context10.n = 15;
           break;
         }
         setHasPrevCached(false);
-        setMessagesToMap(channel.id, []);
         setAllMessages([]);
+        messageQuery.limit = MESSAGES_MAX_LENGTH;
+        if (!Number(channel.lastDisplayedMessageId)) {
+          _context10.n = 8;
+          break;
+        }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context10.n = 6;
           break;
         }
         _context10.n = 5;
-        return effects.call(queuedChannelCall, channel.id, function () {
-          try {
-            return Promise.resolve(messageQuery.loadPreviousMessageId('0')).then(function (firstResult) {
-              var _exit = false;
-              var _temp7 = function () {
-                if (firstResult.messages.length === 50) {
-                  messageQuery.limit = 30;
-                  return Promise.resolve(messageQuery.loadPreviousMessageId(firstResult.messages[0].id)).then(function (secondResult) {
-                    var _messages$hasNext = {
-                      messages: [].concat(secondResult.messages, firstResult.messages),
-                      hasNext: secondResult.hasNext
-                    };
-                    _exit = true;
-                    return _messages$hasNext;
-                  });
-                }
-              }();
-              return _temp7 && _temp7.then ? _temp7.then(function (_result) {
-                return _exit ? _result : firstResult;
-              }) : _exit ? _temp7 : firstResult;
-            });
-          } catch (e) {
-            return Promise.reject(e);
-          }
-        });
+        return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
       case 5:
-        result = _context10.v;
+        _t1 = _context10.v;
         _context10.n = 7;
         break;
       case 6:
-        result = {
+        _t1 = {
           messages: [],
           hasNext: false
         };
       case 7:
-        sentMessages = [];
-        if (withDeliveredMessages) {
-          sentMessages = getFromAllMessagesByMessageId('', '', true);
-        }
-        messagesMap = {};
-        result.messages.forEach(function (msg) {
-          messagesMap[msg.tid || ''] = msg;
-        });
-        filteredSentMessages = sentMessages.filter(function (msg) {
-          return !messagesMap[msg.tid || ''];
-        });
-        result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
-        _context10.n = 8;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        result = _t1;
+        _context10.n = 12;
+        break;
       case 8:
-        setMessagesToMap(channel.id, result.messages);
-        setAllMessages(result.messages);
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context10.n = 10;
+          break;
+        }
         _context10.n = 9;
-        return effects.put(setMessagesHasPrevAC(true));
+        return effects.call(messageQuery.loadPrevious);
       case 9:
-        _context10.n = 12;
+        _t10 = _context10.v;
+        _context10.n = 11;
         break;
       case 10:
-        result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context10.n = 11;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+        _t10 = {
+          messages: [],
+          hasNext: false
+        };
       case 11:
-        _context10.n = 12;
-        return effects.put(setMessagesHasPrevAC(true));
+        result = _t10;
       case 12:
         _context10.n = 13;
-        return effects.put(setMessagesHasNextAC(false));
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 13:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$ = result.messages[0]) === null || _result$messages$ === void 0 ? void 0 : _result$messages$.id, (_result$messages = result.messages[result.messages.length - 1]) === null || _result$messages === void 0 ? void 0 : _result$messages.id);
+        setAllMessages(result.messages);
+        _context10.n = 14;
+        return effects.put(setMessagesHasPrevAC(true));
+      case 14:
+        _context10.n = 17;
+        break;
+      case 15:
+        result.messages = getFromAllMessagesByMessageId('', '', true);
+        _context10.n = 16;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+      case 16:
+        _context10.n = 17;
+        return effects.put(setMessagesHasPrevAC(true));
+      case 17:
+        _context10.n = 18;
+        return effects.put(setMessagesHasNextAC(false));
+      case 18:
         setHasNextCached(false);
         if (!(messageId && scrollToMessage)) {
-          _context10.n = 14;
+          _context10.n = 21;
           break;
         }
-        _context10.n = 14;
-        return effects.put(setScrollToMessagesAC(messageId, highlight, behavior));
-      case 14:
-        _context10.n = 44;
+        if (!(channel.newMessageCount && channel.newMessageCount > 0)) {
+          _context10.n = 20;
+          break;
+        }
+        _context10.n = 19;
+        return effects.put(setScrollToMessagesAC(channel.lastDisplayedMessageId, highlight, behavior));
+      case 19:
+        _context10.n = 21;
         break;
-      case 15:
+      case 20:
+        _context10.n = 21;
+        return effects.put(scrollToNewMessageAC(true));
+      case 21:
+        _context10.n = 77;
+        break;
+      case 22:
         if (!messageId) {
-          _context10.n = 29;
+          _context10.n = 52;
           break;
         }
-        _allMessages = getAllMessages();
-        messageIndex = _allMessages.findIndex(function (msg) {
-          return msg.id === messageId;
+        messages = store.getState().MessageReducer.activeChannelMessages;
+        centerMessageId = (_messages$Math$floor = messages[Math.floor(messages.length / 2)]) === null || _messages$Math$floor === void 0 ? void 0 : _messages$Math$floor.id;
+        loadWithMessageId = networkChanged && (messages === null || messages === void 0 ? void 0 : messages.length) > 0 ? centerMessageId : messageId;
+        allMessages = getAllMessages();
+        messageIndex = allMessages.findIndex(function (msg) {
+          return msg.id === loadWithMessageId;
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context10.n = 18;
+          _context10.n = 25;
           break;
         }
-        result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context10.n = 16;
+        result.messages = allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
+        _context10.n = 23;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 16:
+      case 23:
         setHasPrevCached(messageIndex > maxLengthPart);
-        setHasNextCached(_allMessages.length > maxLengthPart);
-        _context10.n = 17;
+        setHasNextCached(allMessages.length > maxLengthPart);
+        _context10.n = 24;
         return effects.put(setMessagesHasPrevAC(true));
-      case 17:
-        _context10.n = 25;
+      case 24:
+        _context10.n = 48;
         break;
-      case 18:
+      case 25:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
-        log.info('load by message id from server ...............', messageId);
+        log.info('load by message id from server ...............', loadWithMessageId);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 22;
+          _context10.n = 27;
           break;
         }
-        _context10.n = 19;
-        return effects.call(queuedChannelCall, channel.id, function () {
-          try {
-            return Promise.resolve(messageQuery.loadNearMessageId(messageId)).then(function (firstResult) {
-              var _exit2 = false;
-              var _temp8 = function () {
-                if (firstResult.messages.length === 50) {
-                  messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-                  return Promise.resolve(messageQuery.loadPreviousMessageId(firstResult.messages[0].id)).then(function (secondResult) {
-                    messageQuery.reverse = false;
-                    return Promise.resolve(messageQuery.loadNextMessageId(firstResult.messages[firstResult.messages.length - 1].id)).then(function (thirdResult) {
-                      messageQuery.reverse = true;
-                      var _messages$hasNext$sec = {
-                        messages: [].concat(secondResult.messages, firstResult.messages, thirdResult.messages),
-                        hasNext: secondResult.hasNext,
-                        secondResultHasNext: secondResult.hasNext
-                      };
-                      _exit2 = true;
-                      return _messages$hasNext$sec;
-                    });
-                  });
-                }
-              }();
-              return _temp8 && _temp8.then ? _temp8.then(function (_result2) {
-                return _exit2 ? _result2 : firstResult;
-              }) : _exit2 ? _temp8 : firstResult;
-            });
-          } catch (e) {
-            return Promise.reject(e);
-          }
-        });
-      case 19:
-        queueResult = _context10.v;
-        result = queueResult;
-        if (!(result.messages.length === 50 && result.secondResultHasNext !== undefined)) {
-          _context10.n = 21;
+        _context10.n = 26;
+        return effects.call(messageQuery.loadNearMessageId, loadWithMessageId);
+      case 26:
+        _t11 = _context10.v;
+        _context10.n = 28;
+        break;
+      case 27:
+        _t11 = {
+          messages: [],
+          hasNext: false
+        };
+      case 28:
+        result = _t11;
+        _context10.n = 29;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+      case 29:
+        if (!(result.messages.length === 50)) {
+          _context10.n = 47;
           break;
         }
-        _context10.n = 20;
-        return effects.put(setMessagesHasPrevAC(result.secondResultHasNext));
-      case 20:
-        result = {
-          messages: result.messages,
-          hasNext: result.hasNext
+        messageQuery.limit = (MESSAGES_MAX_PAGE_COUNT - 50) / 2;
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context10.n = 31;
+          break;
+        }
+        _context10.n = 30;
+        return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
+      case 30:
+        _t12 = _context10.v;
+        _context10.n = 32;
+        break;
+      case 31:
+        _t12 = {
+          messages: [],
+          hasNext: false
         };
-      case 21:
-        _context10.n = 23;
+      case 32:
+        secondResult = _t12;
+        result.messages = [].concat(secondResult.messages, result.messages);
+        _context10.n = 33;
+        return effects.put(addMessagesAC(JSON.parse(JSON.stringify(secondResult.messages)), MESSAGE_LOAD_DIRECTION.PREV));
+      case 33:
+        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length;
+        messageQuery.reverse = false;
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context10.n = 35;
+          break;
+        }
+        _context10.n = 34;
+        return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
+      case 34:
+        _t13 = _context10.v;
+        _context10.n = 36;
         break;
-      case 22:
-        result = {
+      case 35:
+        _t13 = {
           messages: [],
           hasNext: false
         };
-      case 23:
-        _context10.n = 24;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 24:
-        setMessagesToMap(channel.id, result.messages);
+      case 36:
+        thirdResult = _t13;
+        result.messages = [].concat(result.messages, thirdResult.messages);
+        _context10.n = 37;
+        return effects.put(addMessagesAC(JSON.parse(JSON.stringify(thirdResult.messages)), MESSAGE_LOAD_DIRECTION.NEXT));
+      case 37:
+        if (!(secondResult.hasNext && !thirdResult.hasNext)) {
+          _context10.n = 42;
+          break;
+        }
+        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length - result.messages.length;
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context10.n = 39;
+          break;
+        }
+        _context10.n = 38;
+        return effects.call(messageQuery.loadPreviousMessageId, result.messages[0].id);
+      case 38:
+        _t14 = _context10.v;
+        _context10.n = 40;
+        break;
+      case 39:
+        _t14 = {
+          messages: [],
+          hasNext: false
+        };
+      case 40:
+        fourthResult = _t14;
+        result.messages = [].concat(fourthResult.messages, result.messages);
+        _context10.n = 41;
+        return effects.put(addMessagesAC(JSON.parse(JSON.stringify(fourthResult.messages)), MESSAGE_LOAD_DIRECTION.PREV));
+      case 41:
+        _context10.n = 46;
+        break;
+      case 42:
+        if (!(!secondResult.hasNext && thirdResult.hasNext)) {
+          _context10.n = 46;
+          break;
+        }
+        messageQuery.limit = MESSAGES_MAX_PAGE_COUNT - 50 - secondResult.messages.length - result.messages.length;
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context10.n = 44;
+          break;
+        }
+        _context10.n = 43;
+        return effects.call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
+      case 43:
+        _t15 = _context10.v;
+        _context10.n = 45;
+        break;
+      case 44:
+        _t15 = {
+          messages: [],
+          hasNext: false
+        };
+      case 45:
+        _fourthResult = _t15;
+        result.messages = [].concat(result.messages, _fourthResult.messages);
+        _context10.n = 46;
+        return effects.put(addMessagesAC(JSON.parse(JSON.stringify(_fourthResult.messages)), MESSAGE_LOAD_DIRECTION.NEXT));
+      case 46:
+        messageQuery.reverse = true;
+      case 47:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$2 = result.messages[0]) === null || _result$messages$2 === void 0 ? void 0 : _result$messages$2.id, (_result$messages2 = result.messages[result.messages.length - 1]) === null || _result$messages2 === void 0 ? void 0 : _result$messages2.id);
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
-      case 25:
-        _context10.n = 26;
+      case 48:
+        _context10.n = 49;
         return effects.put(setMessagesHasNextAC(true));
-      case 26:
+      case 49:
         if (!scrollToMessage) {
-          _context10.n = 27;
+          _context10.n = 50;
           break;
         }
-        _context10.n = 27;
-        return effects.put(setScrollToMessagesAC(messageId, true, behavior));
-      case 27:
-        _context10.n = 28;
+        _context10.n = 50;
+        return effects.put(setScrollToMessagesAC(loadWithMessageId, highlight, behavior));
+      case 50:
+        _context10.n = 51;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 28:
-        _context10.n = 44;
+      case 51:
+        _context10.n = 77;
         break;
-      case 29:
+      case 52:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context10.n = 36;
+          _context10.n = 64;
           break;
         }
-        setMessagesToMap(channel.id, []);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
+        if (!Number(channel.lastDisplayedMessageId)) {
+          _context10.n = 56;
+          break;
+        }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 31;
+          _context10.n = 54;
           break;
         }
-        _context10.n = 30;
-        return effects.call(queuedChannelCall, channel.id, function () {
-          try {
-            if (Number(channel.lastDisplayedMessageId)) {
-              return Promise.resolve(messageQuery.loadNearMessageId(channel.lastDisplayedMessageId)).then(function (firstResult) {
-                var _exit3 = false;
-                var _temp9 = function () {
-                  if (firstResult.messages.length === 50) {
-                    messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
-                    return Promise.resolve(messageQuery.loadPreviousMessageId(firstResult.messages[0].id)).then(function (secondResult) {
-                      if (channel.newMessageCount > 25) {
-                        messageQuery.reverse = false;
-                        return Promise.resolve(messageQuery.loadNextMessageId(firstResult.messages[firstResult.messages.length - 1].id)).then(function (thirdResult) {
-                          messageQuery.reverse = true;
-                          var _messages$hasNext2 = {
-                            messages: [].concat(secondResult.messages, firstResult.messages, thirdResult.messages),
-                            hasNext: secondResult.hasNext
-                          };
-                          _exit3 = true;
-                          return _messages$hasNext2;
-                        });
-                      } else {
-                        var _messages$hasNext3 = {
-                          messages: [].concat(secondResult.messages, firstResult.messages),
-                          hasNext: secondResult.hasNext
-                        };
-                        _exit3 = true;
-                        return _messages$hasNext3;
-                      }
-                    });
-                  }
-                }();
-                return _temp9 && _temp9.then ? _temp9.then(function (_result3) {
-                  return _exit3 ? _result3 : firstResult;
-                }) : _exit3 ? _temp9 : firstResult;
-              });
-            } else {
-              return Promise.resolve(messageQuery.loadPrevious()).then(function (firstResult) {
-                var _exit4 = false;
-                var _temp0 = function () {
-                  if (firstResult.messages.length === 50) {
-                    messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-                    return Promise.resolve(messageQuery.loadPreviousMessageId(firstResult.messages[0].id)).then(function (secondResult) {
-                      var _messages$hasNext4 = {
-                        messages: [].concat(secondResult.messages, firstResult.messages),
-                        hasNext: secondResult.hasNext
-                      };
-                      _exit4 = true;
-                      return _messages$hasNext4;
-                    });
-                  }
-                }();
-                return _temp0 && _temp0.then ? _temp0.then(function (_result4) {
-                  return _exit4 ? _result4 : firstResult;
-                }) : _exit4 ? _temp0 : firstResult;
-              });
-            }
-          } catch (e) {
-            return Promise.reject(e);
-          }
-        });
-      case 30:
-        result = _context10.v;
-        _context10.n = 32;
+        _context10.n = 53;
+        return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
+      case 53:
+        _t16 = _context10.v;
+        _context10.n = 55;
         break;
-      case 31:
-        result = {
+      case 54:
+        _t16 = {
           messages: [],
           hasNext: false
         };
-      case 32:
-        _context10.n = 33;
+      case 55:
+        result = _t16;
+        _context10.n = 60;
+        break;
+      case 56:
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context10.n = 58;
+          break;
+        }
+        _context10.n = 57;
+        return effects.call(messageQuery.loadPrevious);
+      case 57:
+        _t17 = _context10.v;
+        _context10.n = 59;
+        break;
+      case 58:
+        _t17 = {
+          messages: [],
+          hasNext: false
+        };
+      case 59:
+        result = _t17;
+      case 60:
+        _context10.n = 61;
         return effects.put(setMessagesHasPrevAC(true));
-      case 33:
-        _context10.n = 34;
+      case 61:
+        _context10.n = 62;
         return effects.put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
-      case 34:
-        setMessagesToMap(channel.id, result.messages);
+      case 62:
+        setMessagesToMap(channel.id, result.messages, (_result$messages$3 = result.messages[0]) === null || _result$messages$3 === void 0 ? void 0 : _result$messages$3.id, (_result$messages3 = result.messages[result.messages.length - 1]) === null || _result$messages3 === void 0 ? void 0 : _result$messages3.id);
         setAllMessages([].concat(result.messages));
-        _context10.n = 35;
+        _context10.n = 63;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 35:
-        _context10.n = 44;
+      case 63:
+        _context10.n = 77;
         break;
-      case 36:
-        setMessagesToMap(channel.id, []);
-        setAllMessages([]);
+      case 64:
         if (!(cachedMessages && cachedMessages.length)) {
-          _context10.n = 38;
+          _context10.n = 66;
           break;
         }
-        parsedMessages = JSON.parse(JSON.stringify(cachedMessages));
-        setMessagesToMap(channel.id, parsedMessages);
-        setAllMessages(parsedMessages);
-        _context10.n = 37;
-        return effects.put(setMessagesAC(parsedMessages));
-      case 37:
+        parsedMessages = getFromAllMessagesByMessageId('', '', true);
+        setMessagesToMap(channel.id, parsedMessages, (_parsedMessages$ = parsedMessages[0]) === null || _parsedMessages$ === void 0 ? void 0 : _parsedMessages$.id, (_parsedMessages = parsedMessages[parsedMessages.length - 1]) === null || _parsedMessages === void 0 ? void 0 : _parsedMessages.id);
+        _context10.n = 65;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(parsedMessages))));
+      case 65:
         _filteredPendingMessages = getFilteredPendingMessages(parsedMessages);
-        _context10.n = 38;
+        _context10.n = 66;
         return effects.put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 38:
+      case 66:
         log.info('load message from server');
+        result = {
+          messages: [],
+          hasNext: false
+        };
+        if (!((channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage4 = channel.lastMessage) === null || _channel$lastMessage4 === void 0 ? void 0 : _channel$lastMessage4.id))) {
+          _context10.n = 70;
+          break;
+        }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 40;
+          _context10.n = 68;
           break;
         }
-        _context10.n = 39;
-        return effects.call(queuedChannelCall, channel.id, function () {
-          try {
-            return Promise.resolve(messageQuery.loadPrevious()).then(function (firstResult) {
-              var _exit5 = false;
-              var _temp1 = function () {
-                if (firstResult.messages.length === 50) {
-                  messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
-                  return Promise.resolve(messageQuery.loadPreviousMessageId(firstResult.messages[0].id)).then(function (secondResult) {
-                    var _messages$hasNext5 = {
-                      messages: [].concat(secondResult.messages, firstResult.messages),
-                      hasNext: secondResult.hasNext
-                    };
-                    _exit5 = true;
-                    return _messages$hasNext5;
-                  });
-                }
-              }();
-              return _temp1 && _temp1.then ? _temp1.then(function (_result5) {
-                return _exit5 ? _result5 : firstResult;
-              }) : _exit5 ? _temp1 : firstResult;
-            });
-          } catch (e) {
-            return Promise.reject(e);
-          }
-        });
-      case 39:
-        result = _context10.v;
-        _context10.n = 41;
+        _context10.n = 67;
+        return effects.call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
+      case 67:
+        _t18 = _context10.v;
+        _context10.n = 69;
         break;
-      case 40:
-        result = {
+      case 68:
+        _t18 = {
           messages: [],
           hasNext: false
         };
-      case 41:
+      case 69:
+        result = _t18;
+        _context10.n = 74;
+        break;
+      case 70:
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context10.n = 72;
+          break;
+        }
+        _context10.n = 71;
+        return effects.call(messageQuery.loadPrevious);
+      case 71:
+        _t19 = _context10.v;
+        _context10.n = 73;
+        break;
+      case 72:
+        _t19 = {
+          messages: [],
+          hasNext: false
+        };
+      case 73:
+        result = _t19;
+      case 74:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -20868,72 +20764,73 @@ function getMessagesQuery(action) {
           updateMessageOnAllMessages(msg.id, updatedMessage || msg);
           updatedMessages.push(updatedMessage || msg);
         });
-        _context10.n = 42;
-        return effects.call(updateMessages, channel, updatedMessages);
-      case 42:
-        _context10.n = 43;
+        messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
+        _context10.n = 75;
+        return effects.call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
+      case 75:
+        _context10.n = 76;
         return effects.put(setMessagesHasPrevAC(true));
-      case 43:
-        _context10.n = 44;
+      case 76:
+        _context10.n = 77;
         return effects.put(setMessagesHasNextAC(false));
-      case 44:
+      case 77:
         filteredPendingMessages = getFilteredPendingMessages(result.messages);
-        _context10.n = 45;
+        _context10.n = 78;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 45:
+      case 78:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 47;
+          _context10.n = 80;
           break;
         }
-        _context10.n = 46;
+        _context10.n = 79;
         return effects.put(setWaitToSendPendingMessagesAC(false));
-      case 46:
-        _context10.n = 47;
+      case 79:
+        _context10.n = 80;
         return effects.spawn(sendPendingMessages, connectionState);
-      case 47:
-        _context10.n = 48;
-        return effects.call(queuedChannelCall, channel.id, SceytChatClient.getChannel, channel.id, true);
-      case 48:
+      case 80:
+        _context10.n = 81;
+        return effects.call(SceytChatClient.getChannel, channel.id, true);
+      case 81:
         updatedChannel = _context10.v;
         if (!updatedChannel) {
-          _context10.n = 50;
+          _context10.n = 83;
           break;
         }
-        _context10.n = 49;
+        _context10.n = 82;
         return effects.put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
-      case 49:
+      case 82:
         updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
-      case 50:
-        _context10.n = 52;
+      case 83:
+        _context10.n = 85;
         break;
-      case 51:
-        if (!channel.isMockChannel) {
-          _context10.n = 52;
+      case 84:
+        if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
+          _context10.n = 85;
           break;
         }
-        _context10.n = 52;
+        _context10.n = 85;
         return effects.put(setMessagesAC([]));
-      case 52:
-        _context10.n = 54;
+      case 85:
+        _context10.n = 87;
         break;
-      case 53:
-        _context10.p = 53;
-        _t1 = _context10.v;
-        log.error('error in message query', _t1);
-      case 54:
-        _context10.p = 54;
-        _context10.n = 55;
+      case 86:
+        _context10.p = 86;
+        _t20 = _context10.v;
+        log.error('error in message query', _t20);
+      case 87:
+        _context10.p = 87;
+        _context10.n = 88;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 55:
-        return _context10.f(54);
-      case 56:
+      case 88:
+        return _context10.f(87);
+      case 89:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 53, 54, 56]]);
+  }, _marked7$1, null, [[0, 86, 87, 89]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t10;
+  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t21;
   return _regenerator().w(function (_context11) {
     while (1) switch (_context11.p = _context11.n) {
       case 0:
@@ -20983,15 +20880,15 @@ function getMessageQuery(action) {
         break;
       case 7:
         _context11.p = 7;
-        _t10 = _context11.v;
-        log.error('error in message query', _t10);
+        _t21 = _context11.v;
+        log.error('error in message query', _t21);
       case 8:
         return _context11.a(2);
     }
   }, _marked8$1, null, [[0, 7]]);
 }
 function loadMoreMessages(action) {
-  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t11;
+  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _result$messages$4, _result$messages4, _result$messages$5, _result$messages5, _t22;
   return _regenerator().w(function (_context12) {
     while (1) switch (_context12.p = _context12.n) {
       case 0:
@@ -21030,12 +20927,12 @@ function loadMoreMessages(action) {
           break;
         }
         _context12.n = 4;
-        return effects.call(queuedChannelCall, channelId, messageQuery.loadPreviousMessageId, messageId);
+        return effects.call(messageQuery.loadPreviousMessageId, messageId);
       case 4:
         result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.PREV);
-          setMessagesToMap(channelId, result.messages);
+          setMessagesToMap(channelId, result.messages, (_result$messages$4 = result.messages[0]) === null || _result$messages$4 === void 0 ? void 0 : _result$messages$4.id, (_result$messages4 = result.messages[result.messages.length - 1]) === null || _result$messages4 === void 0 ? void 0 : _result$messages4.id);
         }
         _context12.n = 5;
         return effects.put(setMessagesHasPrevAC(result.hasNext));
@@ -21058,12 +20955,12 @@ function loadMoreMessages(action) {
         log.info('saga load next from server ... ', messageId);
         messageQuery.reverse = false;
         _context12.n = 8;
-        return effects.call(queuedChannelCall, channelId, messageQuery.loadNextMessageId, messageId);
+        return effects.call(messageQuery.loadNextMessageId, messageId);
       case 8:
         result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.NEXT);
-          setMessagesToMap(channelId, result.messages);
+          setMessagesToMap(channelId, result.messages, (_result$messages$5 = result.messages[0]) === null || _result$messages$5 === void 0 ? void 0 : _result$messages$5.id, (_result$messages5 = result.messages[result.messages.length - 1]) === null || _result$messages5 === void 0 ? void 0 : _result$messages5.id);
         }
         _context12.n = 9;
         return effects.put(setMessagesHasNextAC(result.hasNext));
@@ -21104,15 +21001,15 @@ function loadMoreMessages(action) {
         break;
       case 18:
         _context12.p = 18;
-        _t11 = _context12.v;
-        log.error('error in load more messages', _t11);
+        _t22 = _context12.v;
+        log.error('error in load more messages', _t22);
       case 19:
         return _context12.a(2);
     }
   }, _marked9$1, null, [[0, 18]]);
 }
 function addReaction(action) {
-  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t12;
+  var payload, channelId, messageId, key, score, reason, enforceUnique, user, channel, _yield$call, message, reaction, channelUpdateParam, _t23;
   return _regenerator().w(function (_context13) {
     while (1) switch (_context13.p = _context13.n) {
       case 0:
@@ -21131,7 +21028,7 @@ function addReaction(action) {
           }
         }
         _context13.n = 2;
-        return effects.call(queuedChannelCall, channelId, channel.addReaction, messageId, key, score, reason, enforceUnique);
+        return effects.call(channel.addReaction, messageId, key, score, reason, enforceUnique);
       case 2:
         _yield$call = _context13.v;
         message = _yield$call.message;
@@ -21165,15 +21062,15 @@ function addReaction(action) {
         break;
       case 8:
         _context13.p = 8;
-        _t12 = _context13.v;
-        log.error('ERROR in add reaction', _t12.message);
+        _t23 = _context13.v;
+        log.error('ERROR in add reaction', _t23.message);
       case 9:
         return _context13.a(2);
     }
   }, _marked0$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
-  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t13;
+  var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t24;
   return _regenerator().w(function (_context14) {
     while (1) switch (_context14.p = _context14.n) {
       case 0:
@@ -21191,7 +21088,7 @@ function deleteReaction(action) {
           }
         }
         _context14.n = 2;
-        return effects.call(queuedChannelCall, channelId, channel.deleteReaction, messageId, key);
+        return effects.call(channel.deleteReaction, messageId, key);
       case 2:
         _yield$call2 = _context14.v;
         message = _yield$call2.message;
@@ -21221,15 +21118,15 @@ function deleteReaction(action) {
         break;
       case 7:
         _context14.p = 7;
-        _t13 = _context14.v;
-        log.error('ERROR in delete reaction', _t13.message);
+        _t24 = _context14.v;
+        log.error('ERROR in delete reaction', _t24.message);
       case 8:
         return _context14.a(2);
     }
   }, _marked1$1, null, [[0, 7]]);
 }
 function getReactions(action) {
-  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t14;
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t25;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -21264,15 +21161,15 @@ function getReactions(action) {
         break;
       case 6:
         _context15.p = 6;
-        _t14 = _context15.v;
-        log.error('ERROR in get reactions', _t14.message);
+        _t25 = _context15.v;
+        log.error('ERROR in get reactions', _t25.message);
       case 7:
         return _context15.a(2);
     }
   }, _marked10$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
-  var payload, limit, ReactionQuery, result, _t15;
+  var payload, limit, ReactionQuery, result, _t26;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.p = _context16.n) {
       case 0:
@@ -21300,15 +21197,15 @@ function loadMoreReactions(action) {
         break;
       case 5:
         _context16.p = 5;
-        _t15 = _context16.v;
-        log.error('ERROR in load more reactions', _t15.message);
+        _t26 = _context16.v;
+        log.error('ERROR in load more reactions', _t26.message);
       case 6:
         return _context16.a(2);
     }
   }, _marked11$1, null, [[0, 5]]);
 }
 function getMessageAttachments(action) {
-  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t16;
+  var _action$payload2, channelId, attachmentType, limit, direction, attachmentId, forPopup, SceytChatClient, typeList, AttachmentByTypeQueryBuilder, AttachmentByTypeQuery, result, _t27;
   return _regenerator().w(function (_context17) {
     while (1) switch (_context17.p = _context17.n) {
       case 0:
@@ -21386,15 +21283,15 @@ function getMessageAttachments(action) {
         break;
       case 13:
         _context17.p = 13;
-        _t16 = _context17.v;
-        log.error('error in message attachment query', _t16);
+        _t27 = _context17.v;
+        log.error('error in message attachment query', _t27);
       case 14:
         return _context17.a(2);
     }
   }, _marked12$1, null, [[0, 13]]);
 }
 function loadMoreMessageAttachments(action) {
-  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t17;
+  var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t28;
   return _regenerator().w(function (_context18) {
     while (1) switch (_context18.p = _context18.n) {
       case 0:
@@ -21438,15 +21335,15 @@ function loadMoreMessageAttachments(action) {
         break;
       case 8:
         _context18.p = 8;
-        _t17 = _context18.v;
-        log.error('error in message attachment query', _t17);
+        _t28 = _context18.v;
+        log.error('error in message attachment query', _t28);
       case 9:
         return _context18.a(2);
     }
   }, _marked13$1, null, [[0, 8]]);
 }
 function pauseAttachmentUploading(action) {
-  var attachmentId, isPaused, _t18;
+  var attachmentId, isPaused, _t29;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -21468,15 +21365,15 @@ function pauseAttachmentUploading(action) {
         break;
       case 2:
         _context19.p = 2;
-        _t18 = _context19.v;
-        log.error('error in pause attachment uploading', _t18);
+        _t29 = _context19.v;
+        log.error('error in pause attachment uploading', _t29);
       case 3:
         return _context19.a(2);
     }
   }, _marked14$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
-  var attachmentId, isResumed, _t19;
+  var attachmentId, isResumed, _t30;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.p = _context20.n) {
       case 0:
@@ -21499,15 +21396,15 @@ function resumeAttachmentUploading(action) {
         break;
       case 2:
         _context20.p = 2;
-        _t19 = _context20.v;
-        log.error('error in resume attachment uploading', _t19);
+        _t30 = _context20.v;
+        log.error('error in resume attachment uploading', _t30);
       case 3:
         return _context20.a(2);
     }
   }, _marked15$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
-  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t20;
+  var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t31;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
@@ -21537,8 +21434,8 @@ function getMessageMarkers(action) {
         break;
       case 5:
         _context21.p = 5;
-        _t20 = _context21.v;
-        log.error('error in get message markers', _t20);
+        _t31 = _context21.v;
+        log.error('error in get message markers', _t31);
       case 6:
         _context21.p = 6;
         _context21.n = 7;
@@ -21676,7 +21573,7 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   }, _marked18$1);
 }
 function addPollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t21;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t32;
   return _regenerator().w(function (_context24) {
     while (1) switch (_context24.p = _context24.n) {
       case 0:
@@ -21775,8 +21672,8 @@ function addPollVote(action) {
         break;
       case 8:
         _context24.p = 8;
-        _t21 = _context24.v;
-        log.error('error in add poll vote', _t21);
+        _t32 = _context24.v;
+        log.error('error in add poll vote', _t32);
       case 9:
         return _context24.a(2);
     }
@@ -21877,7 +21774,7 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
   }, _marked21$1);
 }
 function deletePollVote(action) {
-  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, connectionState, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t22;
+  var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _message$pollDetails1, _message$pollDetails10, _message$pollDetails11, connectionState, vote, pendingAction, conflictCheck, channel, _Object$values2, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t33;
   return _regenerator().w(function (_context27) {
     while (1) switch (_context27.p = _context27.n) {
       case 0:
@@ -21962,8 +21859,8 @@ function deletePollVote(action) {
         break;
       case 9:
         _context27.p = 9;
-        _t22 = _context27.v;
-        log.error('error in delete poll vote', _t22);
+        _t33 = _context27.v;
+        log.error('error in delete poll vote', _t33);
       case 10:
         return _context27.a(2);
     }
@@ -22041,7 +21938,7 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
   }, _marked24$1);
 }
 function closePoll(action) {
-  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t23;
+  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t34;
   return _regenerator().w(function (_context30) {
     while (1) switch (_context30.p = _context30.n) {
       case 0:
@@ -22074,8 +21971,8 @@ function closePoll(action) {
         break;
       case 4:
         _context30.p = 4;
-        _t23 = _context30.v;
-        log.error('error in close poll', _t23);
+        _t34 = _context30.v;
+        log.error('error in close poll', _t34);
       case 5:
         return _context30.a(2);
     }
@@ -22164,7 +22061,7 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
   }, _marked27$1);
 }
 function retractPollVote(action) {
-  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator5, _step5, _message$pollDetails12, _message$pollDetails13, vote, _t24;
+  var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator5, _step5, _message$pollDetails12, _message$pollDetails13, vote, _t35;
   return _regenerator().w(function (_context33) {
     while (1) switch (_context33.p = _context33.n) {
       case 0:
@@ -22206,15 +22103,15 @@ function retractPollVote(action) {
         break;
       case 4:
         _context33.p = 4;
-        _t24 = _context33.v;
-        log.error('error in retract poll vote', _t24);
+        _t35 = _context33.v;
+        log.error('error in retract poll vote', _t35);
       case 5:
         return _context33.a(2);
     }
   }, _marked28$1, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
-  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t25;
+  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t36;
   return _regenerator().w(function (_context34) {
     while (1) switch (_context34.p = _context34.n) {
       case 0:
@@ -22230,13 +22127,6 @@ function resendPendingPollActions(action) {
       case 1:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         pendingPollActionsMapCopy = JSON.parse(JSON.stringify(pendingPollActionsMap));
-        _context34.n = 2;
-        return effects.call(function () {
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 1000);
-          });
-        });
-      case 2:
         Object.keys(pendingPollActionsMapCopy).forEach(function (messageId) {
           pendingPollActionsMapCopy[messageId].forEach(function (pendingAction) {
             var type = pendingAction.type,
@@ -22266,19 +22156,19 @@ function resendPendingPollActions(action) {
             }
           });
         });
-        _context34.n = 4;
+        _context34.n = 3;
         break;
+      case 2:
+        _context34.p = 2;
+        _t36 = _context34.v;
+        log.error('error in resend pending poll actions', _t36);
       case 3:
-        _context34.p = 3;
-        _t25 = _context34.v;
-        log.error('error in resend pending poll actions', _t25);
-      case 4:
         return _context34.a(2);
     }
-  }, _marked29$1, null, [[0, 3]]);
+  }, _marked29$1, null, [[0, 2]]);
 }
 function getPollVotes(action) {
-  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t26;
+  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t37;
   return _regenerator().w(function (_context35) {
     while (1) switch (_context35.p = _context35.n) {
       case 0:
@@ -22344,8 +22234,8 @@ function getPollVotes(action) {
         break;
       case 7:
         _context35.p = 7;
-        _t26 = _context35.v;
-        log.error('ERROR in get poll votes', _t26);
+        _t37 = _context35.v;
+        log.error('ERROR in get poll votes', _t37);
         _context35.n = 8;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
@@ -22354,7 +22244,7 @@ function getPollVotes(action) {
   }, _marked30$1, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
-  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t27;
+  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t38;
   return _regenerator().w(function (_context36) {
     while (1) switch (_context36.p = _context36.n) {
       case 0:
@@ -22412,8 +22302,8 @@ function loadMorePollVotes(action) {
         break;
       case 6:
         _context36.p = 6;
-        _t27 = _context36.v;
-        log.error('ERROR in load more poll votes', _t27);
+        _t38 = _context36.v;
+        log.error('ERROR in load more poll votes', _t38);
         _context36.n = 7;
         return effects.put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
@@ -22934,6 +22824,10 @@ function getContacts() {
       case 0:
         _context.p = 0;
         SceytChatClient = getClient();
+        if (!(SceytChatClient.connectionStatus === CONNECTION_STATUS.CONNECTED)) {
+          _context.n = 3;
+          break;
+        }
         _context.n = 1;
         return effects.call(SceytChatClient.getAllContacts);
       case 1:
@@ -23144,6 +23038,12 @@ function getUsers(action) {
         payload = action.payload;
         params = payload.params;
         SceytChatClient = getClient();
+        if (!(SceytChatClient.connectionState !== CONNECTION_STATUS.CONNECTED)) {
+          _context5.n = 1;
+          break;
+        }
+        return _context5.a(2);
+      case 1:
         usersQueryBuilder = new SceytChatClient.UserListQueryBuilder();
         if (params.query) {
           usersQueryBuilder.query(params.query);
@@ -23173,35 +23073,35 @@ function getUsers(action) {
           usersQueryBuilder.filterByUsername();
         }
         log.info('user query params ..... ', params);
-        _context5.n = 1;
+        _context5.n = 2;
         return effects.call(usersQueryBuilder.build);
-      case 1:
+      case 2:
         usersQuery = _context5.v;
         query.usersQuery = usersQuery;
-        _context5.n = 2;
-        return effects.put(setUsersLoadingStateAC(LOADING_STATE.LOADING));
-      case 2:
         _context5.n = 3;
-        return effects.call(usersQuery.loadNextPage);
+        return effects.put(setUsersLoadingStateAC(LOADING_STATE.LOADING));
       case 3:
-        _yield$call = _context5.v;
-        users = _yield$call.users;
         _context5.n = 4;
-        return effects.put(setUsersAC(JSON.parse(JSON.stringify(users))));
+        return effects.call(usersQuery.loadNextPage);
       case 4:
+        _yield$call = _context5.v;
+        users = _yield$call.users;
         _context5.n = 5;
-        return effects.put(setUsersLoadingStateAC(LOADING_STATE.LOADED));
+        return effects.put(setUsersAC(JSON.parse(JSON.stringify(users))));
       case 5:
-        _context5.n = 7;
-        break;
+        _context5.n = 6;
+        return effects.put(setUsersLoadingStateAC(LOADING_STATE.LOADED));
       case 6:
-        _context5.p = 6;
+        _context5.n = 8;
+        break;
+      case 7:
+        _context5.p = 7;
         _t5 = _context5.v;
         log.error('ERROR on get users', _t5.message);
-      case 7:
+      case 8:
         return _context5.a(2);
     }
-  }, _marked5$3, null, [[0, 6]]);
+  }, _marked5$3, null, [[0, 7]]);
 }
 function loadMoreUsers(action) {
   var payload, limit, usersQuery, _yield$call2, users, _t6;
@@ -38608,7 +38508,8 @@ var MessageList = function MessageList(_ref2) {
   var handleMessagesListScroll = React.useCallback(function () {
     try {
       var target = scrollRef.current;
-      if (!target) return Promise.resolve();
+      var messageBox = document.getElementById('messageBox');
+      if (!target || !messageBox) return Promise.resolve();
       if (scrollToMentionedMessage) {
         if (target.scrollTop <= -50 || channel.lastMessage.id !== messages[messages.length - 1].id) {
           dispatch(showScrollToNewMessageButtonAC(true));
@@ -38621,9 +38522,12 @@ var MessageList = function MessageList(_ref2) {
       clearTimeout(hideTopDateTimeout.current);
       renderTopDate();
       var forceLoadPrevMessages = false;
-      if (-target.scrollTop + target.offsetHeight + 30 > target.scrollHeight) {
+      if (-target.scrollTop + target.offsetHeight + 100 > messageBox.scrollHeight) {
         forceLoadPrevMessages = true;
       }
+      if (unreadScrollTo) {
+        return Promise.resolve();
+      }
       if (target.scrollTop === 0 && scrollToNewMessage.scrollToBottom && scrollToNewMessage.updateMessageList && messagesLoading !== LOADING_STATE.LOADING) {
         dispatch(getMessagesAC(channel, true));
       }
@@ -38638,7 +38542,7 @@ var MessageList = function MessageList(_ref2) {
       }
       var currentIndex = messagesIndexMapRef.current[lastVisibleMessageId];
       var hasIndex = typeof currentIndex === 'number';
-      if (hasIndex && currentIndex < 15 || forceLoadPrevMessages) {
+      if (hasIndex && currentIndex < 10 || forceLoadPrevMessages) {
         if (connectionStatus === CONNECTION_STATUS.CONNECTED && !scrollToNewMessage.scrollToBottom && hasPrevMessages) {
           if (loadingRef.current || messagesLoading === LOADING_STATE.LOADING || prevDisableRef.current) {
             shouldLoadMessagesRef.current = 'prev';
@@ -38655,7 +38559,7 @@ var MessageList = function MessageList(_ref2) {
           }
         }
       }
-      if (hasIndex && currentIndex >= messages.length - 15 || target.scrollTop === 0) {
+      if (hasIndex && currentIndex >= messages.length - 10 || target.scrollTop > -100) {
         if (connectionStatus === CONNECTION_STATUS.CONNECTED && !scrollToNewMessage.scrollToBottom && (hasNextMessages || getHasNextCached())) {
           if (loadingRef.current || messagesLoading === LOADING_STATE.LOADING || nextDisableRef.current) {
             shouldLoadMessagesRef.current = 'next';
@@ -38714,7 +38618,7 @@ var MessageList = function MessageList(_ref2) {
           }, 1000 + positiveValue * 0.1);
         }
       } else {
-        dispatch(getMessagesAC(channel, undefined, messageId));
+        dispatch(getMessagesAC(channel, undefined, messageId, undefined, true, 'smooth', true));
       }
       return Promise.resolve();
     } catch (e) {
@@ -38722,7 +38626,7 @@ var MessageList = function MessageList(_ref2) {
     }
   };
   var handleLoadMoreMessages = function handleLoadMoreMessages(direction, limit) {
-    if (scrollToMentionedMessage) {
+    if (scrollToMentionedMessage || scrollToNewMessage.scrollToBottom) {
       return;
     }
     var lastMessageId = messages.length && messages[messages.length - 1].id;
@@ -38866,9 +38770,6 @@ var MessageList = function MessageList(_ref2) {
             behavior: 'smooth'
           });
         }
-        setTimeout(function () {
-          dispatch(scrollToNewMessageAC(false, false, false));
-        }, 800);
       } else {
         nextDisableRef.current = true;
         prevDisableRef.current = true;
@@ -38877,10 +38778,6 @@ var MessageList = function MessageList(_ref2) {
           behavior: 'smooth'
         });
         dispatch(showScrollToNewMessageButtonAC(false));
-        setTimeout(function () {
-          prevDisableRef.current = false;
-          dispatch(scrollToNewMessageAC(false, false, false));
-        }, 800);
       }
     }
   }, [scrollToNewMessage]);
@@ -38908,7 +38805,7 @@ var MessageList = function MessageList(_ref2) {
       var visibleMessages = getVisibleMessagesMap();
       var visibleMessagesIds = Object.keys(visibleMessages);
       var messageId = visibleMessagesIds[visibleMessagesIds.length - 1];
-      dispatch(getMessagesAC(channel, undefined, messageId, undefined, undefined, undefined, 'instant'));
+      dispatch(getMessagesAC(channel, undefined, messageId, undefined, undefined, 'instant'));
       setUnreadMessageId(messageId);
     } else {
       if (!channel.isLinkedChannel) {
@@ -39065,13 +38962,13 @@ var MessageList = function MessageList(_ref2) {
   }, [messagesLoading, messages, lastVisibleMessageId]);
   React.useEffect(function () {
     log.info('connection status is changed.. .... ', connectionStatus, 'channel  ... ', channel);
-    if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
+    if (connectionStatus === CONNECTION_STATUS.CONNECTED && channel !== null && channel !== void 0 && channel.id) {
       loadingRef.current = false;
       prevDisableRef.current = false;
       nextDisableRef.current = false;
       clearMessagesMap();
       removeAllMessages();
-      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, false, 'instant', false));
+      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, 'instant', false, true));
     }
   }, [connectionStatus]);
   React.useEffect(function () {
@@ -39177,7 +39074,8 @@ var MessageList = function MessageList(_ref2) {
     enableResetScrollToCoords: false,
     replyMessage: messageForReply && messageForReply.id,
     attachmentsSelected: attachmentsSelected,
-    className: 'messageBox'
+    className: 'messageBox',
+    id: 'messageBox'
   }, messages.map(function (message, index) {
     var prevMessage = messages[index - 1];
     var nextMessage = messages[index + 1];
@@ -48404,7 +48302,7 @@ var MessagesScrollToBottomButton = function MessagesScrollToBottomButton(_ref) {
           }
         }
       } else {
-        dispatch(getMessagesAC(channel, true, messageId, undefined, undefined, false));
+        dispatch(getMessagesAC(channel, true, messageId, undefined, false, 'smooth', true));
       }
       return Promise.resolve();
     } catch (e) {