sceyt-chat-react-uikit 1.7.6 → 1.7.7-beta.10

package/index.modern.js

@@ -8998,7 +8998,8 @@ var handleVoteDetails = function handleVoteDetails(voteDetails, message) {
   var vote = voteDetails.vote;
   var optionId = vote.optionId;
   var currentVotesPerOption = existingVoteDetails.votesPerOption || {};
-  var newVotesPerOption = _extends({}, currentVotesPerOption, (_extends2 = {}, _extends2[optionId] = (currentVotesPerOption[optionId] || 0) + voteDetails.incrementVotesPerOptionCount, _extends2));
+  var optionVotesCount = (currentVotesPerOption[optionId] || 0) + voteDetails.incrementVotesPerOptionCount;
+  var newVotesPerOption = _extends({}, currentVotesPerOption, (_extends2 = {}, _extends2[optionId] = optionVotesCount >= 0 ? optionVotesCount : 0, _extends2));
   var newVotes = existingVoteDetails.votes || [];
   var newOwnVotes = existingVoteDetails.ownVotes || [];
   if (voteDetails.type === 'add') {
@@ -9032,6 +9033,7 @@ var showChannelDetails = false;
 var channelTypesFilter = [];
 var memberCount = 10;
 var disableFrowardMentionsCount = false;
+var onUpdateChannel = function onUpdateChannel() {};
 var useInviteLink = false;
 var inviteLinkOptions = null;
 function setBaseUrlForInviteMembers(url) {
@@ -9146,6 +9148,12 @@ function setDisableFrowardMentionsCount(disable) {
 function getDisableFrowardMentionsCount() {
   return disableFrowardMentionsCount;
 }
+function setOnUpdateChannel(callback) {
+  onUpdateChannel = callback;
+}
+function getOnUpdateChannel() {
+  return onUpdateChannel;
+}
 var handleNewMessages;
 function setHandleNewMessages(callback) {
   handleNewMessages = callback;
@@ -10883,7 +10891,7 @@ function updateMessageOnMap(channelId, updatedMessage, voteDetails) {
         } else {
           var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(mes, updatedMessage.params.deliveryStatus);
           updatedMessageData = _extends({}, mes, updatedMessage.params, statusUpdatedMessage);
-          var voteDetailsData = void 0;
+          var voteDetailsData = mes === null || mes === void 0 ? void 0 : mes.pollDetails;
           if (voteDetails) {
             voteDetailsData = handleVoteDetails(voteDetails, updatedMessageData);
           }
@@ -11947,6 +11955,26 @@ var _memberSlice$actions = memberSlice.actions,
   getRolesFail = _memberSlice$actions.getRolesFail;
 var MembersReducer = memberSlice.reducer;
 
+var SET_CONTACT_LOADING_STATE = 'SET_CONTACT_LOADING_STATE';
+var GET_CONTACTS = 'GET_CONTACTS';
+var GET_USERS = 'GET_USERS';
+var LOAD_MORE_USERS = 'LOAD_MORE_USERS';
+var BLOCK_USERS = 'BLOCK_USERS';
+var UNBLOCK_USERS = 'UNBLOCK_USERS';
+var UPDATE_PROFILE = 'UPDATE_PROFILE';
+var CHECK_USER_STATUS = 'CHECK_USER_STATUS';
+var CONNECTION_EVENT_TYPES = {
+  TOKEN_WILL_EXPIRE: 'TOKEN_WILL_EXPIRE',
+  CONNECTION_STATUS_CHANGED: 'CONNECTION_STATUS_CHANGED',
+  TOKEN_EXPIRED: 'TOKEN_EXPIRED'
+};
+var CONNECTION_STATUS = {
+  CONNECTING: 'Connecting',
+  CONNECTED: 'Connected',
+  CONNECTING_FAILED: 'Failed',
+  DISCONNECTED: 'Disconnected'
+};
+
 var initialState$3 = {
   connectionStatus: '',
   contactList: [],
@@ -11960,7 +11988,8 @@ var initialState$3 = {
     lastName: '',
     state: ''
   },
-  browserTabIsActive: true
+  browserTabIsActive: true,
+  waitToSendPendingMessages: false
 };
 var userSlice = createSlice({
   name: 'users',
@@ -11968,6 +11997,9 @@ var userSlice = createSlice({
   reducers: {
     setConnectionStatus: function setConnectionStatus(state, action) {
       state.connectionStatus = action.payload.status;
+      if (action.payload.status === CONNECTION_STATUS.CONNECTED) {
+        state.waitToSendPendingMessages = true;
+      }
     },
     setUser: function setUser(state, action) {
       state.user = _extends({}, action.payload.user);
@@ -11999,6 +12031,9 @@ var userSlice = createSlice({
     },
     setBrowserTabIsActive: function setBrowserTabIsActive(state, action) {
       state.browserTabIsActive = action.payload.state;
+    },
+    setWaitToSendPendingMessages: function setWaitToSendPendingMessages(state, action) {
+      state.waitToSendPendingMessages = action.payload.state;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -12016,7 +12051,8 @@ var _userSlice$actions = userSlice.actions,
   updateUserMap = _userSlice$actions.updateUserMap,
   setContacts = _userSlice$actions.setContacts,
   updateUserProfile = _userSlice$actions.updateUserProfile,
-  setBrowserTabIsActive = _userSlice$actions.setBrowserTabIsActive;
+  setBrowserTabIsActive = _userSlice$actions.setBrowserTabIsActive,
+  setWaitToSendPendingMessages = _userSlice$actions.setWaitToSendPendingMessages;
 var UserReducer = userSlice.reducer;
 
 var SET_THEME = 'SET_THEME';
@@ -12699,26 +12735,6 @@ var joinChannelWithInviteKeyAC = function joinChannelWithInviteKeyAC(key) {
   };
 };
 
-var SET_CONTACT_LOADING_STATE = 'SET_CONTACT_LOADING_STATE';
-var GET_CONTACTS = 'GET_CONTACTS';
-var GET_USERS = 'GET_USERS';
-var LOAD_MORE_USERS = 'LOAD_MORE_USERS';
-var BLOCK_USERS = 'BLOCK_USERS';
-var UNBLOCK_USERS = 'UNBLOCK_USERS';
-var UPDATE_PROFILE = 'UPDATE_PROFILE';
-var CHECK_USER_STATUS = 'CHECK_USER_STATUS';
-var CONNECTION_EVENT_TYPES = {
-  TOKEN_WILL_EXPIRE: 'TOKEN_WILL_EXPIRE',
-  CONNECTION_STATUS_CHANGED: 'CONNECTION_STATUS_CHANGED',
-  TOKEN_EXPIRED: 'TOKEN_EXPIRED'
-};
-var CONNECTION_STATUS = {
-  CONNECTING: 'Connecting',
-  CONNECTED: 'Connected',
-  CONNECTING_FAILED: 'Failed',
-  DISCONNECTED: 'Disconnected'
-};
-
 var getUsersAC = function getUsersAC(params) {
   return {
     type: GET_USERS,
@@ -12830,6 +12846,11 @@ var updateUserStatusOnMapAC = function updateUserStatusOnMapAC(usersMap) {
     usersMap: usersMap
   });
 };
+var setWaitToSendPendingMessagesAC = function setWaitToSendPendingMessagesAC(state) {
+  return setWaitToSendPendingMessages({
+    state: state
+  });
+};
 
 var userDisplayNameFromContact = false;
 var setShowOnlyContactUsers = function setShowOnlyContactUsers(value) {
@@ -14519,7 +14540,7 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, _chan2, _channel, member, _channelExists, _activeChannelId, groupName, updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId2, _channelExists3, activeChannel, _updateChannelData, _groupName, _channel4, addedMembers, _activeChannelId3, _channelExists4, _updateChannelData2, _groupName2, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _activeChannelId4, _groupName3, _channel5, message, messageToHandle, _channelFilterTypes, _activeChannelId5, _channelExists6, channelForAdd, hasNextMessage, _groupName4, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelId, markerList, _channel6, _activeChannelId6, updateLastMessage, markersMap, activeChannelMessages, _iterator, _step, messageId, isPendingMessage, lastMessage, _channelId, _channel7, _channel8, deletedMessage, _activeChannelId7, _channelExists7, _channel9, _message, _activeChannelId8, _channelExists8, _channel0, user, _message2, reaction, isSelf, _activeChannelId9, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, _contactsMap, _getFromContacts2, _state, _theme, _accentColor, _textSecondary, _messageBody, channelUpdateParams, _pollDetailsData$chan, _pollDetailsData$chan2, _channel1, pollDetails, _messageId, pollDetailsData, _activeChannelId0, addedVotes, deletedVotes, objs, _iterator2, _step2, vote, _iterator3, _step3, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel10, _pollDetails, _messageId2, _pollDetailsData, _activeChannelId1, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel11, _pollDetails2, _messageId3, _activeChannelId10, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel12, _messageId4, _activeChannelId11, _obj5, _channel13, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId12, _channelUpdateParams, _channel14, _updatedChannel, _channel15, _activeChannelId13, channelExist, _channel16, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _groupName5, _channel23, _groupName6, _channel24, members, _activeChannelId14, i, _channel25, _channel26, _channelId2, from, name, status, _t, _t2;
+          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, _chan2, _channel, member, _channelExists, _activeChannelId, groupName, updateChannelData, _channel2, _channelExists2, _channel3, removedMembers, _activeChannelId2, _channelExists3, activeChannel, _updateChannelData, _groupName, _channel4, addedMembers, _activeChannelId3, _channelExists4, _updateChannelData2, _groupName2, onUpdateChannel, updatedChannel, _channelExists5, subject, avatarUrl, muted, mutedTill, metadata, _channel5, fields, _activeChannelId4, _groupName3, _channel6, message, messageToHandle, _channelFilterTypes, _activeChannelId5, _channelExists6, channelForAdd, hasNextMessage, _groupName4, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelId, markerList, _channel7, _activeChannelId6, updateLastMessage, markersMap, activeChannelMessages, _iterator, _step, messageId, isPendingMessage, lastMessage, _channelId, _channel8, _channel9, deletedMessage, _activeChannelId7, _channelExists7, _channel0, _message, _activeChannelId8, _channelExists8, _channel1, user, _message2, reaction, isSelf, _activeChannelId9, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, _contactsMap, _getFromContacts2, _state, _theme, _accentColor, _textSecondary, _messageBody, channelUpdateParams, _pollDetailsData$chan, _pollDetailsData$chan2, _channel10, pollDetails, _messageId, pollDetailsData, _activeChannelId0, addedVotes, deletedVotes, objs, _iterator2, _step2, vote, _iterator3, _step3, _vote, _i, _objs, obj, _store$getState$Messa, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel11, _pollDetails, _messageId2, _pollDetailsData, _activeChannelId1, _deletedVotes, _objs3, _iterator4, _step4, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel12, _pollDetails2, _messageId3, _activeChannelId10, _pollDetailsData2, retractedVotes, _objs6, _iterator5, _step5, _vote4, _i5, _objs7, _obj4, _iterator6, _step6, _vote3, _channel13, _messageId4, _activeChannelId11, _obj5, _channel14, _user, _message3, _reaction, channelFromMap, _isSelf, _activeChannelId12, _channelUpdateParams, _channel15, _updatedChannel, _channel16, _activeChannelId13, channelExist, _channel17, _channel18, _channel19, _channel20, _channel21, _channel22, _channel23, _groupName5, _channel24, _groupName6, _channel25, members, _activeChannelId14, i, _channel26, _channel27, _channelId2, from, name, status, _t, _t2;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.p = _context.n) {
               case 0:
@@ -14786,10 +14807,33 @@ function watchForEvents() {
                 });
                 return _context.a(3, 183);
               case 46:
+                onUpdateChannel = getOnUpdateChannel();
                 log.info('channel UPDATE_CHANNEL ... ');
                 updatedChannel = args.updatedChannel;
                 _channelExists5 = checkChannelExists(updatedChannel.id);
                 subject = updatedChannel.subject, avatarUrl = updatedChannel.avatarUrl, muted = updatedChannel.muted, mutedTill = updatedChannel.mutedTill, metadata = updatedChannel.metadata;
+                _channel5 = getChannelFromMap(updatedChannel.id);
+                fields = [];
+                if (_channel5) {
+                  if (_channel5.subject !== subject) {
+                    fields.push('subject');
+                  }
+                  if (_channel5.avatarUrl !== avatarUrl) {
+                    fields.push('avatarUrl');
+                  }
+                  if (_channel5.muted !== muted) {
+                    fields.push('muted');
+                  }
+                  if (_channel5.mutedTill !== mutedTill) {
+                    fields.push('mutedTill');
+                  }
+                  if (_channel5.metadata !== isJSON(metadata) ? JSON.parse(metadata) : metadata) {
+                    fields.push('metadata');
+                  }
+                }
+                if (onUpdateChannel) {
+                  onUpdateChannel(updatedChannel, fields);
+                }
                 if (!_channelExists5) {
                   _context.n = 49;
                   break;
@@ -14833,18 +14877,18 @@ function watchForEvents() {
                 });
                 return _context.a(3, 183);
               case 51:
-                _channel5 = args.channel, message = args.message;
-                log.info('channel MESSAGE ... id : ', message.id, ', channel.id: ', _channel5.id);
-                messageToHandle = handleNewMessages ? handleNewMessages(message, _channel5) : message;
+                _channel6 = args.channel, message = args.message;
+                log.info('channel MESSAGE ... id : ', message.id, ', channel.id: ', _channel6.id);
+                messageToHandle = handleNewMessages ? handleNewMessages(message, _channel6) : message;
                 _channelFilterTypes = getChannelTypesFilter();
-                if (!(messageToHandle && _channel5 && (_channelFilterTypes !== null && _channelFilterTypes !== void 0 && _channelFilterTypes.length ? _channelFilterTypes.includes(_channel5.type) : true))) {
+                if (!(messageToHandle && _channel6 && (_channelFilterTypes !== null && _channelFilterTypes !== void 0 && _channelFilterTypes.length ? _channelFilterTypes.includes(_channel6.type) : true))) {
                   _context.n = 65;
                   break;
                 }
-                _channel5.metadata = isJSON(_channel5.metadata) ? JSON.parse(_channel5.metadata) : _channel5.metadata;
+                _channel6.metadata = isJSON(_channel6.metadata) ? JSON.parse(_channel6.metadata) : _channel6.metadata;
                 _activeChannelId5 = getActiveChannelId();
-                _channelExists6 = checkChannelExists(_channel5.id);
-                channelForAdd = JSON.parse(JSON.stringify(_channel5));
+                _channelExists6 = checkChannelExists(_channel6.id);
+                channelForAdd = JSON.parse(JSON.stringify(_channel6));
                 _context.n = 52;
                 return put(addChannelAC(channelForAdd));
               case 52:
@@ -14852,7 +14896,7 @@ function watchForEvents() {
                   _context.n = 53;
                   break;
                 }
-                setChannelInMap(_channel5);
+                setChannelInMap(_channel6);
                 _context.n = 54;
                 break;
               case 53:
@@ -14863,7 +14907,7 @@ function watchForEvents() {
                 _context.n = 54;
                 return put(updateChannelLastMessageAC(message, channelForAdd));
               case 54:
-                if (!(_channel5.id === _activeChannelId5)) {
+                if (!(_channel6.id === _activeChannelId5)) {
                   _context.n = 56;
                   break;
                 }
@@ -14883,9 +14927,9 @@ function watchForEvents() {
                 _context.n = 56;
                 return put(scrollToNewMessageAC(true, false, true));
               case 56:
-                addMessageToMap(_channel5.id, message);
+                addMessageToMap(_channel6.id, message);
                 _context.n = 57;
-                return put(updateChannelDataAC(_channel5.id, {
+                return put(updateChannelDataAC(_channel6.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
                   newMessageCount: channelForAdd.newMessageCount,
@@ -14901,9 +14945,9 @@ function watchForEvents() {
                   lastReactedMessage: null
                 }));
               case 57:
-                _groupName4 = getChannelGroupName(_channel5);
+                _groupName4 = getChannelGroupName(_channel6);
                 _context.n = 58;
-                return put(updateSearchedChannelDataAC(_channel5.id, {
+                return put(updateSearchedChannelDataAC(_channel6.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
                   newMessageCount: channelForAdd.newMessageCount,
@@ -14920,7 +14964,7 @@ function watchForEvents() {
                 }, _groupName4));
               case 58:
                 showNotifications = getShowNotifications();
-                if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel5.muted)) {
+                if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !_channel6.muted)) {
                   _context.n = 61;
                   break;
                 }
@@ -14932,7 +14976,7 @@ function watchForEvents() {
                 return select(browserTabIsActiveSelector);
               case 59:
                 tabIsActive = _context.v;
-                if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel5.id !== _activeChannelId5)) {
+                if (!(document.visibilityState !== 'visible' || !tabIsActive || _channel6.id !== _activeChannelId5)) {
                   _context.n = 61;
                   break;
                 }
@@ -14955,7 +14999,7 @@ function watchForEvents() {
                   accentColor: accentColor,
                   textSecondary: textSecondary
                 });
-                setNotification(messageBody, message.user, _channel5, undefined, message.attachments && message.attachments.length ? message.attachments.find(function (att) {
+                setNotification(messageBody, message.user, _channel6, undefined, message.attachments && message.attachments.length ? message.attachments.find(function (att) {
                   return att.type !== attachmentTypes.link;
                 }) : undefined);
               case 61:
@@ -14970,9 +15014,9 @@ function watchForEvents() {
                 break;
               case 63:
                 _context.n = 64;
-                return put(markMessagesAsDeliveredAC(_channel5.id, [message.id]));
+                return put(markMessagesAsDeliveredAC(_channel6.id, [message.id]));
               case 64:
-                updateChannelOnAllChannels(_channel5.id, {
+                updateChannelOnAllChannels(_channel6.id, {
                   messageCount: channelForAdd.messageCount,
                   unread: channelForAdd.unread,
                   newMessageCount: channelForAdd.newMessageCount,
@@ -14984,10 +15028,10 @@ function watchForEvents() {
                   lastMessage: channelForAdd.lastMessage,
                   messages: channelForAdd.messages,
                   newReactions: channelForAdd.newReactions,
-                  lastReactedMessage: _channel5.lastReactedMessage,
-                  userMessageReactions: _channel5.userMessageReactions
+                  lastReactedMessage: _channel6.lastReactedMessage,
+                  userMessageReactions: _channel6.userMessageReactions
                 });
-                updateChannelLastMessageOnAllChannels(_channel5.id, _channel5.lastMessage);
+                updateChannelLastMessageOnAllChannels(_channel6.id, _channel6.lastMessage);
               case 65:
                 return _context.a(3, 183);
               case 66:
@@ -14995,9 +15039,9 @@ function watchForEvents() {
                 _context.n = 67;
                 return call(getChannelFromMap, channelId);
               case 67:
-                _channel6 = _context.v;
-                log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel6, 'markers list: ', markerList);
-                if (!_channel6) {
+                _channel7 = _context.v;
+                log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', _channel7, 'markers list: ', markerList);
+                if (!_channel7) {
                   _context.n = 78;
                   break;
                 }
@@ -15033,8 +15077,8 @@ function watchForEvents() {
                 }
               case 72:
                 markersMap[messageId] = true;
-                if (_channel6) {
-                  if (_channel6.lastMessage && messageId === _channel6.lastMessage.id) {
+                if (_channel7) {
+                  if (_channel7.lastMessage && messageId === _channel7.lastMessage.id) {
                     updateLastMessage = true;
                   }
                 }
@@ -15050,10 +15094,10 @@ function watchForEvents() {
                   _context.n = 75;
                   break;
                 }
-                lastMessage = _extends({}, _channel6.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel6.lastMessage, markerList.name));
-                updateChannelLastMessageOnAllChannels(_channel6.id, lastMessage);
+                lastMessage = _extends({}, _channel7.lastMessage, updateMessageDeliveryStatusAndMarkers(_channel7.lastMessage, markerList.name));
+                updateChannelLastMessageOnAllChannels(_channel7.id, lastMessage);
                 _context.n = 75;
-                return put(updateChannelLastMessageStatusAC(lastMessage, _channel6));
+                return put(updateChannelLastMessageStatusAC(lastMessage, _channel7));
               case 75:
                 if (!(_activeChannelId6 === channelId)) {
                   _context.n = 77;
@@ -15064,7 +15108,7 @@ function watchForEvents() {
               case 76:
                 updateMarkersOnAllMessages(markersMap, markerList.name);
               case 77:
-                updateMessageStatusOnMap(_channel6.id, {
+                updateMessageStatusOnMap(_channel7.id, {
                   name: markerList.name,
                   markersMap: markersMap
                 });
@@ -15076,21 +15120,21 @@ function watchForEvents() {
               case 79:
                 _channelId = args.channelId;
                 log.info('channel DELETE ... ');
-                _channel7 = getChannelFromMap(_channelId);
+                _channel8 = getChannelFromMap(_channelId);
                 _context.n = 80;
-                return put(setChannelToRemoveAC(_channel7));
+                return put(setChannelToRemoveAC(_channel8));
               case 80:
                 deleteChannelFromAllChannels(_channelId);
                 return _context.a(3, 183);
               case 81:
-                _channel8 = args.channel, deletedMessage = args.deletedMessage;
+                _channel9 = args.channel, deletedMessage = args.deletedMessage;
                 _context.n = 82;
                 return call(getActiveChannelId);
               case 82:
                 _activeChannelId7 = _context.v;
                 log.info('channel DELETE_MESSAGE ... ');
-                _channelExists7 = checkChannelExists(_channel8.id);
-                if (!(_channel8.id === _activeChannelId7)) {
+                _channelExists7 = checkChannelExists(_channel9.id);
+                if (!(_channel9.id === _activeChannelId7)) {
                   _context.n = 83;
                   break;
                 }
@@ -15098,7 +15142,7 @@ function watchForEvents() {
                 _context.n = 83;
                 return put(updateMessageAC(deletedMessage.id, deletedMessage));
               case 83:
-                updateMessageOnMap(_channel8.id, {
+                updateMessageOnMap(_channel9.id, {
                   messageId: deletedMessage.id,
                   params: deletedMessage
                 });
@@ -15107,33 +15151,33 @@ function watchForEvents() {
                   break;
                 }
                 _context.n = 84;
-                return put(updateChannelDataAC(_channel8.id, {
-                  newMessageCount: _channel8.newMessageCount,
-                  muted: _channel8.muted,
-                  mutedTill: _channel8.mutedTill
+                return put(updateChannelDataAC(_channel9.id, {
+                  newMessageCount: _channel9.newMessageCount,
+                  muted: _channel9.muted,
+                  mutedTill: _channel9.mutedTill
                 }));
               case 84:
-                if (!(_channel8.lastMessage.id === deletedMessage.id)) {
+                if (!(_channel9.lastMessage.id === deletedMessage.id)) {
                   _context.n = 85;
                   break;
                 }
                 _context.n = 85;
-                return put(updateChannelLastMessageAC(deletedMessage, _channel8));
+                return put(updateChannelLastMessageAC(deletedMessage, _channel9));
               case 85:
-                updateChannelOnAllChannels(_channel8.id, {
-                  newMessageCount: _channel8.newMessageCount,
-                  muted: _channel8.muted,
-                  mutedTill: _channel8.mutedTill
+                updateChannelOnAllChannels(_channel9.id, {
+                  newMessageCount: _channel9.newMessageCount,
+                  muted: _channel9.muted,
+                  mutedTill: _channel9.mutedTill
                 }, deletedMessage);
                 return _context.a(3, 183);
               case 86:
-                _channel9 = args.channel, _message = args.message;
+                _channel0 = args.channel, _message = args.message;
                 _context.n = 87;
                 return call(getActiveChannelId);
               case 87:
                 _activeChannelId8 = _context.v;
-                _channelExists8 = checkChannelExists(_channel9.id);
-                if (!(_channel9.id === _activeChannelId8)) {
+                _channelExists8 = checkChannelExists(_channel0.id);
+                if (!(_channel0.id === _activeChannelId8)) {
                   _context.n = 89;
                   break;
                 }
@@ -15160,29 +15204,29 @@ function watchForEvents() {
                   _context.n = 90;
                   break;
                 }
-                if (!(_channel9.lastMessage.id === _message.id)) {
+                if (!(_channel0.lastMessage.id === _message.id)) {
                   _context.n = 90;
                   break;
                 }
                 _context.n = 90;
-                return put(updateChannelLastMessageAC(_message, _channel9));
+                return put(updateChannelLastMessageAC(_message, _channel0));
               case 90:
-                if (checkChannelExistsOnMessagesMap(_channel9.id)) {
-                  updateMessageOnMap(_channel9.id, {
+                if (checkChannelExistsOnMessagesMap(_channel0.id)) {
+                  updateMessageOnMap(_channel0.id, {
                     messageId: _message.id,
                     params: _message
                   });
                 }
-                updateChannelOnAllChannels(_channel9.id, {}, _message);
+                updateChannelOnAllChannels(_channel0.id, {}, _message);
                 return _context.a(3, 183);
               case 91:
-                _channel0 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
+                _channel1 = args.channel, user = args.user, _message2 = args.message, reaction = args.reaction;
                 isSelf = user.id === SceytChatClient.user.id;
                 _context.n = 92;
                 return call(getActiveChannelId);
               case 92:
                 _activeChannelId9 = _context.v;
-                if (!(_channel0.id === _activeChannelId9)) {
+                if (!(_channel1.id === _activeChannelId9)) {
                   _context.n = 94;
                   break;
                 }
@@ -15199,7 +15243,7 @@ function watchForEvents() {
                   _context.n = 96;
                   break;
                 }
-                if (!(document.visibilityState !== 'visible' || _channel0.id !== _activeChannelId9)) {
+                if (!(document.visibilityState !== 'visible' || _channel1.id !== _activeChannelId9)) {
                   _context.n = 96;
                   break;
                 }
@@ -15222,38 +15266,38 @@ function watchForEvents() {
                   accentColor: _accentColor,
                   textSecondary: _textSecondary
                 });
-                setNotification(_messageBody, reaction.user, _channel0, reaction.key, _message2.attachments && _message2.attachments.length ? _message2.attachments.find(function (att) {
+                setNotification(_messageBody, reaction.user, _channel1, reaction.key, _message2.attachments && _message2.attachments.length ? _message2.attachments.find(function (att) {
                   return att.type !== attachmentTypes.link;
                 }) : undefined);
               case 96:
-                if (!(_channel0.newReactions && _channel0.newReactions.length)) {
+                if (!(_channel1.newReactions && _channel1.newReactions.length)) {
                   _context.n = 97;
                   break;
                 }
                 channelUpdateParams = {
-                  userMessageReactions: _channel0.newReactions,
+                  userMessageReactions: _channel1.newReactions,
                   lastReactedMessage: _message2,
-                  newReactions: _channel0.newReactions,
-                  muted: _channel0.muted,
-                  mutedTill: _channel0.mutedTill
+                  newReactions: _channel1.newReactions,
+                  muted: _channel1.muted,
+                  mutedTill: _channel1.mutedTill
                 };
                 _context.n = 97;
-                return put(updateChannelDataAC(_channel0.id, channelUpdateParams));
+                return put(updateChannelDataAC(_channel1.id, channelUpdateParams));
               case 97:
-                updateChannelOnAllChannels(_channel0.id, {
-                  userMessageReactions: _channel0.newReactions,
+                updateChannelOnAllChannels(_channel1.id, {
+                  userMessageReactions: _channel1.newReactions,
                   lastReactedMessage: _message2,
-                  newReactions: _channel0.newReactions,
-                  muted: _channel0.muted,
-                  mutedTill: _channel0.mutedTill
+                  newReactions: _channel1.newReactions,
+                  muted: _channel1.muted,
+                  mutedTill: _channel1.mutedTill
                 });
               case 98:
-                if (checkChannelExistsOnMessagesMap(_channel0.id)) {
-                  addReactionToMessageOnMap(_channel0.id, _message2, reaction, true);
+                if (checkChannelExistsOnMessagesMap(_channel1.id)) {
+                  addReactionToMessageOnMap(_channel1.id, _message2, reaction, true);
                 }
                 return _context.a(3, 183);
               case 99:
-                _channel1 = args.channel, pollDetails = args.pollDetails, _messageId = args.messageId;
+                _channel10 = args.channel, pollDetails = args.pollDetails, _messageId = args.messageId;
                 pollDetailsData = pollDetails;
                 _context.n = 100;
                 return call(getActiveChannelId);
@@ -15267,7 +15311,7 @@ function watchForEvents() {
                   objs.push({
                     type: vote.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
                     vote: vote,
-                    incrementVotesPerOptionCount: -((deletedVotes === null || deletedVotes === void 0 ? void 0 : deletedVotes.length) || 0)
+                    incrementVotesPerOptionCount: -1
                   });
                 }
                 for (_iterator3 = _createForOfIteratorHelperLoose(addedVotes); !(_step3 = _iterator3()).done;) {
@@ -15275,7 +15319,7 @@ function watchForEvents() {
                   objs.push({
                     type: _vote.user.id === SceytChatClient.user.id ? 'addOwn' : 'add',
                     vote: _vote,
-                    incrementVotesPerOptionCount: (addedVotes === null || addedVotes === void 0 ? void 0 : addedVotes.length) || 0
+                    incrementVotesPerOptionCount: 1
                   });
                 }
                 _i = 0, _objs = objs;
@@ -15315,7 +15359,7 @@ function watchForEvents() {
                   break;
                 }
                 _obj = _objs2[_i2];
-                updateMessageOnMap(_channel1.id, {
+                updateMessageOnMap(_channel10.id, {
                   messageId: _messageId,
                   params: {}
                 }, {
@@ -15323,7 +15367,7 @@ function watchForEvents() {
                   vote: _obj.vote,
                   incrementVotesPerOptionCount: _obj.incrementVotesPerOptionCount
                 });
-                if (!(_channel1.id === _activeChannelId0)) {
+                if (!(_channel10.id === _activeChannelId0)) {
                   _context.n = 107;
                   break;
                 }
@@ -15337,7 +15381,7 @@ function watchForEvents() {
               case 108:
                 return _context.a(3, 183);
               case 109:
-                _channel10 = args.channel, _pollDetails = args.pollDetails, _messageId2 = args.messageId;
+                _channel11 = args.channel, _pollDetails = args.pollDetails, _messageId2 = args.messageId;
                 _pollDetailsData = _pollDetails;
                 _context.n = 110;
                 return call(getActiveChannelId);
@@ -15350,7 +15394,7 @@ function watchForEvents() {
                   _objs3.push({
                     type: _vote2.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
                     vote: _vote2,
-                    incrementVotesPerOptionCount: -((_deletedVotes === null || _deletedVotes === void 0 ? void 0 : _deletedVotes.length) || 0)
+                    incrementVotesPerOptionCount: -1
                   });
                 }
                 _i3 = 0, _objs4 = _objs3;
@@ -15378,11 +15422,11 @@ function watchForEvents() {
                   break;
                 }
                 _obj3 = _objs5[_i4];
-                updateMessageOnMap(_channel10.id, {
+                updateMessageOnMap(_channel11.id, {
                   messageId: _messageId2,
                   params: {}
                 }, _obj3);
-                if (!(_channel10.id === _activeChannelId1)) {
+                if (!(_channel11.id === _activeChannelId1)) {
                   _context.n = 115;
                   break;
                 }
@@ -15396,7 +15440,7 @@ function watchForEvents() {
               case 116:
                 return _context.a(3, 183);
               case 117:
-                _channel11 = args.channel, _pollDetails2 = args.pollDetails, _messageId3 = args.messageId;
+                _channel12 = args.channel, _pollDetails2 = args.pollDetails, _messageId3 = args.messageId;
                 _context.n = 118;
                 return call(getActiveChannelId);
               case 118:
@@ -15409,7 +15453,7 @@ function watchForEvents() {
                   _objs6.push({
                     type: _vote4.user.id === SceytChatClient.user.id ? 'deleteOwn' : 'delete',
                     vote: _vote4,
-                    incrementVotesPerOptionCount: -((retractedVotes === null || retractedVotes === void 0 ? void 0 : retractedVotes.length) || 0)
+                    incrementVotesPerOptionCount: -1
                   });
                 }
                 _i5 = 0, _objs7 = _objs6;
@@ -15419,7 +15463,7 @@ function watchForEvents() {
                   break;
                 }
                 _obj4 = _objs7[_i5];
-                updateMessageOnMap(_channel11.id, {
+                updateMessageOnMap(_channel12.id, {
                   messageId: _messageId3,
                   params: {}
                 }, _obj4);
@@ -15440,7 +15484,7 @@ function watchForEvents() {
                 _context.n = 120;
                 break;
               case 122:
-                if (!(_channel11.id === _activeChannelId10)) {
+                if (!(_channel12.id === _activeChannelId10)) {
                   _context.n = 123;
                   break;
                 }
@@ -15454,7 +15498,7 @@ function watchForEvents() {
               case 124:
                 return _context.a(3, 183);
               case 125:
-                _channel12 = args.channel, _messageId4 = args.messageId;
+                _channel13 = args.channel, _messageId4 = args.messageId;
                 _context.n = 126;
                 return call(getActiveChannelId);
               case 126:
@@ -15463,11 +15507,11 @@ function watchForEvents() {
                   type: 'close',
                   incrementVotesPerOptionCount: 0
                 };
-                updateMessageOnMap(_channel12.id, {
+                updateMessageOnMap(_channel13.id, {
                   messageId: _messageId4,
                   params: {}
                 }, _obj5);
-                if (!(_channel12.id === _activeChannelId11)) {
+                if (!(_channel13.id === _activeChannelId11)) {
                   _context.n = 128;
                   break;
                 }
@@ -15479,15 +15523,15 @@ function watchForEvents() {
               case 128:
                 return _context.a(3, 183);
               case 129:
-                _channel13 = args.channel, _user = args.user, _message3 = args.message, _reaction = args.reaction;
-                log.info('channel REACTION_DELETED ... ', _channel13);
-                channelFromMap = getChannelFromMap(_channel13.id);
+                _channel14 = args.channel, _user = args.user, _message3 = args.message, _reaction = args.reaction;
+                log.info('channel REACTION_DELETED ... ', _channel14);
+                channelFromMap = getChannelFromMap(_channel14.id);
                 _isSelf = _user.id === SceytChatClient.user.id;
                 _context.n = 130;
                 return call(getActiveChannelId);
               case 130:
                 _activeChannelId12 = _context.v;
-                if (!(_channel13.id === _activeChannelId12)) {
+                if (!(_channel14.id === _activeChannelId12)) {
                   _context.n = 132;
                   break;
                 }
@@ -15496,54 +15540,54 @@ function watchForEvents() {
               case 131:
                 removeReactionOnAllMessages(_message3, _reaction, true);
               case 132:
-                _channelUpdateParams = JSON.parse(JSON.stringify(_channel13));
+                _channelUpdateParams = JSON.parse(JSON.stringify(_channel14));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message3.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
                 _context.n = 133;
-                return put(updateChannelDataAC(_channel13.id, _channelUpdateParams));
+                return put(updateChannelDataAC(_channel14.id, _channelUpdateParams));
               case 133:
-                updateChannelOnAllChannels(_channel13.id, _channelUpdateParams);
-                if (checkChannelExistsOnMessagesMap(_channel13.id)) {
-                  removeReactionToMessageOnMap(_channel13.id, _message3, _reaction, true);
+                updateChannelOnAllChannels(_channel14.id, _channelUpdateParams);
+                if (checkChannelExistsOnMessagesMap(_channel14.id)) {
+                  removeReactionToMessageOnMap(_channel14.id, _message3, _reaction, true);
                 }
                 return _context.a(3, 183);
               case 134:
-                _channel14 = args.channel;
-                if (!_channel14) {
+                _channel15 = args.channel;
+                if (!_channel15) {
                   _context.n = 136;
                   break;
                 }
-                _updatedChannel = JSON.parse(JSON.stringify(_channel14));
+                _updatedChannel = JSON.parse(JSON.stringify(_channel15));
                 _context.n = 135;
-                return put(updateChannelDataAC(_channel14.id, {
-                  lastMessage: _channel14.lastMessage,
-                  newMessageCount: _channel14.newMessageCount,
-                  newMentionCount: _channel14.newMentionCount,
-                  unread: _channel14.unread,
-                  newReactedMessageCount: _channel14.newReactedMessageCount,
-                  newReactions: _channel14.newReactions,
-                  lastReactedMessage: _channel14.lastReactedMessage,
-                  lastReceivedMsgId: _channel14.lastReceivedMsgId,
-                  lastDisplayedMessageId: _channel14.lastDisplayedMessageId,
-                  messageRetentionPeriod: _channel14.messageRetentionPeriod
+                return put(updateChannelDataAC(_channel15.id, {
+                  lastMessage: _channel15.lastMessage,
+                  newMessageCount: _channel15.newMessageCount,
+                  newMentionCount: _channel15.newMentionCount,
+                  unread: _channel15.unread,
+                  newReactedMessageCount: _channel15.newReactedMessageCount,
+                  newReactions: _channel15.newReactions,
+                  lastReactedMessage: _channel15.lastReactedMessage,
+                  lastReceivedMsgId: _channel15.lastReceivedMsgId,
+                  lastDisplayedMessageId: _channel15.lastDisplayedMessageId,
+                  messageRetentionPeriod: _channel15.messageRetentionPeriod
                 }));
               case 135:
-                updateChannelOnAllChannels(_channel14.id, _updatedChannel);
+                updateChannelOnAllChannels(_channel15.id, _updatedChannel);
               case 136:
                 return _context.a(3, 183);
               case 137:
-                _channel15 = args.channel;
-                log.info('CLEAR_HISTORY: ', _channel15);
+                _channel16 = args.channel;
+                log.info('CLEAR_HISTORY: ', _channel16);
                 _context.n = 138;
                 return call(getActiveChannelId);
               case 138:
                 _activeChannelId13 = _context.v;
                 _context.n = 139;
-                return call(checkChannelExists, _channel15.id);
+                return call(checkChannelExists, _channel16.id);
               case 139:
                 channelExist = _context.v;
-                if (!(_channel15.id === _activeChannelId13)) {
+                if (!(_channel16.id === _activeChannelId13)) {
                   _context.n = 141;
                   break;
                 }
@@ -15552,141 +15596,141 @@ function watchForEvents() {
               case 140:
                 removeAllMessages();
               case 141:
-                removeMessagesFromMap(_channel15.id);
+                removeMessagesFromMap(_channel16.id);
                 if (!channelExist) {
                   _context.n = 142;
                   break;
                 }
                 _context.n = 142;
-                return put(updateChannelDataAC(_channel15.id, {
+                return put(updateChannelDataAC(_channel16.id, {
                   lastMessage: null,
                   newMessageCount: 0,
                   newMentionCount: 0,
-                  muted: _channel15.muted,
-                  mutedTill: _channel15.mutedTill
+                  muted: _channel16.muted,
+                  mutedTill: _channel16.mutedTill
                 }));
               case 142:
-                updateChannelOnAllChannels(_channel15.id, {
+                updateChannelOnAllChannels(_channel16.id, {
                   lastMessage: null,
                   newMessageCount: 0,
                   newMentionCount: 0,
-                  muted: _channel15.muted,
-                  mutedTill: _channel15.mutedTill
+                  muted: _channel16.muted,
+                  mutedTill: _channel16.mutedTill
                 });
                 return _context.a(3, 183);
               case 143:
-                _channel16 = args.channel;
+                _channel17 = args.channel;
                 log.info('channel MUTE ... ');
                 _context.n = 144;
-                return put(updateChannelDataAC(_channel16.id, {
-                  muted: _channel16.muted,
-                  mutedTill: _channel16.mutedTill
+                return put(updateChannelDataAC(_channel17.id, {
+                  muted: _channel17.muted,
+                  mutedTill: _channel17.mutedTill
                 }));
               case 144:
-                updateChannelOnAllChannels(_channel16.id, {
-                  muted: _channel16.muted,
-                  mutedTill: _channel16.mutedTill
+                updateChannelOnAllChannels(_channel17.id, {
+                  muted: _channel17.muted,
+                  mutedTill: _channel17.mutedTill
                 });
                 return _context.a(3, 183);
               case 145:
-                _channel17 = args.channel;
+                _channel18 = args.channel;
                 log.info('channel UNMUTE ... ');
                 _context.n = 146;
-                return put(updateChannelDataAC(_channel17.id, {
-                  muted: _channel17.muted,
-                  mutedTill: _channel17.mutedTill
+                return put(updateChannelDataAC(_channel18.id, {
+                  muted: _channel18.muted,
+                  mutedTill: _channel18.mutedTill
                 }));
               case 146:
-                updateChannelOnAllChannels(_channel17.id, {
-                  muted: _channel17.muted,
-                  mutedTill: _channel17.mutedTill
+                updateChannelOnAllChannels(_channel18.id, {
+                  muted: _channel18.muted,
+                  mutedTill: _channel18.mutedTill
                 });
                 return _context.a(3, 183);
               case 147:
-                _channel18 = args.channel;
+                _channel19 = args.channel;
                 log.info('channel PINED ... ');
                 _context.n = 148;
-                return put(updateChannelDataAC(_channel18.id, {
-                  pinnedAt: _channel18.pinnedAt
+                return put(updateChannelDataAC(_channel19.id, {
+                  pinnedAt: _channel19.pinnedAt
                 }, true));
               case 148:
-                updateChannelOnAllChannels(_channel18.id, {
-                  pinnedAt: _channel18.pinnedAt
+                updateChannelOnAllChannels(_channel19.id, {
+                  pinnedAt: _channel19.pinnedAt
                 });
                 return _context.a(3, 183);
               case 149:
-                _channel19 = args.channel;
+                _channel20 = args.channel;
                 log.info('channel UNPINED ... ');
                 _context.n = 150;
-                return put(updateChannelDataAC(_channel19.id, {
-                  pinnedAt: _channel19.pinnedAt
+                return put(updateChannelDataAC(_channel20.id, {
+                  pinnedAt: _channel20.pinnedAt
                 }, false, true));
               case 150:
-                updateChannelOnAllChannels(_channel19.id, {
-                  pinnedAt: _channel19.pinnedAt
+                updateChannelOnAllChannels(_channel20.id, {
+                  pinnedAt: _channel20.pinnedAt
                 });
                 return _context.a(3, 183);
               case 151:
-                _channel20 = args.channel;
+                _channel21 = args.channel;
                 log.info('channel HIDE ... ');
                 _context.n = 152;
-                return put(setChannelToHideAC(_channel20));
+                return put(setChannelToHideAC(_channel21));
               case 152:
                 return _context.a(3, 183);
               case 153:
-                _channel21 = args.channel;
+                _channel22 = args.channel;
                 log.info('channel UNHIDE ... ');
                 _context.n = 154;
-                return put(setChannelToUnHideAC(_channel21));
+                return put(setChannelToUnHideAC(_channel22));
               case 154:
                 return _context.a(3, 183);
               case 155:
-                _channel22 = args.channel;
+                _channel23 = args.channel;
                 _context.n = 156;
-                return put(updateChannelDataAC(_channel22.id, {
-                  unread: _channel22.unread,
-                  muted: _channel22.muted,
-                  mutedTill: _channel22.mutedTill
+                return put(updateChannelDataAC(_channel23.id, {
+                  unread: _channel23.unread,
+                  muted: _channel23.muted,
+                  mutedTill: _channel23.mutedTill
                 }));
               case 156:
-                _groupName5 = getChannelGroupName(_channel22);
+                _groupName5 = getChannelGroupName(_channel23);
                 _context.n = 157;
-                return put(updateSearchedChannelDataAC(_channel22.id, {
-                  unread: _channel22.unread
+                return put(updateSearchedChannelDataAC(_channel23.id, {
+                  unread: _channel23.unread
                 }, _groupName5));
               case 157:
-                updateChannelOnAllChannels(_channel22.id, {
-                  unread: _channel22.unread
+                updateChannelOnAllChannels(_channel23.id, {
+                  unread: _channel23.unread
                 });
                 return _context.a(3, 183);
               case 158:
-                _channel23 = args.channel;
+                _channel24 = args.channel;
                 _context.n = 159;
-                return put(updateChannelDataAC(_channel23.id, {
-                  unread: _channel23.unread,
-                  muted: _channel23.muted,
-                  mutedTill: _channel23.mutedTill
+                return put(updateChannelDataAC(_channel24.id, {
+                  unread: _channel24.unread,
+                  muted: _channel24.muted,
+                  mutedTill: _channel24.mutedTill
                 }));
               case 159:
-                _groupName6 = getChannelGroupName(_channel23);
+                _groupName6 = getChannelGroupName(_channel24);
                 _context.n = 160;
-                return put(updateSearchedChannelDataAC(_channel23.id, {
-                  unread: _channel23.unread
+                return put(updateSearchedChannelDataAC(_channel24.id, {
+                  unread: _channel24.unread
                 }, _groupName6));
               case 160:
-                updateChannelOnAllChannels(_channel23.id, {
-                  unread: _channel23.unread
+                updateChannelOnAllChannels(_channel24.id, {
+                  unread: _channel24.unread
                 });
                 return _context.a(3, 183);
               case 161:
-                _channel24 = args.channel, members = args.members;
-                log.info('channel CHANGE_ROLE  channel ... ', _channel24);
+                _channel25 = args.channel, members = args.members;
+                log.info('channel CHANGE_ROLE  channel ... ', _channel25);
                 log.info('channel CHANGE_ROLE  member ... ', members);
                 _context.n = 162;
                 return call(getActiveChannelId);
               case 162:
                 _activeChannelId14 = _context.v;
-                if (!(_channel24.id === _activeChannelId14)) {
+                if (!(_channel25.id === _activeChannelId14)) {
                   _context.n = 163;
                   break;
                 }
@@ -15704,16 +15748,16 @@ function watchForEvents() {
                   break;
                 }
                 _context.n = 165;
-                return put(updateChannelDataAC(_channel24.id, {
+                return put(updateChannelDataAC(_channel25.id, {
                   userRole: members[i].role,
-                  muted: _channel24.muted,
-                  mutedTill: _channel24.mutedTill
+                  muted: _channel25.muted,
+                  mutedTill: _channel25.mutedTill
                 }));
               case 165:
-                updateChannelOnAllChannels(_channel24.id, {
+                updateChannelOnAllChannels(_channel25.id, {
                   userRole: members[i].role,
-                  muted: _channel24.muted,
-                  mutedTill: _channel24.mutedTill
+                  muted: _channel25.muted,
+                  mutedTill: _channel25.mutedTill
                 });
               case 166:
                 i++;
@@ -15722,12 +15766,12 @@ function watchForEvents() {
               case 167:
                 return _context.a(3, 183);
               case 168:
-                _channel25 = args.channel;
-                log.info('channel frozen  channel ... ', _channel25);
+                _channel26 = args.channel;
+                log.info('channel frozen  channel ... ', _channel26);
                 return _context.a(3, 183);
               case 169:
-                _channel26 = args.channel;
-                log.info('channel unfrozen  channel ... ', _channel26);
+                _channel27 = args.channel;
+                log.info('channel unfrozen  channel ... ', _channel27);
                 return _context.a(3, 183);
               case 170:
                 _channelId2 = args.channelId, from = args.from, name = args.name;
@@ -16063,25 +16107,31 @@ function createChannel(action) {
   }, _marked$2, null, [[0, 17]]);
 }
 function getChannels(action) {
-  var _params$filter, _types, payload, params, SceytChatClient, channelQueryBuilder, channelTypesFilter, types, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, channelMessageMap, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, i, allChannelsData, allChannelList, _t2, _t3, _t4;
+  var _params$filter, _types, _activeChannel, _mappedChannels, _mappedChannels3, _mappedChannels4, payload, params, SceytChatClient, connectionStatus, channelQueryBuilder, channelTypesFilter, types, limit, channelQuery, channelsData, channelList, channelId, activeChannel, _yield$call, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys, _mappedChannels2, channelMessageMap, _activeChannel2, _activeChannel3, hiddenList, allChannelsQueryBuilder, allChannelsQuery, hasNext, totalAllChannelsAdded, i, _connectionStatus, allChannelsData, allChannelList, _t2, _t3, _t4;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.p = _context2.n) {
       case 0:
-        _context2.p = 0;
+        log.info('[getChannels] start get channels');
+        _context2.p = 1;
         payload = action.payload;
         params = payload.params;
+        log.info('[getChannels] input params:', JSON.stringify(params));
         SceytChatClient = getClient();
-        if (!(store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
-          _context2.n = 1;
+        connectionStatus = store.getState().UserReducer.connectionStatus;
+        log.info('[getChannels] connection status:', connectionStatus);
+        if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
+          _context2.n = 2;
           break;
         }
+        log.warn('[getChannels] connection not ready, aborting. Status:', connectionStatus);
         return _context2.a(2);
-      case 1:
-        _context2.n = 2;
-        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
+        _context2.n = 3;
+        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
+      case 3:
         channelQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
         channelTypesFilter = getChannelTypesFilter();
+        log.info('[getChannels] channelTypesFilter:', JSON.stringify(channelTypesFilter));
         types = [];
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
           types = channelTypesFilter;
@@ -16089,59 +16139,77 @@ function getChannels(action) {
         if (params !== null && params !== void 0 && (_params$filter = params.filter) !== null && _params$filter !== void 0 && _params$filter.channelType) {
           types.push(params.filter.channelType);
         }
+        log.info('[getChannels] final types array:', JSON.stringify(types));
         if ((_types = types) !== null && _types !== void 0 && _types.length) {
           channelQueryBuilder.types(types);
         }
         if (params.memberCount) {
+          log.info('[getChannels] setting memberCount filter:', params === null || params === void 0 ? void 0 : params.memberCount);
           channelQueryBuilder.memberCount(params.memberCount);
         }
         channelQueryBuilder.order('lastMessage');
-        channelQueryBuilder.limit(params.limit || 50);
-        _context2.n = 3;
+        limit = params.limit || 50;
+        log.info('[getChannels] query limit:', limit);
+        channelQueryBuilder.limit(limit);
+        _context2.n = 4;
         return call(channelQueryBuilder.build);
-      case 3:
+      case 4:
         channelQuery = _context2.v;
-        _context2.n = 4;
+        log.info('[getChannels] query built successfully');
+        _context2.n = 5;
         return call(channelQuery.loadNextPage);
-      case 4:
+      case 5:
         channelsData = _context2.v;
         channelList = channelsData.channels;
-        _context2.n = 5;
-        return put(channelHasNextAC(channelsData.hasNext));
-      case 5:
+        log.info('[getChannels] channelsData received:', JSON.stringify({
+          channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
+          hasNext: channelsData.hasNext
+        }));
         _context2.n = 6;
-        return call(getActiveChannelId);
+        return put(channelHasNextAC(channelsData.hasNext));
       case 6:
+        _context2.n = 7;
+        return call(getActiveChannelId);
+      case 7:
         channelId = _context2.v;
+        log.info('[getChannels] active channelId:', channelId);
         if (!channelId) {
-          _context2.n = 8;
+          _context2.n = 9;
           break;
         }
-        _context2.n = 7;
+        _context2.n = 8;
         return call(getChannelFromMap, channelId);
-      case 7:
+      case 8:
         _t2 = _context2.v;
-        _context2.n = 9;
+        _context2.n = 10;
         break;
-      case 8:
-        _t2 = null;
       case 9:
-        activeChannel = _t2;
-        _context2.n = 10;
-        return call(destroyChannelsMap);
+        _t2 = null;
       case 10:
+        activeChannel = _t2;
+        log.info('[getChannels] activeChannel from map:', activeChannel ? (_activeChannel = activeChannel) === null || _activeChannel === void 0 ? void 0 : _activeChannel.id : 'null');
         _context2.n = 11;
-        return call(setChannelsInMap, channelList);
+        return call(destroyChannelsMap);
       case 11:
+        log.info('[getChannels] channels map destroyed');
+        _context2.n = 12;
+        return call(setChannelsInMap, channelList);
+      case 12:
         _yield$call = _context2.v;
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
-        if (!channelsForUpdateLastReactionMessage.length) {
-          _context2.n = 13;
+        log.info('[getChannels] setChannelsInMap result:', JSON.stringify({
+          mappedChannelsCount: ((_mappedChannels = mappedChannels) === null || _mappedChannels === void 0 ? void 0 : _mappedChannels.length) || 0,
+          channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
+        }));
+        log.info('channelsForUpdateLastReactionMessage', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
+        if (!(channelsForUpdateLastReactionMessage !== null && channelsForUpdateLastReactionMessage !== void 0 && channelsForUpdateLastReactionMessage.length)) {
+          _context2.n = 14;
           break;
         }
+        log.info('[getChannels] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
         channelMessageMap = {};
-        _context2.n = 12;
+        _context2.n = 13;
         return call(function () {
           try {
             return Promise.resolve(Promise.all(channelsForUpdateLastReactionMessage.map(function (channel) {
@@ -16149,9 +16217,10 @@ function getChannels(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel.id] = messages[0];
+                    log.info('[getChannels] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
-                    log.error(e, 'Error on getMessagesById');
+                    log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   });
                 }));
@@ -16163,89 +16232,133 @@ function getChannels(action) {
             return Promise.reject(e);
           }
         });
-      case 12:
+      case 13:
+        log.info('[getChannels] reaction messages fetched:', channelMessageMap ? (_Object$keys = Object.keys(channelMessageMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel.id]) {
             channel.lastReactedMessage = channelMessageMap[channel.id];
           }
           return channel;
         });
-      case 13:
-        _context2.n = 14;
-        return put(setChannelsAC(mappedChannels));
+        log.info('[getChannels] mappedChannels updated with reaction messages, final count:', ((_mappedChannels2 = mappedChannels) === null || _mappedChannels2 === void 0 ? void 0 : _mappedChannels2.length) || 0);
       case 14:
+        log.info('[getChannels] setting channels in state, count:', ((_mappedChannels3 = mappedChannels) === null || _mappedChannels3 === void 0 ? void 0 : _mappedChannels3.length) || 0);
+        _context2.n = 15;
+        return put(setChannelsAC(mappedChannels));
+      case 15:
         if (!channelId) {
           activeChannel = channelList[0];
+          log.info('[getChannels] no active channelId, setting first channel as active:', (_activeChannel2 = activeChannel) === null || _activeChannel2 === void 0 ? void 0 : _activeChannel2.id);
         }
         query.channelQuery = channelQuery;
         if (!(activeChannel && getAutoSelectFitsChannel())) {
-          _context2.n = 15;
+          _context2.n = 16;
           break;
         }
-        _context2.n = 15;
-        return put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
-      case 15:
+        log.info('[getChannels] auto-selecting channel:', (_activeChannel3 = activeChannel) === null || _activeChannel3 === void 0 ? void 0 : _activeChannel3.id);
         _context2.n = 16;
-        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
+        return put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
       case 16:
+        _context2.n = 17;
+        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
+      case 17:
         hiddenList = store.getState().ChannelReducer.hideChannelList;
+        log.info('[getChannels] hiddenList state:', hiddenList);
         if (hiddenList) {
-          _context2.n = 23;
+          _context2.n = 28;
           break;
         }
+        log.info('[getChannels] starting all channels query (hiddenList is false)');
         allChannelsQueryBuilder = new SceytChatClient.ChannelListQueryBuilder();
         allChannelsQueryBuilder.order('lastMessage');
         if (channelTypesFilter !== null && channelTypesFilter !== void 0 && channelTypesFilter.length) {
           allChannelsQueryBuilder.types(channelTypesFilter);
+          log.info('[getChannels] allChannelsQuery types:', JSON.stringify(channelTypesFilter));
         }
         if (params !== null && params !== void 0 && params.memberCount) {
           allChannelsQueryBuilder.memberCount(params.memberCount);
+          log.info('[getChannels] allChannelsQuery memberCount:', params === null || params === void 0 ? void 0 : params.memberCount);
         }
         allChannelsQueryBuilder.limit(50);
-        _context2.n = 17;
+        _context2.n = 18;
         return call(allChannelsQueryBuilder.build);
-      case 17:
+      case 18:
         allChannelsQuery = _context2.v;
+        log.info('[getChannels] allChannelsQuery built');
         hasNext = true;
+        totalAllChannelsAdded = 0;
         i = 0;
-      case 18:
+      case 19:
         if (!(i <= 4)) {
-          _context2.n = 23;
+          _context2.n = 27;
           break;
         }
         if (!hasNext) {
-          _context2.n = 22;
+          _context2.n = 25;
+          break;
+        }
+        _context2.p = 20;
+        _connectionStatus = store.getState().UserReducer.connectionStatus;
+        if (!(_connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
+          _context2.n = 21;
           break;
         }
-        _context2.p = 19;
-        _context2.n = 20;
+        log.warn('[getChannels] connection not ready, aborting. Status:', _connectionStatus);
+        return _context2.a(3, 27);
+      case 21:
+        log.info('[getChannels] loading all channels page:', i + 1);
+        _context2.n = 22;
         return call(allChannelsQuery.loadNextPage);
-      case 20:
+      case 22:
         allChannelsData = _context2.v;
         hasNext = allChannelsData.hasNext;
         allChannelList = allChannelsData.channels;
+        log.info('[getChannels] all channels page', i + 1, 'loaded:', JSON.stringify({
+          channelsCount: (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0,
+          hasNext: hasNext
+        }));
         addChannelsToAllChannels(allChannelList);
-        _context2.n = 22;
+        totalAllChannelsAdded += (allChannelList === null || allChannelList === void 0 ? void 0 : allChannelList.length) || 0;
+        log.info('[getChannels] total all channels added so far:', totalAllChannelsAdded);
+        _context2.n = 24;
         break;
-      case 21:
-        _context2.p = 21;
+      case 23:
+        _context2.p = 23;
         _t3 = _context2.v;
-        log.error(_t3, 'Error on get all channels');
-      case 22:
+        log.error(_t3, 'Error on get all channels page:', i + 1);
+        return _context2.a(3, 27);
+      case 24:
+        _context2.n = 26;
+        break;
+      case 25:
+        log.info('[getChannels] no more pages available, stopping at iteration:', i);
+      case 26:
         i++;
-        _context2.n = 18;
+        _context2.n = 19;
         break;
-      case 23:
-        _context2.n = 25;
+      case 27:
+        log.info('[getChannels] all channels query completed, total channels added:', totalAllChannelsAdded);
+        _context2.n = 29;
         break;
-      case 24:
-        _context2.p = 24;
+      case 28:
+        log.info('[getChannels] skipping all channels query (hiddenList is true)');
+      case 29:
+        log.info('[getChannels] completed successfully. Final mapped channels count:', ((_mappedChannels4 = mappedChannels) === null || _mappedChannels4 === void 0 ? void 0 : _mappedChannels4.length) || 0);
+        _context2.n = 31;
+        break;
+      case 30:
+        _context2.p = 30;
         _t4 = _context2.v;
-        log.error(JSON.stringify(_t4), 'Error on get channels');
-      case 25:
+        log.error('[getChannels] error occurred:', JSON.stringify(_t4), 'Error on get channels');
+        log.error('[getChannels] error details:', {
+          message: _t4.message,
+          code: _t4.code,
+          stack: _t4.stack
+        });
+      case 31:
         return _context2.a(2);
     }
-  }, _marked2$1, null, [[19, 21], [0, 24]]);
+  }, _marked2$1, null, [[20, 23], [1, 30]]);
 }
 function searchChannels(action) {
   var payload, params, contactsMap, SceytChatClient, getFromContacts, searchBy, _params$filter2, _types2, channelQueryBuilder, channelTypesFilter, types, allChannels, publicChannels, chatsGroups, contactsList, contactsWithChannelsMap, lowerCaseSearchBy, handleChannels, channelsMap, _iterator, _step, channel, channelQuery, channelsData, _iterator2, _step2, _channel, channelsToAdd, _t5;
@@ -16568,39 +16681,66 @@ function searchChannelsForForward(action) {
   }, _marked5, null, [[0, 7]]);
 }
 function channelsLoadMore(action) {
-  var payload, limit, channelQuery, channelsData, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, channelMessageMap, _t8;
+  var _mappedChannels5, _mappedChannels7, _mappedChannels8, payload, limit, channelQuery, channelsData, channelList, _yield$call3, mappedChannels, channelsForUpdateLastReactionMessage, _Object$keys2, _mappedChannels6, channelMessageMap, _t8;
   return _regenerator().w(function (_context6) {
     while (1) switch (_context6.p = _context6.n) {
       case 0:
-        _context6.p = 0;
+        log.info('[channelsLoadMore] start load more channels');
+        _context6.p = 1;
         payload = action.payload;
         limit = payload.limit;
+        log.info('[channelsLoadMore] input payload:', JSON.stringify({
+          limit: limit
+        }));
         channelQuery = query.channelQuery;
+        log.info('[channelsLoadMore] channelQuery exists:', !!channelQuery);
+        if (channelQuery) {
+          _context6.n = 2;
+          break;
+        }
+        log.error('[channelsLoadMore] channelQuery is null or undefined, cannot load more');
+        return _context6.a(2);
+      case 2:
         if (limit) {
+          log.info('[channelsLoadMore] setting query limit to:', limit);
           channelQuery.limit = limit;
+        } else {
+          log.info('[channelsLoadMore] no limit provided, using existing query limit');
         }
-        _context6.n = 1;
-        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
-      case 1:
-        _context6.n = 2;
-        return call(channelQuery.loadNextPage);
-      case 2:
-        channelsData = _context6.v;
         _context6.n = 3;
-        return put(channelHasNextAC(channelsData.hasNext));
+        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADING));
       case 3:
+        log.info('[channelsLoadMore] loading next page...');
         _context6.n = 4;
-        return call(setChannelsInMap, channelsData.channels);
+        return call(channelQuery.loadNextPage);
       case 4:
+        channelsData = _context6.v;
+        channelList = channelsData.channels;
+        log.info('[channelsLoadMore] channelsData received:', JSON.stringify({
+          channelsCount: (channelList === null || channelList === void 0 ? void 0 : channelList.length) || 0,
+          hasNext: channelsData.hasNext
+        }));
+        _context6.n = 5;
+        return put(channelHasNextAC(channelsData.hasNext));
+      case 5:
+        log.info('[channelsLoadMore] hasNext set to:', channelsData.hasNext);
+        _context6.n = 6;
+        return call(setChannelsInMap, channelsData.channels);
+      case 6:
         _yield$call3 = _context6.v;
         mappedChannels = _yield$call3.channels;
         channelsForUpdateLastReactionMessage = _yield$call3.channelsForUpdateLastReactionMessage;
-        if (!channelsForUpdateLastReactionMessage.length) {
-          _context6.n = 6;
+        log.info('[channelsLoadMore] setChannelsInMap result:', JSON.stringify({
+          mappedChannelsCount: ((_mappedChannels5 = mappedChannels) === null || _mappedChannels5 === void 0 ? void 0 : _mappedChannels5.length) || 0,
+          channelsForUpdateLastReactionMessageCount: (channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length) || 0
+        }));
+        if (!(channelsForUpdateLastReactionMessage !== null && channelsForUpdateLastReactionMessage !== void 0 && channelsForUpdateLastReactionMessage.length)) {
+          _context6.n = 8;
           break;
         }
+        log.info('[channelsLoadMore] processing channels for reaction message update:', channelsForUpdateLastReactionMessage === null || channelsForUpdateLastReactionMessage === void 0 ? void 0 : channelsForUpdateLastReactionMessage.length);
         channelMessageMap = {};
-        _context6.n = 5;
+        _context6.n = 7;
         return call(function () {
           try {
             return Promise.resolve(Promise.all(channelsForUpdateLastReactionMessage.map(function (channel) {
@@ -16608,9 +16748,10 @@ function channelsLoadMore(action) {
                 return Promise.resolve(new Promise(function (resolve) {
                   channel.getMessagesById([channel.newReactions[0].messageId]).then(function (messages) {
                     channelMessageMap[channel.id] = messages[0];
+                    log.info('[channelsLoadMore] successfully fetched reaction message for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   })["catch"](function (e) {
-                    log.error(e, 'Error on getMessagesById');
+                    log.error(e, 'Error on getMessagesById for channel:', channel === null || channel === void 0 ? void 0 : channel.id);
                     resolve(true);
                   });
                 }));
@@ -16622,30 +16763,43 @@ function channelsLoadMore(action) {
             return Promise.reject(e);
           }
         });
-      case 5:
+      case 7:
+        log.info('[channelsLoadMore] reaction messages fetched:', channelMessageMap ? (_Object$keys2 = Object.keys(channelMessageMap)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length : 0);
         mappedChannels = mappedChannels.map(function (channel) {
           if (channelMessageMap[channel.id]) {
             channel.lastReactedMessage = channelMessageMap[channel.id];
           }
           return channel;
         });
-      case 6:
-        _context6.n = 7;
-        return put(addChannelsAC(mappedChannels));
-      case 7:
-        _context6.n = 8;
-        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
+        log.info('[channelsLoadMore] mappedChannels updated with reaction messages, final count:', ((_mappedChannels6 = mappedChannels) === null || _mappedChannels6 === void 0 ? void 0 : _mappedChannels6.length) || 0);
+        _context6.n = 9;
+        break;
       case 8:
+        log.info('[channelsLoadMore] no channels need reaction message update');
+      case 9:
+        log.info('[channelsLoadMore] adding channels to state, count:', ((_mappedChannels7 = mappedChannels) === null || _mappedChannels7 === void 0 ? void 0 : _mappedChannels7.length) || 0);
         _context6.n = 10;
+        return put(addChannelsAC(mappedChannels));
+      case 10:
+        _context6.n = 11;
+        return put(setChannelsLoadingStateAC(LOADING_STATE.LOADED));
+      case 11:
+        log.info('[channelsLoadMore] completed successfully. Total channels added:', ((_mappedChannels8 = mappedChannels) === null || _mappedChannels8 === void 0 ? void 0 : _mappedChannels8.length) || 0);
+        _context6.n = 13;
         break;
-      case 9:
-        _context6.p = 9;
+      case 12:
+        _context6.p = 12;
         _t8 = _context6.v;
-        log.error(_t8, 'Error in load more channels');
-      case 10:
+        log.error('[channelsLoadMore] error occurred:', _t8);
+        log.error('[channelsLoadMore] error details:', JSON.stringify({
+          message: _t8 === null || _t8 === void 0 ? void 0 : _t8.message,
+          code: _t8 === null || _t8 === void 0 ? void 0 : _t8.code,
+          stack: _t8 === null || _t8 === void 0 ? void 0 : _t8.stack
+        }));
+      case 13:
         return _context6.a(2);
     }
-  }, _marked6, null, [[0, 9]]);
+  }, _marked6, null, [[1, 12]]);
 }
 function getChannelMentions(action) {
   var payload, channelId, _SceytChatClient3, mentionsQueryBuilder, mentionsQuery, mentions, _t9;
@@ -17357,7 +17511,7 @@ function blockChannel(action) {
   }, _marked20, null, [[0, 5]]);
 }
 function updateChannel(action) {
-  var payload, channelId, config, _SceytChatClient6, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, _t22;
+  var payload, channelId, config, _SceytChatClient6, channel, paramsToUpdate, fileToUpload, _yield$call5, subject, avatarUrl, metadata, onUpdateChannel, _channel3, _channel4, _channel5, fields, updatedChannel, _t22;
   return _regenerator().w(function (_context21) {
     while (1) switch (_context21.p = _context21.n) {
       case 0:
@@ -17421,16 +17575,37 @@ function updateChannel(action) {
           avatarUrl: avatarUrl,
           metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
         });
-        _context21.n = 7;
-        break;
+        onUpdateChannel = getOnUpdateChannel();
+        if (!onUpdateChannel) {
+          _context21.n = 7;
+          break;
+        }
+        fields = [];
+        if (((_channel3 = channel) === null || _channel3 === void 0 ? void 0 : _channel3.subject) !== subject) {
+          fields.push('subject');
+        }
+        if (((_channel4 = channel) === null || _channel4 === void 0 ? void 0 : _channel4.avatarUrl) !== avatarUrl) {
+          fields.push('avatarUrl');
+        }
+        if (JSON.stringify((_channel5 = channel) === null || _channel5 === void 0 ? void 0 : _channel5.metadata) !== metadata) {
+          fields.push('metadata');
+        }
+        _context21.n = 6;
+        return call(getChannelFromMap, channelId);
       case 6:
-        _context21.p = 6;
+        updatedChannel = _context21.v;
+        onUpdateChannel(updatedChannel, fields);
+      case 7:
+        _context21.n = 9;
+        break;
+      case 8:
+        _context21.p = 8;
         _t22 = _context21.v;
         log.error('ERROR in update channel', _t22.message);
-      case 7:
+      case 9:
         return _context21.a(2);
     }
-  }, _marked21, null, [[0, 6]]);
+  }, _marked21, null, [[0, 8]]);
 }
 function checkUsersStatus() {
   var _SceytChatClient7, usersForUpdate, updatedUsers, usersToUpdateMap, update, updateData, _t23;
@@ -18671,7 +18846,9 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
       addAllMessages([messageToAdd], MESSAGE_LOAD_DIRECTION.NEXT);
     }
     setPendingMessage(channel.id, messageToAdd);
-    store.dispatch(scrollToNewMessageAC(true));
+    if (!(messageToAdd !== null && messageToAdd !== void 0 && messageToAdd.forwardingDetails)) {
+      store.dispatch(scrollToNewMessageAC(true));
+    }
     if (activeChannelId === channel.id) {
       store.dispatch(addMessageAC(messageToAdd));
     }
@@ -18680,23 +18857,14 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
     return Promise.reject(e);
   }
 };
-var updatePendingMessage$1 = function updatePendingMessage(message, channel, updatedMessage) {
-  var messageToUpdate = _extends({}, message, updatedMessage);
-  updateMessageOnMap(channel.id, {
-    messageId: message.tid,
-    params: messageToUpdate
-  });
-  updateMessageOnAllMessages(message.tid, messageToUpdate);
-  updatePendingMessageOnMap(channel.id, message.tid, messageToUpdate);
-  store.dispatch(updateMessageAC(message.tid, messageToUpdate, false));
-};
 function sendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, messageCopy, _loop2, _i, _t2;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, messageCopy, _loop2, _i, _t2;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.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;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
@@ -18740,7 +18908,7 @@ function sendMessage(action) {
         }) : [];
         customUploader = getCustomUploader();
         if (!(message.attachments && message.attachments.length)) {
-          _context3.n = 22;
+          _context3.n = 14;
           break;
         }
         linkAttachment = null;
@@ -18753,11 +18921,11 @@ function sendMessage(action) {
           return att.type !== attachmentTypes.link;
         });
         if (!(mediaAttachments && mediaAttachments.length)) {
-          _context3.n = 18;
+          _context3.n = 11;
           break;
         }
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, messageForSendCopy;
+          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.n) {
               case 0:
@@ -18803,55 +18971,37 @@ function sendMessage(action) {
                 if (customUploader) {
                   messageAttachment.url = attachment.data;
                 }
-                if (!sendAttachmentsAsSeparateMessage) {
-                  _context.n = 4;
-                  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 = _messageBuilder.create();
-                setPendingAttachment(messageAttachment.tid, _extends({}, messageAttachment.data, {
-                  messageTid: _messageToSend.tid,
-                  channelId: channel.id
-                }));
-                messageForSend = _extends({}, _messageToSend, {
-                  attachments: [messageAttachment]
-                });
-                messagesToSend.push(messageForSend);
-                messageForSendCopy = messageForSend;
-                if (!isAddToPendingMessagesMap) {
-                  _context.n = 2;
-                  break;
+                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]
+                  });
+                  messagesToSend.push(messageForSend);
+                  pendingMessages.push(_extends({}, messageForSend, {
+                    attachments: [attachment]
+                  }));
+                } else {
+                  attachmentsToSend.push(messageAttachment);
                 }
-                _context.n = 1;
-                return call(addPendingMessage, message, _extends({}, messageForSendCopy, {
-                  attachments: [attachment]
-                }), channel);
-              case 1:
-                _context.n = 3;
-                break;
-              case 2:
-                _context.n = 3;
-                return call(updatePendingMessage$1, message, channel, messageForSendCopy);
-              case 3:
-                _context.n = 5;
-                break;
-              case 4:
-                attachmentsToSend.push(messageAttachment);
-              case 5:
                 if (!(!messageAttachment.cachedUrl && customUploader)) {
-                  _context.n = 6;
+                  _context.n = 1;
                   break;
                 }
-                _context.n = 6;
+                _context.n = 1;
                 return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.UPLOADING, messageAttachment.tid));
-              case 6:
+              case 1:
                 return _context.a(2);
             }
           }, _callee);
@@ -18868,68 +19018,28 @@ function sendMessage(action) {
         _context3.n = 8;
         break;
       case 10:
-        if (sendAttachmentsAsSeparateMessage) {
-          _context3.n = 18;
-          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 = messageBuilder.create();
-        messageCopy = messageToSend;
-        if (!customUploader) {
-          _context3.n = 14;
-          break;
-        }
-        if (sendAttachmentsAsSeparateMessage) {
-          _context3.n = 13;
-          break;
-        }
-        if (!isAddToPendingMessagesMap) {
-          _context3.n = 12;
-          break;
+        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();
+          messageCopy = messageToSend;
+          pendingMessages.push(_extends({}, messageCopy, {
+            attachments: message.attachments
+          }));
+          messageToSend = _extends({}, messageToSend, {
+            attachments: attachmentsToSend
+          });
+          messagesToSend.push(messageToSend);
         }
-        _context3.n = 11;
-        return call(addPendingMessage, message, _extends({}, messageCopy, {
-          attachments: message.attachments
-        }), channel);
       case 11:
-        _context3.n = 13;
-        break;
-      case 12:
-        updatePendingMessage$1(message, channel, messageCopy);
-      case 13:
-        _context3.n = 17;
-        break;
-      case 14:
-        if (!isAddToPendingMessagesMap) {
-          _context3.n = 16;
-          break;
-        }
-        _context3.n = 15;
-        return call(addPendingMessage, message, messageCopy, channel);
-      case 15:
-        _context3.n = 17;
-        break;
-      case 16:
-        updatePendingMessage$1(message, channel, messageCopy);
-      case 17:
-        messageToSend.attachments = attachmentsToSend;
-        messagesToSend.push(messageToSend);
-      case 18:
-        if (!(connectionState !== CONNECTION_STATUS.CONNECTED)) {
-          _context3.n = 19;
-          break;
-        }
-        throw new Error('Connection is required to send message');
-      case 19:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee2() {
-          var messageAttachment, messageToSend, _messageCopy, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, _t;
+          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) {
               case 0:
@@ -18937,6 +19047,7 @@ function sendMessage(action) {
                 messageToSend = messagesToSend[_i];
                 _context2.p = 1;
                 _messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
+                store.dispatch(scrollToNewMessageAC(true));
                 if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
                   _context2.n = 12;
                   break;
@@ -18995,12 +19106,7 @@ function sendMessage(action) {
                 _context2.n = 5;
                 break;
               case 8:
-                if (!isAddToPendingMessagesMap) {
-                  message.tid && store.dispatch(removePendingMessageAC(channel.id, message.tid));
-                  message.id && store.dispatch(removePendingMessageAC(channel.id, message.id));
-                  messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
-                  messageToSend.id && store.dispatch(removePendingMessageAC(channel.id, messageToSend.id));
-                }
+                message.tid && store.dispatch(removePendingMessageAC(channel.id, message.tid));
                 attachmentsToUpdate = [];
                 if (messageResponse.attachments && messageResponse.attachments.length > 0) {
                   currentAttachmentsMap = {};
@@ -19063,19 +19169,33 @@ function sendMessage(action) {
               case 12:
                 throw new Error('Connection required to send message');
               case 13:
-                _context2.n = 16;
+                _context2.n = 17;
                 break;
               case 14:
                 _context2.p = 14;
                 _t = _context2.v;
-                log.error('Error on uploading attachment', messageToSend.tid, _t);
-                if (!(messageToSend.attachments && messageToSend.attachments.length)) {
+                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;
+                  break;
+                }
+                if (!isAddToPendingMessagesMap) {
                   _context2.n = 15;
                   break;
                 }
                 _context2.n = 15;
-                return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.FAIL, messageToSend.attachments[0].tid));
+                return call(addPendingMessage, message, pendingMessage, channel);
               case 15:
+                log.error('Error on uploading attachment', messageToSend.tid, _t);
+                if (!(messageToSend.attachments && messageToSend.attachments.length)) {
+                  _context2.n = 16;
+                  break;
+                }
+                _context2.n = 16;
+                return put(updateAttachmentUploadingStateAC(UPLOAD_STATE.FAIL, messageToSend.attachments[0].tid));
+              case 16:
                 updateMessageOnMap(channel.id, {
                   messageId: messageToSend.tid,
                   params: {
@@ -19085,40 +19205,40 @@ function sendMessage(action) {
                 updateMessageOnAllMessages(messageToSend.tid, {
                   state: MESSAGE_STATUS.FAILED
                 });
-                _context2.n = 16;
+                _context2.n = 17;
                 return put(updateMessageAC(messageToSend.tid, {
                   state: MESSAGE_STATUS.FAILED
                 }));
-              case 16:
+              case 17:
                 return _context2.a(2);
             }
           }, _callee2, null, [[1, 14]]);
         });
         _i = 0;
-      case 20:
+      case 12:
         if (!(_i < messagesToSend.length)) {
-          _context3.n = 22;
+          _context3.n = 14;
           break;
         }
-        return _context3.d(_regeneratorValues(_loop2()), 21);
-      case 21:
+        return _context3.d(_regeneratorValues(_loop2()), 13);
+      case 13:
         _i++;
-        _context3.n = 20;
+        _context3.n = 12;
         break;
-      case 22:
-        _context3.n = 24;
+      case 14:
+        _context3.n = 16;
         break;
-      case 23:
-        _context3.p = 23;
+      case 15:
+        _context3.p = 15;
         _t2 = _context3.v;
         log.error('error on send message ... ', _t2);
-      case 24:
+      case 16:
         return _context3.a(2);
     }
-  }, _marked$3, null, [[1, 23]]);
+  }, _marked$3, null, [[1, 15]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
+  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -19137,6 +19257,7 @@ function sendTextMessage(action) {
             setChannelInMap(channel);
           }
         }
+        pendingMessage = null;
         activeChannelId = getActiveChannelId();
         _context4.p = 3;
         if (!channel.isMockChannel) {
@@ -19180,52 +19301,38 @@ function sendTextMessage(action) {
         if (message.repliedInThread) {
           messageBuilder.setReplyInThread();
         }
-        messageToSend = messageBuilder.create();
+        messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
         pendingMessage = JSON.parse(JSON.stringify(_extends({}, messageToSend, {
+          attachments: message === null || message === void 0 ? void 0 : message.attachments,
           createdAt: new Date(Date.now()),
           mentionedUsers: message.mentionedUsers,
           parentMessage: message.parentMessage
         })));
         sendMessageTid = messageToSend.tid;
-        if (pendingMessage.metadata) {
+        if (pendingMessage && pendingMessage.metadata) {
           pendingMessage.metadata = JSON.parse(pendingMessage.metadata);
         }
-        if (!(activeChannelId === channel.id)) {
-          _context4.n = 10;
-          break;
-        }
-        if (!isAddToPendingMessagesMap) {
-          _context4.n = 9;
-          break;
-        }
-        _context4.n = 8;
-        return call(addPendingMessage, message, pendingMessage, channel);
-      case 8:
-        _context4.n = 10;
-        break;
-      case 9:
-        updatePendingMessage$1(message, channel, pendingMessage);
-      case 10:
+        store.dispatch(scrollToNewMessageAC(true));
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context4.n = 18;
+          _context4.n = 15;
           break;
         }
         if (!sendMessageHandler) {
-          _context4.n = 12;
+          _context4.n = 9;
           break;
         }
-        _context4.n = 11;
+        _context4.n = 8;
         return call(sendMessageHandler, messageToSend, channel.id);
-      case 11:
+      case 8:
         messageResponse = _context4.v;
-        _context4.n = 14;
+        _context4.n = 11;
         break;
-      case 12:
-        _context4.n = 13;
+      case 9:
+        _context4.n = 10;
         return call(channel.sendMessage, messageToSend);
-      case 13:
+      case 10:
         messageResponse = _context4.v;
-      case 14:
+      case 11:
         messageUpdateData = {
           id: messageResponse.id,
           body: messageResponse.body,
@@ -19244,12 +19351,12 @@ function sendTextMessage(action) {
           channelId: channel.id
         };
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 15;
+          _context4.n = 12;
           break;
         }
-        _context4.n = 15;
+        _context4.n = 12;
         return put(updateMessageAC(messageToSend.tid, messageUpdateData));
-      case 15:
+      case 12:
         updateMessageOnMap(channel.id, {
           messageId: !isAddToPendingMessagesMap ? message.tid : messageToSend.tid,
           params: messageUpdateData
@@ -19263,17 +19370,17 @@ function sendTextMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context4.n = 16;
+        _context4.n = 13;
         return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 16:
+      case 13:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context4.n = 17;
+          _context4.n = 14;
           break;
         }
-        _context4.n = 17;
+        _context4.n = 14;
         return put(markChannelAsReadAC(channel.id));
-      case 17:
+      case 14:
         channel.lastMessage = messageToUpdate;
         if (!isAddToPendingMessagesMap) {
           message.tid && store.dispatch(removePendingMessageAC(channel.id, message.tid));
@@ -19281,19 +19388,30 @@ function sendTextMessage(action) {
           messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
           messageToSend.id && store.dispatch(removePendingMessageAC(channel.id, messageToSend.id));
         }
-        _context4.n = 19;
+        _context4.n = 16;
         break;
-      case 18:
+      case 15:
         throw new Error('Connection required to send message');
-      case 19:
-        _context4.n = 20;
+      case 16:
+        _context4.n = 17;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 20:
-        _context4.n = 23;
+      case 17:
+        _context4.n = 21;
         break;
-      case 21:
-        _context4.p = 21;
+      case 18:
+        _context4.p = 18;
         _t3 = _context4.v;
+        if (!(activeChannelId === channel.id && pendingMessage && action.type !== RESEND_MESSAGE)) {
+          _context4.n = 19;
+          break;
+        }
+        if (!isAddToPendingMessagesMap) {
+          _context4.n = 19;
+          break;
+        }
+        _context4.n = 19;
+        return call(addPendingMessage, message, pendingMessage, channel);
+      case 19:
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
           messageId: sendMessageTid,
@@ -19302,61 +19420,68 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 22;
+          _context4.n = 20;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 22;
+        _context4.n = 20;
         return put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 22:
-        _context4.n = 23;
+      case 20:
+        _context4.n = 21;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 23:
+      case 21:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 21]]);
+  }, _marked2$2, null, [[3, 18]]);
 }
 function forwardMessage(action) {
-  var payload, message, channelId, connectionState, isForward, isAddToPendingMessagesMap, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, pendingMessage, activeChannelId, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
+  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) {
       case 0:
-        _context5.p = 0;
         payload = action.payload;
         message = payload.message, channelId = payload.channelId, connectionState = payload.connectionState, isForward = payload.isForward, isAddToPendingMessagesMap = payload.isAddToPendingMessagesMap;
-        _context5.n = 1;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
-      case 1:
+        pendingMessage = null;
+        channel = null;
+        activeChannelId = getActiveChannelId();
+        messageTid = null;
+        _context5.p = 1;
         _context5.n = 2;
-        return call(getChannelFromMap, channelId);
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
       case 2:
+        _context5.n = 3;
+        return call(getChannelFromMap, channelId);
+      case 3:
         channel = _context5.v;
         if (channel) {
-          _context5.n = 5;
+          _context5.n = 6;
           break;
         }
-        channel = getChannelFromAllChannels(channelId);
+        channel = getChannelFromAllChannels(channelId) || null;
         if (channel) {
-          _context5.n = 4;
+          _context5.n = 5;
           break;
         }
         SceytChatClient = getClient();
-        _context5.n = 3;
+        _context5.n = 4;
         return call(SceytChatClient.getChannel, channelId);
-      case 3:
-        channel = _context5.v;
       case 4:
+        channel = _context5.v;
+      case 5:
         if (channel) {
           setChannelInMap(channel);
         }
-      case 5:
-        _context5.n = 6;
-        return put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 6:
+        if (channel) {
+          _context5.n = 7;
+          break;
+        }
+        throw new Error('Channel not found');
+      case 7:
         mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
@@ -19388,12 +19513,14 @@ function forwardMessage(action) {
             allowVoteRetract: message.pollDetails.allowVoteRetract
           };
         }
-        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisableMentionsCount(getDisableFrowardMentionsCount()).setMetadata(message.metadata ? JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id).setPollDetails(pollDetails);
+        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisableMentionsCount(getDisableFrowardMentionsCount()).setMetadata(message.metadata ? isJSON(message.metadata) ? message.metadata : JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id).setPollDetails(pollDetails);
         messageToSend = messageBuilder.create();
+        messageToSend.tid = action.type === RESEND_MESSAGE ? action.payload.message.tid : messageToSend.tid;
+        messageTid = messageToSend.tid;
         pendingMessage = _extends({}, messageToSend, {
           createdAt: new Date(Date.now())
         });
-        if (isForward) {
+        if (isForward && pendingMessage && action.type !== RESEND_MESSAGE) {
           if (message.forwardingDetails) {
             pendingMessage.forwardingDetails.user = message.forwardingDetails.user;
             pendingMessage.forwardingDetails.channelId = message.forwardingDetails.channelId;
@@ -19403,43 +19530,29 @@ function forwardMessage(action) {
           }
           pendingMessage.forwardingDetails.hops = message.forwardingDetails ? message.forwardingDetails.hops : 1;
         }
-        activeChannelId = getActiveChannelId();
         if (!(channelId === activeChannelId)) {
-          _context5.n = 7;
+          _context5.n = 8;
           break;
         }
         hasNextMessages = store.getState().MessageReducer.messagesHasNext;
         if (getHasNextCached()) {
-          _context5.n = 7;
+          _context5.n = 8;
           break;
         }
         if (!hasNextMessages) {
-          _context5.n = 7;
-          break;
-        }
-        _context5.n = 7;
-        return put(getMessagesAC(channel));
-      case 7:
-        if (!isAddToPendingMessagesMap) {
-          _context5.n = 9;
+          _context5.n = 8;
           break;
         }
         _context5.n = 8;
-        return call(addPendingMessage, message, pendingMessage, channel);
+        return put(getMessagesAC(channel));
       case 8:
-        _context5.n = 10;
-        break;
-      case 9:
-        _context5.n = 10;
-        return call(updatePendingMessage$1, message, channel, pendingMessage);
-      case 10:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context5.n = 15;
+          _context5.n = 14;
           break;
         }
-        _context5.n = 11;
+        _context5.n = 9;
         return call(channel.sendMessage, messageToSend);
-      case 11:
+      case 9:
         messageResponse = _context5.v;
         messageUpdateData = {
           id: messageResponse.id,
@@ -19456,18 +19569,15 @@ function forwardMessage(action) {
           channelId: channel.id
         };
         if (!(channelId === activeChannelId)) {
-          _context5.n = 13;
+          _context5.n = 11;
           break;
         }
-        _context5.n = 12;
+        _context5.n = 10;
         return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData))));
-      case 12:
+      case 10:
         updateMessageOnAllMessages(messageToSend.tid, messageUpdateData);
-      case 13:
+      case 11:
         message.tid && store.dispatch(removePendingMessageAC(channel.id, message.tid));
-        message.id && store.dispatch(removePendingMessageAC(channel.id, message.id));
-        messageToSend.tid && store.dispatch(removePendingMessageAC(channel.id, messageToSend.tid));
-        messageToSend.id && store.dispatch(removePendingMessageAC(channel.id, messageToSend.id));
         updateMessageOnMap(channel.id, {
           messageId: !isAddToPendingMessagesMap ? message.tid : messageToSend.tid,
           params: messageUpdateData
@@ -19478,30 +19588,71 @@ function forwardMessage(action) {
           lastMessage: messageToUpdate,
           lastReactedMessage: null
         };
-        _context5.n = 14;
+        _context5.n = 12;
         return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 14:
+      case 12:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
         if (!channel.unread) {
-          _context5.n = 15;
+          _context5.n = 13;
           break;
         }
-        _context5.n = 15;
+        _context5.n = 13;
         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 = 17;
+        _context5.n = 20;
         break;
       case 16:
         _context5.p = 16;
         _t4 = _context5.v;
-        log.error('error on forward message ... ', _t4);
+        if (!(pendingMessage && channel && action.type !== RESEND_MESSAGE)) {
+          _context5.n = 17;
+          break;
+        }
+        if (!isAddToPendingMessagesMap) {
+          _context5.n = 17;
+          break;
+        }
+        _context5.n = 17;
+        return call(addPendingMessage, message, pendingMessage, channel);
       case 17:
+        if (!(channel && messageTid)) {
+          _context5.n = 18;
+          break;
+        }
+        updateMessageOnMap(channel.id, {
+          messageId: messageTid,
+          params: {
+            state: MESSAGE_STATUS.FAILED
+          }
+        });
+        if (!(activeChannelId === channel.id)) {
+          _context5.n = 18;
+          break;
+        }
+        updateMessageOnAllMessages(messageTid, {
+          state: MESSAGE_STATUS.FAILED
+        });
         _context5.n = 18;
-        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+        return put(updateMessageAC(messageTid, {
+          state: MESSAGE_STATUS.FAILED
+        }));
       case 18:
+        _context5.n = 19;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 19:
+        log.error('error on forward message ... ', _t4);
+      case 20:
+        _context5.n = 21;
+        return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
+      case 21:
         return _context5.a(2);
     }
-  }, _marked3$1, null, [[0, 16]]);
+  }, _marked3$1, null, [[1, 16]]);
 }
 function resendMessage(action) {
   var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isVoiceMessage;
@@ -19647,19 +19798,18 @@ function editMessage(action) {
   }, _marked6$1, null, [[0, 5]]);
 }
 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, pendingMessagesMap, channelId, _iterator, _step, msg, pendingPollActionsMap, _t7, _t8, _t9, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
+  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, pendingMessagesMap, channelId, _iterator, _step, _msg$attachments, msg, attachments, pendingPollActionsMap, _t7, _t8, _t9, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
-        console.log('getMessagesQuery');
-        _context9.p = 1;
-        _context9.n = 2;
+        _context9.p = 0;
+        _context9.n = 1;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADING));
-      case 2:
+      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;
         connectionState = store.getState().UserReducer.connectionStatus;
         if (!(channel.id && !channel.isMockChannel)) {
-          _context9.n = 81;
+          _context9.n = 86;
           break;
         }
         SceytChatClient = getClient();
@@ -19667,18 +19817,18 @@ function getMessagesQuery(action) {
         messageQueryBuilder.limit(limit || MESSAGES_MAX_LENGTH);
         messageQueryBuilder.reverse(true);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 4;
+          _context9.n = 3;
           break;
         }
-        _context9.n = 3;
+        _context9.n = 2;
         return call(messageQueryBuilder.build);
-      case 3:
+      case 2:
         _t7 = _context9.v;
-        _context9.n = 5;
+        _context9.n = 4;
         break;
-      case 4:
+      case 3:
         _t7 = null;
-      case 5:
+      case 4:
         messageQuery = _t7;
         query.messageQuery = messageQuery;
         cachedMessages = Object.values(getMessagesFromMap(channel.id) || {}).sort(function (a, b) {
@@ -19689,60 +19839,60 @@ function getMessagesQuery(action) {
           hasNext: false
         };
         if (!loadWithLastMessage) {
-          _context9.n = 20;
+          _context9.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)) {
-          _context9.n = 15;
+          _context9.n = 14;
           break;
         }
         setHasPrevCached(false);
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 7;
+          _context9.n = 6;
           break;
         }
-        _context9.n = 6;
+        _context9.n = 5;
         return call(messageQuery.loadPreviousMessageId, '0');
-      case 6:
+      case 5:
         _t8 = _context9.v;
-        _context9.n = 8;
+        _context9.n = 7;
         break;
-      case 7:
+      case 6:
         _t8 = {
           messages: [],
           hasNext: false
         };
-      case 8:
+      case 7:
         result = _t8;
         if (!(result.messages.length === 50)) {
-          _context9.n = 12;
+          _context9.n = 11;
           break;
         }
         messageQuery.limit = 30;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 10;
+          _context9.n = 9;
           break;
         }
-        _context9.n = 9;
+        _context9.n = 8;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 9:
+      case 8:
         _t9 = _context9.v;
-        _context9.n = 11;
+        _context9.n = 10;
         break;
-      case 10:
+      case 9:
         _t9 = {
           messages: [],
           hasNext: false
         };
-      case 11:
+      case 10:
         secondResult = _t9;
         result.messages = [].concat(secondResult.messages, result.messages);
         result.hasNext = secondResult.hasNext;
-      case 12:
+      case 11:
         sentMessages = [];
         if (withDeliveredMessages) {
           sentMessages = getFromAllMessagesByMessageId('', '', true);
@@ -19755,40 +19905,40 @@ function getMessagesQuery(action) {
           return !messagesMap[msg.tid || ''];
         });
         result.messages = [].concat(result.messages, filteredSentMessages).slice(filteredSentMessages.length);
-        _context9.n = 13;
+        _context9.n = 12;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 13:
+      case 12:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages(result.messages);
-        _context9.n = 14;
+        _context9.n = 13;
         return put(setMessagesHasPrevAC(true));
-      case 14:
-        _context9.n = 17;
+      case 13:
+        _context9.n = 16;
         break;
-      case 15:
+      case 14:
         result.messages = getFromAllMessagesByMessageId('', '', true);
-        _context9.n = 16;
+        _context9.n = 15;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
+      case 15:
+        _context9.n = 16;
+        return put(setMessagesHasPrevAC(true));
       case 16:
         _context9.n = 17;
-        return put(setMessagesHasPrevAC(true));
-      case 17:
-        _context9.n = 18;
         return put(setMessagesHasNextAC(false));
-      case 18:
+      case 17:
         setHasNextCached(false);
         if (!messageId) {
-          _context9.n = 19;
+          _context9.n = 18;
           break;
         }
-        _context9.n = 19;
+        _context9.n = 18;
         return put(setScrollToMessagesAC(messageId, highlight, behavior));
-      case 19:
-        _context9.n = 73;
+      case 18:
+        _context9.n = 72;
         break;
-      case 20:
+      case 19:
         if (!messageId) {
-          _context9.n = 39;
+          _context9.n = 38;
           break;
         }
         _allMessages = getAllMessages();
@@ -19797,299 +19947,299 @@ function getMessagesQuery(action) {
         });
         maxLengthPart = MESSAGES_MAX_LENGTH / 2;
         if (!(messageIndex >= maxLengthPart)) {
-          _context9.n = 23;
+          _context9.n = 22;
           break;
         }
         result.messages = _allMessages.slice(messageIndex - maxLengthPart, messageIndex + maxLengthPart);
-        _context9.n = 21;
+        _context9.n = 20;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 21:
+      case 20:
         setHasPrevCached(messageIndex > maxLengthPart);
         setHasNextCached(_allMessages.length > maxLengthPart);
-        _context9.n = 22;
+        _context9.n = 21;
         return put(setMessagesHasPrevAC(true));
-      case 22:
-        _context9.n = 35;
+      case 21:
+        _context9.n = 34;
         break;
-      case 23:
+      case 22:
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         log.info('load by message id from server ...............', messageId);
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 25;
+          _context9.n = 24;
           break;
         }
-        _context9.n = 24;
+        _context9.n = 23;
         return call(messageQuery.loadNearMessageId, messageId);
-      case 24:
+      case 23:
         _t0 = _context9.v;
-        _context9.n = 26;
+        _context9.n = 25;
         break;
-      case 25:
+      case 24:
         _t0 = {
           messages: [],
           hasNext: false
         };
-      case 26:
+      case 25:
         result = _t0;
         if (!(result.messages.length === 50)) {
-          _context9.n = 33;
+          _context9.n = 32;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 28;
+          _context9.n = 27;
           break;
         }
-        _context9.n = 27;
+        _context9.n = 26;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 27:
+      case 26:
         _t1 = _context9.v;
-        _context9.n = 29;
+        _context9.n = 28;
         break;
-      case 28:
+      case 27:
         _t1 = {
           messages: [],
           hasNext: false
         };
-      case 29:
+      case 28:
         _secondResult = _t1;
         messageQuery.reverse = false;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 31;
+          _context9.n = 30;
           break;
         }
-        _context9.n = 30;
+        _context9.n = 29;
         return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 30:
+      case 29:
         _t10 = _context9.v;
-        _context9.n = 32;
+        _context9.n = 31;
         break;
-      case 31:
+      case 30:
         _t10 = {
           messages: [],
           hasNext: false
         };
-      case 32:
+      case 31:
         thirdResult = _t10;
         result.messages = [].concat(_secondResult.messages, result.messages, thirdResult.messages);
         result.hasNext = _secondResult.hasNext;
         messageQuery.reverse = true;
-        _context9.n = 33;
+        _context9.n = 32;
         return put(setMessagesHasPrevAC(_secondResult.hasNext));
-      case 33:
-        _context9.n = 34;
+      case 32:
+        _context9.n = 33;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 34:
+      case 33:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
         setHasPrevCached(false);
         setHasNextCached(false);
+      case 34:
+        _context9.n = 35;
+        return put(setMessagesHasNextAC(true));
       case 35:
         _context9.n = 36;
-        return put(setMessagesHasNextAC(true));
+        return put(setScrollToMessagesAC(messageId, true, behavior));
       case 36:
         _context9.n = 37;
-        return put(setScrollToMessagesAC(messageId, true, behavior));
-      case 37:
-        _context9.n = 38;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 38:
-        _context9.n = 73;
+      case 37:
+        _context9.n = 72;
         break;
-      case 39:
+      case 38:
         if (!(channel.newMessageCount && channel.lastDisplayedMessageId)) {
-          _context9.n = 62;
+          _context9.n = 61;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         messageQuery.limit = MESSAGES_MAX_LENGTH;
         if (!Number(channel.lastDisplayedMessageId)) {
-          _context9.n = 51;
+          _context9.n = 50;
           break;
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 41;
+          _context9.n = 40;
           break;
         }
-        _context9.n = 40;
+        _context9.n = 39;
         return call(messageQuery.loadNearMessageId, channel.lastDisplayedMessageId);
-      case 40:
+      case 39:
         _t11 = _context9.v;
-        _context9.n = 42;
+        _context9.n = 41;
         break;
-      case 41:
+      case 40:
         _t11 = {
           messages: [],
           hasNext: false
         };
-      case 42:
+      case 41:
         result = _t11;
         if (!(result.messages.length === 50)) {
-          _context9.n = 50;
+          _context9.n = 49;
           break;
         }
         messageQuery.limit = channel.newMessageCount > 25 ? (MESSAGES_MAX_LENGTH - 50) / 2 : MESSAGES_MAX_LENGTH - 50;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 44;
+          _context9.n = 43;
           break;
         }
-        _context9.n = 43;
+        _context9.n = 42;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 43:
+      case 42:
         _t12 = _context9.v;
-        _context9.n = 45;
+        _context9.n = 44;
         break;
-      case 44:
+      case 43:
         _t12 = {
           messages: [],
           hasNext: false
         };
-      case 45:
+      case 44:
         _secondResult2 = _t12;
         if (!(channel.newMessageCount > 25)) {
-          _context9.n = 49;
+          _context9.n = 48;
           break;
         }
         messageQuery.reverse = false;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 47;
+          _context9.n = 46;
           break;
         }
-        _context9.n = 46;
+        _context9.n = 45;
         return call(messageQuery.loadNextMessageId, result.messages[result.messages.length - 1].id);
-      case 46:
+      case 45:
         _t13 = _context9.v;
-        _context9.n = 48;
+        _context9.n = 47;
         break;
-      case 47:
+      case 46:
         _t13 = {
           messages: [],
           hasNext: false
         };
-      case 48:
+      case 47:
         _thirdResult = _t13;
         result.messages = [].concat(_secondResult2.messages, result.messages, _thirdResult.messages);
         messageQuery.reverse = true;
-        _context9.n = 50;
+        _context9.n = 49;
         break;
-      case 49:
+      case 48:
         result.messages = [].concat(_secondResult2.messages, result.messages);
-      case 50:
-        _context9.n = 58;
+      case 49:
+        _context9.n = 57;
         break;
-      case 51:
+      case 50:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 53;
+          _context9.n = 52;
           break;
         }
-        _context9.n = 52;
+        _context9.n = 51;
         return call(messageQuery.loadPrevious);
-      case 52:
+      case 51:
         _t14 = _context9.v;
-        _context9.n = 54;
+        _context9.n = 53;
         break;
-      case 53:
+      case 52:
         _t14 = {
           messages: [],
           hasNext: false
         };
-      case 54:
+      case 53:
         result = _t14;
         if (!(result.messages.length === 50)) {
-          _context9.n = 58;
+          _context9.n = 57;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 56;
+          _context9.n = 55;
           break;
         }
-        _context9.n = 55;
+        _context9.n = 54;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 55:
+      case 54:
         _t15 = _context9.v;
-        _context9.n = 57;
+        _context9.n = 56;
         break;
-      case 56:
+      case 55:
         _t15 = {
           messages: [],
           hasNext: false
         };
-      case 57:
+      case 56:
         _secondResult3 = _t15;
         result.messages = [].concat(_secondResult3.messages, result.messages);
         result.hasNext = _secondResult3.hasNext;
+      case 57:
+        _context9.n = 58;
+        return put(setMessagesHasPrevAC(true));
       case 58:
         _context9.n = 59;
-        return put(setMessagesHasPrevAC(true));
-      case 59:
-        _context9.n = 60;
         return put(setMessagesHasNextAC(channel.lastMessage && result.messages.length > 0 && channel.lastMessage.id !== result.messages[result.messages.length - 1].id));
-      case 60:
+      case 59:
         setMessagesToMap(channel.id, result.messages);
         setAllMessages([].concat(result.messages));
-        _context9.n = 61;
+        _context9.n = 60;
         return put(setMessagesAC(JSON.parse(JSON.stringify(result.messages))));
-      case 61:
-        _context9.n = 73;
+      case 60:
+        _context9.n = 72;
         break;
-      case 62:
+      case 61:
         previousAllMessages = getAllMessages();
         setMessagesToMap(channel.id, []);
         setAllMessages([]);
         if (!(cachedMessages && cachedMessages.length)) {
-          _context9.n = 63;
+          _context9.n = 62;
           break;
         }
         setMessagesToMap(channel.id, []);
         setAllMessages([].concat(cachedMessages));
-        _context9.n = 63;
+        _context9.n = 62;
         return put(setMessagesAC(JSON.parse(JSON.stringify(cachedMessages))));
-      case 63:
+      case 62:
         log.info('load message from server');
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 65;
+          _context9.n = 64;
           break;
         }
-        _context9.n = 64;
+        _context9.n = 63;
         return call(messageQuery.loadPrevious);
-      case 64:
+      case 63:
         _t16 = _context9.v;
-        _context9.n = 66;
+        _context9.n = 65;
         break;
-      case 65:
+      case 64:
         _t16 = {
           messages: [],
           hasNext: false
         };
-      case 66:
+      case 65:
         result = _t16;
         if (!(result.messages.length === 50)) {
-          _context9.n = 70;
+          _context9.n = 69;
           break;
         }
         messageQuery.limit = MESSAGES_MAX_LENGTH - 50;
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 68;
+          _context9.n = 67;
           break;
         }
-        _context9.n = 67;
+        _context9.n = 66;
         return call(messageQuery.loadPreviousMessageId, result.messages[0].id);
-      case 67:
+      case 66:
         _t17 = _context9.v;
-        _context9.n = 69;
+        _context9.n = 68;
         break;
-      case 68:
+      case 67:
         _t17 = {
           messages: [],
           hasNext: false
         };
-      case 69:
+      case 68:
         _secondResult4 = _t17;
         result.messages = [].concat(_secondResult4.messages, result.messages);
         result.hasNext = _secondResult4.hasNext;
-      case 70:
+      case 69:
         updatedMessages = [];
         result.messages.forEach(function (msg) {
           var updatedMessage = updateMessageOnMap(channel.id, {
@@ -20118,18 +20268,18 @@ function getMessagesQuery(action) {
         updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage || []);
         setMessagesToMap(channel.id, updatedMessages);
         setAllMessages(updatedMessages);
-        _context9.n = 71;
+        _context9.n = 70;
         return put(setMessagesAC(JSON.parse(JSON.stringify(updatedMessages))));
+      case 70:
+        _context9.n = 71;
+        return put(setMessagesHasPrevAC(true));
       case 71:
         _context9.n = 72;
-        return put(setMessagesHasPrevAC(true));
-      case 72:
-        _context9.n = 73;
         return put(setMessagesHasNextAC(false));
-      case 73:
+      case 72:
         pendingMessages = getPendingMessages(channel.id);
         if (!(pendingMessages && pendingMessages.length)) {
-          _context9.n = 74;
+          _context9.n = 73;
           break;
         }
         _messagesMap = {};
@@ -20139,71 +20289,122 @@ function getMessagesQuery(action) {
         filteredPendingMessages = pendingMessages.filter(function (msg) {
           return !_messagesMap[msg.tid || ''];
         });
-        _context9.n = 74;
+        _context9.n = 73;
         return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 74:
-        if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context9.n = 80;
+      case 73:
+        waitToSendPendingMessages = store.getState().UserReducer.waitToSendPendingMessages;
+        if (!(connectionState === CONNECTION_STATUS.CONNECTED && waitToSendPendingMessages)) {
+          _context9.n = 84;
           break;
         }
+        _context9.n = 74;
+        return put(setWaitToSendPendingMessagesAC(false));
+      case 74:
         pendingMessagesMap = getPendingMessagesMap();
         _t18 = _regeneratorKeys(pendingMessagesMap);
       case 75:
         if ((_t19 = _t18()).done) {
-          _context9.n = 79;
+          _context9.n = 83;
           break;
         }
         channelId = _t19.value;
         _iterator = _createForOfIteratorHelperLoose(pendingMessagesMap[channelId]);
       case 76:
         if ((_step = _iterator()).done) {
-          _context9.n = 78;
+          _context9.n = 82;
           break;
         }
         msg = _step.value;
+        attachments = (_msg$attachments = msg.attachments) === null || _msg$attachments === void 0 ? void 0 : _msg$attachments.filter(function (att) {
+          return att.type !== attachmentTypes.link;
+        });
+        if (!(msg !== null && msg !== void 0 && msg.forwardingDetails)) {
+          _context9.n = 78;
+          break;
+        }
         _context9.n = 77;
-        return put(resendMessageAC(msg, channelId, connectionState));
+        return call(forwardMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: msg,
+            connectionState: connectionState,
+            channelId: channelId
+          }
+        });
       case 77:
-        _context9.n = 76;
+        _context9.n = 81;
         break;
       case 78:
+        if (!(attachments && attachments.length > 0)) {
+          _context9.n = 80;
+          break;
+        }
+        _context9.n = 79;
+        return call(sendMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: msg,
+            connectionState: connectionState,
+            channelId: channelId
+          }
+        });
+      case 79:
+        _context9.n = 81;
+        break;
+      case 80:
+        _context9.n = 81;
+        return call(sendTextMessage, {
+          type: RESEND_MESSAGE,
+          payload: {
+            message: msg,
+            connectionState: connectionState,
+            channelId: channelId
+          }
+        });
+      case 81:
+        _context9.n = 76;
+        break;
+      case 82:
         _context9.n = 75;
         break;
-      case 79:
+      case 83:
         pendingPollActionsMap = store.getState().MessageReducer.pendingPollActions;
         if (!(pendingPollActionsMap && Object.keys(pendingPollActionsMap).length > 0)) {
-          _context9.n = 80;
+          _context9.n = 84;
           break;
         }
-        _context9.n = 80;
+        _context9.n = 84;
         return put(resendPendingPollActionsAC(connectionState));
-      case 80:
-        _context9.n = 82;
+      case 84:
+        _context9.n = 85;
+        return put(setWaitToSendPendingMessagesAC(false));
+      case 85:
+        _context9.n = 87;
         break;
-      case 81:
+      case 86:
         if (!channel.isMockChannel) {
-          _context9.n = 82;
+          _context9.n = 87;
           break;
         }
-        _context9.n = 82;
+        _context9.n = 87;
         return put(setMessagesAC([]));
-      case 82:
-        _context9.n = 84;
+      case 87:
+        _context9.n = 89;
         break;
-      case 83:
-        _context9.p = 83;
+      case 88:
+        _context9.p = 88;
         _t20 = _context9.v;
         log.error('error in message query', _t20);
-      case 84:
-        _context9.p = 84;
-        _context9.n = 85;
+      case 89:
+        _context9.p = 89;
+        _context9.n = 90;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 85:
-        return _context9.f(84);
-      case 86:
+      case 90:
+        return _context9.f(89);
+      case 91:
         return _context9.a(2);
     }
-  }, _marked7$1, null, [[1, 83, 84, 86]]);
+  }, _marked7$1, null, [[0, 88, 89, 91]]);
 }
 function getMessageQuery(action) {
   var payload, channelId, messageId, channel, connectionState, messages, fetchedMessage, _t21;
@@ -22107,28 +22308,34 @@ function getRoles(action) {
         _action$payload = action.payload, timeout = _action$payload.timeout, attempts = _action$payload.attempts;
         _context8.p = 1;
         SceytChatClient = getClient();
-        _context8.n = 2;
-        return call(SceytChatClient.getRoles);
+        if (!(store.getState().UserReducer.connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
+          _context8.n = 2;
+          break;
+        }
+        return _context8.a(2);
       case 2:
-        roles = _context8.v;
         _context8.n = 3;
-        return put(getRolesSuccessAC(roles));
+        return call(SceytChatClient.getRoles);
       case 3:
+        roles = _context8.v;
         _context8.n = 4;
-        return put(getRolesFailAC());
+        return put(getRolesSuccessAC(roles));
       case 4:
-        _context8.n = 6;
-        break;
+        _context8.n = 5;
+        return put(getRolesFailAC());
       case 5:
-        _context8.p = 5;
+        _context8.n = 7;
+        break;
+      case 6:
+        _context8.p = 6;
         _t8 = _context8.v;
         log.error('ERROR get roles', _t8);
-        _context8.n = 6;
+        _context8.n = 7;
         return put(getRolesFailAC((timeout || 0) + 300, (attempts || 0) + 1));
-      case 6:
+      case 7:
         return _context8.a(2);
     }
-  }, _marked8$2, null, [[1, 5]]);
+  }, _marked8$2, null, [[1, 6]]);
 }
 function MembersSaga() {
   return _regenerator().w(function (_context9) {
@@ -23224,7 +23431,8 @@ var SceytChat = function SceytChat(_ref) {
     disableFrowardMentionsCount = _ref$disableFrowardMe === void 0 ? false : _ref$disableFrowardMe,
     chatMinWidth = _ref.chatMinWidth,
     _ref$embeddedJoinGrou = _ref.embeddedJoinGroupPopup,
-    embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou;
+    embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou,
+    onUpdateChannel = _ref.onUpdateChannel;
   var useInviteLink = getUseInviteLink();
   var _useColor = useColors(),
     backgroundColor = _useColor[THEME_COLORS.BACKGROUND],
@@ -23293,7 +23501,6 @@ var SceytChat = function SceytChat(_ref) {
       setSceytChatClient(client);
       dispatch(setUserAC(client.user));
       dispatch(watchForEventsAC());
-      dispatch(setConnectionStatusAC(client.connectionState));
     } else {
       clearMessagesMap();
       removeAllMessages();
@@ -23308,6 +23515,9 @@ var SceytChat = function SceytChat(_ref) {
       setTabIsActive(true);
     };
   }, [client]);
+  useEffect(function () {
+    dispatch(setConnectionStatusAC(client.connectionState));
+  }, [client === null || client === void 0 ? void 0 : client.connectionState]);
   useEffect(function () {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
       if (showOnlyContactUsers) {
@@ -23467,6 +23677,11 @@ var SceytChat = function SceytChat(_ref) {
     onJoin: handleJoinChannel,
     channel: joinableChannel
   })) : null;
+  useEffect(function () {
+    if (onUpdateChannel) {
+      setOnUpdateChannel(onUpdateChannel);
+    }
+  }, [onUpdateChannel]);
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, SceytChatClient ? (/*#__PURE__*/React__default.createElement(ChatContainer, {
     onDrop: handleDropFile,
     onDragOver: handleDragOver,
@@ -23529,7 +23744,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
       ResetLinkConfirmModal: {}
     } : _ref$inviteLinkOption,
     _ref$embeddedJoinGrou = _ref.embeddedJoinGroupPopup,
-    embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou;
+    embeddedJoinGroupPopup = _ref$embeddedJoinGrou === void 0 ? false : _ref$embeddedJoinGrou,
+    onUpdateChannel = _ref.onUpdateChannel;
   useEffect(function () {
     log.setLevel(logLevel);
     if (baseUrlForInviteMembers) {
@@ -23566,7 +23782,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     memberCount: memberCount,
     disableFrowardMentionsCount: disableFrowardMentionsCount,
     chatMinWidth: chatMinWidth,
-    embeddedJoinGroupPopup: embeddedJoinGroupPopup
+    embeddedJoinGroupPopup: embeddedJoinGroupPopup,
+    onUpdateChannel: onUpdateChannel
   }));
 };
 
@@ -32464,7 +32681,7 @@ var AudioPlayer = function AudioPlayer(_ref) {
               wavesurfer.current.seekTo(0);
               var audioDuration = wavesurfer.current.getDuration();
               setDuration(audioDuration);
-              setCurrentTime(formatAudioVideoTime(0));
+              setCurrentTime(formatAudioVideoTime(audioDuration));
               setCurrentTimeSeconds(0);
               if (playingAudioId === file.id) {
                 dispatch(setPlayingAudioIdAC(null));
@@ -34754,6 +34971,12 @@ var PollMessage = function PollMessage(_ref) {
   var handleViewResults = function handleViewResults() {
     return setShowResults(true);
   };
+  var handleResultsClick = function handleResultsClick(e) {
+    e.stopPropagation();
+    if (isHaveResults && !poll.anonymous) {
+      handleViewResults();
+    }
+  };
   return /*#__PURE__*/React__default.createElement(Container$i, null, /*#__PURE__*/React__default.createElement(Question$1, {
     color: textPrimary
   }, poll.name), /*#__PURE__*/React__default.createElement(SubTitle$1, {
@@ -34792,7 +35015,10 @@ var PollMessage = function PollMessage(_ref) {
       border: borderSecondary
     }))), /*#__PURE__*/React__default.createElement(Title$2, {
       color: textPrimary
-    }, opt.name), poll.anonymous ? null : (/*#__PURE__*/React__default.createElement(UsersContainer, null, optionVotesUsers.map(function (vote) {
+    }, opt.name), poll.anonymous ? null : (/*#__PURE__*/React__default.createElement(UsersContainer, {
+      onClick: handleResultsClick,
+      cursor: poll.anonymous ? 'default' : 'pointer'
+    }, optionVotesUsers.map(function (vote) {
       var _vote$user, _vote$user2, _vote$user2$profile, _vote$user3, _vote$user3$profile;
       return /*#__PURE__*/React__default.createElement(Avatar, {
         key: vote === null || vote === void 0 ? void 0 : (_vote$user = vote.user) === null || _vote$user === void 0 ? void 0 : _vote$user.id,
@@ -34805,7 +35031,9 @@ var PollMessage = function PollMessage(_ref) {
         border: "2px solid " + (message.incoming ? incomingMessageBackground : outgoingMessageBackground)
       });
     }))), /*#__PURE__*/React__default.createElement(Votes, {
-      color: textPrimary
+      color: textPrimary,
+      onClick: handleResultsClick,
+      cursor: poll.anonymous ? 'default' : 'pointer'
     }, votes)), /*#__PURE__*/React__default.createElement(Bar$1, {
       track: borderSecondary,
       closed: poll.closed
@@ -34821,7 +35049,7 @@ var PollMessage = function PollMessage(_ref) {
     color: isHaveResults ? accent : textSecondary,
     disabledOpacity: 0.8,
     borderRadius: '14px',
-    onClick: isHaveResults ? handleViewResults : undefined,
+    onClick: handleViewResults,
     style: {
       width: '100%',
       marginTop: 10
@@ -34863,8 +35091,10 @@ var StyledCheck = styled(SvgFilledCheckbox)(_templateObject9$d || (_templateObje
 var Title$2 = styled.div(_templateObject0$c || (_templateObject0$c = _taggedTemplateLiteralLoose(["\n  flex: 1 1 auto;\n  color: ", ";\n  margin-right: auto;\n  font-weight: 400;\n  font-size: 14px;\n  line-height: 20px;\n  letter-spacing: -0.2px;\n  max-width: calc(100% - 80px);\n  word-break: break-word;\n"])), function (p) {
   return p.color;
 });
-var Votes = styled.span(_templateObject1$9 || (_templateObject1$9 = _taggedTemplateLiteralLoose(["\n  color: ", ";\n  font-weight: 400;\n  font-size: 14px;\n  line-height: 20px;\n  letter-spacing: -0.2px;\n  margin-left: 4px;\n"])), function (p) {
+var Votes = styled.span(_templateObject1$9 || (_templateObject1$9 = _taggedTemplateLiteralLoose(["\n  color: ", ";\n  font-weight: 400;\n  font-size: 14px;\n  line-height: 20px;\n  letter-spacing: -0.2px;\n  margin-left: 4px;\n  cursor: ", ";\n"])), function (p) {
   return p.color;
+}, function (p) {
+  return p.cursor;
 });
 var Bar$1 = styled.div(_templateObject10$6 || (_templateObject10$6 = _taggedTemplateLiteralLoose(["\n  width: ", ";\n  height: 6px;\n  border-radius: 6px;\n  background: ", ";\n  overflow: hidden;\n  margin-left: auto;\n"])), function (p) {
   return p.closed ? '100%' : "calc(100% - 28px)";
@@ -34872,7 +35102,9 @@ var Bar$1 = styled.div(_templateObject10$6 || (_templateObject10$6 = _taggedTemp
   return p.track;
 });
 var Fill = styled.div(_templateObject11$4 || (_templateObject11$4 = _taggedTemplateLiteralLoose(["\n  height: 100%;\n  border-radius: 6px;\n  transition: width 0.3s ease-in-out;\n"])));
-var UsersContainer = styled.div(_templateObject12$3 || (_templateObject12$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  margin-left: auto;\n  padding-left: 16px;\n  height: max-content;\n"])));
+var UsersContainer = styled.div(_templateObject12$3 || (_templateObject12$3 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: center;\n  margin-left: auto;\n  padding-left: 16px;\n  height: max-content;\n  cursor: ", ";\n"])), function (p) {
+  return p.cursor;
+});
 
 var _templateObject$G, _templateObject2$B, _templateObject3$v, _templateObject4$q, _templateObject5$l, _templateObject6$j, _templateObject7$i, _templateObject8$g, _templateObject9$e, _templateObject0$d, _templateObject1$a;
 var validateUrl = function validateUrl(url) {
@@ -34884,11 +35116,12 @@ var validateUrl = function validateUrl(url) {
   }
 };
 var isDescriptionOnlySymbol = function isDescriptionOnlySymbol(description) {
+  if (!description) return true;
   var trimmed = description === null || description === void 0 ? void 0 : description.trim();
   return !!trimmed && !/[a-zA-Z0-9]/.test(trimmed);
 };
 var OGMetadata = function OGMetadata(_ref) {
-  var _metadata$og0, _metadata$og0$image, _metadata$og0$image$, _metadata$og10, _metadata$og10$favico, _metadata$og18, _metadata$og19, _metadata$og20;
+  var _metadata$og5, _metadata$og6, _metadata$og9, _metadata$og14, _metadata$og14$image, _metadata$og14$image$, _metadata$og16, _metadata$og16$favico, _metadata$og20, _metadata$og21, _metadata$og22;
   var attachments = _ref.attachments,
     state = _ref.state,
     incoming = _ref.incoming,
@@ -34942,12 +35175,7 @@ var OGMetadata = function OGMetadata(_ref) {
     });
   }, [attachments]);
   var metadata = useMemo(function () {
-    var _metadata$og, _metadata$og2;
-    var metadata = (oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[attachment === null || attachment === void 0 ? void 0 : attachment.url]) || null;
-    if (metadata !== null && metadata !== void 0 && (_metadata$og = metadata.og) !== null && _metadata$og !== void 0 && _metadata$og.title && metadata !== null && metadata !== void 0 && (_metadata$og2 = metadata.og) !== null && _metadata$og2 !== void 0 && _metadata$og2.description) {
-      return metadata;
-    }
-    return null;
+    return (oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[attachment === null || attachment === void 0 ? void 0 : attachment.url]) || null;
   }, [oGMetadata, attachment === null || attachment === void 0 ? void 0 : attachment.url]);
   var _useState2 = useState(false),
     imageLoadError = _useState2[0],
@@ -34972,9 +35200,9 @@ var OGMetadata = function OGMetadata(_ref) {
               var queryBuilder = new client.MessageLinkOGQueryBuilder(url);
               return Promise.resolve(queryBuilder.build()).then(function (query) {
                 return Promise.resolve(query.loadOGData()).then(function (metadata) {
-                  var _metadata$og3, _metadata$og3$image, _metadata$og3$image$;
+                  var _metadata$og, _metadata$og$image, _metadata$og$image$;
                   var image = new Image();
-                  image.src = metadata === null || metadata === void 0 ? void 0 : (_metadata$og3 = metadata.og) === null || _metadata$og3 === void 0 ? void 0 : (_metadata$og3$image = _metadata$og3.image) === null || _metadata$og3$image === void 0 ? void 0 : (_metadata$og3$image$ = _metadata$og3$image[0]) === null || _metadata$og3$image$ === void 0 ? void 0 : _metadata$og3$image$.url;
+                  image.src = metadata === null || metadata === void 0 ? void 0 : (_metadata$og = metadata.og) === null || _metadata$og === void 0 ? void 0 : (_metadata$og$image = _metadata$og.image) === null || _metadata$og$image === void 0 ? void 0 : (_metadata$og$image$ = _metadata$og$image[0]) === null || _metadata$og$image$ === void 0 ? void 0 : _metadata$og$image$.url;
                   var _temp = function () {
                     if (image.src) {
                       image.onload = function () {
@@ -34996,10 +35224,10 @@ var OGMetadata = function OGMetadata(_ref) {
                       };
                       image.onerror = function () {
                         try {
-                          var _metadata$og4, _metadata$og4$favicon;
+                          var _metadata$og2, _metadata$og2$favicon;
                           setImageLoadError(true);
                           var favicon = new Image();
-                          favicon.src = metadata === null || metadata === void 0 ? void 0 : (_metadata$og4 = metadata.og) === null || _metadata$og4 === void 0 ? void 0 : (_metadata$og4$favicon = _metadata$og4.favicon) === null || _metadata$og4$favicon === void 0 ? void 0 : _metadata$og4$favicon.url;
+                          favicon.src = metadata === null || metadata === void 0 ? void 0 : (_metadata$og2 = metadata.og) === null || _metadata$og2 === void 0 ? void 0 : (_metadata$og2$favicon = _metadata$og2.favicon) === null || _metadata$og2$favicon === void 0 ? void 0 : _metadata$og2$favicon.url;
                           if (favicon.src) {
                             favicon.onload = function () {
                               try {
@@ -35091,10 +35319,22 @@ var OGMetadata = function OGMetadata(_ref) {
     }
     return url;
   }, [attachment]);
+  var shouldShowTitle = useMemo(function () {
+    var _metadata$og3, _metadata$og4;
+    return ogShowTitle && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og3 = metadata.og) === null || _metadata$og3 === void 0 ? void 0 : _metadata$og3.title) && !isDescriptionOnlySymbol(metadata === null || metadata === void 0 ? void 0 : (_metadata$og4 = metadata.og) === null || _metadata$og4 === void 0 ? void 0 : _metadata$og4.description);
+  }, [ogShowTitle, metadata === null || metadata === void 0 ? void 0 : (_metadata$og5 = metadata.og) === null || _metadata$og5 === void 0 ? void 0 : _metadata$og5.title, metadata === null || metadata === void 0 ? void 0 : (_metadata$og6 = metadata.og) === null || _metadata$og6 === void 0 ? void 0 : _metadata$og6.description]);
+  var shouldShowDescription = useMemo(function () {
+    var _metadata$og7, _metadata$og8;
+    return ogShowDescription && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og7 = metadata.og) === null || _metadata$og7 === void 0 ? void 0 : _metadata$og7.description) && !isDescriptionOnlySymbol(metadata === null || metadata === void 0 ? void 0 : (_metadata$og8 = metadata.og) === null || _metadata$og8 === void 0 ? void 0 : _metadata$og8.description);
+  }, [ogShowDescription, metadata === null || metadata === void 0 ? void 0 : (_metadata$og9 = metadata.og) === null || _metadata$og9 === void 0 ? void 0 : _metadata$og9.description]);
   var showOGMetadata = useMemo(function () {
-    var _metadata$og5, _metadata$og6, _metadata$og7, _metadata$og7$image, _metadata$og7$image$, _metadata$og8, _metadata$og8$favicon;
-    return state !== 'deleted' && ((metadata === null || metadata === void 0 ? void 0 : (_metadata$og5 = metadata.og) === null || _metadata$og5 === void 0 ? void 0 : _metadata$og5.title) || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og6 = metadata.og) === null || _metadata$og6 === void 0 ? void 0 : _metadata$og6.description) || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og7 = metadata.og) === null || _metadata$og7 === void 0 ? void 0 : (_metadata$og7$image = _metadata$og7.image) === null || _metadata$og7$image === void 0 ? void 0 : (_metadata$og7$image$ = _metadata$og7$image[0]) === null || _metadata$og7$image$ === void 0 ? void 0 : _metadata$og7$image$.url) || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og8 = metadata.og) === null || _metadata$og8 === void 0 ? void 0 : (_metadata$og8$favicon = _metadata$og8.favicon) === null || _metadata$og8$favicon === void 0 ? void 0 : _metadata$og8$favicon.url)) && metadata;
-  }, [state, metadata]);
+    var _metadata$og0, _metadata$og1, _metadata$og10, _metadata$og11, _metadata$og11$image, _metadata$og11$image$, _metadata$og12, _metadata$og12$favico;
+    var descriptionIsSymbol = isDescriptionOnlySymbol(metadata === null || metadata === void 0 ? void 0 : (_metadata$og0 = metadata.og) === null || _metadata$og0 === void 0 ? void 0 : _metadata$og0.description);
+    if (descriptionIsSymbol) {
+      return false;
+    }
+    return state !== 'deleted' && ((metadata === null || metadata === void 0 ? void 0 : (_metadata$og1 = metadata.og) === null || _metadata$og1 === void 0 ? void 0 : _metadata$og1.title) || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og10 = metadata.og) === null || _metadata$og10 === void 0 ? void 0 : _metadata$og10.description) || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og11 = metadata.og) === null || _metadata$og11 === void 0 ? void 0 : (_metadata$og11$image = _metadata$og11.image) === null || _metadata$og11$image === void 0 ? void 0 : (_metadata$og11$image$ = _metadata$og11$image[0]) === null || _metadata$og11$image$ === void 0 ? void 0 : _metadata$og11$image$.url) || (metadata === null || metadata === void 0 ? void 0 : (_metadata$og12 = metadata.og) === null || _metadata$og12 === void 0 ? void 0 : (_metadata$og12$favico = _metadata$og12.favicon) === null || _metadata$og12$favico === void 0 ? void 0 : _metadata$og12$favico.url)) && metadata;
+  }, [state, metadata, shouldShowTitle, shouldShowDescription]);
   var calculatedImageHeight = useMemo(function () {
     if (!(metadata !== null && metadata !== void 0 && metadata.imageWidth) || !(metadata !== null && metadata !== void 0 && metadata.imageHeight)) {
       return 0;
@@ -35102,13 +35342,13 @@ var OGMetadata = function OGMetadata(_ref) {
     return (metadata === null || metadata === void 0 ? void 0 : metadata.imageHeight) / ((metadata === null || metadata === void 0 ? void 0 : metadata.imageWidth) / maxWidth);
   }, [metadata === null || metadata === void 0 ? void 0 : metadata.imageWidth, metadata === null || metadata === void 0 ? void 0 : metadata.imageHeight, maxWidth]);
   var hasImage = useMemo(function () {
-    var _metadata$og9, _metadata$og9$image, _metadata$og9$image$;
-    return (metadata === null || metadata === void 0 ? void 0 : (_metadata$og9 = metadata.og) === null || _metadata$og9 === void 0 ? void 0 : (_metadata$og9$image = _metadata$og9.image) === null || _metadata$og9$image === void 0 ? void 0 : (_metadata$og9$image$ = _metadata$og9$image[0]) === null || _metadata$og9$image$ === void 0 ? void 0 : _metadata$og9$image$.url) && !imageLoadError;
-  }, [metadata === null || metadata === void 0 ? void 0 : (_metadata$og0 = metadata.og) === null || _metadata$og0 === void 0 ? void 0 : (_metadata$og0$image = _metadata$og0.image) === null || _metadata$og0$image === void 0 ? void 0 : (_metadata$og0$image$ = _metadata$og0$image[0]) === null || _metadata$og0$image$ === void 0 ? void 0 : _metadata$og0$image$.url, imageLoadError]);
+    var _metadata$og13, _metadata$og13$image, _metadata$og13$image$;
+    return (metadata === null || metadata === void 0 ? void 0 : (_metadata$og13 = metadata.og) === null || _metadata$og13 === void 0 ? void 0 : (_metadata$og13$image = _metadata$og13.image) === null || _metadata$og13$image === void 0 ? void 0 : (_metadata$og13$image$ = _metadata$og13$image[0]) === null || _metadata$og13$image$ === void 0 ? void 0 : _metadata$og13$image$.url) && !imageLoadError;
+  }, [metadata === null || metadata === void 0 ? void 0 : (_metadata$og14 = metadata.og) === null || _metadata$og14 === void 0 ? void 0 : (_metadata$og14$image = _metadata$og14.image) === null || _metadata$og14$image === void 0 ? void 0 : (_metadata$og14$image$ = _metadata$og14$image[0]) === null || _metadata$og14$image$ === void 0 ? void 0 : _metadata$og14$image$.url, imageLoadError]);
   var faviconUrl = useMemo(function () {
-    var _metadata$og1, _metadata$og1$favicon;
-    return ogShowFavicon && metadata !== null && metadata !== void 0 && metadata.faviconLoaded ? metadata === null || metadata === void 0 ? void 0 : (_metadata$og1 = metadata.og) === null || _metadata$og1 === void 0 ? void 0 : (_metadata$og1$favicon = _metadata$og1.favicon) === null || _metadata$og1$favicon === void 0 ? void 0 : _metadata$og1$favicon.url : '';
-  }, [metadata === null || metadata === void 0 ? void 0 : (_metadata$og10 = metadata.og) === null || _metadata$og10 === void 0 ? void 0 : (_metadata$og10$favico = _metadata$og10.favicon) === null || _metadata$og10$favico === void 0 ? void 0 : _metadata$og10$favico.url, metadata === null || metadata === void 0 ? void 0 : metadata.faviconLoaded, ogShowFavicon]);
+    var _metadata$og15, _metadata$og15$favico;
+    return ogShowFavicon && metadata !== null && metadata !== void 0 && metadata.faviconLoaded ? metadata === null || metadata === void 0 ? void 0 : (_metadata$og15 = metadata.og) === null || _metadata$og15 === void 0 ? void 0 : (_metadata$og15$favico = _metadata$og15.favicon) === null || _metadata$og15$favico === void 0 ? void 0 : _metadata$og15$favico.url : '';
+  }, [metadata === null || metadata === void 0 ? void 0 : (_metadata$og16 = metadata.og) === null || _metadata$og16 === void 0 ? void 0 : (_metadata$og16$favico = _metadata$og16.favicon) === null || _metadata$og16$favico === void 0 ? void 0 : _metadata$og16$favico.url, metadata === null || metadata === void 0 ? void 0 : metadata.faviconLoaded, ogShowFavicon]);
   var resolvedOrder = useMemo(function () {
     return order || {
       image: 1,
@@ -35124,15 +35364,15 @@ var OGMetadata = function OGMetadata(_ref) {
   }, [hasImage, calculatedImageHeight]);
   useEffect(function () {
     if (metadataLoaded || oGMetadata !== null && oGMetadata !== void 0 && oGMetadata[attachment === null || attachment === void 0 ? void 0 : attachment.url]) {
-      if (oGMetadata !== null && oGMetadata !== void 0 && oGMetadata[attachment === null || attachment === void 0 ? void 0 : attachment.url] && metadataGetSuccessCallback && metadata) {
+      if (showOGMetadata && oGMetadata !== null && oGMetadata !== void 0 && oGMetadata[attachment === null || attachment === void 0 ? void 0 : attachment.url] && metadataGetSuccessCallback && metadata) {
         metadataGetSuccessCallback(attachment === null || attachment === void 0 ? void 0 : attachment.url, true, showImage, metadata);
       } else {
         metadataGetSuccessCallback === null || metadataGetSuccessCallback === void 0 ? void 0 : metadataGetSuccessCallback(attachment === null || attachment === void 0 ? void 0 : attachment.url, false, false, metadata);
       }
     }
-  }, [metadataLoaded, oGMetadata, attachment === null || attachment === void 0 ? void 0 : attachment.url, metadata]);
+  }, [metadataLoaded, oGMetadata, attachment === null || attachment === void 0 ? void 0 : attachment.url, metadata, showOGMetadata, showImage]);
   var elements = useMemo(function () {
-    var _resolvedOrder$image, _metadata$og11, _metadata$og11$image, _metadata$og11$image$, _resolvedOrder$title, _metadata$og12, _metadata$og13, _metadata$og14, _metadata$og14$title, _resolvedOrder$descri, _metadata$og15, _metadata$og16, _metadata$og17, _metadata$og17$descri, _resolvedOrder$link;
+    var _resolvedOrder$image, _metadata$og17, _metadata$og17$image, _metadata$og17$image$, _resolvedOrder$title, _metadata$og18, _metadata$og18$title, _resolvedOrder$descri, _metadata$og19, _metadata$og19$descri, _resolvedOrder$link;
     return [showImage ? {
       key: 'image',
       order: (_resolvedOrder$image = resolvedOrder === null || resolvedOrder === void 0 ? void 0 : resolvedOrder.image) != null ? _resolvedOrder$image : 1,
@@ -35144,28 +35384,28 @@ var OGMetadata = function OGMetadata(_ref) {
         maxWidth: maxWidth,
         maxHeight: maxHeight || calculatedImageHeight
       }, /*#__PURE__*/React__default.createElement(Img, {
-        src: metadata === null || metadata === void 0 ? void 0 : (_metadata$og11 = metadata.og) === null || _metadata$og11 === void 0 ? void 0 : (_metadata$og11$image = _metadata$og11.image) === null || _metadata$og11$image === void 0 ? void 0 : (_metadata$og11$image$ = _metadata$og11$image[0]) === null || _metadata$og11$image$ === void 0 ? void 0 : _metadata$og11$image$.url,
+        src: metadata === null || metadata === void 0 ? void 0 : (_metadata$og17 = metadata.og) === null || _metadata$og17 === void 0 ? void 0 : (_metadata$og17$image = _metadata$og17.image) === null || _metadata$og17$image === void 0 ? void 0 : (_metadata$og17$image$ = _metadata$og17$image[0]) === null || _metadata$og17$image$ === void 0 ? void 0 : _metadata$og17$image$.url,
         alt: 'OG image',
         shouldAnimate: shouldAnimate
       })))
     } : null, {
       key: 'title',
       order: (_resolvedOrder$title = resolvedOrder === null || resolvedOrder === void 0 ? void 0 : resolvedOrder.title) != null ? _resolvedOrder$title : 2,
-      render: ogShowTitle && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og12 = metadata.og) === null || _metadata$og12 === void 0 ? void 0 : _metadata$og12.title) && !isDescriptionOnlySymbol(metadata === null || metadata === void 0 ? void 0 : (_metadata$og13 = metadata.og) === null || _metadata$og13 === void 0 ? void 0 : _metadata$og13.description) && (/*#__PURE__*/React__default.createElement(Title$3, {
+      render: shouldShowTitle && (/*#__PURE__*/React__default.createElement(Title$3, {
         maxWidth: maxWidth,
         shouldAnimate: shouldAnimate,
         padding: infoPadding,
         color: textPrimary
-      }, /*#__PURE__*/React__default.createElement("span", null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og14 = metadata.og) === null || _metadata$og14 === void 0 ? void 0 : (_metadata$og14$title = _metadata$og14.title) === null || _metadata$og14$title === void 0 ? void 0 : _metadata$og14$title.trim())))
+      }, /*#__PURE__*/React__default.createElement("span", null, metadata === null || metadata === void 0 ? void 0 : (_metadata$og18 = metadata.og) === null || _metadata$og18 === void 0 ? void 0 : (_metadata$og18$title = _metadata$og18.title) === null || _metadata$og18$title === void 0 ? void 0 : _metadata$og18$title.trim())))
     }, {
       key: 'description',
       order: (_resolvedOrder$descri = resolvedOrder === null || resolvedOrder === void 0 ? void 0 : resolvedOrder.description) != null ? _resolvedOrder$descri : 3,
-      render: ogShowDescription && (metadata === null || metadata === void 0 ? void 0 : (_metadata$og15 = metadata.og) === null || _metadata$og15 === void 0 ? void 0 : _metadata$og15.description) && !isDescriptionOnlySymbol(metadata === null || metadata === void 0 ? void 0 : (_metadata$og16 = metadata.og) === null || _metadata$og16 === void 0 ? void 0 : _metadata$og16.description) && (/*#__PURE__*/React__default.createElement(Desc, {
+      render: shouldShowDescription && (/*#__PURE__*/React__default.createElement(Desc, {
         maxWidth: maxWidth,
         shouldAnimate: shouldAnimate,
         color: textSecondary,
         padding: infoPadding
-      }, metadata === null || metadata === void 0 ? void 0 : (_metadata$og17 = metadata.og) === null || _metadata$og17 === void 0 ? void 0 : (_metadata$og17$descri = _metadata$og17.description) === null || _metadata$og17$descri === void 0 ? void 0 : _metadata$og17$descri.trim()))
+      }, metadata === null || metadata === void 0 ? void 0 : (_metadata$og19 = metadata.og) === null || _metadata$og19 === void 0 ? void 0 : (_metadata$og19$descri = _metadata$og19.description) === null || _metadata$og19$descri === void 0 ? void 0 : _metadata$og19$descri.trim()))
     }, {
       key: 'link',
       order: (_resolvedOrder$link = resolvedOrder === null || resolvedOrder === void 0 ? void 0 : resolvedOrder.link) != null ? _resolvedOrder$link : 4,
@@ -35180,7 +35420,7 @@ var OGMetadata = function OGMetadata(_ref) {
       var _a$order, _b$order;
       return ((_a$order = a.order) != null ? _a$order : 0) - ((_b$order = b.order) != null ? _b$order : 0);
     });
-  }, [hasImage, resolvedOrder, showOGMetadata, maxWidth, calculatedImageHeight, maxHeight, metadata === null || metadata === void 0 ? void 0 : (_metadata$og18 = metadata.og) === null || _metadata$og18 === void 0 ? void 0 : _metadata$og18.image, shouldAnimate, ogShowTitle, metadata === null || metadata === void 0 ? void 0 : (_metadata$og19 = metadata.og) === null || _metadata$og19 === void 0 ? void 0 : _metadata$og19.title, infoPadding, ogShowDescription, metadata === null || metadata === void 0 ? void 0 : (_metadata$og20 = metadata.og) === null || _metadata$og20 === void 0 ? void 0 : _metadata$og20.description, textSecondary, ogShowUrl, ogUrl]);
+  }, [hasImage, resolvedOrder, showOGMetadata, maxWidth, calculatedImageHeight, maxHeight, metadata === null || metadata === void 0 ? void 0 : (_metadata$og20 = metadata.og) === null || _metadata$og20 === void 0 ? void 0 : _metadata$og20.image, shouldAnimate, shouldShowTitle, metadata === null || metadata === void 0 ? void 0 : (_metadata$og21 = metadata.og) === null || _metadata$og21 === void 0 ? void 0 : _metadata$og21.title, infoPadding, shouldShowDescription, metadata === null || metadata === void 0 ? void 0 : (_metadata$og22 = metadata.og) === null || _metadata$og22 === void 0 ? void 0 : _metadata$og22.description, textSecondary, ogShowUrl, ogUrl]);
   var textContent = useMemo(function () {
     return /*#__PURE__*/React__default.createElement(OGText, {
       shouldAnimate: shouldAnimate,
@@ -35215,6 +35455,9 @@ var OGMetadata = function OGMetadata(_ref) {
       dispatch(getChannelByInviteKeyAC(key));
     }
   }, [attachment === null || attachment === void 0 ? void 0 : attachment.url]);
+  if (!showOGMetadata) {
+    return null;
+  }
   return /*#__PURE__*/React__default.createElement(OGMetadataContainer, Object.assign({
     showOGMetadata: !!showOGMetadata,
     bgColor: incoming ? incomingMessageBackgroundX : outgoingMessageBackgroundX,
@@ -35562,8 +35805,8 @@ var MessageBody = function MessageBody(_ref) {
     return (oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[linkAttachment.url]) || null;
   }, [oGMetadata, linkAttachment === null || linkAttachment === void 0 ? void 0 : linkAttachment.url]);
   var ogMetadataContainerWidth = useMemo(function () {
-    var _linkMetadata$og, _linkMetadata$og$imag, _linkMetadata$og$imag2, _linkMetadata$og2, _linkMetadata$og3, _linkMetadata$og3$fav;
-    if (!linkMetadata || !linkAttachment) return (ogMetadataProps === null || ogMetadataProps === void 0 ? void 0 : ogMetadataProps.maxWidth) || 400;
+    var _linkMetadata$og, _linkMetadata$og$imag, _linkMetadata$og$imag2, _linkMetadata$og2, _linkMetadata$og3, _linkMetadata$og3$des, _linkMetadata$og4, _linkMetadata$og4$fav;
+    if (!linkMetadata || !linkAttachment) return undefined;
     if (hasLongLinkAttachmentUrl) {
       return 400;
     }
@@ -35572,8 +35815,11 @@ var MessageBody = function MessageBody(_ref) {
     var imageHeight = linkMetadata === null || linkMetadata === void 0 ? void 0 : linkMetadata.imageHeight;
     var calculatedImageHeight = imageWidth && imageHeight ? imageHeight / (imageWidth / ((ogMetadataProps === null || ogMetadataProps === void 0 ? void 0 : ogMetadataProps.maxWidth) || 400)) : 0;
     var showImage = hasImage && calculatedImageHeight >= 180 && calculatedImageHeight <= 400;
-    var hasDescription = linkMetadata === null || linkMetadata === void 0 ? void 0 : (_linkMetadata$og2 = linkMetadata.og) === null || _linkMetadata$og2 === void 0 ? void 0 : _linkMetadata$og2.description;
-    var hasFavicon = (ogMetadataProps === null || ogMetadataProps === void 0 ? void 0 : ogMetadataProps.ogShowFavicon) && (linkMetadata === null || linkMetadata === void 0 ? void 0 : linkMetadata.faviconLoaded) && (linkMetadata === null || linkMetadata === void 0 ? void 0 : (_linkMetadata$og3 = linkMetadata.og) === null || _linkMetadata$og3 === void 0 ? void 0 : (_linkMetadata$og3$fav = _linkMetadata$og3.favicon) === null || _linkMetadata$og3$fav === void 0 ? void 0 : _linkMetadata$og3$fav.url);
+    var hasDescription = !isDescriptionOnlySymbol(linkMetadata === null || linkMetadata === void 0 ? void 0 : (_linkMetadata$og2 = linkMetadata.og) === null || _linkMetadata$og2 === void 0 ? void 0 : _linkMetadata$og2.description) && (linkMetadata === null || linkMetadata === void 0 ? void 0 : (_linkMetadata$og3 = linkMetadata.og) === null || _linkMetadata$og3 === void 0 ? void 0 : (_linkMetadata$og3$des = _linkMetadata$og3.description) === null || _linkMetadata$og3$des === void 0 ? void 0 : _linkMetadata$og3$des.trim());
+    var hasFavicon = (ogMetadataProps === null || ogMetadataProps === void 0 ? void 0 : ogMetadataProps.ogShowFavicon) && (linkMetadata === null || linkMetadata === void 0 ? void 0 : linkMetadata.faviconLoaded) && (linkMetadata === null || linkMetadata === void 0 ? void 0 : (_linkMetadata$og4 = linkMetadata.og) === null || _linkMetadata$og4 === void 0 ? void 0 : (_linkMetadata$og4$fav = _linkMetadata$og4.favicon) === null || _linkMetadata$og4$fav === void 0 ? void 0 : _linkMetadata$og4$fav.url);
+    if (!hasDescription) {
+      return undefined;
+    }
     if (showImage) {
       return 400;
     }
@@ -39253,7 +39499,7 @@ function MentionsPlugin(_ref3) {
   });
 }
 var MentionsContainerWrapper = styled.div(_templateObject$L || (_templateObject$L = _taggedTemplateLiteralLoose(["\n  position: relative;\n  animation: fadeIn 0.2s ease-in-out;\n  @keyframes fadeIn {\n    from {\n      opacity: 0;\n    }\n    to {\n      opacity: 1;\n    }\n  }\n"])));
-var MentionsList = styled.ul(_templateObject2$G || (_templateObject2$G = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  bottom: 100%;\n  width: 300px;\n  transition: all 0.2s;\n  overflow: auto;\n  max-height: 240px;\n  z-index: 200;\n  padding: 2px 0 0;\n  background: ", ";\n  border: ", ";\n  box-sizing: border-box;\n  box-shadow: ", ";\n  border-radius: 6px;\n  visibility: ", ";\n"])), function (props) {
+var MentionsList = styled.ul(_templateObject2$G || (_templateObject2$G = _taggedTemplateLiteralLoose(["\n  position: absolute;\n  bottom: 5px;\n  width: 300px;\n  transition: all 0.2s;\n  overflow: auto;\n  max-height: 240px;\n  z-index: 200;\n  padding: 2px 0 0;\n  background: ", ";\n  border: ", ";\n  box-sizing: border-box;\n  box-shadow: ", ";\n  border-radius: 6px;\n  visibility: ", ";\n"])), function (props) {
   return props.backgroundColor;
 }, function (props) {
   return props.withBorder && "1px solid " + props.borderColor;