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

package/index.js

@@ -9215,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
@@ -9232,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);
       }
@@ -10239,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: {
@@ -10253,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
     }
   };
 }
@@ -11420,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,
@@ -11465,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,
@@ -18933,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;
 };
@@ -19128,7 +19144,7 @@ var updateMessage$1 = function updateMessage(actionType, pending, channelId, scr
           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, undefined, false, 'smooth', true));
+          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);
       }
@@ -20305,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, _result$messages$, _result$messages, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _result$messages$2, _result$messages2, _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;
+  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:
@@ -20313,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 = 59;
+        if (!(channel !== null && channel !== void 0 && channel.id && !(channel !== null && channel !== void 0 && channel.isMockChannel))) {
+          _context10.n = 84;
           break;
         }
         SceytChatClient = getClient();
@@ -20346,23 +20362,26 @@ 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);
         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(messageQuery.loadPreviousMessageId, '0');
+        return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
       case 5:
         _t1 = _context10.v;
         _context10.n = 7;
@@ -20374,241 +20393,368 @@ function getMessagesQuery(action) {
         };
       case 7:
         result = _t1;
-        sentMessages = [];
-        if (withDeliveredMessages) {
-          sentMessages = getFromAllMessagesByMessageId('', '', true);
+        _context10.n = 12;
+        break;
+      case 8:
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context10.n = 10;
+          break;
         }
-        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;
+        _context10.n = 9;
+        return effects.call(messageQuery.loadPrevious);
+      case 9:
+        _t10 = _context10.v;
+        _context10.n = 11;
+        break;
+      case 10:
+        _t10 = {
+          messages: [],
+          hasNext: false
+        };
+      case 11:
+        result = _t10;
+      case 12:
+        _context10.n = 13;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 8:
+      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 = 9;
+        _context10.n = 14;
         return effects.put(setMessagesHasPrevAC(true));
-      case 9:
-        _context10.n = 12;
+      case 14:
+        _context10.n = 17;
         break;
-      case 10:
+      case 15:
         result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context10.n = 11;
+        _context10.n = 16;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 11:
-        _context10.n = 12;
+      case 16:
+        _context10.n = 17;
         return effects.put(setMessagesHasPrevAC(true));
-      case 12:
-        _context10.n = 13;
+      case 17:
+        _context10.n = 18;
         return effects.put(setMessagesHasNextAC(false));
-      case 13:
+      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 = 52;
+        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 = 27;
+          _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 = 23;
+      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 = 20;
+          _context10.n = 27;
           break;
         }
-        _context10.n = 19;
-        return effects.call(messageQuery.loadNearMessageId, messageId);
-      case 19:
-        _t10 = _context10.v;
-        _context10.n = 21;
+        _context10.n = 26;
+        return effects.call(messageQuery.loadNearMessageId, loadWithMessageId);
+      case 26:
+        _t11 = _context10.v;
+        _context10.n = 28;
         break;
-      case 20:
-        _t10 = {
+      case 27:
+        _t11 = {
           messages: [],
           hasNext: false
         };
-      case 21:
-        result = _t10;
-        _context10.n = 22;
+      case 28:
+        result = _t11;
+        _context10.n = 29;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 22:
+      case 29:
+        if (!(result.messages.length === 50)) {
+          _context10.n = 47;
+          break;
+        }
+        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 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 35:
+        _t13 = {
+          messages: [],
+          hasNext: false
+        };
+      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 23:
-        _context10.n = 24;
+      case 48:
+        _context10.n = 49;
         return effects.put(setMessagesHasNextAC(true));
-      case 24:
+      case 49:
         if (!scrollToMessage) {
-          _context10.n = 25;
+          _context10.n = 50;
           break;
         }
-        _context10.n = 25;
-        return effects.put(setScrollToMessagesAC(messageId, highlight, behavior));
-      case 25:
-        _context10.n = 26;
+        _context10.n = 50;
+        return effects.put(setScrollToMessagesAC(loadWithMessageId, highlight, behavior));
+      case 50:
+        _context10.n = 51;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 26:
-        _context10.n = 52;
+      case 51:
+        _context10.n = 77;
         break;
-      case 27:
+      case 52:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context10.n = 39;
+          _context10.n = 64;
           break;
         }
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context10.n = 31;
+          _context10.n = 56;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 29;
+          _context10.n = 54;
           break;
         }
-        _context10.n = 28;
+        _context10.n = 53;
         return effects.call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 28:
-        _t11 = _context10.v;
-        _context10.n = 30;
+      case 53:
+        _t16 = _context10.v;
+        _context10.n = 55;
         break;
-      case 29:
-        _t11 = {
+      case 54:
+        _t16 = {
           messages: [],
           hasNext: false
         };
-      case 30:
-        result = _t11;
-        _context10.n = 35;
+      case 55:
+        result = _t16;
+        _context10.n = 60;
         break;
-      case 31:
+      case 56:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 33;
+          _context10.n = 58;
           break;
         }
-        _context10.n = 32;
+        _context10.n = 57;
         return effects.call(messageQuery.loadPrevious);
-      case 32:
-        _t12 = _context10.v;
-        _context10.n = 34;
+      case 57:
+        _t17 = _context10.v;
+        _context10.n = 59;
         break;
-      case 33:
-        _t12 = {
+      case 58:
+        _t17 = {
           messages: [],
           hasNext: false
         };
-      case 34:
-        result = _t12;
-      case 35:
-        _context10.n = 36;
+      case 59:
+        result = _t17;
+      case 60:
+        _context10.n = 61;
         return effects.put(setMessagesHasPrevAC(true));
-      case 36:
-        _context10.n = 37;
+      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 37:
+      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 = 38;
+        _context10.n = 63;
         return effects.put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 38:
-        _context10.n = 52;
+      case 63:
+        _context10.n = 77;
         break;
-      case 39:
+      case 64:
         if (!(cachedMessages && cachedMessages.length)) {
-          _context10.n = 41;
+          _context10.n = 66;
           break;
         }
-        parsedMessages = JSON.parse(JSON.stringify(cachedMessages));
+        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);
-        setAllMessages(parsedMessages);
-        _context10.n = 40;
-        return effects.put(setMessagesAC(parsedMessages));
-      case 40:
+        _context10.n = 65;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(parsedMessages))));
+      case 65:
         _filteredPendingMessages = getFilteredPendingMessages(parsedMessages);
-        _context10.n = 41;
+        _context10.n = 66;
         return effects.put(addMessagesAC(_filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 41:
+      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 = 45;
+          _context10.n = 70;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 43;
+          _context10.n = 68;
           break;
         }
-        _context10.n = 42;
+        _context10.n = 67;
         return effects.call(messageQuery.loadPreviousMessageId, channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId);
-      case 42:
-        _t13 = _context10.v;
-        _context10.n = 44;
+      case 67:
+        _t18 = _context10.v;
+        _context10.n = 69;
         break;
-      case 43:
-        _t13 = {
+      case 68:
+        _t18 = {
           messages: [],
           hasNext: false
         };
-      case 44:
-        result = _t13;
-        _context10.n = 49;
+      case 69:
+        result = _t18;
+        _context10.n = 74;
         break;
-      case 45:
+      case 70:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context10.n = 47;
+          _context10.n = 72;
           break;
         }
-        _context10.n = 46;
+        _context10.n = 71;
         return effects.call(messageQuery.loadPrevious);
-      case 46:
-        _t14 = _context10.v;
-        _context10.n = 48;
+      case 71:
+        _t19 = _context10.v;
+        _context10.n = 73;
         break;
-      case 47:
-        _t14 = {
+      case 72:
+        _t19 = {
           messages: [],
           hasNext: false
         };
-      case 48:
-        result = _t14;
-      case 49:
+      case 73:
+        result = _t19;
+      case 74:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -20619,72 +20765,72 @@ function getMessagesQuery(action) {
           updatedMessages.push(updatedMessage || msg);
         });
         messageIdForLoad = (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) > (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage5 = channel.lastMessage) === null || _channel$lastMessage5 === void 0 ? void 0 : _channel$lastMessage5.id) ? (channel === null || channel === void 0 ? void 0 : channel.lastDisplayedMessageId) || '0' : (channel === null || channel === void 0 ? void 0 : (_channel$lastMessage6 = channel.lastMessage) === null || _channel$lastMessage6 === void 0 ? void 0 : _channel$lastMessage6.id) || '0';
-        _context10.n = 50;
+        _context10.n = 75;
         return effects.call(updateMessages, channel, updatedMessages, (_updatedMessages$ = updatedMessages[0]) === null || _updatedMessages$ === void 0 ? void 0 : _updatedMessages$.id, messageIdForLoad);
-      case 50:
-        _context10.n = 51;
+      case 75:
+        _context10.n = 76;
         return effects.put(setMessagesHasPrevAC(true));
-      case 51:
-        _context10.n = 52;
+      case 76:
+        _context10.n = 77;
         return effects.put(setMessagesHasNextAC(false));
-      case 52:
+      case 77:
         filteredPendingMessages = getFilteredPendingMessages(result.messages);
-        _context10.n = 53;
+        _context10.n = 78;
         return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 53:
+      case 78:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context10.n = 55;
+          _context10.n = 80;
           break;
         }
-        _context10.n = 54;
+        _context10.n = 79;
         return effects.put(setWaitToSendPendingMessagesAC(false));
-      case 54:
-        _context10.n = 55;
+      case 79:
+        _context10.n = 80;
         return effects.spawn(sendPendingMessages, connectionState);
-      case 55:
-        _context10.n = 56;
+      case 80:
+        _context10.n = 81;
         return effects.call(SceytChatClient.getChannel, channel.id, true);
-      case 56:
+      case 81:
         updatedChannel = _context10.v;
         if (!updatedChannel) {
-          _context10.n = 58;
+          _context10.n = 83;
           break;
         }
-        _context10.n = 57;
+        _context10.n = 82;
         return effects.put(updateChannelLastMessageAC(updatedChannel.lastMessage, updatedChannel));
-      case 57:
+      case 82:
         updateChannelLastMessageOnAllChannels(channel.id, updatedChannel.lastMessage);
-      case 58:
-        _context10.n = 60;
+      case 83:
+        _context10.n = 85;
         break;
-      case 59:
-        if (!channel.isMockChannel) {
-          _context10.n = 60;
+      case 84:
+        if (!(channel !== null && channel !== void 0 && channel.isMockChannel)) {
+          _context10.n = 85;
           break;
         }
-        _context10.n = 60;
+        _context10.n = 85;
         return effects.put(setMessagesAC([]));
-      case 60:
-        _context10.n = 62;
+      case 85:
+        _context10.n = 87;
         break;
-      case 61:
-        _context10.p = 61;
-        _t15 = _context10.v;
-        log.error('error in message query', _t15);
-      case 62:
-        _context10.p = 62;
-        _context10.n = 63;
+      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 63:
-        return _context10.f(62);
-      case 64:
+      case 88:
+        return _context10.f(87);
+      case 89:
         return _context10.a(2);
     }
-  }, _marked7$1, null, [[0, 61, 62, 64]]);
+  }, _marked7$1, null, [[0, 86, 87, 89]]);
 }
 function getMessageQuery(action) {
-  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t16;
+  var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t21;
   return _regenerator().w(function (_context11) {
     while (1) switch (_context11.p = _context11.n) {
       case 0:
@@ -20734,15 +20880,15 @@ function getMessageQuery(action) {
         break;
       case 7:
         _context11.p = 7;
-        _t16 = _context11.v;
-        log.error('error in message query', _t16);
+        _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, _result$messages$4, _result$messages4, _result$messages$5, _result$messages5, _t17;
+  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:
@@ -20855,15 +21001,15 @@ function loadMoreMessages(action) {
         break;
       case 18:
         _context12.p = 18;
-        _t17 = _context12.v;
-        log.error('error in load more messages', _t17);
+        _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, _t18;
+  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:
@@ -20916,15 +21062,15 @@ function addReaction(action) {
         break;
       case 8:
         _context13.p = 8;
-        _t18 = _context13.v;
-        log.error('ERROR in add reaction', _t18.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, _t19;
+  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:
@@ -20972,15 +21118,15 @@ function deleteReaction(action) {
         break;
       case 7:
         _context14.p = 7;
-        _t19 = _context14.v;
-        log.error('ERROR in delete reaction', _t19.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, _t20;
+  var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t25;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -21015,15 +21161,15 @@ function getReactions(action) {
         break;
       case 6:
         _context15.p = 6;
-        _t20 = _context15.v;
-        log.error('ERROR in get reactions', _t20.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, _t21;
+  var payload, limit, ReactionQuery, result, _t26;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.p = _context16.n) {
       case 0:
@@ -21051,15 +21197,15 @@ function loadMoreReactions(action) {
         break;
       case 5:
         _context16.p = 5;
-        _t21 = _context16.v;
-        log.error('ERROR in load more reactions', _t21.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, _t22;
+  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:
@@ -21137,15 +21283,15 @@ function getMessageAttachments(action) {
         break;
       case 13:
         _context17.p = 13;
-        _t22 = _context17.v;
-        log.error('error in message attachment query', _t22);
+        _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, _t23;
+  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:
@@ -21189,15 +21335,15 @@ function loadMoreMessageAttachments(action) {
         break;
       case 8:
         _context18.p = 8;
-        _t23 = _context18.v;
-        log.error('error in message attachment query', _t23);
+        _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, _t24;
+  var attachmentId, isPaused, _t29;
   return _regenerator().w(function (_context19) {
     while (1) switch (_context19.p = _context19.n) {
       case 0:
@@ -21219,15 +21365,15 @@ function pauseAttachmentUploading(action) {
         break;
       case 2:
         _context19.p = 2;
-        _t24 = _context19.v;
-        log.error('error in pause attachment uploading', _t24);
+        _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, _t25;
+  var attachmentId, isResumed, _t30;
   return _regenerator().w(function (_context20) {
     while (1) switch (_context20.p = _context20.n) {
       case 0:
@@ -21250,15 +21396,15 @@ function resumeAttachmentUploading(action) {
         break;
       case 2:
         _context20.p = 2;
-        _t25 = _context20.v;
-        log.error('error in resume attachment uploading', _t25);
+        _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, _t26;
+  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:
@@ -21288,8 +21434,8 @@ function getMessageMarkers(action) {
         break;
       case 5:
         _context21.p = 5;
-        _t26 = _context21.v;
-        log.error('error in get message markers', _t26);
+        _t31 = _context21.v;
+        log.error('error in get message markers', _t31);
       case 6:
         _context21.p = 6;
         _context21.n = 7;
@@ -21427,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, _t27;
+  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:
@@ -21526,8 +21672,8 @@ function addPollVote(action) {
         break;
       case 8:
         _context24.p = 8;
-        _t27 = _context24.v;
-        log.error('error in add poll vote', _t27);
+        _t32 = _context24.v;
+        log.error('error in add poll vote', _t32);
       case 9:
         return _context24.a(2);
     }
@@ -21628,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, _t28;
+  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:
@@ -21713,8 +21859,8 @@ function deletePollVote(action) {
         break;
       case 9:
         _context27.p = 9;
-        _t28 = _context27.v;
-        log.error('error in delete poll vote', _t28);
+        _t33 = _context27.v;
+        log.error('error in delete poll vote', _t33);
       case 10:
         return _context27.a(2);
     }
@@ -21792,7 +21938,7 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
   }, _marked24$1);
 }
 function closePoll(action) {
-  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t29;
+  var payload, channelId, pollId, message, sceytChatClient, connectionState, _t34;
   return _regenerator().w(function (_context30) {
     while (1) switch (_context30.p = _context30.n) {
       case 0:
@@ -21825,8 +21971,8 @@ function closePoll(action) {
         break;
       case 4:
         _context30.p = 4;
-        _t29 = _context30.v;
-        log.error('error in close poll', _t29);
+        _t34 = _context30.v;
+        log.error('error in close poll', _t34);
       case 5:
         return _context30.a(2);
     }
@@ -21915,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, _t30;
+  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:
@@ -21957,15 +22103,15 @@ function retractPollVote(action) {
         break;
       case 4:
         _context33.p = 4;
-        _t30 = _context33.v;
-        log.error('error in retract poll vote', _t30);
+        _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, _t31;
+  var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t36;
   return _regenerator().w(function (_context34) {
     while (1) switch (_context34.p = _context34.n) {
       case 0:
@@ -22014,15 +22160,15 @@ function resendPendingPollActions(action) {
         break;
       case 2:
         _context34.p = 2;
-        _t31 = _context34.v;
-        log.error('error in resend pending poll actions', _t31);
+        _t36 = _context34.v;
+        log.error('error in resend pending poll actions', _t36);
       case 3:
         return _context34.a(2);
     }
   }, _marked29$1, null, [[0, 2]]);
 }
 function getPollVotes(action) {
-  var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t32;
+  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:
@@ -22088,8 +22234,8 @@ function getPollVotes(action) {
         break;
       case 7:
         _context35.p = 7;
-        _t32 = _context35.v;
-        log.error('ERROR in get poll votes', _t32);
+        _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:
@@ -22098,7 +22244,7 @@ function getPollVotes(action) {
   }, _marked30$1, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
-  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t33;
+  var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t38;
   return _regenerator().w(function (_context36) {
     while (1) switch (_context36.p = _context36.n) {
       case 0:
@@ -22156,8 +22302,8 @@ function loadMorePollVotes(action) {
         break;
       case 6:
         _context36.p = 6;
-        _t33 = _context36.v;
-        log.error('ERROR in load more poll votes', _t33);
+        _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:
@@ -22678,6 +22824,10 @@ function getContacts() {
       case 0:
         _context.p = 0;
         SceytChatClient = getClient();
+        if (!(SceytChatClient.connectionState === CONNECTION_STATUS.CONNECTED)) {
+          _context.n = 3;
+          break;
+        }
         _context.n = 1;
         return effects.call(SceytChatClient.getAllContacts);
       case 1:
@@ -22888,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);
@@ -22917,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;
@@ -38462,7 +38618,7 @@ var MessageList = function MessageList(_ref2) {
           }, 1000 + positiveValue * 0.1);
         }
       } else {
-        dispatch(getMessagesAC(channel, undefined, messageId, undefined, undefined, true, 'smooth', true));
+        dispatch(getMessagesAC(channel, undefined, messageId, undefined, true, 'smooth', true));
       }
       return Promise.resolve();
     } catch (e) {
@@ -38470,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;
@@ -38614,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;
@@ -38625,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]);
@@ -38656,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) {
@@ -38813,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 () {
@@ -48153,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) {