sceyt-chat-react-uikit 1.7.7-beta.15 → 1.7.7-beta.17

package/index.modern.js

@@ -2676,42 +2676,6 @@ var FIXED_TIMER_OPTIONS = {
   '1month': 60 * 60 * 24 * 30,
   custom: 60 * 60 * 24 * 2
 };
-var CUSTOM_OPTIONS = [{
-  label: '1 day',
-  value: '1day',
-  seconds: 60 * 60 * 24
-}, {
-  label: '2 days',
-  value: '2days',
-  seconds: 60 * 60 * 24 * 2
-}, {
-  label: '3 days',
-  value: '3days',
-  seconds: 60 * 60 * 24 * 3
-}, {
-  label: '4 days',
-  value: '4days',
-  seconds: 60 * 60 * 24 * 4
-}, {
-  label: '5 days',
-  value: '5days',
-  seconds: 60 * 60 * 24 * 5
-}, {
-  label: '1 week',
-  value: '1week',
-  seconds: 60 * 60 * 24 * 7
-}, {
-  label: '2 weeks',
-  value: '2weeks',
-  seconds: 60 * 60 * 24 * 14
-}, {
-  label: '1 month',
-  value: '1month',
-  seconds: 60 * 60 * 24 * 30
-}];
-var CUSTOM_SECONDS_MAP = Object.fromEntries(CUSTOM_OPTIONS.map(function (o) {
-  return [o.value, o.seconds];
-}));
 
 // A type of promise-like that resolves synchronously and supports only one observer
 const _Pact = /*#__PURE__*/(function() {
@@ -9078,7 +9042,7 @@ var memberCount = 10;
 var disableFrowardMentionsCount = false;
 var onUpdateChannel = function onUpdateChannel() {};
 var useInviteLink = false;
-var enableDisappearingMessages = true;
+var disappearingSettings;
 var inviteLinkOptions = null;
 function setBaseUrlForInviteMembers(url) {
   baseUrlForInviteMembers = url;
@@ -9297,11 +9261,11 @@ var setShowChannelDetails = function setShowChannelDetails(state) {
 var getShowChannelDetails = function getShowChannelDetails() {
   return showChannelDetails;
 };
-var setEnableDisappearingMessages = function setEnableDisappearingMessages(state) {
-  enableDisappearingMessages = state;
+var setDisappearingSettings = function setDisappearingSettings(settings) {
+  disappearingSettings = settings;
 };
-var getEnableDisappearingMessages = function getEnableDisappearingMessages() {
-  return enableDisappearingMessages;
+var getDisappearingSettings = function getDisappearingSettings() {
+  return disappearingSettings;
 };
 var sortChannelByLastMessage = function sortChannelByLastMessage(channels) {
   return channels.sort(function (a, b) {
@@ -10093,6 +10057,7 @@ var hashString = function hashString(str) {
   }
 };
 var formatDisappearingMessageTime = function formatDisappearingMessageTime(periodInMilliseconds) {
+  var _getDisappearingSetti;
   if (!periodInMilliseconds) return 'Off';
   var periodInSeconds = periodInMilliseconds / 1000;
   switch (periodInSeconds) {
@@ -10103,7 +10068,8 @@ var formatDisappearingMessageTime = function formatDisappearingMessageTime(perio
     case FIXED_TIMER_OPTIONS['1month']:
       return '1 month';
   }
-  var customMatch = CUSTOM_OPTIONS.find(function (option) {
+  var customOptions = ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.customOptions) || [];
+  var customMatch = customOptions.find(function (option) {
     return option.seconds === periodInSeconds;
   });
   if (customMatch) return customMatch.label;
@@ -10251,10 +10217,13 @@ function setMessageToEditAC(message) {
     message: message
   });
 }
-function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior) {
+function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage) {
   if (highlight === void 0) {
     highlight = true;
   }
+  if (scrollToMessage === void 0) {
+    scrollToMessage = true;
+  }
   return {
     type: GET_MESSAGES,
     payload: {
@@ -10264,7 +10233,8 @@ function getMessagesAC(channel, loadWithLastMessage, messageId, limit, withDeliv
       limit: limit,
       withDeliveredMessages: withDeliveredMessages,
       highlight: highlight,
-      behavior: behavior
+      behavior: behavior,
+      scrollToMessage: scrollToMessage
     }
   };
 }
@@ -19002,9 +18972,6 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
       parentMessage: message.parentMessage
     });
     setPendingMessage(channel.id, messageToAdd);
-    if (!(messageToAdd !== null && messageToAdd !== void 0 && messageToAdd.forwardingDetails)) {
-      store.dispatch(scrollToNewMessageAC(true));
-    }
     return Promise.resolve();
   } catch (e) {
     return Promise.reject(e);
@@ -19014,41 +18981,55 @@ var updateMessage$1 = function updateMessage(actionType, pending, channel, scrol
   if (scrollToNewMessage === void 0) {
     scrollToNewMessage = true;
   }
-  try {
-    var activeChannelId = getActiveChannelId();
-    if (actionType !== RESEND_MESSAGE) {
-      addMessageToMap(channel.id, pending);
-      if (activeChannelId === channel.id) {
-        addAllMessages([pending], MESSAGE_LOAD_DIRECTION.NEXT);
-      }
-      if (activeChannelId === channel.id) {
-        store.dispatch(addMessageAC(pending));
-      }
-      if (scrollToNewMessage) {
-        store.dispatch(scrollToNewMessageAC(true));
+  return /*#__PURE__*/_regenerator().m(function _callee() {
+    var activeChannelId;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          activeChannelId = getActiveChannelId();
+          if (!(actionType !== RESEND_MESSAGE)) {
+            _context.n = 2;
+            break;
+          }
+          addMessageToMap(channel.id, pending);
+          if (activeChannelId === channel.id) {
+            addAllMessages([pending], MESSAGE_LOAD_DIRECTION.NEXT);
+          }
+          if (!(activeChannelId === channel.id)) {
+            _context.n = 1;
+            break;
+          }
+          _context.n = 1;
+          return put(addMessageAC(pending));
+        case 1:
+          if (!scrollToNewMessage) {
+            _context.n = 2;
+            break;
+          }
+          _context.n = 2;
+          return put(scrollToNewMessageAC(true, true));
+        case 2:
+          return _context.a(2);
       }
-    }
-    return Promise.resolve();
-  } catch (e) {
-    return Promise.reject(e);
-  }
+    }, _callee);
+  })();
 };
 function sendMessage(action) {
   var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, pending, _loop2, _i, _t2;
-  return _regenerator().w(function (_context3) {
-    while (1) switch (_context3.p = _context3.n) {
+  return _regenerator().w(function (_context4) {
+    while (1) switch (_context4.p = _context4.n) {
       case 0:
         payload = action.payload;
         message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, sendAttachmentsAsSeparateMessage = payload.sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
         pendingMessages = [];
-        _context3.p = 1;
-        _context3.n = 2;
+        _context4.p = 1;
+        _context4.n = 2;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
-        _context3.n = 3;
+        _context4.n = 3;
         return call(getChannelFromMap, channelId);
       case 3:
-        channel = _context3.v;
+        channel = _context4.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
@@ -19056,7 +19037,7 @@ function sendMessage(action) {
           }
         }
         if (!channel.isMockChannel) {
-          _context3.n = 6;
+          _context4.n = 6;
           break;
         }
         SceytChatClient = getClient();
@@ -19066,17 +19047,17 @@ function sendMessage(action) {
           members: channel.members,
           metadata: ''
         };
-        _context3.n = 4;
+        _context4.n = 4;
         return call(SceytChatClient.Channel.create, createChannelData);
       case 4:
-        channel = _context3.v;
-        _context3.n = 5;
+        channel = _context4.v;
+        _context4.n = 5;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(channel))));
       case 5:
         addChannelToAllChannels(channel);
         setChannelInMap(channel);
       case 6:
-        _context3.n = 7;
+        _context4.n = 7;
         return put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 7:
         mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
@@ -19084,7 +19065,7 @@ function sendMessage(action) {
         }) : [];
         customUploader = getCustomUploader();
         if (!(message.attachments && message.attachments.length)) {
-          _context3.n = 14;
+          _context4.n = 15;
           break;
         }
         linkAttachment = null;
@@ -19097,13 +19078,13 @@ function sendMessage(action) {
           return att.type !== attachmentTypes.link;
         });
         if (!(mediaAttachments && mediaAttachments.length)) {
-          _context3.n = 11;
+          _context4.n = 12;
           break;
         }
-        _loop = /*#__PURE__*/_regenerator().m(function _callee() {
+        _loop = /*#__PURE__*/_regenerator().m(function _callee2() {
           var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
-          return _regenerator().w(function (_context) {
-            while (1) switch (_context.n) {
+          return _regenerator().w(function (_context2) {
+            while (1) switch (_context2.n) {
               case 0:
                 attachment = mediaAttachments[i];
                 if (attachment.cachedUrl) {
@@ -19147,101 +19128,112 @@ function sendMessage(action) {
                 if (customUploader) {
                   messageAttachment.url = attachment.data;
                 }
-                if (sendAttachmentsAsSeparateMessage) {
-                  _messageBuilder = channel.createMessageBuilder();
-                  _messageBuilder.setBody(i === 0 ? message.body : '').setAttachments([]).setBodyAttributes(i === 0 ? message.bodyAttributes : {}).setMentionUserIds(i === 0 ? mentionedUserIds : []).setType(message.type).setDisplayCount(message.type === MESSAGE_TYPE.SYSTEM ? 0 : 1).setSilent(message.type === MESSAGE_TYPE.SYSTEM).setMetadata(i === 0 ? JSON.stringify(message.metadata) : '');
-                  if (message.parentMessage) {
-                    _messageBuilder.setParentMessageId(message.parentMessage ? message.parentMessage.id : null);
-                  }
-                  if (message.repliedInThread) {
-                    _messageBuilder.setReplyInThread();
-                  }
-                  _messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : _messageBuilder.create();
-                  setPendingAttachment(messageAttachment.tid, _extends({}, messageAttachment.data, {
-                    messageTid: _messageToSend.tid,
-                    channelId: channel.id
-                  }));
-                  messageForSend = _extends({}, _messageToSend, {
-                    attachments: [messageAttachment],
-                    createdAt: new Date(Date.now())
-                  });
-                  messagesToSend.push(messageForSend);
-                  _pending = _extends({}, messageForSend, {
-                    attachments: [attachment],
-                    createdAt: new Date(Date.now())
-                  });
-                  pendingMessages.push(_pending);
-                  updateMessage$1(action.type, _pending, channel);
-                } else {
-                  attachmentsToSend.push(messageAttachment);
+                if (!sendAttachmentsAsSeparateMessage) {
+                  _context2.n = 2;
+                  break;
                 }
+                _messageBuilder = channel.createMessageBuilder();
+                _messageBuilder.setBody(i === 0 ? message.body : '').setAttachments([]).setBodyAttributes(i === 0 ? message.bodyAttributes : {}).setMentionUserIds(i === 0 ? mentionedUserIds : []).setType(message.type).setDisplayCount(message.type === MESSAGE_TYPE.SYSTEM ? 0 : 1).setSilent(message.type === MESSAGE_TYPE.SYSTEM).setMetadata(i === 0 ? JSON.stringify(message.metadata) : '');
+                if (message.parentMessage) {
+                  _messageBuilder.setParentMessageId(message.parentMessage ? message.parentMessage.id : null);
+                }
+                if (message.repliedInThread) {
+                  _messageBuilder.setReplyInThread();
+                }
+                _messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : _messageBuilder.create();
+                setPendingAttachment(messageAttachment.tid, _extends({}, messageAttachment.data, {
+                  messageTid: _messageToSend.tid,
+                  channelId: channel.id
+                }));
+                messageForSend = _extends({}, _messageToSend, {
+                  attachments: [messageAttachment],
+                  createdAt: new Date(Date.now())
+                });
+                messagesToSend.push(messageForSend);
+                _pending = _extends({}, messageForSend, {
+                  attachments: [attachment],
+                  createdAt: new Date(Date.now())
+                });
+                pendingMessages.push(_pending);
+                _context2.n = 1;
+                return call(updateMessage$1, action.type, _pending, channel);
+              case 1:
+                _context2.n = 3;
+                break;
+              case 2:
+                attachmentsToSend.push(messageAttachment);
+              case 3:
                 if (!(!messageAttachment.cachedUrl && customUploader)) {
-                  _context.n = 1;
+                  _context2.n = 4;
                   break;
                 }
-                _context.n = 1;
+                _context2.n = 4;
                 return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, messageAttachment.tid));
-              case 1:
-                return _context.a(2);
+              case 4:
+                return _context2.a(2);
             }
-          }, _callee);
+          }, _callee2);
         });
         i = 0;
       case 8:
         if (!(i < mediaAttachments.length)) {
-          _context3.n = 10;
+          _context4.n = 10;
           break;
         }
-        return _context3.d(_regeneratorValues(_loop()), 9);
+        return _context4.d(_regeneratorValues(_loop()), 9);
       case 9:
         i++;
-        _context3.n = 8;
+        _context4.n = 8;
         break;
       case 10:
-        if (!sendAttachmentsAsSeparateMessage) {
-          messageBuilder = channel.createMessageBuilder();
-          messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(message.attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisplayCount(message.type === MESSAGE_TYPE.SYSTEM ? 0 : 1).setSilent(message.type === MESSAGE_TYPE.SYSTEM).setMetadata(JSON.stringify(message.metadata));
-          if (message.parentMessage) {
-            messageBuilder.setParentMessageId(message.parentMessage ? message.parentMessage.id : null);
-          }
-          if (message.repliedInThread) {
-            messageBuilder.setReplyInThread();
-          }
-          messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
-          pending = _extends({}, messageToSend, {
-            attachments: message.attachments,
-            createdAt: new Date(Date.now())
-          });
-          pendingMessages.push(pending);
-          updateMessage$1(action.type, pending, channel);
-          messageToSend = _extends({}, messageToSend, {
-            attachments: attachmentsToSend
-          });
-          messagesToSend.push(messageToSend);
+        if (sendAttachmentsAsSeparateMessage) {
+          _context4.n = 12;
+          break;
         }
+        messageBuilder = channel.createMessageBuilder();
+        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(message.attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisplayCount(message.type === MESSAGE_TYPE.SYSTEM ? 0 : 1).setSilent(message.type === MESSAGE_TYPE.SYSTEM).setMetadata(JSON.stringify(message.metadata));
+        if (message.parentMessage) {
+          messageBuilder.setParentMessageId(message.parentMessage ? message.parentMessage.id : null);
+        }
+        if (message.repliedInThread) {
+          messageBuilder.setReplyInThread();
+        }
+        messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
+        pending = _extends({}, messageToSend, {
+          attachments: message.attachments,
+          createdAt: new Date(Date.now())
+        });
+        pendingMessages.push(pending);
+        _context4.n = 11;
+        return call(updateMessage$1, action.type, pending, channel);
       case 11:
-        _loop2 = /*#__PURE__*/_regenerator().m(function _callee2() {
-          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, _t;
-          return _regenerator().w(function (_context2) {
-            while (1) switch (_context2.p = _context2.n) {
+        messageToSend = _extends({}, messageToSend, {
+          attachments: attachmentsToSend
+        });
+        messagesToSend.push(messageToSend);
+      case 12:
+        _loop2 = /*#__PURE__*/_regenerator().m(function _callee3() {
+          var messageAttachment, messageToSend, messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, connectionIsDisconnected, _t;
+          return _regenerator().w(function (_context3) {
+            while (1) switch (_context3.p = _context3.n) {
               case 0:
                 messageAttachment = messagesToSend[_i].attachments;
                 messageToSend = messagesToSend[_i];
-                _context2.p = 1;
+                _context3.p = 1;
                 messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
                 if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-                  _context2.n = 12;
+                  _context3.n = 12;
                   break;
                 }
                 _attachmentsToSend = messageAttachment;
                 if (!customUploader) {
-                  _context2.n = 3;
+                  _context3.n = 3;
                   break;
                 }
-                _context2.n = 2;
+                _context3.n = 2;
                 return call(handleUploadAttachments, messageAttachment || [], messageCopy, channel);
               case 2:
-                _attachmentsToSend = _context2.v;
+                _attachmentsToSend = _context3.v;
               case 3:
                 linkAttachmentToSend = null;
                 if (_i === 0 && linkAttachment) {
@@ -19257,18 +19249,18 @@ function sendMessage(action) {
                     attachments: [].concat(_attachmentsToSend)
                   });
                 }
-                _context2.n = 4;
+                _context3.n = 4;
                 return call(channel.sendMessage, messageToSend);
               case 4:
-                messageResponse = _context2.v;
+                messageResponse = _context3.v;
                 if (!customUploader) {
-                  _context2.n = 8;
+                  _context3.n = 8;
                   break;
                 }
                 k = 0;
               case 5:
                 if (!(k < messageAttachment.length)) {
-                  _context2.n = 8;
+                  _context3.n = 8;
                   break;
                 }
                 messageResponse.attachments[k] = _extends({}, messageResponse.attachments[k], {
@@ -19282,13 +19274,13 @@ function sendMessage(action) {
                     checksum: pendingAttachment.checksum || (pendingAttachment === null || pendingAttachment === void 0 ? void 0 : pendingAttachment.file)
                   })], 'checksum');
                 }
-                _context2.n = 6;
+                _context3.n = 6;
                 return put(removeAttachmentProgressAC(messageAttachment[k].tid));
               case 6:
                 deletePendingAttachment(messageAttachment[k].tid);
               case 7:
                 k++;
-                _context2.n = 5;
+                _context3.n = 5;
                 break;
               case 8:
                 if (action.type === RESEND_MESSAGE) {
@@ -19326,7 +19318,7 @@ function sendMessage(action) {
                   createdAt: messageResponse.createdAt,
                   channelId: channel.id
                 };
-                _context2.n = 9;
+                _context3.n = 9;
                 return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData))));
               case 9:
                 updateMessageOnMap(channel.id, {
@@ -19341,48 +19333,55 @@ function sendMessage(action) {
                   lastReactedMessage: null
                 };
                 if (!channel.unread) {
-                  _context2.n = 10;
+                  _context3.n = 10;
                   break;
                 }
-                _context2.n = 10;
+                _context3.n = 10;
                 return put(markChannelAsReadAC(channel.id));
               case 10:
-                _context2.n = 11;
+                _context3.n = 11;
                 return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
               case 11:
                 updateChannelOnAllChannels(channel.id, channelUpdateParam);
-                _context2.n = 13;
+                _context3.n = 13;
                 break;
               case 12:
                 throw new Error('Connection required to send message');
               case 13:
-                _context2.n = 17;
+                _context3.n = 19;
                 break;
               case 14:
-                _context2.p = 14;
-                _t = _context2.v;
+                _context3.p = 14;
+                _t = _context3.v;
                 pendingMessage = pendingMessages === null || pendingMessages === void 0 ? void 0 : pendingMessages.find(function (pendingMessage) {
                   return pendingMessage.tid === messageToSend.tid;
                 });
                 if (!(channel && pendingMessage && action.type !== RESEND_MESSAGE)) {
-                  _context2.n = 15;
+                  _context3.n = 17;
                   break;
                 }
-                if (!isAddToPendingMessagesMap) {
-                  _context2.n = 15;
+                connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+                if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
+                  _context3.n = 16;
                   break;
                 }
-                _context2.n = 15;
+                _context3.n = 15;
                 return call(addPendingMessage, message, pendingMessage, channel);
               case 15:
+                _context3.n = 17;
+                break;
+              case 16:
+                _context3.n = 17;
+                return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+              case 17:
                 log.error('Error on uploading attachment', messageToSend.tid, _t);
                 if (!(messageToSend.attachments && messageToSend.attachments.length)) {
-                  _context2.n = 16;
+                  _context3.n = 18;
                   break;
                 }
-                _context2.n = 16;
+                _context3.n = 18;
                 return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.FAIL, messageToSend.attachments[0].tid));
-              case 16:
+              case 18:
                 updateMessageOnMap(channel.id, {
                   messageId: messageToSend.tid,
                   params: {
@@ -19392,52 +19391,58 @@ function sendMessage(action) {
                 updateMessageOnAllMessages(messageToSend.tid, {
                   state: MESSAGE_STATUS.FAILED
                 });
-                _context2.n = 17;
+                _context3.n = 19;
                 return put(updateMessageAC(messageToSend.tid, {
                   state: MESSAGE_STATUS.FAILED
                 }));
-              case 17:
-                return _context2.a(2);
+              case 19:
+                return _context3.a(2);
             }
-          }, _callee2, null, [[1, 14]]);
+          }, _callee3, null, [[1, 14]]);
         });
         _i = 0;
-      case 12:
+      case 13:
         if (!(_i < messagesToSend.length)) {
-          _context3.n = 14;
+          _context4.n = 15;
           break;
         }
-        return _context3.d(_regeneratorValues(_loop2()), 13);
-      case 13:
-        _i++;
-        _context3.n = 12;
-        break;
+        return _context4.d(_regeneratorValues(_loop2()), 14);
       case 14:
-        _context3.n = 16;
+        _i++;
+        _context4.n = 13;
         break;
       case 15:
-        _context3.p = 15;
-        _t2 = _context3.v;
-        log.error('error on send message ... ', _t2);
+        _context4.n = 17;
+        break;
       case 16:
-        return _context3.a(2);
+        _context4.p = 16;
+        _t2 = _context4.v;
+        log.error('error on send message ... ', _t2);
+      case 17:
+        _context4.p = 17;
+        _context4.n = 18;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 18:
+        return _context4.f(17);
+      case 19:
+        return _context4.a(2);
     }
-  }, _marked$3, null, [[1, 15]]);
+  }, _marked$3, null, [[1, 16, 17, 19]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
-  return _regenerator().w(function (_context4) {
-    while (1) switch (_context4.p = _context4.n) {
+  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t3;
+  return _regenerator().w(function (_context5) {
+    while (1) switch (_context5.p = _context5.n) {
       case 0:
         payload = action.payload;
         message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
-        _context4.n = 1;
+        _context5.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _context4.n = 2;
+        _context5.n = 2;
         return call(getChannelFromMap, channelId);
       case 2:
-        channel = _context4.v;
+        channel = _context5.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
@@ -19446,9 +19451,9 @@ function sendTextMessage(action) {
         }
         pendingMessage = null;
         activeChannelId = getActiveChannelId();
-        _context4.p = 3;
+        _context5.p = 3;
         if (!channel.isMockChannel) {
-          _context4.n = 6;
+          _context5.n = 6;
           break;
         }
         SceytChatClient = getClient();
@@ -19458,17 +19463,17 @@ function sendTextMessage(action) {
           members: channel.members,
           metadata: ''
         };
-        _context4.n = 4;
+        _context5.n = 4;
         return call(SceytChatClient.Channel.create, createChannelData);
       case 4:
-        channel = _context4.v;
-        _context4.n = 5;
+        channel = _context5.v;
+        _context5.n = 5;
         return put(switchChannelActionAC(JSON.parse(JSON.stringify(channel))));
       case 5:
         addChannelToAllChannels(channel);
         setChannelInMap(channel);
       case 6:
-        _context4.n = 7;
+        _context5.n = 7;
         return put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 7:
         mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
@@ -19501,29 +19506,33 @@ function sendTextMessage(action) {
         if (pendingMessage && pendingMessage.metadata) {
           pendingMessage.metadata = JSON.parse(pendingMessage.metadata);
         }
-        if (pendingMessage) {
-          updateMessage$1(action.type, pendingMessage, channel);
+        if (!pendingMessage) {
+          _context5.n = 8;
+          break;
         }
+        _context5.n = 8;
+        return call(updateMessage$1, action.type, pendingMessage, channel);
+      case 8:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context4.n = 15;
+          _context5.n = 16;
           break;
         }
         if (!sendMessageHandler) {
-          _context4.n = 9;
+          _context5.n = 10;
           break;
         }
-        _context4.n = 8;
+        _context5.n = 9;
         return call(sendMessageHandler, messageToSend, channel.id);
-      case 8:
-        messageResponse = _context4.v;
-        _context4.n = 11;
-        break;
       case 9:
-        _context4.n = 10;
-        return call(channel.sendMessage, messageToSend);
+        messageResponse = _context5.v;
+        _context5.n = 12;
+        break;
       case 10:
-        messageResponse = _context4.v;
+        _context5.n = 11;
+        return call(channel.sendMessage, messageToSend);
       case 11:
+        messageResponse = _context5.v;
+      case 12:
         messageUpdateData = {
           id: messageResponse.id,
           body: messageResponse.body,
@@ -19542,12 +19551,12 @@ function sendTextMessage(action) {
           channelId: channel.id
         };
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 12;
+          _context5.n = 13;
           break;
         }
-        _context4.n = 12;
+        _context5.n = 13;
         return put(updateMessageAC(messageToSend.tid, messageUpdateData));
-      case 12:
+      case 13:
         updateMessageOnMap(channel.id, {
           messageId: !isAddToPendingMessagesMap ? message.tid : messageToSend.tid,
           params: messageUpdateData
@@ -19561,45 +19570,49 @@ function sendTextMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context4.n = 13;
+        _context5.n = 14;
         return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 13:
+      case 14:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context4.n = 14;
+          _context5.n = 15;
           break;
         }
-        _context4.n = 14;
+        _context5.n = 15;
         return put(markChannelAsReadAC(channel.id));
-      case 14:
+      case 15:
         channel.lastMessage = messageToUpdate;
         if (action.type === RESEND_MESSAGE) {
           messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
         }
-        _context4.n = 16;
+        _context5.n = 17;
         break;
-      case 15:
-        throw new Error('Connection required to send message');
       case 16:
-        _context4.n = 17;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        throw new Error('Connection required to send message');
       case 17:
-        _context4.n = 21;
+        _context5.n = 22;
         break;
       case 18:
-        _context4.p = 18;
-        _t3 = _context4.v;
+        _context5.p = 18;
+        _t3 = _context5.v;
         if (!(activeChannelId === channel.id && pendingMessage && action.type !== RESEND_MESSAGE)) {
-          _context4.n = 19;
+          _context5.n = 21;
           break;
         }
-        if (!isAddToPendingMessagesMap) {
-          _context4.n = 19;
+        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
+          _context5.n = 20;
           break;
         }
-        _context4.n = 19;
+        _context5.n = 19;
         return call(addPendingMessage, message, pendingMessage, channel);
       case 19:
+        _context5.n = 21;
+        break;
+      case 20:
+        _context5.n = 21;
+        return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+      case 21:
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
           messageId: sendMessageTid,
@@ -19608,28 +19621,31 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 20;
+          _context5.n = 22;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 20;
+        _context5.n = 22;
         return put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 20:
-        _context4.n = 21;
+      case 22:
+        _context5.p = 22;
+        _context5.n = 23;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 21:
-        return _context4.a(2);
+      case 23:
+        return _context5.f(22);
+      case 24:
+        return _context5.a(2);
     }
-  }, _marked2$2, null, [[3, 18]]);
+  }, _marked2$2, null, [[3, 18, 22, 24]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
-  return _regenerator().w(function (_context5) {
-    while (1) switch (_context5.p = _context5.n) {
+  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, pendingMessage, channel, activeChannelId, messageTid, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, connectionIsDisconnected, _t4;
+  return _regenerator().w(function (_context6) {
+    while (1) switch (_context6.p = _context6.n) {
       case 0:
         payload = action.payload;
         message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
@@ -19637,35 +19653,35 @@ function forwardMessage(action) {
         channel = null;
         activeChannelId = getActiveChannelId();
         messageTid = null;
-        _context5.p = 1;
-        _context5.n = 2;
+        _context6.p = 1;
+        _context6.n = 2;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
-        _context5.n = 3;
+        _context6.n = 3;
         return call(getChannelFromMap, channelId);
       case 3:
-        channel = _context5.v;
+        channel = _context6.v;
         if (channel) {
-          _context5.n = 6;
+          _context6.n = 6;
           break;
         }
         channel = getChannelFromAllChannels(channelId) || null;
         if (channel) {
-          _context5.n = 5;
+          _context6.n = 5;
           break;
         }
         SceytChatClient = getClient();
-        _context5.n = 4;
+        _context6.n = 4;
         return call(SceytChatClient.getChannel, channelId);
       case 4:
-        channel = _context5.v;
+        channel = _context6.v;
       case 5:
         if (channel) {
           setChannelInMap(channel);
         }
       case 6:
         if (channel) {
-          _context5.n = 7;
+          _context6.n = 7;
           break;
         }
         throw new Error('Channel not found');
@@ -19675,7 +19691,7 @@ function forwardMessage(action) {
         }) : [];
         attachments = message.attachments;
         if ((channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC) && !(channel.userRole === 'admin' || channel.userRole === 'owner')) {
-          _context5.n = 15;
+          _context6.n = 16;
           break;
         }
         if (message.attachments && message.attachments.length) {
@@ -19719,32 +19735,36 @@ function forwardMessage(action) {
           pendingMessage.forwardingDetails.hops = message.forwardingDetails ? message.forwardingDetails.hops : 1;
         }
         if (!(channelId === activeChannelId)) {
-          _context5.n = 8;
+          _context6.n = 8;
           break;
         }
         hasNextMessages = store.getState().MessageReducer.messagesHasNext;
         if (getHasNextCached()) {
-          _context5.n = 8;
+          _context6.n = 8;
           break;
         }
         if (!hasNextMessages) {
-          _context5.n = 8;
+          _context6.n = 8;
           break;
         }
-        _context5.n = 8;
+        _context6.n = 8;
         return put(getMessagesAC(channel));
       case 8:
-        if (pendingMessage) {
-          updateMessage$1(action.type, pendingMessage, channel, false);
+        if (!pendingMessage) {
+          _context6.n = 9;
+          break;
         }
+        _context6.n = 9;
+        return call(updateMessage$1, action.type, pendingMessage, channel, false);
+      case 9:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context5.n = 14;
+          _context6.n = 15;
           break;
         }
-        _context5.n = 9;
+        _context6.n = 10;
         return call(channel.sendMessage, messageToSend);
-      case 9:
-        messageResponse = _context5.v;
+      case 10:
+        messageResponse = _context6.v;
         messageUpdateData = {
           id: messageResponse.id,
           type: messageResponse.type,
@@ -19760,14 +19780,14 @@ function forwardMessage(action) {
           channelId: channel.id
         };
         if (!(channelId === activeChannelId)) {
-          _context5.n = 11;
+          _context6.n = 12;
           break;
         }
-        _context5.n = 10;
+        _context6.n = 11;
         return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData))));
-      case 10:
-        updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
       case 11:
+        updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
+      case 12:
         if (action.type === RESEND_MESSAGE) {
           messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
         }
@@ -19781,40 +19801,47 @@ function forwardMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context5.n = 12;
+        _context6.n = 13;
         return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 12:
+      case 13:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context5.n = 13;
+          _context6.n = 14;
           break;
         }
-        _context5.n = 13;
+        _context6.n = 14;
         return put(markChannelAsReadAC(channel.id));
-      case 13:
-        _context5.n = 15;
-        break;
       case 14:
-        throw new Error('Connection required to forward message');
-      case 15:
-        _context5.n = 20;
+        _context6.n = 16;
         break;
+      case 15:
+        throw new Error('Connection required to forward message');
       case 16:
-        _context5.p = 16;
-        _t4 = _context5.v;
+        _context6.n = 22;
+        break;
+      case 17:
+        _context6.p = 17;
+        _t4 = _context6.v;
         if (!(pendingMessage && channel && action.type !== RESEND_MESSAGE)) {
-          _context5.n = 17;
+          _context6.n = 20;
           break;
         }
-        if (!isAddToPendingMessagesMap) {
-          _context5.n = 17;
+        connectionIsDisconnected = store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED;
+        if (!(isAddToPendingMessagesMap && connectionIsDisconnected)) {
+          _context6.n = 19;
           break;
         }
-        _context5.n = 17;
+        _context6.n = 18;
         return call(addPendingMessage, message, pendingMessage, channel);
-      case 17:
+      case 18:
+        _context6.n = 20;
+        break;
+      case 19:
+        _context6.n = 20;
+        return put(removePendingMessageAC(channel.id, pendingMessage.tid));
+      case 20:
         if (!(channel && messageTid)) {
-          _context5.n = 18;
+          _context6.n = 21;
           break;
         }
         updateMessageOnMap(channel.id, {
@@ -19824,33 +19851,33 @@ function forwardMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context5.n = 18;
+          _context6.n = 21;
           break;
         }
         updateMessageOnAllMessages(messageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context5.n = 18;
+        _context6.n = 21;
         return put(updateMessageAC(messageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 18:
-        _context5.n = 19;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
+      case 21:
         log.error('error on forward message ... ', _t4);
-      case 20:
-        _context5.n = 21;
+      case 22:
+        _context6.p = 22;
+        _context6.n = 23;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 21:
-        return _context5.a(2);
+      case 23:
+        return _context6.f(22);
+      case 24:
+        return _context6.a(2);
     }
-  }, _marked3$1, null, [[1, 16]]);
+  }, _marked3$1, null, [[1, 17, 22, 24]]);
 }
 function resendMessage(action) {
   var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isVoiceMessage;
-  return _regenerator().w(function (_context6) {
-    while (1) switch (_context6.n) {
+  return _regenerator().w(function (_context7) {
+    while (1) switch (_context7.n) {
       case 0:
         payload = action.payload;
         message = payload.message, connectionState = payload.connectionState, channelId = payload.channelId;
@@ -19864,33 +19891,33 @@ function resendMessage(action) {
           store.dispatch(sendTextMessageAC(message, channelId, connectionState, false));
         }
       case 1:
-        return _context6.a(2);
+        return _context7.a(2);
     }
   }, _marked4$1);
 }
 function deleteMessage(action) {
   var payload, messageId, channelId, deleteOption, channel, deletedMessage, messageToUpdate, _t5;
-  return _regenerator().w(function (_context7) {
-    while (1) switch (_context7.p = _context7.n) {
+  return _regenerator().w(function (_context8) {
+    while (1) switch (_context8.p = _context8.n) {
       case 0:
-        _context7.p = 0;
+        _context8.p = 0;
         payload = action.payload;
         messageId = payload.messageId, channelId = payload.channelId, deleteOption = payload.deleteOption;
-        _context7.n = 1;
+        _context8.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context7.v;
+        channel = _context8.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context7.n = 2;
+        _context8.n = 2;
         return call(channel.deleteMessageById, messageId, deleteOption === 'forMe');
       case 2:
-        deletedMessage = _context7.v;
-        _context7.n = 3;
+        deletedMessage = _context8.v;
+        _context8.n = 3;
         return put(updateMessageAC(deletedMessage.id, deletedMessage));
       case 3:
         updateMessageOnMap(channel.id, {
@@ -19901,35 +19928,35 @@ function deleteMessage(action) {
         messageToUpdate = JSON.parse(JSON.stringify(deletedMessage));
         updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
         if (!(channel.lastMessage.id === messageId)) {
-          _context7.n = 4;
+          _context8.n = 4;
           break;
         }
-        _context7.n = 4;
+        _context8.n = 4;
         return put(updateChannelLastMessageAC(messageToUpdate, channel));
       case 4:
-        _context7.n = 6;
+        _context8.n = 6;
         break;
       case 5:
-        _context7.p = 5;
-        _t5 = _context7.v;
+        _context8.p = 5;
+        _t5 = _context8.v;
         log.error('ERROR in delete message', _t5.message);
       case 6:
-        return _context7.a(2);
+        return _context8.a(2);
     }
   }, _marked5$1, null, [[0, 5]]);
 }
 function editMessage(action) {
   var payload, message, channelId, channel, linkAttachments, anotherAttachments, linkAttachmentsToSend, editedMessage, messageToUpdate, _t6;
-  return _regenerator().w(function (_context8) {
-    while (1) switch (_context8.p = _context8.n) {
+  return _regenerator().w(function (_context9) {
+    while (1) switch (_context9.p = _context9.n) {
       case 0:
-        _context8.p = 0;
+        _context9.p = 0;
         payload = action.payload;
         message = payload.message, channelId = payload.channelId;
-        _context8.n = 1;
+        _context9.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context8.v;
+        channel = _context9.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
@@ -19951,7 +19978,7 @@ function editMessage(action) {
           });
           message.attachments = [].concat(anotherAttachments, linkAttachmentsToSend);
         }
-        _context8.n = 2;
+        _context9.n = 2;
         return call(channel.editMessage, _extends({}, message, {
           metadata: isJSON(message.metadata) ? message.metadata : JSON.stringify(message.metadata),
           attachments: message.attachments.map(function (att) {
@@ -19961,8 +19988,8 @@ function editMessage(action) {
           })
         }));
       case 2:
-        editedMessage = _context8.v;
-        _context8.n = 3;
+        editedMessage = _context9.v;
+        _context9.n = 3;
         return put(updateMessageAC(editedMessage.id, editedMessage));
       case 3:
         updateMessageOnMap(channel.id, {
@@ -19971,54 +19998,54 @@ function editMessage(action) {
         });
         updateMessageOnAllMessages(message.id, editedMessage);
         if (!(channel.lastMessage.id === message.id)) {
-          _context8.n = 4;
+          _context9.n = 4;
           break;
         }
         messageToUpdate = JSON.parse(JSON.stringify(editedMessage));
         updateChannelLastMessageOnAllChannels(channel.id, messageToUpdate);
-        _context8.n = 4;
+        _context9.n = 4;
         return put(updateChannelLastMessageAC(messageToUpdate, channel));
       case 4:
-        _context8.n = 6;
+        _context9.n = 6;
         break;
       case 5:
-        _context8.p = 5;
-        _t6 = _context8.v;
+        _context9.p = 5;
+        _t6 = _context9.v;
         log.error('ERROR in edit message', _t6.message);
       case 6:
-        return _context8.a(2);
+        return _context9.a(2);
     }
   }, _marked6$1, null, [[0, 5]]);
 }
-var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee3(connectionState) {
+var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee4(connectionState) {
   var pendingMessagesMap, channelId, _iterator, _step, _msg$attachments, msg, attachments, pendingPollActionsMap, _t7, _t8, _t9;
-  return _regenerator().w(function (_context9) {
-    while (1) switch (_context9.p = _context9.n) {
+  return _regenerator().w(function (_context0) {
+    while (1) switch (_context0.p = _context0.n) {
       case 0:
         pendingMessagesMap = _extends({}, getPendingMessagesMap());
         _t7 = _regeneratorKeys(pendingMessagesMap);
       case 1:
         if ((_t8 = _t7()).done) {
-          _context9.n = 12;
+          _context0.n = 12;
           break;
         }
         channelId = _t8.value;
         _iterator = _createForOfIteratorHelperLoose(pendingMessagesMap[channelId]);
       case 2:
         if ((_step = _iterator()).done) {
-          _context9.n = 11;
+          _context0.n = 11;
           break;
         }
         msg = _step.value;
         attachments = msg === null || msg === void 0 ? void 0 : (_msg$attachments = msg.attachments) === null || _msg$attachments === void 0 ? void 0 : _msg$attachments.filter(function (att) {
           return (att === null || att === void 0 ? void 0 : att.type) !== attachmentTypes.link;
         });
-        _context9.p = 3;
+        _context0.p = 3;
         if (!(msg !== null && msg !== void 0 && msg.forwardingDetails)) {
-          _context9.n = 5;
+          _context0.n = 5;
           break;
         }
-        _context9.n = 4;
+        _context0.n = 4;
         return call(forwardMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -20030,14 +20057,14 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee3(connec
           }
         });
       case 4:
-        _context9.n = 8;
+        _context0.n = 8;
         break;
       case 5:
         if (!(attachments && attachments.length > 0)) {
-          _context9.n = 7;
+          _context0.n = 7;
           break;
         }
-        _context9.n = 6;
+        _context0.n = 6;
         return call(sendMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -20050,10 +20077,10 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee3(connec
           }
         });
       case 6:
-        _context9.n = 8;
+        _context0.n = 8;
         break;
       case 7:
-        _context9.n = 8;
+        _context0.n = 8;
         return call(sendTextMessage, {
           type: RESEND_MESSAGE,
           payload: {
@@ -20064,44 +20091,72 @@ var sendPendingMessages = /*#__PURE__*/_regenerator().m(function _callee3(connec
           }
         });
       case 8:
-        _context9.n = 10;
+        _context0.n = 10;
         break;
       case 9:
-        _context9.p = 9;
-        _t9 = _context9.v;
+        _context0.p = 9;
+        _t9 = _context0.v;
         log.error("Failed to send pending message " + (msg.tid || msg.id) + ":", _t9);
       case 10:
-        _context9.n = 2;
+        _context0.n = 2;
         break;
       case 11:
-        _context9.n = 1;
+        _context0.n = 1;
         break;
       case 12:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         if (!(pendingPollActionsMap && Object.keys(pendingPollActionsMap).length > 0)) {
-          _context9.n = 13;
+          _context0.n = 13;
           break;
         }
-        _context9.n = 13;
+        _context0.n = 13;
         return put(resendPendingPollActionsAC(connectionState));
       case 13:
-        return _context9.a(2);
+        return _context0.a(2);
     }
-  }, _callee3, null, [[3, 9]]);
+  }, _callee4, null, [[3, 9]]);
+});
+var updateMessages = /*#__PURE__*/_regenerator().m(function _callee5(channel, updatedMessages) {
+  var _messages, _Object$values;
+  var previousAllMessages, messages, lastMessageId, setMappedAllMessages, allMessagesAfterLastMessage;
+  return _regenerator().w(function (_context1) {
+    while (1) switch (_context1.n) {
+      case 0:
+        previousAllMessages = getAllMessages();
+        messages = [].concat(updatedMessages);
+        lastMessageId = (_messages = messages[messages.length - 1]) === null || _messages === void 0 ? void 0 : _messages.id;
+        setMappedAllMessages = {};
+        previousAllMessages.forEach(function (msg) {
+          if (msg.channelId === channel.id) {
+            setMappedAllMessages[msg.id || msg.tid || ''] = msg;
+          }
+        });
+        allMessagesAfterLastMessage = lastMessageId ? (_Object$values = Object.values(setMappedAllMessages || {})) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (msg) {
+          return msg.id > lastMessageId || !msg.id;
+        }) : Object.values(setMappedAllMessages || {});
+        messages = [].concat(messages, allMessagesAfterLastMessage || []);
+        setMessagesToMap(channel.id, messages);
+        setAllMessages(messages);
+        _context1.n = 1;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(messages))));
+      case 1:
+        return _context1.a(2);
+    }
+  }, _callee5);
 });
 function getMessagesQuery(action) {
-  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _updatedMessages, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, waitToSendPendingMessages, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20, _t21;
-  return _regenerator().w(function (_context0) {
-    while (1) switch (_context0.p = _context0.n) {
+  var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, scrollToMessage, connectionState, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, pendingMessages, _messagesMap, filteredPendingMessages, waitToSendPendingMessages, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20, _t21;
+  return _regenerator().w(function (_context10) {
+    while (1) switch (_context10.p = _context10.n) {
       case 0:
-        _context0.p = 0;
-        _context0.n = 1;
+        _context10.p = 0;
+        _context10.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
-        _action$payload = action.payload, channel = _action$payload.channel, loadWithLastMessage = _action$payload.loadWithLastMessage, messageId = _action$payload.messageId, limit = _action$payload.limit, withDeliveredMessages = _action$payload.withDeliveredMessages, highlight = _action$payload.highlight, behavior = _action$payload.behavior;
+        _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;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel.id && !channel.isMockChannel)) {
-          _context0.n = 76;
+          _context10.n = 76;
           break;
         }
         SceytChatClient = getClient();
@@ -20109,14 +20164,14 @@ function getMessagesQuery(action) {
         messageQueryBuilder.limit(limit || MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 3;
+          _context10.n = 3;
           break;
         }
-        _context0.n = 2;
+        _context10.n = 2;
         return call(messageQueryBuilder.build);
       case 2:
-        _t0 = _context0.v;
-        _context0.n = 4;
+        _t0 = _context10.v;
+        _context10.n = 4;
         break;
       case 3:
         _t0 = null;
@@ -20131,27 +20186,27 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context0.n = 19;
+          _context10.n = 19;
           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)) {
-          _context0.n = 14;
+          _context10.n = 14;
           break;
         }
         setHasPrevCached(false);
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 6;
+          _context10.n = 6;
           break;
         }
-        _context0.n = 5;
+        _context10.n = 5;
         return call(messageQuery.loadPreviousMessageId, '0');
       case 5:
-        _t1 = _context0.v;
-        _context0.n = 7;
+        _t1 = _context10.v;
+        _context10.n = 7;
         break;
       case 6:
         _t1 = {
@@ -20161,19 +20216,19 @@ function getMessagesQuery(action) {
       case 7:
         result = _t1;
         if (!(result.messages.length === 50)) {
-          _context0.n = 11;
+          _context10.n = 11;
           break;
         }
         messageQuery.limit = 30;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 9;
+          _context10.n = 9;
           break;
         }
-        _context0.n = 8;
+        _context10.n = 8;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
       case 8:
-        _t10 = _context0.v;
-        _context0.n = 10;
+        _t10 = _context10.v;
+        _context10.n = 10;
         break;
       case 9:
         _t10 = {
@@ -20197,40 +20252,40 @@ function getMessagesQuery(action) {
           return !messagesMap[msg.tid || ''];
         });
         result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
-        _context0.n = 12;
+        _context10.n = 12;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 12:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages(result.messages);
-        _context0.n = 13;
+        _context10.n = 13;
         return put(setMessagesHasPrevAC(true));
       case 13:
-        _context0.n = 16;
+        _context10.n = 16;
         break;
       case 14:
         result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context0.n = 15;
+        _context10.n = 15;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 15:
-        _context0.n = 16;
+        _context10.n = 16;
         return put(setMessagesHasPrevAC(true));
       case 16:
-        _context0.n = 17;
+        _context10.n = 17;
         return put(setMessagesHasNextAC(false));
       case 17:
         setHasNextCached(false);
-        if (!messageId) {
-          _context0.n = 18;
+        if (!(messageId && scrollToMessage)) {
+          _context10.n = 18;
           break;
         }
-        _context0.n = 18;
+        _context10.n = 18;
         return put(setScrollToMessagesAC(messageId, highlight, behavior));
       case 18:
-        _context0.n = 72;
+        _context10.n = 72;
         break;
       case 19:
         if (!messageId) {
-          _context0.n = 38;
+          _context10.n = 38;
           break;
         }
         _allMessages = getAllMessages();
@@ -20239,32 +20294,32 @@ function getMessagesQuery(action) {
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context0.n = 22;
+          _context10.n = 22;
           break;
         }
         result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context0.n = 20;
+        _context10.n = 20;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 20:
         setHasPrevCached(messageIndex > maxLengthPart);
         setHasNextCached(_allMessages.length > maxLengthPart);
-        _context0.n = 21;
+        _context10.n = 21;
         return put(setMessagesHasPrevAC(true));
       case 21:
-        _context0.n = 34;
+        _context10.n = 34;
         break;
       case 22:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         log.info('load by message id from server ...............', messageId);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 24;
+          _context10.n = 24;
           break;
         }
-        _context0.n = 23;
+        _context10.n = 23;
         return call(messageQuery.loadNearMessageId, messageId);
       case 23:
-        _t11 = _context0.v;
-        _context0.n = 25;
+        _t11 = _context10.v;
+        _context10.n = 25;
         break;
       case 24:
         _t11 = {
@@ -20274,19 +20329,19 @@ function getMessagesQuery(action) {
       case 25:
         result = _t11;
         if (!(result.messages.length === 50)) {
-          _context0.n = 32;
+          _context10.n = 32;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 27;
+          _context10.n = 27;
           break;
         }
-        _context0.n = 26;
+        _context10.n = 26;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
       case 26:
-        _t12 = _context0.v;
-        _context0.n = 28;
+        _t12 = _context10.v;
+        _context10.n = 28;
         break;
       case 27:
         _t12 = {
@@ -20297,14 +20352,14 @@ function getMessagesQuery(action) {
         _secondResult = _t12;
         messageQuery.reverse = false;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 30;
+          _context10.n = 30;
           break;
         }
-        _context0.n = 29;
+        _context10.n = 29;
         return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
       case 29:
-        _t13 = _context0.v;
-        _context0.n = 31;
+        _t13 = _context10.v;
+        _context10.n = 31;
         break;
       case 30:
         _t13 = {
@@ -20316,10 +20371,10 @@ function getMessagesQuery(action) {
         result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
         result.hasNext = _secondResult.hasNext;
         messageQuery.reverse = true;
-        _context0.n = 32;
+        _context10.n = 32;
         return put(setMessagesHasPrevAC(_secondResult.hasNext));
       case 32:
-        _context0.n = 33;
+        _context10.n = 33;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 33:
         setMessagesToMap(channel.id, result.messages);
@@ -20327,38 +20382,42 @@ function getMessagesQuery(action) {
         setHasPrevCached(false);
         setHasNextCached(false);
       case 34:
-        _context0.n = 35;
+        _context10.n = 35;
         return put(setMessagesHasNextAC(true));
       case 35:
-        _context0.n = 36;
+        if (!scrollToMessage) {
+          _context10.n = 36;
+          break;
+        }
+        _context10.n = 36;
         return put(setScrollToMessagesAC(messageId, true, behavior));
       case 36:
-        _context0.n = 37;
+        _context10.n = 37;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 37:
-        _context0.n = 72;
+        _context10.n = 72;
         break;
       case 38:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context0.n = 61;
+          _context10.n = 61;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context0.n = 50;
+          _context10.n = 50;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 40;
+          _context10.n = 40;
           break;
         }
-        _context0.n = 39;
+        _context10.n = 39;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
       case 39:
-        _t14 = _context0.v;
-        _context0.n = 41;
+        _t14 = _context10.v;
+        _context10.n = 41;
         break;
       case 40:
         _t14 = {
@@ -20368,19 +20427,19 @@ function getMessagesQuery(action) {
       case 41:
         result = _t14;
         if (!(result.messages.length === 50)) {
-          _context0.n = 49;
+          _context10.n = 49;
           break;
         }
         messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 43;
+          _context10.n = 43;
           break;
         }
-        _context0.n = 42;
+        _context10.n = 42;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
       case 42:
-        _t15 = _context0.v;
-        _context0.n = 44;
+        _t15 = _context10.v;
+        _context10.n = 44;
         break;
       case 43:
         _t15 = {
@@ -20390,19 +20449,19 @@ function getMessagesQuery(action) {
       case 44:
         _secondResult2 = _t15;
         if (!(channel.newMessageCount > 25)) {
-          _context0.n = 48;
+          _context10.n = 48;
           break;
         }
         messageQuery.reverse = false;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 46;
+          _context10.n = 46;
           break;
         }
-        _context0.n = 45;
+        _context10.n = 45;
         return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
       case 45:
-        _t16 = _context0.v;
-        _context0.n = 47;
+        _t16 = _context10.v;
+        _context10.n = 47;
         break;
       case 46:
         _t16 = {
@@ -20413,23 +20472,23 @@ function getMessagesQuery(action) {
         _thirdResult = _t16;
         result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
         messageQuery.reverse = true;
-        _context0.n = 49;
+        _context10.n = 49;
         break;
       case 48:
         result.messages = [].concat(_secondResult2.messages, result.messages);
       case 49:
-        _context0.n = 57;
+        _context10.n = 57;
         break;
       case 50:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 52;
+          _context10.n = 52;
           break;
         }
-        _context0.n = 51;
+        _context10.n = 51;
         return call(messageQuery.loadPrevious);
       case 51:
-        _t17 = _context0.v;
-        _context0.n = 53;
+        _t17 = _context10.v;
+        _context10.n = 53;
         break;
       case 52:
         _t17 = {
@@ -20439,19 +20498,19 @@ function getMessagesQuery(action) {
       case 53:
         result = _t17;
         if (!(result.messages.length === 50)) {
-          _context0.n = 57;
+          _context10.n = 57;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 55;
+          _context10.n = 55;
           break;
         }
-        _context0.n = 54;
+        _context10.n = 54;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
       case 54:
-        _t18 = _context0.v;
-        _context0.n = 56;
+        _t18 = _context10.v;
+        _context10.n = 56;
         break;
       case 55:
         _t18 = {
@@ -20463,42 +20522,41 @@ function getMessagesQuery(action) {
         result.messages = [].concat(_secondResult3.messages, result.messages);
         result.hasNext = _secondResult3.hasNext;
       case 57:
-        _context0.n = 58;
+        _context10.n = 58;
         return put(setMessagesHasPrevAC(true));
       case 58:
-        _context0.n = 59;
+        _context10.n = 59;
         return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
       case 59:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
-        _context0.n = 60;
+        _context10.n = 60;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
       case 60:
-        _context0.n = 72;
+        _context10.n = 72;
         break;
       case 61:
-        previousAllMessages = getAllMessages();
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         if (!(cachedMessages && cachedMessages.length)) {
-          _context0.n = 62;
+          _context10.n = 62;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([].concat(cachedMessages));
-        _context0.n = 62;
+        _context10.n = 62;
         return put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
       case 62:
         log.info('load message from server');
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 64;
+          _context10.n = 64;
           break;
         }
-        _context0.n = 63;
+        _context10.n = 63;
         return call(messageQuery.loadPrevious);
       case 63:
-        _t19 = _context0.v;
-        _context0.n = 65;
+        _t19 = _context10.v;
+        _context10.n = 65;
         break;
       case 64:
         _t19 = {
@@ -20508,19 +20566,19 @@ function getMessagesQuery(action) {
       case 65:
         result = _t19;
         if (!(result.messages.length === 50)) {
-          _context0.n = 69;
+          _context10.n = 69;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context0.n = 67;
+          _context10.n = 67;
           break;
         }
-        _context0.n = 66;
+        _context10.n = 66;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
       case 66:
-        _t20 = _context0.v;
-        _context0.n = 68;
+        _t20 = _context10.v;
+        _context10.n = 68;
         break;
       case 67:
         _t20 = {
@@ -20541,37 +20599,18 @@ function getMessagesQuery(action) {
           updateMessageOnAllMessages(msg.id, updatedMessage || msg);
           updatedMessages.push(updatedMessage || msg);
         });
-        lastMessageId = (_updatedMessages = updatedMessages[updatedMessages.length - 1]) === null || _updatedMessages === void 0 ? void 0 : _updatedMessages.id;
-        _allMessages2 = getAllMessages();
-        setMappedAllMessages = {};
-        previousAllMessages.forEach(function (msg) {
-          if (msg.channelId === channel.id) {
-            setMappedAllMessages[msg.id] = msg;
-          }
-        });
-        _allMessages2.forEach(function (msg) {
-          if (msg.channelId === channel.id) {
-            setMappedAllMessages[msg.id] = msg;
-          }
-        });
-        allMessagesAfterLastMessage = lastMessageId ? (_Object$values = Object.values(setMappedAllMessages || {})) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (msg) {
-          return msg.id > lastMessageId;
-        }) : Object.values(setMappedAllMessages || {});
-        updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage || []);
-        setMessagesToMap(channel.id, updatedMessages);
-        setAllMessages(updatedMessages);
-        _context0.n = 70;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(updatedMessages))));
+        _context10.n = 70;
+        return call(updateMessages, channel, updatedMessages);
       case 70:
-        _context0.n = 71;
+        _context10.n = 71;
         return put(setMessagesHasPrevAC(true));
       case 71:
-        _context0.n = 72;
+        _context10.n = 72;
         return put(setMessagesHasNextAC(false));
       case 72:
         pendingMessages = getPendingMessages(channel.id);
         if (!(pendingMessages && pendingMessages.length)) {
-          _context0.n = 73;
+          _context10.n = 73;
           break;
         }
         _messagesMap = {};
@@ -20581,76 +20620,76 @@ function getMessagesQuery(action) {
         filteredPendingMessages = pendingMessages.filter(function (msg) {
           return !_messagesMap[msg.tid || ''];
         });
-        _context0.n = 73;
+        _context10.n = 73;
         return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 73:
         waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
-          _context0.n = 75;
+          _context10.n = 75;
           break;
         }
-        _context0.n = 74;
+        _context10.n = 74;
         return put(setWaitToSendPendingMessagesAC(false));
       case 74:
-        _context0.n = 75;
+        _context10.n = 75;
         return spawn(sendPendingMessages, connectionState);
       case 75:
-        _context0.n = 77;
+        _context10.n = 77;
         break;
       case 76:
         if (!channel.isMockChannel) {
-          _context0.n = 77;
+          _context10.n = 77;
           break;
         }
-        _context0.n = 77;
+        _context10.n = 77;
         return put(setMessagesAC([]));
       case 77:
-        _context0.n = 79;
+        _context10.n = 79;
         break;
       case 78:
-        _context0.p = 78;
-        _t21 = _context0.v;
+        _context10.p = 78;
+        _t21 = _context10.v;
         log.error('error in message query', _t21);
       case 79:
-        _context0.p = 79;
-        _context0.n = 80;
+        _context10.p = 79;
+        _context10.n = 80;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 80:
-        return _context0.f(79);
+        return _context10.f(79);
       case 81:
-        return _context0.a(2);
+        return _context10.a(2);
     }
   }, _marked7$1, null, [[0, 78, 79, 81]]);
 }
 function getMessageQuery(action) {
   var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t22;
-  return _regenerator().w(function (_context1) {
-    while (1) switch (_context1.p = _context1.n) {
+  return _regenerator().w(function (_context11) {
+    while (1) switch (_context11.p = _context11.n) {
       case 0:
-        _context1.p = 0;
+        _context11.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId;
-        _context1.n = 1;
+        _context11.n = 1;
         return call(getChannelFromAllChannels, channelId);
       case 1:
-        channel = _context1.v;
+        channel = _context11.v;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(!channel || connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context1.n = 2;
+          _context11.n = 2;
           break;
         }
-        return _context1.a(2);
+        return _context11.a(2);
       case 2:
-        _context1.n = 3;
+        _context11.n = 3;
         return call(channel.getMessagesById, [messageId]);
       case 3:
-        messages = _context1.v;
+        messages = _context11.v;
         fetchedMessage = messages && messages[0] ? JSON.parse(JSON.stringify(messages[0])) : null;
         if (!fetchedMessage) {
-          _context1.n = 6;
+          _context11.n = 6;
           break;
         }
-        _context1.n = 4;
+        _context11.n = 4;
         return put(updateMessageAC(messageId, fetchedMessage));
       case 4:
         updateMessageOnMap(channel.id, {
@@ -20658,45 +20697,45 @@ function getMessageQuery(action) {
           params: fetchedMessage
         });
         updateMessageOnAllMessages(messageId, fetchedMessage);
-        _context1.n = 5;
+        _context11.n = 5;
         return put(setScrollToMessagesAC(messageId, false));
       case 5:
         if (!(channel.lastMessage && channel.lastMessage.id === messageId)) {
-          _context1.n = 6;
+          _context11.n = 6;
           break;
         }
         updateChannelLastMessageOnAllChannels(channel.id, fetchedMessage);
-        _context1.n = 6;
+        _context11.n = 6;
         return put(updateChannelLastMessageAC(fetchedMessage, channel));
       case 6:
-        _context1.n = 8;
+        _context11.n = 8;
         break;
       case 7:
-        _context1.p = 7;
-        _t22 = _context1.v;
+        _context11.p = 7;
+        _t22 = _context11.v;
         log.error('error in message query', _t22);
       case 8:
-        return _context1.a(2);
+        return _context11.a(2);
     }
   }, _marked8$1, null, [[0, 7]]);
 }
 function loadMoreMessages(action) {
   var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t23;
-  return _regenerator().w(function (_context10) {
-    while (1) switch (_context10.p = _context10.n) {
+  return _regenerator().w(function (_context12) {
+    while (1) switch (_context12.p = _context12.n) {
       case 0:
-        _context10.p = 0;
+        _context12.p = 0;
         payload = action.payload;
         limit = payload.limit, direction = payload.direction, channelId = payload.channelId, messageId = payload.messageId, hasNext = payload.hasNext;
         SceytChatClient = getClient();
         messageQueryBuilder = new SceytChatClient.MessageListQueryBuilder(channelId);
         messageQueryBuilder.reverse(true);
-        _context10.n = 1;
+        _context12.n = 1;
         return call(messageQueryBuilder.build);
       case 1:
-        messageQuery = _context10.v;
+        messageQuery = _context12.v;
         messageQuery.limit = limit || 5;
-        _context10.n = 2;
+        _context12.n = 2;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
         result = {
@@ -20704,130 +20743,130 @@ function loadMoreMessages(action) {
           hasNext: false
         };
         if (!(direction === MESSAGE_LOAD_DIRECTION.PREV)) {
-          _context10.n = 6;
+          _context12.n = 6;
           break;
         }
         if (!getHasPrevCached()) {
-          _context10.n = 3;
+          _context12.n = 3;
           break;
         }
         result.messages = getFromAllMessagesByMessageId(messageId, MESSAGE_LOAD_DIRECTION.PREV);
-        _context10.n = 5;
+        _context12.n = 5;
         break;
       case 3:
         if (!hasNext) {
-          _context10.n = 5;
+          _context12.n = 5;
           break;
         }
-        _context10.n = 4;
+        _context12.n = 4;
         return call(messageQuery.loadPreviousMessageId, messageId);
       case 4:
-        result = _context10.v;
+        result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.PREV);
           setMessagesToMap(channelId, result.messages);
         }
-        _context10.n = 5;
+        _context12.n = 5;
         return put(setMessagesHasPrevAC(result.hasNext));
       case 5:
-        _context10.n = 10;
+        _context12.n = 10;
         break;
       case 6:
         if (!getHasNextCached()) {
-          _context10.n = 7;
+          _context12.n = 7;
           break;
         }
         result.messages = getFromAllMessagesByMessageId(messageId, MESSAGE_LOAD_DIRECTION.NEXT);
-        _context10.n = 9;
+        _context12.n = 9;
         break;
       case 7:
         if (!hasNext) {
-          _context10.n = 9;
+          _context12.n = 9;
           break;
         }
         log.info('saga load next from server ... ', messageId);
         messageQuery.reverse = false;
-        _context10.n = 8;
+        _context12.n = 8;
         return call(messageQuery.loadNextMessageId, messageId);
       case 8:
-        result = _context10.v;
+        result = _context12.v;
         if (result.messages.length) {
           addAllMessages(result.messages, MESSAGE_LOAD_DIRECTION.NEXT);
           setMessagesToMap(channelId, result.messages);
         }
-        _context10.n = 9;
+        _context12.n = 9;
         return put(setMessagesHasNextAC(result.hasNext));
       case 9:
-        _context10.n = 10;
+        _context12.n = 10;
         return put(setMessagesHasPrevAC(true));
       case 10:
         if (!(result.messages && result.messages.length && result.messages.length > 0)) {
-          _context10.n = 12;
+          _context12.n = 12;
           break;
         }
-        _context10.n = 11;
+        _context12.n = 11;
         return put(addMessagesAC(JSON.parse(JSON.stringify(result.messages)), direction));
       case 11:
-        _context10.n = 16;
+        _context12.n = 16;
         break;
       case 12:
-        _context10.n = 13;
+        _context12.n = 13;
         return put(addMessagesAC([], direction));
       case 13:
         if (!(direction === MESSAGE_LOAD_DIRECTION.NEXT)) {
-          _context10.n = 15;
+          _context12.n = 15;
           break;
         }
-        _context10.n = 14;
+        _context12.n = 14;
         return put(setMessagesHasNextAC(false));
       case 14:
-        _context10.n = 16;
+        _context12.n = 16;
         break;
       case 15:
-        _context10.n = 16;
+        _context12.n = 16;
         return put(setMessagesHasPrevAC(false));
       case 16:
-        _context10.n = 17;
+        _context12.n = 17;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 17:
-        _context10.n = 19;
+        _context12.n = 19;
         break;
       case 18:
-        _context10.p = 18;
-        _t23 = _context10.v;
+        _context12.p = 18;
+        _t23 = _context12.v;
         log.error('error in load more messages', _t23);
       case 19:
-        return _context10.a(2);
+        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, _t24;
-  return _regenerator().w(function (_context11) {
-    while (1) switch (_context11.p = _context11.n) {
+  return _regenerator().w(function (_context13) {
+    while (1) switch (_context13.p = _context13.n) {
       case 0:
-        _context11.p = 0;
+        _context13.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId, key = payload.key, score = payload.score, reason = payload.reason, enforceUnique = payload.enforceUnique;
         user = getClient().user;
-        _context11.n = 1;
+        _context13.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context11.v;
+        channel = _context13.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context11.n = 2;
+        _context13.n = 2;
         return call(channel.addReaction, messageId, key, score, reason, enforceUnique);
       case 2:
-        _yield$call = _context11.v;
+        _yield$call = _context13.v;
         message = _yield$call.message;
         reaction = _yield$call.reaction;
         if (!(user.id === message.user.id)) {
-          _context11.n = 4;
+          _context13.n = 4;
           break;
         }
         channelUpdateParam = {
@@ -20835,99 +20874,99 @@ function addReaction(action) {
           lastReactedMessage: message,
           newReactions: [reaction]
         };
-        _context11.n = 3;
+        _context13.n = 3;
         return put(updateChannelDataAC(channel.id, channelUpdateParam));
       case 3:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 4:
-        _context11.n = 5;
+        _context13.n = 5;
         return put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 5:
-        _context11.n = 6;
+        _context13.n = 6;
         return put(addReactionToListAC(reaction));
       case 6:
-        _context11.n = 7;
+        _context13.n = 7;
         return put(addReactionToMessageAC(message, reaction, true));
       case 7:
         addReactionToMessageOnMap(channelId, message, reaction, true);
         addReactionOnAllMessages(message, reaction, true);
-        _context11.n = 9;
+        _context13.n = 9;
         break;
       case 8:
-        _context11.p = 8;
-        _t24 = _context11.v;
+        _context13.p = 8;
+        _t24 = _context13.v;
         log.error('ERROR in add reaction', _t24.message);
       case 9:
-        return _context11.a(2);
+        return _context13.a(2);
     }
   }, _marked0$1, null, [[0, 8]]);
 }
 function deleteReaction(action) {
   var payload, channelId, messageId, key, isLastReaction, channel, _yield$call2, message, reaction, channelUpdateParam, _t25;
-  return _regenerator().w(function (_context12) {
-    while (1) switch (_context12.p = _context12.n) {
+  return _regenerator().w(function (_context14) {
+    while (1) switch (_context14.p = _context14.n) {
       case 0:
-        _context12.p = 0;
+        _context14.p = 0;
         payload = action.payload;
         channelId = payload.channelId, messageId = payload.messageId, key = payload.key, isLastReaction = payload.isLastReaction;
-        _context12.n = 1;
+        _context14.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context12.v;
+        channel = _context14.v;
         if (!channel) {
           channel = getChannelFromAllChannels(channelId);
           if (channel) {
             setChannelInMap(channel);
           }
         }
-        _context12.n = 2;
+        _context14.n = 2;
         return call(channel.deleteReaction, messageId, key);
       case 2:
-        _yield$call2 = _context12.v;
+        _yield$call2 = _context14.v;
         message = _yield$call2.message;
         reaction = _yield$call2.reaction;
         if (!isLastReaction) {
-          _context12.n = 4;
+          _context14.n = 4;
           break;
         }
         channelUpdateParam = {
           userMessageReactions: [],
           lastReactedMessage: null
         };
-        _context12.n = 3;
+        _context14.n = 3;
         return put(updateChannelDataAC(channel.id, channelUpdateParam));
       case 3:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 4:
-        _context12.n = 5;
+        _context14.n = 5;
         return put(deleteReactionFromListAC(reaction));
       case 5:
-        _context12.n = 6;
+        _context14.n = 6;
         return put(deleteReactionFromMessageAC(message, reaction, true));
       case 6:
         removeReactionToMessageOnMap(channelId, message, reaction, true);
         removeReactionOnAllMessages(message, reaction, true);
-        _context12.n = 8;
+        _context14.n = 8;
         break;
       case 7:
-        _context12.p = 7;
-        _t25 = _context12.v;
+        _context14.p = 7;
+        _t25 = _context14.v;
         log.error('ERROR in delete reaction', _t25.message);
       case 8:
-        return _context12.a(2);
+        return _context14.a(2);
     }
   }, _marked1$1, null, [[0, 7]]);
 }
 function getReactions(action) {
   var payload, messageId, key, limit, SceytChatClient, reactionQueryBuilder, reactionQuery, result, _t26;
-  return _regenerator().w(function (_context13) {
-    while (1) switch (_context13.p = _context13.n) {
+  return _regenerator().w(function (_context15) {
+    while (1) switch (_context15.p = _context15.n) {
       case 0:
-        _context13.p = 0;
+        _context15.p = 0;
         payload = action.payload;
         messageId = payload.messageId, key = payload.key, limit = payload.limit;
         SceytChatClient = getClient();
-        _context13.n = 1;
+        _context15.n = 1;
         return put(setReactionsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         reactionQueryBuilder = new SceytChatClient.ReactionListQueryBuilder(messageId);
@@ -20935,74 +20974,74 @@ function getReactions(action) {
         if (key) {
           reactionQueryBuilder.setKey(key);
         }
-        _context13.n = 2;
+        _context15.n = 2;
         return call(reactionQueryBuilder.build);
       case 2:
-        reactionQuery = _context13.v;
-        _context13.n = 3;
+        reactionQuery = _context15.v;
+        _context15.n = 3;
         return call(reactionQuery.loadNext);
       case 3:
-        result = _context13.v;
+        result = _context15.v;
         query.ReactionsQuery = reactionQuery;
-        _context13.n = 4;
+        _context15.n = 4;
         return put(setReactionsListAC(result.reactions, result.hasNext));
       case 4:
-        _context13.n = 5;
+        _context15.n = 5;
         return put(setReactionsLoadingStateAC(LOADING_STATE.LOADED));
       case 5:
-        _context13.n = 7;
+        _context15.n = 7;
         break;
       case 6:
-        _context13.p = 6;
-        _t26 = _context13.v;
+        _context15.p = 6;
+        _t26 = _context15.v;
         log.error('ERROR in get reactions', _t26.message);
       case 7:
-        return _context13.a(2);
+        return _context15.a(2);
     }
   }, _marked10$1, null, [[0, 6]]);
 }
 function loadMoreReactions(action) {
   var payload, limit, ReactionQuery, result, _t27;
-  return _regenerator().w(function (_context14) {
-    while (1) switch (_context14.p = _context14.n) {
+  return _regenerator().w(function (_context16) {
+    while (1) switch (_context16.p = _context16.n) {
       case 0:
-        _context14.p = 0;
+        _context16.p = 0;
         payload = action.payload;
         limit = payload.limit;
-        _context14.n = 1;
+        _context16.n = 1;
         return put(setReactionsLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         ReactionQuery = query.ReactionsQuery;
         if (limit) {
           ReactionQuery.limit = limit;
         }
-        _context14.n = 2;
+        _context16.n = 2;
         return call(ReactionQuery.loadNext);
       case 2:
-        result = _context14.v;
-        _context14.n = 3;
+        result = _context16.v;
+        _context16.n = 3;
         return put(addReactionsToListAC(result.reactions, result.hasNext));
       case 3:
-        _context14.n = 4;
+        _context16.n = 4;
         return put(setReactionsLoadingStateAC(LOADING_STATE.LOADED));
       case 4:
-        _context14.n = 6;
+        _context16.n = 6;
         break;
       case 5:
-        _context14.p = 5;
-        _t27 = _context14.v;
+        _context16.p = 5;
+        _t27 = _context16.v;
         log.error('ERROR in load more reactions', _t27.message);
       case 6:
-        return _context14.a(2);
+        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, _t28;
-  return _regenerator().w(function (_context15) {
-    while (1) switch (_context15.p = _context15.n) {
+  return _regenerator().w(function (_context17) {
+    while (1) switch (_context17.p = _context17.n) {
       case 0:
-        _context15.p = 0;
+        _context17.p = 0;
         _action$payload2 = action.payload, channelId = _action$payload2.channelId, attachmentType = _action$payload2.attachmentType, limit = _action$payload2.limit, direction = _action$payload2.direction, attachmentId = _action$payload2.attachmentId, forPopup = _action$payload2.forPopup;
         SceytChatClient = getClient();
         typeList = [attachmentTypes.video, attachmentTypes.image, attachmentTypes.file, attachmentTypes.link, attachmentTypes.voice];
@@ -21017,244 +21056,244 @@ function getMessageAttachments(action) {
         }
         AttachmentByTypeQueryBuilder = new SceytChatClient.AttachmentListQueryBuilder(channelId, typeList);
         AttachmentByTypeQueryBuilder.limit(limit || 34);
-        _context15.n = 1;
+        _context17.n = 1;
         return call(AttachmentByTypeQueryBuilder.build);
       case 1:
-        AttachmentByTypeQuery = _context15.v;
+        AttachmentByTypeQuery = _context17.v;
         if (forPopup) {
           AttachmentByTypeQuery.reverse = true;
         }
         if (!(direction === queryDirection.NEXT)) {
-          _context15.n = 3;
+          _context17.n = 3;
           break;
         }
-        _context15.n = 2;
+        _context17.n = 2;
         return call(AttachmentByTypeQuery.loadPrevious);
       case 2:
-        result = _context15.v;
-        _context15.n = 7;
+        result = _context17.v;
+        _context17.n = 7;
         break;
       case 3:
         if (!(direction === queryDirection.NEAR)) {
-          _context15.n = 5;
+          _context17.n = 5;
           break;
         }
-        _context15.n = 4;
+        _context17.n = 4;
         return call(AttachmentByTypeQuery.loadNearMessageId, attachmentId);
       case 4:
-        result = _context15.v;
-        _context15.n = 7;
+        result = _context17.v;
+        _context17.n = 7;
         break;
       case 5:
-        _context15.n = 6;
+        _context17.n = 6;
         return call(AttachmentByTypeQuery.loadPrevious);
       case 6:
-        result = _context15.v;
+        result = _context17.v;
       case 7:
         if (!forPopup) {
-          _context15.n = 10;
+          _context17.n = 10;
           break;
         }
         query.AttachmentByTypeQueryForPopup = AttachmentByTypeQuery;
-        _context15.n = 8;
+        _context17.n = 8;
         return put(setAttachmentsForPopupAC(JSON.parse(JSON.stringify(result.attachments))));
       case 8:
-        _context15.n = 9;
+        _context17.n = 9;
         return put(setAttachmentsCompleteForPopupAC(result.hasNext));
       case 9:
-        _context15.n = 12;
+        _context17.n = 12;
         break;
       case 10:
         query.AttachmentByTypeQuery = AttachmentByTypeQuery;
-        _context15.n = 11;
+        _context17.n = 11;
         return put(setAttachmentsCompleteAC(result.hasNext));
       case 11:
-        _context15.n = 12;
+        _context17.n = 12;
         return put(setAttachmentsAC(JSON.parse(JSON.stringify(result.attachments))));
       case 12:
-        _context15.n = 14;
+        _context17.n = 14;
         break;
       case 13:
-        _context15.p = 13;
-        _t28 = _context15.v;
+        _context17.p = 13;
+        _t28 = _context17.v;
         log.error('error in message attachment query', _t28);
       case 14:
-        return _context15.a(2);
+        return _context17.a(2);
     }
   }, _marked12$1, null, [[0, 13]]);
 }
 function loadMoreMessageAttachments(action) {
   var _action$payload3, limit, direction, forPopup, AttachmentQuery, _yield$call3, attachments, hasNext, _t29;
-  return _regenerator().w(function (_context16) {
-    while (1) switch (_context16.p = _context16.n) {
+  return _regenerator().w(function (_context18) {
+    while (1) switch (_context18.p = _context18.n) {
       case 0:
-        _context16.p = 0;
+        _context18.p = 0;
         _action$payload3 = action.payload, limit = _action$payload3.limit, direction = _action$payload3.direction, forPopup = _action$payload3.forPopup;
         if (forPopup) {
           AttachmentQuery = query.AttachmentByTypeQueryForPopup;
         } else {
           AttachmentQuery = query.AttachmentByTypeQuery;
         }
-        _context16.n = 1;
+        _context18.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         AttachmentQuery.limit = limit;
-        _context16.n = 2;
+        _context18.n = 2;
         return call(AttachmentQuery.loadPrevious);
       case 2:
-        _yield$call3 = _context16.v;
+        _yield$call3 = _context18.v;
         attachments = _yield$call3.attachments;
         hasNext = _yield$call3.hasNext;
         if (!forPopup) {
-          _context16.n = 4;
+          _context18.n = 4;
           break;
         }
-        _context16.n = 3;
+        _context18.n = 3;
         return put(addAttachmentsForPopupAC(attachments, direction));
       case 3:
-        _context16.n = 7;
+        _context18.n = 7;
         break;
       case 4:
-        _context16.n = 5;
+        _context18.n = 5;
         return put(setAttachmentsCompleteAC(hasNext));
       case 5:
-        _context16.n = 6;
+        _context18.n = 6;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
       case 6:
-        _context16.n = 7;
+        _context18.n = 7;
         return put(addAttachmentsAC(attachments));
       case 7:
-        _context16.n = 9;
+        _context18.n = 9;
         break;
       case 8:
-        _context16.p = 8;
-        _t29 = _context16.v;
+        _context18.p = 8;
+        _t29 = _context18.v;
         log.error('error in message attachment query', _t29);
       case 9:
-        return _context16.a(2);
+        return _context18.a(2);
     }
   }, _marked13$1, null, [[0, 8]]);
 }
 function pauseAttachmentUploading(action) {
   var attachmentId, isPaused, _t30;
-  return _regenerator().w(function (_context17) {
-    while (1) switch (_context17.p = _context17.n) {
+  return _regenerator().w(function (_context19) {
+    while (1) switch (_context19.p = _context19.n) {
       case 0:
-        _context17.p = 0;
+        _context19.p = 0;
         attachmentId = action.payload.attachmentId;
         if (!getCustomUploader()) {
-          _context17.n = 1;
+          _context19.n = 1;
           break;
         }
         isPaused = pauseUpload(attachmentId);
         if (!isPaused) {
-          _context17.n = 1;
+          _context19.n = 1;
           break;
         }
-        _context17.n = 1;
+        _context19.n = 1;
         return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.PAUSED, attachmentId));
       case 1:
-        _context17.n = 3;
+        _context19.n = 3;
         break;
       case 2:
-        _context17.p = 2;
-        _t30 = _context17.v;
+        _context19.p = 2;
+        _t30 = _context19.v;
         log.error('error in pause attachment uploading', _t30);
       case 3:
-        return _context17.a(2);
+        return _context19.a(2);
     }
   }, _marked14$1, null, [[0, 2]]);
 }
 function resumeAttachmentUploading(action) {
   var attachmentId, isResumed, _t31;
-  return _regenerator().w(function (_context18) {
-    while (1) switch (_context18.p = _context18.n) {
+  return _regenerator().w(function (_context20) {
+    while (1) switch (_context20.p = _context20.n) {
       case 0:
-        _context18.p = 0;
+        _context20.p = 0;
         attachmentId = action.payload.attachmentId;
         log.info('resume for attachment ... ', attachmentId);
         if (!getCustomUploader()) {
-          _context18.n = 1;
+          _context20.n = 1;
           break;
         }
         isResumed = resumeUpload(attachmentId);
         if (!isResumed) {
-          _context18.n = 1;
+          _context20.n = 1;
           break;
         }
-        _context18.n = 1;
+        _context20.n = 1;
         return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, attachmentId));
       case 1:
-        _context18.n = 3;
+        _context20.n = 3;
         break;
       case 2:
-        _context18.p = 2;
-        _t31 = _context18.v;
+        _context20.p = 2;
+        _t31 = _context20.v;
         log.error('error in resume attachment uploading', _t31);
       case 3:
-        return _context18.a(2);
+        return _context20.a(2);
     }
   }, _marked15$1, null, [[0, 2]]);
 }
 function getMessageMarkers(action) {
   var _action$payload4, messageId, channelId, deliveryStatus, sceytChatClient, messageMarkerListQueryBuilder, messageMarkerListQuery, messageMarkers, _t32;
-  return _regenerator().w(function (_context19) {
-    while (1) switch (_context19.p = _context19.n) {
+  return _regenerator().w(function (_context21) {
+    while (1) switch (_context21.p = _context21.n) {
       case 0:
-        _context19.p = 0;
-        _context19.n = 1;
+        _context21.p = 0;
+        _context21.n = 1;
         return put(setMessagesMarkersLoadingStateAC(LOADING_STATE.LOADING));
       case 1:
         _action$payload4 = action.payload, messageId = _action$payload4.messageId, channelId = _action$payload4.channelId, deliveryStatus = _action$payload4.deliveryStatus;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context19.n = 4;
+          _context21.n = 4;
           break;
         }
         messageMarkerListQueryBuilder = new sceytChatClient.MessageMarkerListQueryBuilder(channelId, String(messageId), deliveryStatus);
-        _context19.n = 2;
+        _context21.n = 2;
         return call(messageMarkerListQueryBuilder.build);
       case 2:
-        messageMarkerListQuery = _context19.v;
-        _context19.n = 3;
+        messageMarkerListQuery = _context21.v;
+        _context21.n = 3;
         return call(messageMarkerListQuery.loadNext);
       case 3:
-        messageMarkers = _context19.v;
-        _context19.n = 4;
+        messageMarkers = _context21.v;
+        _context21.n = 4;
         return put(setMessageMarkersAC(channelId, messageId, messageMarkers.markers, deliveryStatus));
       case 4:
-        _context19.n = 6;
+        _context21.n = 6;
         break;
       case 5:
-        _context19.p = 5;
-        _t32 = _context19.v;
+        _context21.p = 5;
+        _t32 = _context21.v;
         log.error('error in get message markers', _t32);
       case 6:
-        _context19.p = 6;
-        _context19.n = 7;
+        _context21.p = 6;
+        _context21.n = 7;
         return put(setMessagesMarkersLoadingStateAC(LOADING_STATE.LOADED));
       case 7:
-        return _context19.f(6);
+        return _context21.f(6);
       case 8:
-        return _context19.a(2);
+        return _context21.a(2);
     }
   }, _marked16$1, null, [[0, 5, 6, 8]]);
 }
 function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
   var _user$presence, _message$pollDetails, _message$pollDetails2, _message$pollDetails3, _message$pollDetails4;
   var channel, user, vote, objs, _message$pollDetails5, _message$pollDetails6, _message$pollDetails7, _iterator2, _step2, obj;
-  return _regenerator().w(function (_context20) {
-    while (1) switch (_context20.n) {
+  return _regenerator().w(function (_context22) {
+    while (1) switch (_context22.n) {
       case 0:
-        _context20.n = 1;
+        _context22.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context20.v;
+        channel = _context22.v;
         if (message.pollDetails) {
-          _context20.n = 2;
+          _context22.n = 2;
           break;
         }
-        return _context20.a(2);
+        return _context22.a(2);
       case 2:
         user = getClient().user;
         vote = {
@@ -21292,13 +21331,13 @@ function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
           incrementVotesPerOptionCount: 1
         });
         if (isResend) {
-          _context20.n = 5;
+          _context22.n = 5;
           break;
         }
         _iterator2 = _createForOfIteratorHelperLoose(objs);
       case 3:
         if ((_step2 = _iterator2()).done) {
-          _context20.n = 5;
+          _context22.n = 5;
           break;
         }
         obj = _step2.value;
@@ -21307,46 +21346,46 @@ function executeAddPollVote(channelId, pollId, optionId, message, isResend) {
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context20.n = 4;
+        _context22.n = 4;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        _context20.n = 3;
+        _context22.n = 3;
         break;
       case 5:
         if (!channel) {
-          _context20.n = 7;
+          _context22.n = 7;
           break;
         }
-        _context20.n = 6;
+        _context22.n = 6;
         return call(channel.addVote, message.id, pollId, [optionId]);
       case 6:
-        _context20.n = 7;
+        _context22.n = 7;
         return put(removePendingPollActionAC(message.id, 'ADD_POLL_VOTE', optionId));
       case 7:
-        return _context20.a(2);
+        return _context22.a(2);
     }
   }, _marked17$1);
 }
 function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
   var channel, obj;
-  return _regenerator().w(function (_context21) {
-    while (1) switch (_context21.n) {
+  return _regenerator().w(function (_context23) {
+    while (1) switch (_context23.n) {
       case 0:
-        _context21.n = 1;
+        _context23.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context21.v;
+        channel = _context23.v;
         if (channel) {
-          _context21.n = 2;
+          _context23.n = 2;
           break;
         }
-        return _context21.a(2);
+        return _context23.a(2);
       case 2:
         if (message.pollDetails) {
-          _context21.n = 3;
+          _context23.n = 3;
           break;
         }
-        return _context21.a(2);
+        return _context23.a(2);
       case 3:
         obj = {
           type: 'addOwn',
@@ -21358,24 +21397,24 @@ function updateMessageOptimisticallyForAddPollVote(channelId, message, vote) {
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context21.n = 4;
+        _context23.n = 4;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        return _context21.a(2);
+        return _context23.a(2);
     }
   }, _marked18$1);
 }
 function addPollVote(action) {
   var payload, channelId, pollId, optionId, message, isResend, sceytChatClient, _user$presence2, connectionState, user, vote, pendingAction, conflictCheck, channel, _Object$values2, _store$getState$Messa, _currentMessage$pollD, _currentMessage$pollD2, _currentMessage$pollD3, currentMessage, hasNext, obj, _t33;
-  return _regenerator().w(function (_context22) {
-    while (1) switch (_context22.p = _context22.n) {
+  return _regenerator().w(function (_context24) {
+    while (1) switch (_context24.p = _context24.n) {
       case 0:
-        _context22.p = 0;
+        _context24.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context22.n = 7;
+          _context24.n = 7;
           break;
         }
         connectionState = sceytChatClient.connectionState;
@@ -21402,7 +21441,7 @@ function addPollVote(action) {
           }
         };
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context22.n = 6;
+          _context24.n = 6;
           break;
         }
         pendingAction = {
@@ -21414,22 +21453,22 @@ function addPollVote(action) {
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && !conflictCheck.shouldSkip)) {
-          _context22.n = 4;
+          _context24.n = 4;
           break;
         }
-        _context22.n = 1;
+        _context24.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context22.v;
+        channel = _context24.v;
         if (!channel) {
-          _context22.n = 3;
+          _context24.n = 3;
           break;
         }
         currentMessage = ((_Object$values2 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values2 === void 0 ? void 0 : _Object$values2.find(function (msg) {
           return msg.id === message.id || msg.tid === message.id;
         })) || message;
         hasNext = ((_store$getState$Messa = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa === void 0 ? void 0 : _store$getState$Messa[pollId]) || false;
-        _context22.n = 2;
+        _context24.n = 2;
         return put(addPollVotesToListAC(pollId, optionId, [(_currentMessage$pollD = currentMessage.pollDetails) === null || _currentMessage$pollD === void 0 ? void 0 : (_currentMessage$pollD2 = _currentMessage$pollD.voteDetails) === null || _currentMessage$pollD2 === void 0 ? void 0 : (_currentMessage$pollD3 = _currentMessage$pollD2.ownVotes) === null || _currentMessage$pollD3 === void 0 ? void 0 : _currentMessage$pollD3[0]], hasNext, message.id));
       case 2:
         obj = {
@@ -21442,60 +21481,60 @@ function addPollVote(action) {
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context22.n = 3;
+        _context24.n = 3;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 3:
-        _context22.n = 5;
+        _context24.n = 5;
         break;
       case 4:
         if (conflictCheck.shouldSkip) {
-          _context22.n = 5;
+          _context24.n = 5;
           break;
         }
-        return _context22.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, message, vote)), 5);
+        return _context24.d(_regeneratorValues(updateMessageOptimisticallyForAddPollVote(channelId, message, vote)), 5);
       case 5:
         if (!conflictCheck.shouldSkip) {
           setPendingPollAction(pendingAction);
         }
-        return _context22.a(2);
+        return _context24.a(2);
       case 6:
-        return _context22.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message, isResend)), 7);
+        return _context24.d(_regeneratorValues(executeAddPollVote(channelId, pollId, optionId, message, isResend)), 7);
       case 7:
-        _context22.n = 9;
+        _context24.n = 9;
         break;
       case 8:
-        _context22.p = 8;
-        _t33 = _context22.v;
+        _context24.p = 8;
+        _t33 = _context24.v;
         log.error('error in add poll vote', _t33);
       case 9:
-        return _context22.a(2);
+        return _context24.a(2);
     }
   }, _marked19$1, null, [[0, 8]]);
 }
 function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
   var _message$pollDetails8, _message$pollDetails9, _message$pollDetails0;
   var channel, vote, obj;
-  return _regenerator().w(function (_context23) {
-    while (1) switch (_context23.n) {
+  return _regenerator().w(function (_context25) {
+    while (1) switch (_context25.n) {
       case 0:
-        _context23.n = 1;
+        _context25.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context23.v;
+        channel = _context25.v;
         if (message.pollDetails) {
-          _context23.n = 2;
+          _context25.n = 2;
           break;
         }
-        return _context23.a(2);
+        return _context25.a(2);
       case 2:
         vote = (_message$pollDetails8 = message.pollDetails) === null || _message$pollDetails8 === void 0 ? void 0 : (_message$pollDetails9 = _message$pollDetails8.voteDetails) === null || _message$pollDetails9 === void 0 ? void 0 : (_message$pollDetails0 = _message$pollDetails9.ownVotes) === null || _message$pollDetails0 === void 0 ? void 0 : _message$pollDetails0.find(function (vote) {
           return vote.optionId === optionId;
         });
         if (vote) {
-          _context23.n = 3;
+          _context25.n = 3;
           break;
         }
-        return _context23.a(2);
+        return _context25.a(2);
       case 3:
         obj = {
           type: 'deleteOwn',
@@ -21503,7 +21542,7 @@ function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
           incrementVotesPerOptionCount: -1
         };
         if (isResend) {
-          _context23.n = 4;
+          _context25.n = 4;
           break;
         }
         updateMessageOnMap(channel.id, {
@@ -21511,43 +21550,43 @@ function executeDeletePollVote(channelId, pollId, optionId, message, isResend) {
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context23.n = 4;
+        _context25.n = 4;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
         if (!channel) {
-          _context23.n = 6;
+          _context25.n = 6;
           break;
         }
-        _context23.n = 5;
+        _context25.n = 5;
         return call(channel.deleteVote, message.id, pollId, [optionId]);
       case 5:
-        _context23.n = 6;
+        _context25.n = 6;
         return put(removePendingPollActionAC(message.id, 'DELETE_POLL_VOTE', optionId));
       case 6:
-        return _context23.a(2);
+        return _context25.a(2);
     }
   }, _marked20$1);
 }
 function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote) {
   var channel, obj;
-  return _regenerator().w(function (_context24) {
-    while (1) switch (_context24.n) {
+  return _regenerator().w(function (_context26) {
+    while (1) switch (_context26.n) {
       case 0:
-        _context24.n = 1;
+        _context26.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context24.v;
+        channel = _context26.v;
         if (channel) {
-          _context24.n = 2;
+          _context26.n = 2;
           break;
         }
-        return _context24.a(2);
+        return _context26.a(2);
       case 2:
         if (message.pollDetails) {
-          _context24.n = 3;
+          _context26.n = 3;
           break;
         }
-        return _context24.a(2);
+        return _context26.a(2);
       case 3:
         obj = {
           type: 'deleteOwn',
@@ -21559,24 +21598,24 @@ function updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context24.n = 4;
+        _context26.n = 4;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        return _context24.a(2);
+        return _context26.a(2);
     }
   }, _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$values3, _currentMessage$pollD4, _currentMessage$pollD5, _currentMessage$pollD6, currentMessage, obj, _t34;
-  return _regenerator().w(function (_context25) {
-    while (1) switch (_context25.p = _context25.n) {
+  return _regenerator().w(function (_context27) {
+    while (1) switch (_context27.p = _context27.n) {
       case 0:
-        _context25.p = 0;
+        _context27.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, optionId = payload.optionId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context25.n = 8;
+          _context27.n = 8;
           break;
         }
         connectionState = sceytChatClient.connectionState;
@@ -21584,13 +21623,13 @@ function deletePollVote(action) {
           return vote.optionId === optionId;
         });
         if (vote) {
-          _context25.n = 1;
+          _context27.n = 1;
           break;
         }
-        return _context25.a(2);
+        return _context27.a(2);
       case 1:
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context25.n = 7;
+          _context27.n = 7;
           break;
         }
         pendingAction = {
@@ -21602,21 +21641,21 @@ function deletePollVote(action) {
         };
         conflictCheck = checkPendingPollActionConflict(pendingAction);
         if (!(conflictCheck.hasConflict && conflictCheck.shouldSkip)) {
-          _context25.n = 5;
+          _context27.n = 5;
           break;
         }
-        _context25.n = 2;
+        _context27.n = 2;
         return call(getChannelFromMap, channelId);
       case 2:
-        channel = _context25.v;
+        channel = _context27.v;
         if (!channel) {
-          _context25.n = 4;
+          _context27.n = 4;
           break;
         }
         currentMessage = ((_Object$values3 = Object.values(getMessagesFromMap(channelId) || {})) === null || _Object$values3 === void 0 ? void 0 : _Object$values3.find(function (msg) {
           return msg.id === message.id || msg.tid === message.id;
         })) || message;
-        _context25.n = 3;
+        _context27.n = 3;
         return put(deletePollVotesFromListAC(pollId, optionId, [(_currentMessage$pollD4 = currentMessage.pollDetails) === null || _currentMessage$pollD4 === void 0 ? void 0 : (_currentMessage$pollD5 = _currentMessage$pollD4.voteDetails) === null || _currentMessage$pollD5 === void 0 ? void 0 : (_currentMessage$pollD6 = _currentMessage$pollD5.ownVotes) === null || _currentMessage$pollD6 === void 0 ? void 0 : _currentMessage$pollD6[0]], message.id));
       case 3:
         obj = {
@@ -21629,45 +21668,45 @@ function deletePollVote(action) {
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context25.n = 4;
+        _context27.n = 4;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        _context25.n = 6;
+        _context27.n = 6;
         break;
       case 5:
         if (conflictCheck.shouldSkip) {
-          _context25.n = 6;
+          _context27.n = 6;
           break;
         }
-        return _context25.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)), 6);
+        return _context27.d(_regeneratorValues(updateMessageOptimisticallyForDeletePollVote(channelId, message, vote)), 6);
       case 6:
         if (!conflictCheck.shouldSkip) {
           setPendingPollAction(pendingAction);
         }
-        return _context25.a(2);
+        return _context27.a(2);
       case 7:
-        return _context25.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message, isResend)), 8);
+        return _context27.d(_regeneratorValues(executeDeletePollVote(channelId, pollId, optionId, message, isResend)), 8);
       case 8:
-        _context25.n = 10;
+        _context27.n = 10;
         break;
       case 9:
-        _context25.p = 9;
-        _t34 = _context25.v;
+        _context27.p = 9;
+        _t34 = _context27.v;
         log.error('error in delete poll vote', _t34);
       case 10:
-        return _context25.a(2);
+        return _context27.a(2);
     }
   }, _marked22$1, null, [[0, 9]]);
 }
 function executeClosePoll(channelId, pollId, message) {
   var channel, obj;
-  return _regenerator().w(function (_context26) {
-    while (1) switch (_context26.n) {
+  return _regenerator().w(function (_context28) {
+    while (1) switch (_context28.n) {
       case 0:
-        _context26.n = 1;
+        _context28.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context26.v;
+        channel = _context28.v;
         obj = {
           type: 'close',
           incrementVotesPerOptionCount: 0
@@ -21677,37 +21716,37 @@ function executeClosePoll(channelId, pollId, message) {
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context26.n = 2;
+        _context28.n = 2;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 2:
         if (!channel) {
-          _context26.n = 4;
+          _context28.n = 4;
           break;
         }
-        _context26.n = 3;
+        _context28.n = 3;
         return call(channel.closePoll, message.id, pollId);
       case 3:
-        _context26.n = 4;
+        _context28.n = 4;
         return put(removePendingPollActionAC(message.id, 'CLOSE_POLL'));
       case 4:
-        return _context26.a(2);
+        return _context28.a(2);
     }
   }, _marked23$1);
 }
 function updateMessageOptimisticallyForClosePoll(channelId, message) {
   var channel, pollDetails;
-  return _regenerator().w(function (_context27) {
-    while (1) switch (_context27.n) {
+  return _regenerator().w(function (_context29) {
+    while (1) switch (_context29.n) {
       case 0:
-        _context27.n = 1;
+        _context29.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context27.v;
+        channel = _context29.v;
         if (channel) {
-          _context27.n = 2;
+          _context29.n = 2;
           break;
         }
-        return _context27.a(2);
+        return _context29.a(2);
       case 2:
         pollDetails = JSON.parse(JSON.stringify(message.pollDetails));
         pollDetails.closed = true;
@@ -21721,34 +21760,34 @@ function updateMessageOptimisticallyForClosePoll(channelId, message) {
         updateMessageOnAllMessages(message.id, {
           pollDetails: pollDetails
         });
-        _context27.n = 3;
+        _context29.n = 3;
         return put(updateMessageAC(message.id, {
           pollDetails: pollDetails
         }));
       case 3:
-        return _context27.a(2);
+        return _context29.a(2);
     }
   }, _marked24$1);
 }
 function closePoll(action) {
   var payload, channelId, pollId, message, sceytChatClient, connectionState, _t35;
-  return _regenerator().w(function (_context28) {
-    while (1) switch (_context28.p = _context28.n) {
+  return _regenerator().w(function (_context30) {
+    while (1) switch (_context30.p = _context30.n) {
       case 0:
-        _context28.p = 0;
+        _context30.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, message = payload.message;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context28.n = 3;
+          _context30.n = 3;
           break;
         }
         connectionState = sceytChatClient.connectionState;
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context28.n = 2;
+          _context30.n = 2;
           break;
         }
-        return _context28.d(_regeneratorValues(updateMessageOptimisticallyForClosePoll(channelId, message)), 1);
+        return _context30.d(_regeneratorValues(updateMessageOptimisticallyForClosePoll(channelId, message)), 1);
       case 1:
         setPendingPollAction({
           type: 'CLOSE_POLL',
@@ -21756,38 +21795,38 @@ function closePoll(action) {
           pollId: pollId,
           message: message
         });
-        return _context28.a(2);
+        return _context30.a(2);
       case 2:
-        return _context28.d(_regeneratorValues(executeClosePoll(channelId, pollId, message)), 3);
+        return _context30.d(_regeneratorValues(executeClosePoll(channelId, pollId, message)), 3);
       case 3:
-        _context28.n = 5;
+        _context30.n = 5;
         break;
       case 4:
-        _context28.p = 4;
-        _t35 = _context28.v;
+        _context30.p = 4;
+        _t35 = _context30.v;
         log.error('error in close poll', _t35);
       case 5:
-        return _context28.a(2);
+        return _context30.a(2);
     }
   }, _marked25$1, null, [[0, 4]]);
 }
 function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
   var channel, _iterator3, _step3, obj;
-  return _regenerator().w(function (_context29) {
-    while (1) switch (_context29.n) {
+  return _regenerator().w(function (_context31) {
+    while (1) switch (_context31.n) {
       case 0:
-        _context29.n = 1;
+        _context31.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context29.v;
+        channel = _context31.v;
         if (isResend) {
-          _context29.n = 4;
+          _context31.n = 4;
           break;
         }
         _iterator3 = _createForOfIteratorHelperLoose(objs);
       case 2:
         if ((_step3 = _iterator3()).done) {
-          _context29.n = 4;
+          _context31.n = 4;
           break;
         }
         obj = _step3.value;
@@ -21796,45 +21835,45 @@ function executeRetractPollVote(channelId, pollId, message, objs, isResend) {
           params: {}
         }, obj);
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context29.n = 3;
+        _context31.n = 3;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 3:
-        _context29.n = 2;
+        _context31.n = 2;
         break;
       case 4:
         if (!channel) {
-          _context29.n = 6;
+          _context31.n = 6;
           break;
         }
-        _context29.n = 5;
+        _context31.n = 5;
         return call(channel.retractVote, message.id, pollId);
       case 5:
-        _context29.n = 6;
+        _context31.n = 6;
         return put(removePendingPollActionAC(message.id || '', 'RETRACT_POLL_VOTE'));
       case 6:
-        return _context29.a(2);
+        return _context31.a(2);
     }
   }, _marked26$1);
 }
 function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs) {
   var channel, _iterator4, _step4, obj;
-  return _regenerator().w(function (_context30) {
-    while (1) switch (_context30.n) {
+  return _regenerator().w(function (_context32) {
+    while (1) switch (_context32.n) {
       case 0:
-        _context30.n = 1;
+        _context32.n = 1;
         return call(getChannelFromMap, channelId);
       case 1:
-        channel = _context30.v;
+        channel = _context32.v;
         if (channel) {
-          _context30.n = 2;
+          _context32.n = 2;
           break;
         }
-        return _context30.a(2);
+        return _context32.a(2);
       case 2:
         _iterator4 = _createForOfIteratorHelperLoose(objs);
       case 3:
         if ((_step4 = _iterator4()).done) {
-          _context30.n = 5;
+          _context32.n = 5;
           break;
         }
         obj = _step4.value;
@@ -21843,27 +21882,27 @@ function updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)
           params: {}
         });
         updateMessageOnAllMessages(message.id, {}, obj);
-        _context30.n = 4;
+        _context32.n = 4;
         return put(updateMessageAC(message.id, {}, undefined, obj));
       case 4:
-        _context30.n = 3;
+        _context32.n = 3;
         break;
       case 5:
-        return _context30.a(2);
+        return _context32.a(2);
     }
   }, _marked27$1);
 }
 function retractPollVote(action) {
   var payload, channelId, pollId, message, isResend, sceytChatClient, connectionState, objs, _iterator5, _step5, _message$pollDetails12, _message$pollDetails13, vote, _t36;
-  return _regenerator().w(function (_context31) {
-    while (1) switch (_context31.p = _context31.n) {
+  return _regenerator().w(function (_context33) {
+    while (1) switch (_context33.p = _context33.n) {
       case 0:
-        _context31.p = 0;
+        _context33.p = 0;
         payload = action.payload;
         channelId = payload.channelId, pollId = payload.pollId, message = payload.message, isResend = payload.isResend;
         sceytChatClient = getClient();
         if (!sceytChatClient) {
-          _context31.n = 3;
+          _context33.n = 3;
           break;
         }
         connectionState = sceytChatClient.connectionState;
@@ -21877,10 +21916,10 @@ function retractPollVote(action) {
           });
         }
         if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context31.n = 2;
+          _context33.n = 2;
           break;
         }
-        return _context31.d(_regeneratorValues(updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)), 1);
+        return _context33.d(_regeneratorValues(updateMessageOptimisticallyForRetractPollVote(channelId, message, objs)), 1);
       case 1:
         setPendingPollAction({
           type: 'RETRACT_POLL_VOTE',
@@ -21888,39 +21927,39 @@ function retractPollVote(action) {
           pollId: pollId,
           message: message
         });
-        return _context31.a(2);
+        return _context33.a(2);
       case 2:
-        return _context31.d(_regeneratorValues(executeRetractPollVote(channelId, pollId, message, objs, isResend)), 3);
+        return _context33.d(_regeneratorValues(executeRetractPollVote(channelId, pollId, message, objs, isResend)), 3);
       case 3:
-        _context31.n = 5;
+        _context33.n = 5;
         break;
       case 4:
-        _context31.p = 4;
-        _t36 = _context31.v;
+        _context33.p = 4;
+        _t36 = _context33.v;
         log.error('error in retract poll vote', _t36);
       case 5:
-        return _context31.a(2);
+        return _context33.a(2);
     }
   }, _marked28$1, null, [[0, 4]]);
 }
 function resendPendingPollActions(action) {
   var payload, connectionState, sceytChatClient, pendingPollActionsMap, pendingPollActionsMapCopy, _t37;
-  return _regenerator().w(function (_context32) {
-    while (1) switch (_context32.p = _context32.n) {
+  return _regenerator().w(function (_context34) {
+    while (1) switch (_context34.p = _context34.n) {
       case 0:
-        _context32.p = 0;
+        _context34.p = 0;
         payload = action.payload;
         connectionState = payload.connectionState;
         sceytChatClient = getClient();
         if (!(!sceytChatClient || connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context32.n = 1;
+          _context34.n = 1;
           break;
         }
-        return _context32.a(2);
+        return _context34.a(2);
       case 1:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         pendingPollActionsMapCopy = JSON.parse(JSON.stringify(pendingPollActionsMap));
-        _context32.n = 2;
+        _context34.n = 2;
         return call(function () {
           return new Promise(function (resolve) {
             return setTimeout(resolve, 1000);
@@ -21956,32 +21995,32 @@ function resendPendingPollActions(action) {
             }
           });
         });
-        _context32.n = 4;
+        _context34.n = 4;
         break;
       case 3:
-        _context32.p = 3;
-        _t37 = _context32.v;
+        _context34.p = 3;
+        _t37 = _context34.v;
         log.error('error in resend pending poll actions', _t37);
       case 4:
-        return _context32.a(2);
+        return _context34.a(2);
     }
   }, _marked29$1, null, [[0, 3]]);
 }
 function getPollVotes(action) {
   var payload, messageId, pollId, optionId, limit, key, SceytChatClient, queryBuilder, pollVotesQuery, result, formattedVotes, _t38;
-  return _regenerator().w(function (_context33) {
-    while (1) switch (_context33.p = _context33.n) {
+  return _regenerator().w(function (_context35) {
+    while (1) switch (_context35.p = _context35.n) {
       case 0:
-        _context33.p = 0;
+        _context35.p = 0;
         payload = action.payload;
         messageId = payload.messageId, pollId = payload.pollId, optionId = payload.optionId, limit = payload.limit;
         key = pollId + "_" + optionId;
-        _context33.n = 1;
+        _context35.n = 1;
         return put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADING));
       case 1:
         SceytChatClient = getClient();
         if (!(!SceytChatClient || !SceytChatClient.PollVotesQueryBuilder)) {
-          _context33.n = 2;
+          _context35.n = 2;
           break;
         }
         throw new Error('SceytChatClient or PollVotesQueryBuilder not available');
@@ -21989,14 +22028,14 @@ function getPollVotes(action) {
         queryBuilder = new SceytChatClient.PollVotesQueryBuilder(messageId, pollId);
         queryBuilder.setOptionId(optionId);
         queryBuilder.limit(limit || 20);
-        _context33.n = 3;
+        _context35.n = 3;
         return call(queryBuilder.build);
       case 3:
-        pollVotesQuery = _context33.v;
-        _context33.n = 4;
+        pollVotesQuery = _context35.v;
+        _context35.n = 4;
         return call(pollVotesQuery.loadNext);
       case 4:
-        result = _context33.v;
+        result = _context35.v;
         if (!query.PollVotesQueries) {
           query.PollVotesQueries = {};
         }
@@ -22024,39 +22063,39 @@ function getPollVotes(action) {
             }
           };
         });
-        _context33.n = 5;
+        _context35.n = 5;
         return put(setPollVotesListAC(pollId, optionId, formattedVotes, result.hasNext || false));
       case 5:
-        _context33.n = 6;
+        _context35.n = 6;
         return put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADED));
       case 6:
-        _context33.n = 8;
+        _context35.n = 8;
         break;
       case 7:
-        _context33.p = 7;
-        _t38 = _context33.v;
+        _context35.p = 7;
+        _t38 = _context35.v;
         log.error('ERROR in get poll votes', _t38);
-        _context33.n = 8;
+        _context35.n = 8;
         return put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 8:
-        return _context33.a(2);
+        return _context35.a(2);
     }
   }, _marked30$1, null, [[0, 7]]);
 }
 function loadMorePollVotes(action) {
   var payload, pollId, optionId, limit, key, pollVotesQuery, result, formattedVotes, _t39;
-  return _regenerator().w(function (_context34) {
-    while (1) switch (_context34.p = _context34.n) {
+  return _regenerator().w(function (_context36) {
+    while (1) switch (_context36.p = _context36.n) {
       case 0:
-        _context34.p = 0;
+        _context36.p = 0;
         payload = action.payload;
         pollId = payload.pollId, optionId = payload.optionId, limit = payload.limit;
         key = pollId + "_" + optionId;
-        _context34.n = 1;
+        _context36.n = 1;
         return put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADING));
       case 1:
         if (!(!query.PollVotesQueries || !query.PollVotesQueries[key])) {
-          _context34.n = 2;
+          _context36.n = 2;
           break;
         }
         throw new Error('Poll votes query not found');
@@ -22065,10 +22104,10 @@ function loadMorePollVotes(action) {
         if (limit && pollVotesQuery.limit < limit) {
           pollVotesQuery.limit = limit;
         }
-        _context34.n = 3;
+        _context36.n = 3;
         return call(pollVotesQuery.loadNext);
       case 3:
-        result = _context34.v;
+        result = _context36.v;
         formattedVotes = (result.votes || []).map(function (vote) {
           return {
             optionId: vote.optionId || optionId,
@@ -22092,105 +22131,105 @@ function loadMorePollVotes(action) {
             }
           };
         });
-        _context34.n = 4;
+        _context36.n = 4;
         return put(addPollVotesToListAC(pollId, optionId, formattedVotes, result.hasNext || false));
       case 4:
-        _context34.n = 5;
+        _context36.n = 5;
         return put(setPollVotesLoadingStateAC(pollId, optionId, LOADING_STATE.LOADED));
       case 5:
-        _context34.n = 7;
+        _context36.n = 7;
         break;
       case 6:
-        _context34.p = 6;
-        _t39 = _context34.v;
+        _context36.p = 6;
+        _t39 = _context36.v;
         log.error('ERROR in load more poll votes', _t39);
-        _context34.n = 7;
+        _context36.n = 7;
         return put(setPollVotesLoadingStateAC(action.payload.pollId, action.payload.optionId, LOADING_STATE.LOADED));
       case 7:
-        return _context34.a(2);
+        return _context36.a(2);
     }
   }, _marked31$1, null, [[0, 6]]);
 }
 function MessageSaga() {
-  return _regenerator().w(function (_context35) {
-    while (1) switch (_context35.n) {
+  return _regenerator().w(function (_context37) {
+    while (1) switch (_context37.n) {
       case 0:
-        _context35.n = 1;
+        _context37.n = 1;
         return takeEvery(SEND_MESSAGE, sendMessage);
       case 1:
-        _context35.n = 2;
+        _context37.n = 2;
         return takeEvery(SEND_TEXT_MESSAGE, sendTextMessage);
       case 2:
-        _context35.n = 3;
+        _context37.n = 3;
         return takeEvery(FORWARD_MESSAGE, forwardMessage);
       case 3:
-        _context35.n = 4;
+        _context37.n = 4;
         return takeEvery(RESEND_MESSAGE, resendMessage);
       case 4:
-        _context35.n = 5;
+        _context37.n = 5;
         return takeLatest(EDIT_MESSAGE, editMessage);
       case 5:
-        _context35.n = 6;
+        _context37.n = 6;
         return takeEvery(DELETE_MESSAGE, deleteMessage);
       case 6:
-        _context35.n = 7;
+        _context37.n = 7;
         return takeLatest(GET_MESSAGES, getMessagesQuery);
       case 7:
-        _context35.n = 8;
+        _context37.n = 8;
         return takeEvery(GET_MESSAGE, getMessageQuery);
       case 8:
-        _context35.n = 9;
+        _context37.n = 9;
         return takeLatest(GET_MESSAGE_MARKERS, getMessageMarkers);
       case 9:
-        _context35.n = 10;
+        _context37.n = 10;
         return takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);
       case 10:
-        _context35.n = 11;
+        _context37.n = 11;
         return takeLatest(LOAD_MORE_MESSAGES_ATTACHMENTS, loadMoreMessageAttachments);
       case 11:
-        _context35.n = 12;
+        _context37.n = 12;
         return takeLatest(ADD_REACTION, addReaction);
       case 12:
-        _context35.n = 13;
+        _context37.n = 13;
         return takeLatest(DELETE_REACTION, deleteReaction);
       case 13:
-        _context35.n = 14;
+        _context37.n = 14;
         return takeEvery(LOAD_MORE_MESSAGES, loadMoreMessages);
       case 14:
-        _context35.n = 15;
+        _context37.n = 15;
         return takeEvery(GET_REACTIONS, getReactions);
       case 15:
-        _context35.n = 16;
+        _context37.n = 16;
         return takeEvery(LOAD_MORE_REACTIONS, loadMoreReactions);
       case 16:
-        _context35.n = 17;
+        _context37.n = 17;
         return takeEvery(PAUSE_ATTACHMENT_UPLOADING, pauseAttachmentUploading);
       case 17:
-        _context35.n = 18;
+        _context37.n = 18;
         return takeEvery(RESUME_ATTACHMENT_UPLOADING, resumeAttachmentUploading);
       case 18:
-        _context35.n = 19;
+        _context37.n = 19;
         return takeEvery(ADD_POLL_VOTE, addPollVote);
       case 19:
-        _context35.n = 20;
+        _context37.n = 20;
         return takeEvery(DELETE_POLL_VOTE, deletePollVote);
       case 20:
-        _context35.n = 21;
+        _context37.n = 21;
         return takeEvery(CLOSE_POLL, closePoll);
       case 21:
-        _context35.n = 22;
+        _context37.n = 22;
         return takeEvery(RETRACT_POLL_VOTE, retractPollVote);
       case 22:
-        _context35.n = 23;
+        _context37.n = 23;
         return takeEvery(GET_POLL_VOTES, getPollVotes);
       case 23:
-        _context35.n = 24;
+        _context37.n = 24;
         return takeEvery(LOAD_MORE_POLL_VOTES, loadMorePollVotes);
       case 24:
-        _context35.n = 25;
+        _context37.n = 25;
         return takeEvery(RESEND_PENDING_POLL_ACTIONS, resendPendingPollActions);
       case 25:
-        return _context35.a(2);
+        return _context37.a(2);
     }
   }, _marked32$1);
 }
@@ -23962,21 +24001,31 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     _ref$embeddedJoinGrou = _ref.embeddedJoinGroupPopup,
     embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou,
     onUpdateChannel = _ref.onUpdateChannel,
-    _ref$enableDisappeari = _ref.enableDisappearingMessages,
-    enableDisappearingMessages = _ref$enableDisappeari === void 0 ? false : _ref$enableDisappeari;
+    _ref$disappearingSett = _ref.disappearingSettings,
+    disappearingSettings = _ref$disappearingSett === void 0 ? null : _ref$disappearingSett;
   useEffect(function () {
     log.setLevel(logLevel);
+  }, [logLevel]);
+  useEffect(function () {
     if (baseUrlForInviteMembers) {
       setBaseUrlForInviteMembers(baseUrlForInviteMembers);
     }
+  }, [baseUrlForInviteMembers]);
+  useEffect(function () {
     if (useInviteLink) {
       setUseInviteLink(useInviteLink);
     }
+  }, [useInviteLink]);
+  useEffect(function () {
     if (inviteLinkOptions) {
       setInviteLinkOptions(inviteLinkOptions);
     }
-    setEnableDisappearingMessages(enableDisappearingMessages);
-  }, [baseUrlForInviteMembers, useInviteLink, inviteLinkOptions, enableDisappearingMessages]);
+  }, [inviteLinkOptions]);
+  useEffect(function () {
+    if (disappearingSettings) {
+      setDisappearingSettings(disappearingSettings);
+    }
+  }, [disappearingSettings]);
   return /*#__PURE__*/React__default.createElement(Provider, {
     store: store,
     context: SceytReduxContext
@@ -24344,7 +24393,7 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
   })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'RM' ? " removed " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.slice(0, 5).map(function (mem) {
     return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
-  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'joined via invite link' : lastMessage.body === 'ADM' && getEnableDisappearingMessages() ? !Number(lastMessageMetas === null || lastMessageMetas === void 0 ? void 0 : lastMessageMetas.autoDeletePeriod) ? 'disabled disappearing messages' : "set disappearing message time to " + formatDisappearingMessageTime(lastMessageMetas !== null && lastMessageMetas !== void 0 && lastMessageMetas.autoDeletePeriod ? Number(lastMessageMetas.autoDeletePeriod) : null) : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
+  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'joined via invite link' : lastMessage.body === 'ADM' ? !Number(lastMessageMetas === null || lastMessageMetas === void 0 ? void 0 : lastMessageMetas.autoDeletePeriod) ? 'disabled disappearing messages' : "set the disappearing messages timer to " + formatDisappearingMessageTime(lastMessageMetas !== null && lastMessageMetas !== void 0 && lastMessageMetas.autoDeletePeriod ? Number(lastMessageMetas.autoDeletePeriod) : null) : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
     poll: (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.pollDetails) && (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.type) === MESSAGE_TYPE.POLL
   }, channel.lastReactedMessage && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, "Reacted", /*#__PURE__*/React__default.createElement(ReactionItem, null, channel.newReactions && channel.newReactions[0] && channel.newReactions[0].key), "to", ' "')), LastMessageAttachments({
     lastMessage: lastMessage
@@ -29573,7 +29622,7 @@ var Message = function Message(_ref) {
     return mem === user.id ? 'You' : " " + systemMessageUserName(mem, contactsMap[mem], message.mentionedUsers);
   })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'RM' ? " removed " + (messageMetas && messageMetas.m && messageMetas.m.slice(0, 5).map(function (mem) {
     return mem === user.id ? 'You' : " " + systemMessageUserName(mem, contactsMap[mem], message.mentionedUsers);
-  })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'LG' ? ' left the group' : message.body === 'JL' ? " joined via invite link" : message.body === 'ADM' && getEnableDisappearingMessages() ? !Number(messageMetas === null || messageMetas === void 0 ? void 0 : messageMetas.autoDeletePeriod) ? ' disabled disappearing messages' : " set disappearing message time to " + formatDisappearingMessageTime(messageMetas !== null && messageMetas !== void 0 && messageMetas.autoDeletePeriod ? Number(messageMetas.autoDeletePeriod) : null) : ''));
+  })) + " " + (messageMetas && messageMetas.m && messageMetas.m.length > 5 ? "and " + (messageMetas.m.length - 5) + " more" : '') : message.body === 'LG' ? ' left the group' : message.body === 'JL' ? " joined via invite link" : message.body === 'ADM' ? !Number(messageMetas === null || messageMetas === void 0 ? void 0 : messageMetas.autoDeletePeriod) ? ' disabled disappearing messages' : " set the disappearing messages timer to " + formatDisappearingMessageTime(messageMetas !== null && messageMetas !== void 0 && messageMetas.autoDeletePeriod ? Number(messageMetas.autoDeletePeriod) : null) : ''));
 };
 var SystemMessage = /*#__PURE__*/React__default.memo(Message, function (prevProps, nextProps) {
   return prevProps.message.deliveryStatus === nextProps.message.deliveryStatus && prevProps.message.state === nextProps.message.state && prevProps.message.userMarkers === nextProps.message.userMarkers && prevProps.nextMessage === nextProps.nextMessage && prevProps.connectionStatus === nextProps.connectionStatus && prevProps.tabIsActive === nextProps.tabIsActive;
@@ -32761,45 +32810,44 @@ var AudioVisualization = function AudioVisualization(_ref) {
       return Math.max(2, normalized);
     });
   }, [tmb, height]);
-  var progressPercentage = duration > 0 ? currentTime / duration * 100 : 0;
-  var lastPlayedBarIndex = useMemo(function () {
-    if (progressPercentage === 0) return -1;
-    var barIndex = Math.floor(progressPercentage / 100 * normalizedBars.length);
-    return Math.min(barIndex, normalizedBars.length - 1);
-  }, [progressPercentage, normalizedBars.length]);
+  var exactIndex = duration > 0 ? currentTime / duration * normalizedBars.length : 0;
+  var floorIndex = Math.floor(exactIndex);
+  var fractionalPart = exactIndex - floorIndex;
   return /*#__PURE__*/React__default.createElement(Container$e, {
     height: height
   }, normalizedBars.map(function (barHeight, index) {
-    var barPosition = index / normalizedBars.length * 100;
-    var isPlayed = barPosition < progressPercentage;
-    var isLastPlayed = index === lastPlayedBarIndex;
-    var finalHeight = isLastPlayed ? Math.min(barHeight * 1.3, height) : barHeight;
+    var progressRatio = index < floorIndex ? 1 : index === floorIndex ? fractionalPart : 0;
+    var barOpacity = progressRatio > 0 ? 0.8 + progressRatio * 0.2 : 0.8;
     return /*#__PURE__*/React__default.createElement(Bar, {
       key: index,
-      height: finalHeight,
+      height: barHeight,
       width: barWidth,
       gap: barGap,
       radius: barRadius,
-      color: isPlayed ? progressColor : waveColor,
-      isBold: isLastPlayed
+      waveColor: waveColor,
+      progressColor: progressColor,
+      progressRatio: progressRatio,
+      barOpacity: barOpacity
     });
   }));
 };
 var Container$e = styled.div(_templateObject$v || (_templateObject$v = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  height: ", "px;\n  width: 100%;\n  gap: 2px;\n"])), function (props) {
   return props.height;
 });
-var Bar = styled.div(_templateObject2$r || (_templateObject2$r = _taggedTemplateLiteralLoose(["\n  width: ", "px;\n  height: ", "px;\n  background-color: ", ";\n  border-radius: ", "px;\n  min-height: 2px;\n  transition:\n    background-color 0.1s ease,\n    height 0.1s ease,\n    opacity 0.1s ease;\n  opacity: ", ";\n  ", "\n"])), function (props) {
+var Bar = styled.div(_templateObject2$r || (_templateObject2$r = _taggedTemplateLiteralLoose(["\n  position: relative;\n  width: ", "px;\n  height: ", "px;\n  border-radius: ", "px;\n  min-height: 2px;\n  overflow: hidden;\n  background-color: ", ";\n  opacity: ", ";\n\n  &::before {\n    content: '';\n    position: absolute;\n    top: 0;\n    left: 0;\n    width: ", "%;\n    height: 100%;\n    background-color: ", ";\n    border-radius: inherit;\n    will-change: width;\n    transform: translateZ(0);\n  }\n"])), function (props) {
   return props.width;
 }, function (props) {
   return props.height;
-}, function (props) {
-  return props.color;
 }, function (props) {
   return props.radius;
 }, function (props) {
-  return props.isBold ? 1 : 0.8;
+  return props.waveColor;
+}, function (props) {
+  return props.barOpacity;
 }, function (props) {
-  return props.isBold ? "\n    box-shadow: 0 0 4px " + props.color + ";\n    filter: brightness(1.2);\n  " : '';
+  return props.progressRatio * 100;
+}, function (props) {
+  return props.progressColor;
 });
 
 var _templateObject$w, _templateObject2$s, _templateObject3$m, _templateObject4$i, _templateObject5$f, _templateObject6$d, _templateObject7$c;
@@ -33054,7 +33102,7 @@ var AudioVisualizationPlaceholder = styled.div(_templateObject4$i || (_templateO
 }, function (props) {
   return props.hidden ? 'none' : 'auto';
 });
-var AudioRate = styled.div(_templateObject5$f || (_templateObject5$f = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  width: 30px;\n  min-width: 30px;\n  border-radius: 12px;\n  font-weight: 600;\n  font-size: 12px;\n  line-height: 14px;\n  color: ", ";\n  height: 18px;\n  box-sizing: border-box;\n  margin-left: 14px;\n  cursor: pointer;\n\n  & > span {\n    margin-top: auto;\n    line-height: 16px;\n    font-size: 9px;\n  }\n"])), function (props) {
+var AudioRate = styled.div(_templateObject5$f || (_templateObject5$f = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  top: 10px;\n  right: 12px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  background-color: ", ";\n  width: 30px;\n  min-width: 30px;\n  border-radius: 12px;\n  font-weight: 600;\n  font-size: 12px;\n  line-height: 14px;\n  color: ", ";\n  height: 18px;\n  box-sizing: border-box;\n  margin-left: 14px;\n  cursor: pointer;\n\n  & > span {\n    margin-top: auto;\n    line-height: 16px;\n    font-size: 9px;\n  }\n"])), function (props) {
   return props.backgroundColor;
 }, function (props) {
   return props.color;
@@ -38733,7 +38781,7 @@ var MessageList = function MessageList(_ref2) {
       nextDisableRef.current = false;
       clearMessagesMap();
       removeAllMessages();
-      dispatch(getMessagesAC(channel));
+      dispatch(getMessagesAC(channel, false, lastVisibleMessageId, 0, false, false, 'instant', false));
     }
   }, [connectionStatus]);
   useEffect(function () {
@@ -44282,7 +44330,7 @@ function DisappearingMessagesPopup(_ref) {
   var _useState = useState('off'),
     selectedOption = _useState[0],
     setSelectedOption = _useState[1];
-  var _useState2 = useState('2days'),
+  var _useState2 = useState(''),
     customValue = _useState2[0],
     setCustomValue = _useState2[1];
   var _useState3 = useState(true),
@@ -44293,6 +44341,22 @@ function DisappearingMessagesPopup(_ref) {
     setDropdownOpen = _useState4[1];
   var previousTimerRef = useRef(currentTimer);
   var hasInitializedRef = useRef(false);
+  var CUSTOM_OPTIONS = useMemo(function () {
+    var _getDisappearingSetti;
+    return ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.customOptions) || [];
+  }, []);
+  useEffect(function () {
+    var _CUSTOM_OPTIONS$;
+    if (CUSTOM_OPTIONS.length > 0 && (_CUSTOM_OPTIONS$ = CUSTOM_OPTIONS[0]) !== null && _CUSTOM_OPTIONS$ !== void 0 && _CUSTOM_OPTIONS$.label) {
+      var _CUSTOM_OPTIONS$2;
+      setCustomValue(((_CUSTOM_OPTIONS$2 = CUSTOM_OPTIONS[0]) === null || _CUSTOM_OPTIONS$2 === void 0 ? void 0 : _CUSTOM_OPTIONS$2.label) || '');
+    }
+  }, [CUSTOM_OPTIONS]);
+  var CUSTOM_SECONDS_MAP = useMemo(function () {
+    return Object.fromEntries(CUSTOM_OPTIONS.map(function (o) {
+      return [o.label, o.seconds];
+    }));
+  }, [CUSTOM_OPTIONS]);
   useEffect(function () {
     if (previousTimerRef.current !== currentTimer) {
       setInitialRender(true);
@@ -44303,16 +44367,16 @@ function DisappearingMessagesPopup(_ref) {
       setSelectedOption('off');
     } else {
       var fixedMatch = Object.keys(FIXED_TIMER_OPTIONS).find(function (key) {
-        return FIXED_TIMER_OPTIONS[key] === currentTimer;
+        return (FIXED_TIMER_OPTIONS[key] || 0) * 1000 === currentTimer;
       });
       if (fixedMatch) {
         setSelectedOption(fixedMatch);
       } else {
         var customMatch = CUSTOM_OPTIONS.find(function (o) {
-          return o.seconds === currentTimer;
+          return o.seconds * 1000 === currentTimer;
         });
         setSelectedOption('custom');
-        setCustomValue((customMatch === null || customMatch === void 0 ? void 0 : customMatch.value) || '2days');
+        setCustomValue((customMatch === null || customMatch === void 0 ? void 0 : customMatch.label) || '2days');
       }
     }
   }, [currentTimer]);
@@ -44327,9 +44391,10 @@ function DisappearingMessagesPopup(_ref) {
   }, [selectedOption, customValue]);
   var isValueUnchanged = useMemo(function () {
     if (initialRender) return true;
-    var normalizedCurrent = currentTimer === 0 ? null : currentTimer != null ? currentTimer : null;
-    var normalizedSelected = selectedTimerValue === 0 ? null : selectedTimerValue != null ? selectedTimerValue : null;
-    return normalizedCurrent === normalizedSelected;
+    if ((selectedTimerValue || 0) * 1000 === (currentTimer || 0)) {
+      return true;
+    }
+    return false;
   }, [currentTimer, selectedTimerValue, initialRender]);
   var handleSet = useCallback(function () {
     if (selectedOption === 'custom') {
@@ -44342,9 +44407,9 @@ function DisappearingMessagesPopup(_ref) {
   var selectedCustomLabel = useMemo(function () {
     var _CUSTOM_OPTIONS$find;
     return ((_CUSTOM_OPTIONS$find = CUSTOM_OPTIONS.find(function (o) {
-      return o.value === customValue;
+      return o.label === customValue;
     })) === null || _CUSTOM_OPTIONS$find === void 0 ? void 0 : _CUSTOM_OPTIONS$find.label) || '2 days';
-  }, [customValue]);
+  }, [customValue, CUSTOM_OPTIONS]);
   return /*#__PURE__*/React__default.createElement(PopupContainer, null, /*#__PURE__*/React__default.createElement(Popup, {
     theme: theme,
     backgroundColor: background,
@@ -44390,7 +44455,7 @@ function DisappearingMessagesPopup(_ref) {
       borderRadius: '4px',
       variant: 'checkbox'
     }), option.label);
-  }), /*#__PURE__*/React__default.createElement(TimerOptionItem, {
+  }), CUSTOM_OPTIONS.length > 0 && (/*#__PURE__*/React__default.createElement(TimerOptionItem, {
     color: textPrimary,
     onClick: function onClick() {
       return setSelectedOption('custom');
@@ -44406,7 +44471,7 @@ function DisappearingMessagesPopup(_ref) {
     borderColor: iconInactive,
     borderRadius: '4px',
     variant: 'checkbox'
-  }), "Custom"), selectedOption === 'custom' && (/*#__PURE__*/React__default.createElement(CustomTimerSection, null, /*#__PURE__*/React__default.createElement(Label, {
+  }), "Custom")), selectedOption === 'custom' && (/*#__PURE__*/React__default.createElement(CustomTimerSection, null, /*#__PURE__*/React__default.createElement(Label, {
     color: textPrimary,
     marginTop: '0'
   }, "Auto-delete after"), /*#__PURE__*/React__default.createElement(CustomSelectWrapper, {
@@ -44435,9 +44500,9 @@ function DisappearingMessagesPopup(_ref) {
   }, CUSTOM_OPTIONS.map(function (o) {
     return /*#__PURE__*/React__default.createElement(CustomDropdownOptionLi, {
       hoverBackground: backgroundHovered,
-      key: o.value,
+      key: o.label,
       onClick: function onClick() {
-        return setCustomValue(o.value);
+        return setCustomValue(o.label);
       },
       textColor: textPrimary
     }, o.label);
@@ -44476,6 +44541,7 @@ var SetButton = styled(Button)(_templateObject8$n || (_templateObject8$n = _tagg
 
 var _templateObject$T, _templateObject2$O, _templateObject3$H, _templateObject4$B, _templateObject5$w, _templateObject6$s, _templateObject7$r, _templateObject8$o, _templateObject9$k, _templateObject0$i, _templateObject1$f, _templateObject10$9, _templateObject11$7, _templateObject12$6, _templateObject13$4, _templateObject14$3, _templateObject15$3, _templateObject16$3, _templateObject17$3, _templateObject18$3, _templateObject19$3, _templateObject20$3;
 var Actions = function Actions(_ref) {
+  var _getDisappearingSetti;
   var setActionsHeight = _ref.setActionsHeight,
     channel = _ref.channel,
     actionMenuOpen = _ref.actionMenuOpen,
@@ -44784,7 +44850,7 @@ var Actions = function Actions(_ref) {
     color: staredMessagesTextColor || textPrimary,
     hoverColor: staredMessagesTextColor || textPrimary,
     fontSize: actionItemsFontSize
-  }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, staredMessagesIcon || /*#__PURE__*/React__default.createElement(DefaultStarIcon, null), " Starred messages "))), getEnableDisappearingMessages() && !channel.isMockChannel && canToggleDisappearingMessages && (isDirectChannel && directChannelUser ? directChannelUser.state !== USER_STATE.DELETED : true) && (/*#__PURE__*/React__default.createElement(ActionItem, {
+  }, /*#__PURE__*/React__default.createElement(React__default.Fragment, null, staredMessagesIcon || /*#__PURE__*/React__default.createElement(DefaultStarIcon, null), " Starred messages "))), ((_getDisappearingSetti = getDisappearingSettings()) === null || _getDisappearingSetti === void 0 ? void 0 : _getDisappearingSetti.show) && !channel.isMockChannel && canToggleDisappearingMessages && (isDirectChannel && directChannelUser ? directChannelUser.state !== USER_STATE.DELETED : true) && (/*#__PURE__*/React__default.createElement(ActionItem, {
     key: 1.5,
     onClick: handleToggleDisappearingMessagesPopup,
     iconColor: iconPrimary,