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

package/index.js

@@ -16167,6 +16167,9 @@ function sendMessage(action) {
                 }
                 _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 === exports.MESSAGE_TYPE.SYSTEM ? 0 : 1).setSilent(message.type === exports.MESSAGE_TYPE.SYSTEM).setMetadata(i === 0 ? JSON.stringify(message.metadata) : '');
+                if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
+                  _messageBuilder.setDisableMentionsCount(true);
+                }
                 if (message.parentMessage) {
                   _messageBuilder.setParentMessageId(message.parentMessage ? message.parentMessage.id : null);
                 }
@@ -16238,6 +16241,9 @@ function sendMessage(action) {
         }
         messageBuilder = channel.createMessageBuilder();
         messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(message.attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisplayCount(message.type === exports.MESSAGE_TYPE.SYSTEM ? 0 : 1).setSilent(message.type === exports.MESSAGE_TYPE.SYSTEM).setMetadata(JSON.stringify(message.metadata));
+        if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
+          messageBuilder.setDisableMentionsCount(true);
+        }
         if (message.parentMessage) {
           messageBuilder.setParentMessageId(message.parentMessage ? message.parentMessage.id : null);
         }
@@ -16534,6 +16540,9 @@ function sendTextMessage(action) {
         }
         messageBuilder = channel.createMessageBuilder();
         messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisplayCount((message === null || message === void 0 ? void 0 : message.displayCount) !== undefined ? message.displayCount : message.type === exports.MESSAGE_TYPE.SYSTEM ? 0 : 1).setSilent((message === null || message === void 0 ? void 0 : message.silent) !== undefined ? message.silent : message.type === exports.MESSAGE_TYPE.SYSTEM).setMetadata(JSON.stringify(message.metadata)).setPollDetails(message.pollDetails ? message.pollDetails : null);
+        if (channel.type === DEFAULT_CHANNEL_TYPE.DIRECT) {
+          messageBuilder.setDisableMentionsCount(true);
+        }
         if (message.parentMessage) {
           messageBuilder.setParentMessageId(message.parentMessage ? message.parentMessage.id : null);
         }
@@ -22216,10 +22225,11 @@ function updateActiveChannelMembersRemove(removedMembers, channelId) {
 
 var _marked$2 = /*#__PURE__*/_regenerator().m(handleChannelMessageEvent),
   _marked2$2 = /*#__PURE__*/_regenerator().m(handleUnreadMessagesInfoEvent),
-  _marked3$1 = /*#__PURE__*/_regenerator().m(handleMessageMarkersReceivedEvent),
-  _marked4$1 = /*#__PURE__*/_regenerator().m(handleDeleteMessageEvent),
-  _marked5$1 = /*#__PURE__*/_regenerator().m(handleEditMessageEvent),
-  _marked6$1 = /*#__PURE__*/_regenerator().m(watchForEvents);
+  _marked3$1 = /*#__PURE__*/_regenerator().m(handleChannelMarkedAsReadEvent),
+  _marked4$1 = /*#__PURE__*/_regenerator().m(handleMessageMarkersReceivedEvent),
+  _marked5$1 = /*#__PURE__*/_regenerator().m(handleDeleteMessageEvent),
+  _marked6$1 = /*#__PURE__*/_regenerator().m(handleEditMessageEvent),
+  _marked7$1 = /*#__PURE__*/_regenerator().m(watchForEvents);
 var getStoredChannel$1 = function getStoredChannel(channelId) {
   return getChannelFromMap(channelId) || getChannelFromAllChannels(channelId) || getChannelFromAllChannelsMap(channelId) || null;
 };
@@ -22467,26 +22477,62 @@ function handleUnreadMessagesInfoEvent(args) {
     }
   }, _marked2$2);
 }
+function handleChannelMarkedAsReadEvent(args) {
+  var channel, channelUpdateParams, groupName;
+  return _regenerator().w(function (_context3) {
+    while (1) switch (_context3.n) {
+      case 0:
+        channel = args.channel;
+        if (channel) {
+          _context3.n = 1;
+          break;
+        }
+        return _context3.a(2);
+      case 1:
+        channelUpdateParams = _extends({
+          unread: false,
+          newMessageCount: 0,
+          newMentionCount: 0,
+          muted: channel.muted,
+          mutedTill: channel.mutedTill
+        }, channel.lastReceivedMsgId ? {
+          lastReceivedMsgId: channel.lastReceivedMsgId
+        } : {}, channel.lastDisplayedMessageId ? {
+          lastDisplayedMessageId: channel.lastDisplayedMessageId
+        } : {});
+        _context3.n = 2;
+        return effects.put(updateChannelDataAC(channel.id, channelUpdateParams));
+      case 2:
+        groupName = getChannelGroupName(channel);
+        _context3.n = 3;
+        return effects.put(updateSearchedChannelDataAC(channel.id, channelUpdateParams, groupName));
+      case 3:
+        updateChannelOnAllChannels(channel.id, channelUpdateParams);
+      case 4:
+        return _context3.a(2);
+    }
+  }, _marked3$1);
+}
 function handleMessageMarkersReceivedEvent(args, SceytChatClient) {
   var _markerList$user;
   var channelId, markerList, channel, isOwnMarker, activeChannelId, updateLastMessage, markersMap, markerUpdateParams, _iterator, _step, messageId, lastMessage;
-  return _regenerator().w(function (_context3) {
-    while (1) switch (_context3.n) {
+  return _regenerator().w(function (_context4) {
+    while (1) switch (_context4.n) {
       case 0:
         channelId = args.channelId, markerList = args.markerList;
         channel = getStoredChannel$1(channelId);
         log.info('channel MESSAGE_MARKERS_RECEIVED ... channel: ', channel, 'markers list: ', markerList);
         if (channel) {
-          _context3.n = 1;
+          _context4.n = 1;
           break;
         }
-        return _context3.a(2);
+        return _context4.a(2);
       case 1:
         isOwnMarker = ((_markerList$user = markerList.user) === null || _markerList$user === void 0 ? void 0 : _markerList$user.id) === SceytChatClient.user.id;
-        _context3.n = 2;
+        _context4.n = 2;
         return effects.call(getActiveChannelId);
       case 2:
-        activeChannelId = _context3.v;
+        activeChannelId = _context4.v;
         updateLastMessage = false;
         markersMap = {};
         markerUpdateParams = {
@@ -22501,19 +22547,19 @@ function handleMessageMarkersReceivedEvent(args, SceytChatClient) {
           }
         }
         if (!updateLastMessage) {
-          _context3.n = 3;
+          _context4.n = 3;
           break;
         }
         lastMessage = _extends({}, channel.lastMessage, updateMessageDeliveryStatusAndMarkers(channel.lastMessage, markerUpdateParams, isOwnMarker));
         updateChannelLastMessageOnAllChannels(channel.id, lastMessage);
-        _context3.n = 3;
+        _context4.n = 3;
         return effects.put(updateChannelLastMessageStatusAC(lastMessage, channel));
       case 3:
         if (!(activeChannelId === channelId)) {
-          _context3.n = 4;
+          _context4.n = 4;
           break;
         }
-        _context3.n = 4;
+        _context4.n = 4;
         return effects.put(updateMessagesStatusAC(markerList.name, markersMap, isOwnMarker, markerList));
       case 4:
         updateMessageStatusOnMap(channel.id, {
@@ -22522,32 +22568,32 @@ function handleMessageMarkersReceivedEvent(args, SceytChatClient) {
           marker: markerList
         }, isOwnMarker);
         if (isOwnMarker) {
-          _context3.n = 5;
+          _context4.n = 5;
           break;
         }
-        _context3.n = 5;
+        _context4.n = 5;
         return effects.put(updateMessagesMarkersAC(channelId, markerList.name, markerList));
       case 5:
-        return _context3.a(2);
+        return _context4.a(2);
     }
-  }, _marked3$1);
+  }, _marked4$1);
 }
 function handleDeleteMessageEvent(args) {
   var channel, deletedMessage, activeChannelId, channelExists;
-  return _regenerator().w(function (_context4) {
-    while (1) switch (_context4.n) {
+  return _regenerator().w(function (_context5) {
+    while (1) switch (_context5.n) {
       case 0:
         channel = args.channel, deletedMessage = args.deletedMessage;
-        _context4.n = 1;
+        _context5.n = 1;
         return effects.call(getActiveChannelId);
       case 1:
-        activeChannelId = _context4.v;
+        activeChannelId = _context5.v;
         channelExists = checkChannelExists(channel.id);
         if (!(channel.id === activeChannelId)) {
-          _context4.n = 2;
+          _context5.n = 2;
           break;
         }
-        _context4.n = 2;
+        _context5.n = 2;
         return effects.put(updateMessageAC(deletedMessage.id, deletedMessage));
       case 2:
         updateMessageOnMap(channel.id, {
@@ -22555,10 +22601,10 @@ function handleDeleteMessageEvent(args) {
           params: deletedMessage
         });
         if (!channelExists) {
-          _context4.n = 4;
+          _context5.n = 4;
           break;
         }
-        _context4.n = 3;
+        _context5.n = 3;
         return effects.put(updateChannelDataAC(channel.id, {
           newMessageCount: channel.newMessageCount,
           muted: channel.muted,
@@ -22566,10 +22612,10 @@ function handleDeleteMessageEvent(args) {
         }));
       case 3:
         if (!(channel.lastMessage.id === deletedMessage.id)) {
-          _context4.n = 4;
+          _context5.n = 4;
           break;
         }
-        _context4.n = 4;
+        _context5.n = 4;
         return effects.put(updateChannelLastMessageAC(deletedMessage, channel));
       case 4:
         updateChannelOnAllChannels(channel.id, {
@@ -22577,29 +22623,29 @@ function handleDeleteMessageEvent(args) {
           muted: channel.muted,
           mutedTill: channel.mutedTill
         }, deletedMessage);
-        _context4.n = 5;
+        _context5.n = 5;
         return effects.put(removePendingMessageMutationAC(deletedMessage.id));
       case 5:
-        return _context4.a(2);
+        return _context5.a(2);
     }
-  }, _marked4$1);
+  }, _marked5$1);
 }
 function handleEditMessageEvent(args) {
   var channel, message, activeChannelId, channelExists;
-  return _regenerator().w(function (_context5) {
-    while (1) switch (_context5.n) {
+  return _regenerator().w(function (_context6) {
+    while (1) switch (_context6.n) {
       case 0:
         channel = args.channel, message = args.message;
-        _context5.n = 1;
+        _context6.n = 1;
         return effects.call(getActiveChannelId);
       case 1:
-        activeChannelId = _context5.v;
+        activeChannelId = _context6.v;
         channelExists = checkChannelExists(channel.id);
         if (!(channel.id === activeChannelId)) {
-          _context5.n = 2;
+          _context6.n = 2;
           break;
         }
-        _context5.n = 2;
+        _context6.n = 2;
         return effects.put(updateMessageAC(message.id, {
           body: message.body,
           state: message.state,
@@ -22610,14 +22656,14 @@ function handleEditMessageEvent(args) {
         }));
       case 2:
         if (!channelExists) {
-          _context5.n = 3;
+          _context6.n = 3;
           break;
         }
         if (!(channel.lastMessage.id === message.id)) {
-          _context5.n = 3;
+          _context6.n = 3;
           break;
         }
-        _context5.n = 3;
+        _context6.n = 3;
         return effects.put(updateChannelLastMessageAC(message, channel));
       case 3:
         if (checkChannelExistsOnMessagesMap(channel.id)) {
@@ -22627,17 +22673,17 @@ function handleEditMessageEvent(args) {
           });
         }
         updateChannelOnAllChannels(channel.id, {}, message);
-        _context5.n = 4;
+        _context6.n = 4;
         return effects.put(removePendingMessageMutationAC(message.id));
       case 4:
-        return _context5.a(2);
+        return _context6.a(2);
     }
-  }, _marked5$1);
+  }, _marked6$1);
 }
 function watchForEvents() {
   var SceytChatClient, channelListener, connectionListener, usersTimeout, chan, _loop;
-  return _regenerator().w(function (_context9) {
-    while (1) switch (_context9.n) {
+  return _regenerator().w(function (_context0) {
+    while (1) switch (_context0.n) {
       case 0:
         SceytChatClient = getClient();
         channelListener = new SceytChatClient.ChannelListener();
@@ -23037,45 +23083,45 @@ function watchForEvents() {
           };
         });
         _loop = /*#__PURE__*/_regenerator().m(function _callee3() {
-          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, joinedMember, _chan2, customLoadMembersFunctions, joinMembersEvent, membersList, updateChannelData, _channel, member, _channelExists, activeChannelId, groupName, _updateChannelData, users, blockedUsers, allChannels, _loop2, _iterator2, _step2, _users, unblockedUsers, _allChannels, _loop3, _iterator3, _step3, _channel2, removedMembers, _activeChannelId, _channelExists2, activeChannel, _updateChannelData2, _groupName, _channel3, addedMembers, _activeChannelId2, _channelExists3, _updateChannelData3, _customLoadMembersFunctions, addMembersEvent, _membersList, _groupName2, onUpdateChannel, updatedChannel, _channelExists4, subject, avatarUrl, muted, mutedTill, metadata, _channel4, fields, parsedChannelMeta, parsedMeta, _activeChannelId3, _groupName3, channelId, _channel5, _channel6, user, message, reaction, isSelf, _activeChannelId4, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelUpdateParams, _pollDetailsData$chan, _pollDetailsData$chan2, _channel7, pollDetails, messageId, pollDetailsData, _activeChannelId5, addedVotes, deletedVotes, objs, _iterator4, _step4, vote, _iterator5, _step5, _vote, _i, _objs, obj, _store$getState$Messa3, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel8, _pollDetails, _messageId, _pollDetailsData, _activeChannelId6, _deletedVotes, _objs3, _iterator6, _step6, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel9, _pollDetails2, _messageId2, _activeChannelId7, _pollDetailsData2, retractedVotes, _objs6, _iterator7, _step7, _vote4, _i5, _objs7, _obj4, _iterator8, _step8, _vote3, _channel0, _messageId3, _activeChannelId8, _obj5, _channel1, _user, _message, _reaction, channelFromMap, _isSelf, _activeChannelId9, _channelUpdateParams, _channel10, _activeChannelId0, channelExist, _channel11, _channel12, _channel13, _channel14, _channel15, _activeChannelId1, lastChannel, _channel16, _channel17, _groupName4, _channel18, _groupName5, _channel19, members, _activeChannelId10, _customLoadMembersFunctions2, updateMembersEvent, _membersList2, i, _channel20, _channel21, _channelId, from, name, status, _t, _t2, _t3, _t4;
-          return _regenerator().w(function (_context8) {
-            while (1) switch (_context8.p = _context8.n) {
+          var _yield$take, type, args, createdChannel, channelFilterTypes, getFromContacts, channelExists, _chan, channel, joinedMember, _chan2, customLoadMembersFunctions, joinMembersEvent, membersList, updateChannelData, _channel, member, _channelExists, activeChannelId, groupName, _updateChannelData, users, blockedUsers, allChannels, _loop2, _iterator2, _step2, _users, unblockedUsers, _allChannels, _loop3, _iterator3, _step3, _channel2, removedMembers, _activeChannelId, _channelExists2, activeChannel, _updateChannelData2, _groupName, _channel3, addedMembers, _activeChannelId2, _channelExists3, _updateChannelData3, _customLoadMembersFunctions, addMembersEvent, _membersList, _groupName2, onUpdateChannel, updatedChannel, _channelExists4, subject, avatarUrl, muted, mutedTill, metadata, _channel4, fields, parsedChannelMeta, parsedMeta, _activeChannelId3, _groupName3, channelId, _channel5, _channel6, user, message, reaction, isSelf, _activeChannelId4, _state$ThemeReducer$n7, _state$ThemeReducer$n8, _state$ThemeReducer$n9, _state$ThemeReducer$n0, _state$ThemeReducer$n1, _state$ThemeReducer$n10, contactsMap, _getFromContacts, state, theme, accentColor, textSecondary, messageBody, channelUpdateParams, _pollDetailsData$chan, _pollDetailsData$chan2, _channel7, pollDetails, messageId, pollDetailsData, _activeChannelId5, addedVotes, deletedVotes, objs, _iterator4, _step4, vote, _iterator5, _step5, _vote, _i, _objs, obj, _store$getState$Messa3, key, hasNext, _i2, _objs2, _obj, _pollDetailsData$chan3, _channel8, _pollDetails, _messageId, _pollDetailsData, _activeChannelId6, _deletedVotes, _objs3, _iterator6, _step6, _vote2, _i3, _objs4, _obj2, _i4, _objs5, _obj3, _pollDetailsData2$cha, _channel9, _pollDetails2, _messageId2, _activeChannelId7, _pollDetailsData2, retractedVotes, _objs6, _iterator7, _step7, _vote4, _i5, _objs7, _obj4, _iterator8, _step8, _vote3, _channel0, _messageId3, _activeChannelId8, _obj5, _channel1, _user, _message, _reaction, channelFromMap, _isSelf, _activeChannelId9, _channelUpdateParams, _channel10, _activeChannelId0, channelExist, _channel11, _channel12, _channel13, _channel14, _channel15, _activeChannelId1, lastChannel, _channel16, _channel17, _groupName4, _channel18, members, _activeChannelId10, _customLoadMembersFunctions2, updateMembersEvent, _membersList2, i, _channel19, _channel20, _channelId, from, name, status, _t, _t2, _t3, _t4;
+          return _regenerator().w(function (_context9) {
+            while (1) switch (_context9.p = _context9.n) {
               case 0:
-                _context8.p = 0;
-                _context8.n = 1;
+                _context9.p = 0;
+                _context9.n = 1;
                 return effects.take(chan);
               case 1:
-                _yield$take = _context8.v;
+                _yield$take = _context9.v;
                 type = _yield$take.type;
                 args = _yield$take.args;
                 _t = type;
-                _context8.n = _t === CHANNEL_EVENT_TYPES.CREATE ? 2 : _t === CHANNEL_EVENT_TYPES.JOIN ? 7 : _t === CHANNEL_EVENT_TYPES.LEAVE ? 17 : _t === CHANNEL_EVENT_TYPES.BLOCK ? 30 : _t === CHANNEL_EVENT_TYPES.UNBLOCK ? 34 : _t === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 38 : _t === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 49 : _t === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 64 : _t === CHANNEL_EVENT_TYPES.MESSAGE ? 69 : _t === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 71 : _t === CHANNEL_EVENT_TYPES.DELETE ? 73 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 75 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 77 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 79 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 86 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 96 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 104 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 112 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 116 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 120 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 122 : _t === CHANNEL_EVENT_TYPES.MUTE ? 128 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 130 : _t === CHANNEL_EVENT_TYPES.PINED ? 132 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 134 : _t === CHANNEL_EVENT_TYPES.HIDE ? 136 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 141 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 143 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 146 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 149 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 159 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 160 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 161 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 170 : 174;
+                _context9.n = _t === CHANNEL_EVENT_TYPES.CREATE ? 2 : _t === CHANNEL_EVENT_TYPES.JOIN ? 7 : _t === CHANNEL_EVENT_TYPES.LEAVE ? 17 : _t === CHANNEL_EVENT_TYPES.BLOCK ? 30 : _t === CHANNEL_EVENT_TYPES.UNBLOCK ? 34 : _t === CHANNEL_EVENT_TYPES.KICK_MEMBERS ? 38 : _t === CHANNEL_EVENT_TYPES.ADD_MEMBERS ? 49 : _t === CHANNEL_EVENT_TYPES.UPDATE_CHANNEL ? 64 : _t === CHANNEL_EVENT_TYPES.MESSAGE ? 69 : _t === CHANNEL_EVENT_TYPES.MESSAGE_MARKERS_RECEIVED ? 71 : _t === CHANNEL_EVENT_TYPES.DELETE ? 73 : _t === CHANNEL_EVENT_TYPES.DELETE_MESSAGE ? 75 : _t === CHANNEL_EVENT_TYPES.EDIT_MESSAGE ? 77 : _t === CHANNEL_EVENT_TYPES.REACTION_ADDED ? 79 : _t === CHANNEL_EVENT_TYPES.POLL_ADDED ? 86 : _t === CHANNEL_EVENT_TYPES.POLL_DELETED ? 96 : _t === CHANNEL_EVENT_TYPES.POLL_RETRACTED ? 104 : _t === CHANNEL_EVENT_TYPES.POLL_CLOSED ? 112 : _t === CHANNEL_EVENT_TYPES.REACTION_DELETED ? 116 : _t === CHANNEL_EVENT_TYPES.UNREAD_MESSAGES_INFO ? 120 : _t === CHANNEL_EVENT_TYPES.CLEAR_HISTORY ? 122 : _t === CHANNEL_EVENT_TYPES.MUTE ? 128 : _t === CHANNEL_EVENT_TYPES.UNMUTE ? 130 : _t === CHANNEL_EVENT_TYPES.PINED ? 132 : _t === CHANNEL_EVENT_TYPES.UNPINED ? 134 : _t === CHANNEL_EVENT_TYPES.HIDE ? 136 : _t === CHANNEL_EVENT_TYPES.UNHIDE ? 141 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_UNREAD ? 143 : _t === CHANNEL_EVENT_TYPES.CHANNEL_MARKED_AS_READ ? 146 : _t === CHANNEL_EVENT_TYPES.CHANGE_ROLE ? 148 : _t === CHANNEL_EVENT_TYPES.FROZEN ? 158 : _t === CHANNEL_EVENT_TYPES.UNFROZEN ? 159 : _t === CHANNEL_EVENT_TYPES.CHANNEL_EVENT ? 160 : _t === CONNECTION_EVENT_TYPES.CONNECTION_STATUS_CHANGED ? 169 : 173;
                 break;
               case 2:
                 createdChannel = args.createdChannel;
                 log.info('CHANNEL_EVENT_CREATE ... ', createdChannel);
                 channelFilterTypes = getChannelTypesFilter();
                 if (!(channelFilterTypes !== null && channelFilterTypes !== void 0 && channelFilterTypes.length ? channelFilterTypes.includes(createdChannel.type) : true)) {
-                  _context8.n = 6;
+                  _context9.n = 6;
                   break;
                 }
                 getFromContacts = getShowOnlyContactUsers();
                 channelExists = checkChannelExists(createdChannel.id);
                 if (channelExists) {
-                  _context8.n = 5;
+                  _context9.n = 5;
                   break;
                 }
                 if (!getFromContacts) {
-                  _context8.n = 3;
+                  _context9.n = 3;
                   break;
                 }
-                _context8.n = 3;
+                _context9.n = 3;
                 return effects.put(getContactsAC());
               case 3:
-                _context8.n = 4;
+                _context9.n = 4;
                 return effects.call(setChannelInMap, createdChannel);
               case 4:
-                _context8.n = 5;
+                _context9.n = 5;
                 return effects.put(setChannelToAddAC(JSON.parse(JSON.stringify(createdChannel))));
               case 5:
                 _chan = getChannelFromAllChannels(createdChannel.id);
@@ -23083,7 +23129,7 @@ function watchForEvents() {
                   addChannelToAllChannels(createdChannel);
                 }
               case 6:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 7:
                 channel = args.channel, joinedMember = args.joinedMember;
                 log.info('channel JOIN ... . ', channel);
@@ -23093,114 +23139,114 @@ function watchForEvents() {
                   _chan2 = getChannelFromAllChannels(channel.id);
                 }
                 if (!_chan2) {
-                  _context8.n = 16;
+                  _context9.n = 16;
                   break;
                 }
                 customLoadMembersFunctions = getCustomLoadMembersFunctions();
                 joinMembersEvent = customLoadMembersFunctions === null || customLoadMembersFunctions === void 0 ? void 0 : customLoadMembersFunctions.joinMembersEvent;
                 membersList = [];
                 if (!joinMembersEvent) {
-                  _context8.n = 10;
+                  _context9.n = 10;
                   break;
                 }
-                _context8.n = 8;
+                _context9.n = 8;
                 return effects.call(joinMembersEvent, _chan2.id, [joinedMember], store.getState().MembersReducer.channelsMembersMap[_chan2.id] || []);
               case 8:
-                membersList = _context8.v;
-                _context8.n = 9;
+                membersList = _context9.v;
+                _context9.n = 9;
                 return effects.put(setMembersToListAC(membersList, _chan2.id));
               case 9:
-                _context8.n = 11;
+                _context9.n = 11;
                 break;
               case 10:
-                _context8.n = 11;
+                _context9.n = 11;
                 return effects.put(addMembersToListAC([joinedMember], _chan2.id));
               case 11:
                 updateChannelOnAllChannels(_chan2.id, {
                   memberCount: _chan2.memberCount + 1
                 });
                 if (!joinMembersEvent) {
-                  _context8.n = 12;
+                  _context9.n = 12;
                   break;
                 }
                 _t2 = {
                   members: membersList
                 };
-                _context8.n = 14;
+                _context9.n = 14;
                 break;
               case 12:
-                _context8.n = 13;
+                _context9.n = 13;
                 return effects.call(updateActiveChannelMembersAdd, [joinedMember], _chan2.id) || {};
               case 13:
-                _t2 = _context8.v;
+                _t2 = _context9.v;
               case 14:
                 updateChannelData = _t2;
-                _context8.n = 15;
+                _context9.n = 15;
                 return effects.put(updateChannelDataAC(_chan2.id, _extends({
                   memberCount: _chan2.memberCount + 1
                 }, updateChannelData)));
               case 15:
-                _context8.n = 16;
+                _context9.n = 16;
                 return effects.put(updateSearchedChannelDataAC(_chan2.id, {
                   memberCount: _chan2.memberCount + 1
                 }, getChannelGroupName(_chan2)));
               case 16:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 17:
                 _channel = args.channel, member = args.member;
                 log.info('channel LEAVE ... ', _channel, member);
                 _channelExists = checkChannelExists(_channel.id);
-                _context8.n = 18;
+                _context9.n = 18;
                 return effects.call(getActiveChannelId);
               case 18:
-                activeChannelId = _context8.v;
+                activeChannelId = _context9.v;
                 if (!(member.id === SceytChatClient.user.id)) {
-                  _context8.n = 23;
+                  _context9.n = 23;
                   break;
                 }
-                _context8.n = 19;
+                _context9.n = 19;
                 return effects.put(switchChannelActionAC(null));
               case 19:
-                _context8.n = 20;
+                _context9.n = 20;
                 return effects.put(removeChannelAC(_channel.id));
               case 20:
                 removeChannelFromMap(_channel.id);
                 deleteChannelFromAllChannels(_channel.id);
-                _context8.n = 21;
+                _context9.n = 21;
                 return effects.put(setChannelToRemoveAC(_channel));
               case 21:
-                _context8.n = 22;
+                _context9.n = 22;
                 return effects.put(removeChannelCachesAC(_channel.id));
               case 22:
-                _context8.n = 29;
+                _context9.n = 29;
                 break;
               case 23:
                 groupName = getChannelGroupName(_channel);
                 if (!_channelExists) {
-                  _context8.n = 27;
+                  _context9.n = 27;
                   break;
                 }
                 _updateChannelData = {};
                 if (!(activeChannelId === _channel.id)) {
-                  _context8.n = 26;
+                  _context9.n = 26;
                   break;
                 }
-                _context8.n = 24;
+                _context9.n = 24;
                 return effects.put(removeMemberFromListAC([member], _channel.id));
               case 24:
-                _context8.n = 25;
+                _context9.n = 25;
                 return effects.call(updateActiveChannelMembersRemove, [member], _channel.id) || {};
               case 25:
-                _updateChannelData = _context8.v;
+                _updateChannelData = _context9.v;
               case 26:
-                _context8.n = 27;
+                _context9.n = 27;
                 return effects.put(updateChannelDataAC(_channel.id, _extends({
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
                   mutedTill: _channel.mutedTill
                 }, _updateChannelData)));
               case 27:
-                _context8.n = 28;
+                _context9.n = 28;
                 return effects.put(updateSearchedChannelDataAC(_channel.id, {
                   memberCount: _channel.memberCount,
                   muted: _channel.muted,
@@ -23213,7 +23259,7 @@ function watchForEvents() {
                   mutedTill: _channel.mutedTill
                 });
               case 29:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 30:
                 log.info('user BLOCK ... ');
                 users = args.users;
@@ -23226,8 +23272,8 @@ function watchForEvents() {
                 allChannels = store.getState().ChannelReducer.channels;
                 _loop2 = /*#__PURE__*/_regenerator().m(function _callee() {
                   var user, directChannel, _directChannel$member, updatedMembers;
-                  return _regenerator().w(function (_context6) {
-                    while (1) switch (_context6.n) {
+                  return _regenerator().w(function (_context7) {
+                    while (1) switch (_context7.n) {
                       case 0:
                         user = _step2.value;
                         directChannel = allChannels.find(function (ch) {
@@ -23237,7 +23283,7 @@ function watchForEvents() {
                           }));
                         });
                         if (!directChannel) {
-                          _context6.n = 1;
+                          _context7.n = 1;
                           break;
                         }
                         updatedMembers = (_directChannel$member = directChannel.members) === null || _directChannel$member === void 0 ? void 0 : _directChannel$member.map(function (m) {
@@ -23245,27 +23291,27 @@ function watchForEvents() {
                             blocked: true
                           }) : m;
                         });
-                        _context6.n = 1;
+                        _context7.n = 1;
                         return effects.put(updateChannelDataAC(directChannel.id, {
                           members: updatedMembers
                         }));
                       case 1:
-                        return _context6.a(2);
+                        return _context7.a(2);
                     }
                   }, _callee);
                 });
                 _iterator2 = _createForOfIteratorHelperLoose(blockedUsers);
               case 31:
                 if ((_step2 = _iterator2()).done) {
-                  _context8.n = 33;
+                  _context9.n = 33;
                   break;
                 }
-                return _context8.d(_regeneratorValues(_loop2()), 32);
+                return _context9.d(_regeneratorValues(_loop2()), 32);
               case 32:
-                _context8.n = 31;
+                _context9.n = 31;
                 break;
               case 33:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 34:
                 log.info('user UNBLOCK ... ');
                 _users = args.users;
@@ -23278,8 +23324,8 @@ function watchForEvents() {
                 _allChannels = store.getState().ChannelReducer.channels;
                 _loop3 = /*#__PURE__*/_regenerator().m(function _callee2() {
                   var user, directChannel, _directChannel$member2, updatedMembers;
-                  return _regenerator().w(function (_context7) {
-                    while (1) switch (_context7.n) {
+                  return _regenerator().w(function (_context8) {
+                    while (1) switch (_context8.n) {
                       case 0:
                         user = _step3.value;
                         directChannel = _allChannels.find(function (ch) {
@@ -23289,7 +23335,7 @@ function watchForEvents() {
                           }));
                         });
                         if (!directChannel) {
-                          _context7.n = 1;
+                          _context8.n = 1;
                           break;
                         }
                         updatedMembers = (_directChannel$member2 = directChannel.members) === null || _directChannel$member2 === void 0 ? void 0 : _directChannel$member2.map(function (m) {
@@ -23297,85 +23343,85 @@ function watchForEvents() {
                             blocked: false
                           }) : m;
                         });
-                        _context7.n = 1;
+                        _context8.n = 1;
                         return effects.put(updateChannelDataAC(directChannel.id, {
                           members: updatedMembers
                         }));
                       case 1:
-                        return _context7.a(2);
+                        return _context8.a(2);
                     }
                   }, _callee2);
                 });
                 _iterator3 = _createForOfIteratorHelperLoose(unblockedUsers);
               case 35:
                 if ((_step3 = _iterator3()).done) {
-                  _context8.n = 37;
+                  _context9.n = 37;
                   break;
                 }
-                return _context8.d(_regeneratorValues(_loop3()), 36);
+                return _context9.d(_regeneratorValues(_loop3()), 36);
               case 36:
-                _context8.n = 35;
+                _context9.n = 35;
                 break;
               case 37:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 38:
                 _channel2 = args.channel, removedMembers = args.removedMembers;
                 log.info('channel KICK_MEMBERS ... ', removedMembers);
-                _context8.n = 39;
+                _context9.n = 39;
                 return effects.call(getActiveChannelId);
               case 39:
-                _activeChannelId = _context8.v;
+                _activeChannelId = _context9.v;
                 _channelExists2 = checkChannelExists(_channel2.id);
                 if (!_channelExists2) {
-                  _context8.n = 48;
+                  _context9.n = 48;
                   break;
                 }
                 if (!removedMembers.find(function (mem) {
                   return mem.id === SceytChatClient.user.id;
                 })) {
-                  _context8.n = 43;
+                  _context9.n = 43;
                   break;
                 }
                 removeChannelFromMap(_channel2.id);
-                _context8.n = 40;
+                _context9.n = 40;
                 return effects.put(removeChannelAC(_channel2.id));
               case 40:
-                _context8.n = 41;
+                _context9.n = 41;
                 return effects.call(getLastChannelFromMap);
               case 41:
-                activeChannel = _context8.v;
+                activeChannel = _context9.v;
                 if (!activeChannel) {
-                  _context8.n = 42;
+                  _context9.n = 42;
                   break;
                 }
-                _context8.n = 42;
+                _context9.n = 42;
                 return effects.put(switchChannelActionAC(JSON.parse(JSON.stringify(activeChannel))));
               case 42:
-                _context8.n = 48;
+                _context9.n = 48;
                 break;
               case 43:
                 _updateChannelData2 = {};
                 if (!(_activeChannelId === _channel2.id)) {
-                  _context8.n = 46;
+                  _context9.n = 46;
                   break;
                 }
-                _context8.n = 44;
+                _context9.n = 44;
                 return effects.put(removeMemberFromListAC(removedMembers, _channel2.id));
               case 44:
-                _context8.n = 45;
+                _context9.n = 45;
                 return effects.call(updateActiveChannelMembersRemove, removedMembers, _channel2.id) || {};
               case 45:
-                _updateChannelData2 = _context8.v;
+                _updateChannelData2 = _context9.v;
               case 46:
                 _groupName = getChannelGroupName(_channel2);
-                _context8.n = 47;
+                _context9.n = 47;
                 return effects.put(updateSearchedChannelDataAC(_channel2.id, {
                   memberCount: _channel2.memberCount,
                   muted: _channel2.muted,
                   mutedTill: _channel2.mutedTill
                 }, _groupName));
               case 47:
-                _context8.n = 48;
+                _context9.n = 48;
                 return effects.put(updateChannelDataAC(_channel2.id, _extends({
                   memberCount: _channel2.memberCount,
                   muted: _channel2.muted,
@@ -23387,79 +23433,79 @@ function watchForEvents() {
                   muted: _channel2.muted,
                   mutedTill: _channel2.mutedTill
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 49:
                 _channel3 = args.channel, addedMembers = args.addedMembers;
                 log.info('channel ADD_MEMBERS ... ', addedMembers);
-                _context8.n = 50;
+                _context9.n = 50;
                 return effects.call(getActiveChannelId);
               case 50:
-                _activeChannelId2 = _context8.v;
+                _activeChannelId2 = _context9.v;
                 _channelExists3 = checkChannelExists(_channel3.id);
                 if (!_channelExists3) {
-                  _context8.n = 60;
+                  _context9.n = 60;
                   break;
                 }
                 _updateChannelData3 = {};
                 if (!(_activeChannelId2 === _channel3.id)) {
-                  _context8.n = 58;
+                  _context9.n = 58;
                   break;
                 }
                 _customLoadMembersFunctions = getCustomLoadMembersFunctions();
                 addMembersEvent = _customLoadMembersFunctions === null || _customLoadMembersFunctions === void 0 ? void 0 : _customLoadMembersFunctions.addMembersEvent;
                 _membersList = [];
                 if (!addMembersEvent) {
-                  _context8.n = 53;
+                  _context9.n = 53;
                   break;
                 }
-                _context8.n = 51;
+                _context9.n = 51;
                 return effects.call(addMembersEvent, _channel3.id, addedMembers, store.getState().MembersReducer.channelsMembersMap[_channel3.id] || []);
               case 51:
-                _membersList = _context8.v;
-                _context8.n = 52;
+                _membersList = _context9.v;
+                _context9.n = 52;
                 return effects.put(setMembersToListAC(_membersList, _channel3.id));
               case 52:
-                _context8.n = 54;
+                _context9.n = 54;
                 break;
               case 53:
-                _context8.n = 54;
+                _context9.n = 54;
                 return effects.put(addMembersToListAC(addedMembers, _channel3.id));
               case 54:
                 if (!addMembersEvent) {
-                  _context8.n = 55;
+                  _context9.n = 55;
                   break;
                 }
                 _t3 = {
                   members: _membersList
                 };
-                _context8.n = 57;
+                _context9.n = 57;
                 break;
               case 55:
-                _context8.n = 56;
+                _context9.n = 56;
                 return effects.call(updateActiveChannelMembersAdd, addedMembers, _channel3.id) || {};
               case 56:
-                _t3 = _context8.v;
+                _t3 = _context9.v;
               case 57:
                 _updateChannelData3 = _t3;
               case 58:
-                _context8.n = 59;
+                _context9.n = 59;
                 return effects.put(updateChannelDataAC(_channel3.id, _extends({
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 }, _updateChannelData3)));
               case 59:
-                _context8.n = 62;
+                _context9.n = 62;
                 break;
               case 60:
-                _context8.n = 61;
+                _context9.n = 61;
                 return effects.call(setChannelInMap, _channel3);
               case 61:
-                _context8.n = 62;
+                _context9.n = 62;
                 return effects.put(setAddedToChannelAC(JSON.parse(JSON.stringify(_channel3))));
               case 62:
                 _groupName2 = getChannelGroupName(_channel3);
-                _context8.n = 63;
+                _context9.n = 63;
                 return effects.put(updateSearchedChannelDataAC(_channel3.id, {
                   memberCount: _channel3.memberCount,
                   muted: _channel3.muted,
@@ -23471,7 +23517,7 @@ function watchForEvents() {
                   muted: _channel3.muted,
                   mutedTill: _channel3.mutedTill
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 64:
                 onUpdateChannel = getOnUpdateChannel();
                 log.info('channel UPDATE_CHANNEL ... ');
@@ -23503,10 +23549,10 @@ function watchForEvents() {
                   onUpdateChannel(updatedChannel, fields);
                 }
                 if (!_channelExists4) {
-                  _context8.n = 67;
+                  _context9.n = 67;
                   break;
                 }
-                _context8.n = 65;
+                _context9.n = 65;
                 return effects.put(updateChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
@@ -23514,21 +23560,21 @@ function watchForEvents() {
                   mutedTill: mutedTill
                 }));
               case 65:
-                _context8.n = 66;
+                _context9.n = 66;
                 return effects.call(getActiveChannelId);
               case 66:
-                _activeChannelId3 = _context8.v;
+                _activeChannelId3 = _context9.v;
                 if (!(_activeChannelId3 === updatedChannel.id)) {
-                  _context8.n = 67;
+                  _context9.n = 67;
                   break;
                 }
-                _context8.n = 67;
+                _context9.n = 67;
                 return effects.put(setActiveChannelAC(_extends({}, updatedChannel, {
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 })));
               case 67:
                 _groupName3 = getChannelGroupName(updatedChannel);
-                _context8.n = 68;
+                _context9.n = 68;
                 return effects.put(updateSearchedChannelDataAC(updatedChannel.id, {
                   subject: subject,
                   avatarUrl: avatarUrl,
@@ -23543,67 +23589,67 @@ function watchForEvents() {
                   mutedTill: mutedTill,
                   metadata: isJSON(metadata) ? JSON.parse(metadata) : metadata
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 69:
-                _context8.n = 70;
+                _context9.n = 70;
                 return effects.call(handleChannelMessageEvent, args, SceytChatClient);
               case 70:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 71:
-                _context8.n = 72;
+                _context9.n = 72;
                 return effects.call(handleMessageMarkersReceivedEvent, args, SceytChatClient);
               case 72:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 73:
                 channelId = args.channelId;
                 log.info('channel DELETE ... ');
                 _channel5 = getChannelFromMap(channelId);
-                _context8.n = 74;
+                _context9.n = 74;
                 return effects.put(setChannelToRemoveAC(_channel5));
               case 74:
                 deleteChannelFromAllChannels(channelId);
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 75:
                 log.info('channel DELETE_MESSAGE ... ');
-                _context8.n = 76;
+                _context9.n = 76;
                 return effects.call(handleDeleteMessageEvent, args);
               case 76:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 77:
-                _context8.n = 78;
+                _context9.n = 78;
                 return effects.call(handleEditMessageEvent, args);
               case 78:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 79:
                 _channel6 = args.channel, user = args.user, message = args.message, reaction = args.reaction;
                 isSelf = user.id === SceytChatClient.user.id;
-                _context8.n = 80;
+                _context9.n = 80;
                 return effects.call(getActiveChannelId);
               case 80:
-                _activeChannelId4 = _context8.v;
+                _activeChannelId4 = _context9.v;
                 if (!(_channel6.id === _activeChannelId4)) {
-                  _context8.n = 81;
+                  _context9.n = 81;
                   break;
                 }
-                _context8.n = 81;
+                _context9.n = 81;
                 return effects.put(addReactionToMessageAC(message, reaction, isSelf));
               case 81:
                 if (!(message.user.id === SceytChatClient.user.id)) {
-                  _context8.n = 85;
+                  _context9.n = 85;
                   break;
                 }
                 if (!(!isSelf && Notification.permission === 'granted')) {
-                  _context8.n = 83;
+                  _context9.n = 83;
                   break;
                 }
                 if (!(document.visibilityState !== 'visible' || _channel6.id !== _activeChannelId4)) {
-                  _context8.n = 83;
+                  _context9.n = 83;
                   break;
                 }
-                _context8.n = 82;
+                _context9.n = 82;
                 return effects.select(contactsMapSelector);
               case 82:
-                contactsMap = _context8.v;
+                contactsMap = _context9.v;
                 _getFromContacts = getShowOnlyContactUsers();
                 state = store.getState();
                 theme = state.ThemeReducer.theme || 'light';
@@ -23624,7 +23670,7 @@ function watchForEvents() {
                 }) : undefined);
               case 83:
                 if (!(_channel6.newReactions && _channel6.newReactions.length)) {
-                  _context8.n = 84;
+                  _context9.n = 84;
                   break;
                 }
                 channelUpdateParams = {
@@ -23634,7 +23680,7 @@ function watchForEvents() {
                   muted: _channel6.muted,
                   mutedTill: _channel6.mutedTill
                 };
-                _context8.n = 84;
+                _context9.n = 84;
                 return effects.put(updateChannelDataAC(_channel6.id, channelUpdateParams));
               case 84:
                 updateChannelOnAllChannels(_channel6.id, {
@@ -23648,15 +23694,15 @@ function watchForEvents() {
                 if (checkChannelExistsOnMessagesMap(_channel6.id)) {
                   addReactionToMessageOnMap(_channel6.id, message, reaction, true);
                 }
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 86:
                 log.info('CHANNEL_EVENT_TYPES.POLL_ADDED ... ');
                 _channel7 = args.channel, pollDetails = args.pollDetails, messageId = args.messageId;
                 pollDetailsData = pollDetails;
-                _context8.n = 87;
+                _context9.n = 87;
                 return effects.call(getActiveChannelId);
               case 87:
-                _activeChannelId5 = _context8.v;
+                _activeChannelId5 = _context9.v;
                 addedVotes = (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan = pollDetailsData.changedVotes) === null || _pollDetailsData$chan === void 0 ? void 0 : _pollDetailsData$chan.addedVotes) || [];
                 deletedVotes = (pollDetailsData === null || pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan2 = pollDetailsData.changedVotes) === null || _pollDetailsData$chan2 === void 0 ? void 0 : _pollDetailsData$chan2.removedVotes) || [];
                 objs = [];
@@ -23677,37 +23723,37 @@ function watchForEvents() {
                 _i = 0, _objs = objs;
               case 88:
                 if (!(_i < _objs.length)) {
-                  _context8.n = 92;
+                  _context9.n = 92;
                   break;
                 }
                 obj = _objs[_i];
                 if (!(pollDetailsData !== null && pollDetailsData !== void 0 && pollDetailsData.id && obj.vote)) {
-                  _context8.n = 91;
+                  _context9.n = 91;
                   break;
                 }
                 key = pollDetailsData.id + "_" + obj.vote.optionId;
                 hasNext = ((_store$getState$Messa3 = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa3 === void 0 ? void 0 : _store$getState$Messa3[key]) || false;
                 if (!(obj.type === 'addOwn')) {
-                  _context8.n = 90;
+                  _context9.n = 90;
                   break;
                 }
-                _context8.n = 89;
+                _context9.n = 89;
                 return effects.put(addPollVotesToListAC(pollDetailsData.id, obj.vote.optionId, [obj.vote], hasNext, undefined));
               case 89:
-                _context8.n = 91;
+                _context9.n = 91;
                 break;
               case 90:
-                _context8.n = 91;
+                _context9.n = 91;
                 return effects.put(deletePollVotesFromListAC(pollDetailsData.id, obj.vote.optionId, [obj.vote], messageId));
               case 91:
                 _i++;
-                _context8.n = 88;
+                _context9.n = 88;
                 break;
               case 92:
                 _i2 = 0, _objs2 = objs;
               case 93:
                 if (!(_i2 < _objs2.length)) {
-                  _context8.n = 95;
+                  _context9.n = 95;
                   break;
                 }
                 _obj = _objs2[_i2];
@@ -23719,25 +23765,25 @@ function watchForEvents() {
                   vote: _obj.vote
                 });
                 if (!(_channel7.id === _activeChannelId5)) {
-                  _context8.n = 94;
+                  _context9.n = 94;
                   break;
                 }
-                _context8.n = 94;
+                _context9.n = 94;
                 return effects.put(updateMessageAC(messageId, {}, undefined, _obj));
               case 94:
                 _i2++;
-                _context8.n = 93;
+                _context9.n = 93;
                 break;
               case 95:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 96:
                 log.info('CHANNEL_EVENT_TYPES.POLL_DELETED ... ');
                 _channel8 = args.channel, _pollDetails = args.pollDetails, _messageId = args.messageId;
                 _pollDetailsData = _pollDetails;
-                _context8.n = 97;
+                _context9.n = 97;
                 return effects.call(getActiveChannelId);
               case 97:
-                _activeChannelId6 = _context8.v;
+                _activeChannelId6 = _context9.v;
                 _deletedVotes = (_pollDetailsData === null || _pollDetailsData === void 0 ? void 0 : (_pollDetailsData$chan3 = _pollDetailsData.changedVotes) === null || _pollDetailsData$chan3 === void 0 ? void 0 : _pollDetailsData$chan3.removedVotes) || [];
                 _objs3 = [];
                 for (_iterator6 = _createForOfIteratorHelperLoose(_deletedVotes); !(_step6 = _iterator6()).done;) {
@@ -23750,25 +23796,25 @@ function watchForEvents() {
                 _i3 = 0, _objs4 = _objs3;
               case 98:
                 if (!(_i3 < _objs4.length)) {
-                  _context8.n = 100;
+                  _context9.n = 100;
                   break;
                 }
                 _obj2 = _objs4[_i3];
                 if (!(_pollDetailsData !== null && _pollDetailsData !== void 0 && _pollDetailsData.id && _obj2.vote)) {
-                  _context8.n = 99;
+                  _context9.n = 99;
                   break;
                 }
-                _context8.n = 99;
+                _context9.n = 99;
                 return effects.put(deletePollVotesFromListAC(_pollDetailsData.id, _obj2.vote.optionId, [_obj2.vote], _messageId));
               case 99:
                 _i3++;
-                _context8.n = 98;
+                _context9.n = 98;
                 break;
               case 100:
                 _i4 = 0, _objs5 = _objs3;
               case 101:
                 if (!(_i4 < _objs5.length)) {
-                  _context8.n = 103;
+                  _context9.n = 103;
                   break;
                 }
                 _obj3 = _objs5[_i4];
@@ -23777,24 +23823,24 @@ function watchForEvents() {
                   params: {}
                 }, _obj3);
                 if (!(_channel8.id === _activeChannelId6)) {
-                  _context8.n = 102;
+                  _context9.n = 102;
                   break;
                 }
-                _context8.n = 102;
+                _context9.n = 102;
                 return effects.put(updateMessageAC(_messageId, {}, undefined, _obj3));
               case 102:
                 _i4++;
-                _context8.n = 101;
+                _context9.n = 101;
                 break;
               case 103:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 104:
                 log.info('CHANNEL_EVENT_TYPES.POLL_RETRACTED ... ');
                 _channel9 = args.channel, _pollDetails2 = args.pollDetails, _messageId2 = args.messageId;
-                _context8.n = 105;
+                _context9.n = 105;
                 return effects.call(getActiveChannelId);
               case 105:
-                _activeChannelId7 = _context8.v;
+                _activeChannelId7 = _context9.v;
                 _pollDetailsData2 = _pollDetails2;
                 retractedVotes = (_pollDetailsData2 === null || _pollDetailsData2 === void 0 ? void 0 : (_pollDetailsData2$cha = _pollDetailsData2.changedVotes) === null || _pollDetailsData2$cha === void 0 ? void 0 : _pollDetailsData2$cha.removedVotes) || [];
                 _objs6 = [];
@@ -23808,7 +23854,7 @@ function watchForEvents() {
                 _i5 = 0, _objs7 = _objs6;
               case 106:
                 if (!(_i5 < _objs7.length)) {
-                  _context8.n = 111;
+                  _context9.n = 111;
                   break;
                 }
                 _obj4 = _objs7[_i5];
@@ -23817,41 +23863,41 @@ function watchForEvents() {
                   params: {}
                 }, _obj4);
                 if (!(_pollDetailsData2 !== null && _pollDetailsData2 !== void 0 && _pollDetailsData2.id && retractedVotes.length > 0)) {
-                  _context8.n = 109;
+                  _context9.n = 109;
                   break;
                 }
                 _iterator8 = _createForOfIteratorHelperLoose(retractedVotes);
               case 107:
                 if ((_step8 = _iterator8()).done) {
-                  _context8.n = 109;
+                  _context9.n = 109;
                   break;
                 }
                 _vote3 = _step8.value;
-                _context8.n = 108;
+                _context9.n = 108;
                 return effects.put(deletePollVotesFromListAC(_pollDetailsData2.id, _vote3.optionId, [_vote3], _messageId2));
               case 108:
-                _context8.n = 107;
+                _context9.n = 107;
                 break;
               case 109:
                 if (!(_channel9.id === _activeChannelId7)) {
-                  _context8.n = 110;
+                  _context9.n = 110;
                   break;
                 }
-                _context8.n = 110;
+                _context9.n = 110;
                 return effects.put(updateMessageAC(_messageId2, {}, undefined, _obj4));
               case 110:
                 _i5++;
-                _context8.n = 106;
+                _context9.n = 106;
                 break;
               case 111:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 112:
                 log.info('CHANNEL_EVENT_TYPES.POLL_CLOSED ... ');
                 _channel0 = args.channel, _messageId3 = args.messageId;
-                _context8.n = 113;
+                _context9.n = 113;
                 return effects.call(getActiveChannelId);
               case 113:
-                _activeChannelId8 = _context8.v;
+                _activeChannelId8 = _context9.v;
                 _obj5 = {
                   type: 'close'
                 };
@@ -23860,74 +23906,74 @@ function watchForEvents() {
                   params: {}
                 }, _obj5);
                 if (!(_channel0.id === _activeChannelId8)) {
-                  _context8.n = 115;
+                  _context9.n = 115;
                   break;
                 }
-                _context8.n = 114;
+                _context9.n = 114;
                 return effects.put(updateMessageAC(_messageId3, {}, undefined, _obj5));
               case 114:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 115:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 116:
                 _channel1 = args.channel, _user = args.user, _message = args.message, _reaction = args.reaction;
                 log.info('channel REACTION_DELETED ... ', _channel1);
                 channelFromMap = getChannelFromMap(_channel1.id);
                 _isSelf = _user.id === SceytChatClient.user.id;
-                _context8.n = 117;
+                _context9.n = 117;
                 return effects.call(getActiveChannelId);
               case 117:
-                _activeChannelId9 = _context8.v;
+                _activeChannelId9 = _context9.v;
                 if (!(_channel1.id === _activeChannelId9)) {
-                  _context8.n = 118;
+                  _context9.n = 118;
                   break;
                 }
-                _context8.n = 118;
+                _context9.n = 118;
                 return effects.put(deleteReactionFromMessageAC(_message, _reaction, _isSelf));
               case 118:
                 _channelUpdateParams = JSON.parse(JSON.stringify(_channel1));
                 if (channelFromMap && channelFromMap.lastReactedMessage && channelFromMap.lastReactedMessage.id === _message.id) {
                   _channelUpdateParams.lastReactedMessage = null;
                 }
-                _context8.n = 119;
+                _context9.n = 119;
                 return effects.put(updateChannelDataAC(_channel1.id, _channelUpdateParams));
               case 119:
                 updateChannelOnAllChannels(_channel1.id, _channelUpdateParams);
                 if (checkChannelExistsOnMessagesMap(_channel1.id)) {
                   removeReactionToMessageOnMap(_channel1.id, _message, _reaction, true);
                 }
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 120:
-                _context8.n = 121;
+                _context9.n = 121;
                 return effects.call(handleUnreadMessagesInfoEvent, args);
               case 121:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 122:
                 _channel10 = args.channel;
                 log.info('CLEAR_HISTORY: ', _channel10);
-                _context8.n = 123;
+                _context9.n = 123;
                 return effects.call(getActiveChannelId);
               case 123:
-                _activeChannelId0 = _context8.v;
-                _context8.n = 124;
+                _activeChannelId0 = _context9.v;
+                _context9.n = 124;
                 return effects.call(checkChannelExists, _channel10.id);
               case 124:
-                channelExist = _context8.v;
+                channelExist = _context9.v;
                 if (!(_channel10.id === _activeChannelId0)) {
-                  _context8.n = 126;
+                  _context9.n = 126;
                   break;
                 }
-                _context8.n = 125;
+                _context9.n = 125;
                 return effects.put(clearMessagesAC());
               case 125:
                 removeAllMessages();
               case 126:
                 removeMessagesFromMap(_channel10.id);
                 if (!channelExist) {
-                  _context8.n = 127;
+                  _context9.n = 127;
                   break;
                 }
-                _context8.n = 127;
+                _context9.n = 127;
                 return effects.put(updateChannelDataAC(_channel10.id, {
                   lastMessage: null,
                   newMessageCount: 0,
@@ -23943,11 +23989,11 @@ function watchForEvents() {
                   muted: _channel10.muted,
                   mutedTill: _channel10.mutedTill
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 128:
                 _channel11 = args.channel;
                 log.info('channel MUTE ... ');
-                _context8.n = 129;
+                _context9.n = 129;
                 return effects.put(updateChannelDataAC(_channel11.id, {
                   muted: _channel11.muted,
                   mutedTill: _channel11.mutedTill
@@ -23957,11 +24003,11 @@ function watchForEvents() {
                   muted: _channel11.muted,
                   mutedTill: _channel11.mutedTill
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 130:
                 _channel12 = args.channel;
                 log.info('channel UNMUTE ... ');
-                _context8.n = 131;
+                _context9.n = 131;
                 return effects.put(updateChannelDataAC(_channel12.id, {
                   muted: _channel12.muted,
                   mutedTill: _channel12.mutedTill
@@ -23971,11 +24017,11 @@ function watchForEvents() {
                   muted: _channel12.muted,
                   mutedTill: _channel12.mutedTill
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 132:
                 _channel13 = args.channel;
                 log.info('channel PINED ... ');
-                _context8.n = 133;
+                _context9.n = 133;
                 return effects.put(updateChannelDataAC(_channel13.id, {
                   pinnedAt: _channel13.pinnedAt
                 }, true));
@@ -23983,11 +24029,11 @@ function watchForEvents() {
                 updateChannelOnAllChannels(_channel13.id, {
                   pinnedAt: _channel13.pinnedAt
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 134:
                 _channel14 = args.channel;
                 log.info('channel UNPINED ... ');
-                _context8.n = 135;
+                _context9.n = 135;
                 return effects.put(updateChannelDataAC(_channel14.id, {
                   pinnedAt: _channel14.pinnedAt
                 }, false, true));
@@ -23995,39 +24041,39 @@ function watchForEvents() {
                 updateChannelOnAllChannels(_channel14.id, {
                   pinnedAt: _channel14.pinnedAt
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 136:
                 _channel15 = args.channel;
                 log.info('channel HIDE ... ');
-                _context8.n = 137;
+                _context9.n = 137;
                 return effects.put(setChannelToHideAC(_channel15));
               case 137:
-                _context8.n = 138;
+                _context9.n = 138;
                 return effects.call(getActiveChannelId);
               case 138:
-                _activeChannelId1 = _context8.v;
+                _activeChannelId1 = _context9.v;
                 if (!(_activeChannelId1 === _channel15.id)) {
-                  _context8.n = 140;
+                  _context9.n = 140;
                   break;
                 }
-                _context8.n = 139;
+                _context9.n = 139;
                 return effects.call(getLastChannelFromMap, true);
               case 139:
-                lastChannel = _context8.v;
-                _context8.n = 140;
+                lastChannel = _context9.v;
+                _context9.n = 140;
                 return effects.put(switchChannelActionAC(lastChannel || null));
               case 140:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 141:
                 _channel16 = args.channel;
                 log.info('channel UNHIDE ... ');
-                _context8.n = 142;
+                _context9.n = 142;
                 return effects.put(setChannelToUnHideAC(_channel16));
               case 142:
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 143:
                 _channel17 = args.channel;
-                _context8.n = 144;
+                _context9.n = 144;
                 return effects.put(updateChannelDataAC(_channel17.id, {
                   unread: _channel17.unread,
                   muted: _channel17.muted,
@@ -24035,7 +24081,7 @@ function watchForEvents() {
                 }));
               case 144:
                 _groupName4 = getChannelGroupName(_channel17);
-                _context8.n = 145;
+                _context9.n = 145;
                 return effects.put(updateSearchedChannelDataAC(_channel17.id, {
                   unread: _channel17.unread
                 }, _groupName4));
@@ -24043,104 +24089,90 @@ function watchForEvents() {
                 updateChannelOnAllChannels(_channel17.id, {
                   unread: _channel17.unread
                 });
-                return _context8.a(3, 175);
+                return _context9.a(3, 174);
               case 146:
-                _channel18 = args.channel;
-                _context8.n = 147;
-                return effects.put(updateChannelDataAC(_channel18.id, {
-                  unread: _channel18.unread,
-                  muted: _channel18.muted,
-                  mutedTill: _channel18.mutedTill
-                }));
+                _context9.n = 147;
+                return effects.call(handleChannelMarkedAsReadEvent, args);
               case 147:
-                _groupName5 = getChannelGroupName(_channel18);
-                _context8.n = 148;
-                return effects.put(updateSearchedChannelDataAC(_channel18.id, {
-                  unread: _channel18.unread
-                }, _groupName5));
+                return _context9.a(3, 174);
               case 148:
-                updateChannelOnAllChannels(_channel18.id, {
-                  unread: _channel18.unread
-                });
-                return _context8.a(3, 175);
-              case 149:
-                _channel19 = args.channel, members = args.members;
-                log.info('channel CHANGE_ROLE  channel ... ', _channel19);
+                _channel18 = args.channel, members = args.members;
+                log.info('channel CHANGE_ROLE  channel ... ', _channel18);
                 log.info('channel CHANGE_ROLE  member ... ', members);
-                _context8.n = 150;
+                _context9.n = 149;
                 return effects.call(getActiveChannelId);
-              case 150:
-                _activeChannelId10 = _context8.v;
-                if (!(_channel19.id === _activeChannelId10)) {
-                  _context8.n = 154;
+              case 149:
+                _activeChannelId10 = _context9.v;
+                if (!(_channel18.id === _activeChannelId10)) {
+                  _context9.n = 153;
                   break;
                 }
                 _customLoadMembersFunctions2 = getCustomLoadMembersFunctions();
                 updateMembersEvent = _customLoadMembersFunctions2 === null || _customLoadMembersFunctions2 === void 0 ? void 0 : _customLoadMembersFunctions2.updateMembersEvent;
                 if (!updateMembersEvent) {
-                  _context8.n = 153;
+                  _context9.n = 152;
                   break;
                 }
-                _context8.n = 151;
-                return effects.call(updateMembersEvent, _channel19.id, members, store.getState().MembersReducer.channelsMembersMap[_channel19.id] || []);
+                _context9.n = 150;
+                return effects.call(updateMembersEvent, _channel18.id, members, store.getState().MembersReducer.channelsMembersMap[_channel18.id] || []);
+              case 150:
+                _membersList2 = _context9.v;
+                _context9.n = 151;
+                return effects.put(setMembersToListAC(_membersList2, _channel18.id));
               case 151:
-                _membersList2 = _context8.v;
-                _context8.n = 152;
-                return effects.put(setMembersToListAC(_membersList2, _channel19.id));
-              case 152:
-                _context8.n = 154;
+                _context9.n = 153;
                 break;
+              case 152:
+                _context9.n = 153;
+                return effects.put(updateMembersAC(members, _channel18.id));
               case 153:
-                _context8.n = 154;
-                return effects.put(updateMembersAC(members, _channel19.id));
-              case 154:
                 i = 0;
-              case 155:
+              case 154:
                 if (!(i < members.length)) {
-                  _context8.n = 158;
+                  _context9.n = 157;
                   break;
                 }
                 if (!(members[i].id === SceytChatClient.user.id)) {
-                  _context8.n = 157;
+                  _context9.n = 156;
                   break;
                 }
-                _context8.n = 156;
-                return effects.put(updateChannelDataAC(_channel19.id, {
+                _context9.n = 155;
+                return effects.put(updateChannelDataAC(_channel18.id, {
                   userRole: members[i].role,
-                  muted: _channel19.muted,
-                  mutedTill: _channel19.mutedTill
+                  muted: _channel18.muted,
+                  mutedTill: _channel18.mutedTill
                 }));
-              case 156:
-                updateChannelOnAllChannels(_channel19.id, {
+              case 155:
+                updateChannelOnAllChannels(_channel18.id, {
                   userRole: members[i].role,
-                  muted: _channel19.muted,
-                  mutedTill: _channel19.mutedTill
+                  muted: _channel18.muted,
+                  mutedTill: _channel18.mutedTill
                 });
-              case 157:
+              case 156:
                 i++;
-                _context8.n = 155;
+                _context9.n = 154;
                 break;
+              case 157:
+                return _context9.a(3, 174);
               case 158:
-                return _context8.a(3, 175);
+                _channel19 = args.channel;
+                log.info('channel frozen  channel ... ', _channel19);
+                return _context9.a(3, 174);
               case 159:
                 _channel20 = args.channel;
-                log.info('channel frozen  channel ... ', _channel20);
-                return _context8.a(3, 175);
+                log.info('channel unfrozen  channel ... ', _channel20);
+                return _context9.a(3, 174);
               case 160:
-                _channel21 = args.channel;
-                log.info('channel unfrozen  channel ... ', _channel21);
-                return _context8.a(3, 175);
-              case 161:
                 _channelId = args.channelId, from = args.from, name = args.name;
                 log.info('channel event received >>>... . . . . . ', args);
                 if (!(from.id === SceytChatClient.user.id)) {
-                  _context8.n = 162;
+                  _context9.n = 161;
                   break;
                 }
-                return _context8.a(3, 175);
-              case 162:
+                return _context9.a(3, 174);
+              case 161:
                 if (!(name === 'start_typing')) {
-                  _context8.n = 164;
+                  _context9.n = 163;
                   break;
                 }
                 if (!usersTimeout.typingTimeout[_channelId]) {
@@ -24152,27 +24184,27 @@ function watchForEvents() {
                 usersTimeout.typingTimeout[_channelId][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId, from, 'stop_typing');
                 }, 5000);
-                _context8.n = 163;
+                _context9.n = 162;
                 return effects.put(switchTypingIndicatorAC(true, _channelId, from));
-              case 163:
-                _context8.n = 169;
+              case 162:
+                _context9.n = 168;
                 break;
-              case 164:
+              case 163:
                 if (!(name === 'stop_typing')) {
-                  _context8.n = 166;
+                  _context9.n = 165;
                   break;
                 }
                 if (usersTimeout.typingTimeout[_channelId] && usersTimeout.typingTimeout[_channelId][from.id]) {
                   clearTimeout(usersTimeout.typingTimeout[_channelId][from.id]);
                 }
-                _context8.n = 165;
+                _context9.n = 164;
                 return effects.put(switchTypingIndicatorAC(false, _channelId, from));
-              case 165:
-                _context8.n = 169;
+              case 164:
+                _context9.n = 168;
                 break;
-              case 166:
+              case 165:
                 if (!(name === 'start_recording')) {
-                  _context8.n = 168;
+                  _context9.n = 167;
                   break;
                 }
                 if (!usersTimeout.recordingTimeout[_channelId]) {
@@ -24184,63 +24216,63 @@ function watchForEvents() {
                 usersTimeout.recordingTimeout[_channelId][from.id] = setTimeout(function () {
                   channelListener.onReceivedChannelEvent(_channelId, from, 'stop_recording');
                 }, 5000);
-                _context8.n = 167;
+                _context9.n = 166;
                 return effects.put(switchRecordingIndicatorAC(true, _channelId, from));
-              case 167:
-                _context8.n = 169;
+              case 166:
+                _context9.n = 168;
                 break;
-              case 168:
+              case 167:
                 if (!(name === 'stop_recording')) {
-                  _context8.n = 169;
+                  _context9.n = 168;
                   break;
                 }
                 if (usersTimeout.recordingTimeout[_channelId] && usersTimeout.recordingTimeout[_channelId][from.id]) {
                   clearTimeout(usersTimeout.recordingTimeout[_channelId][from.id]);
                 }
-                _context8.n = 169;
+                _context9.n = 168;
                 return effects.put(switchRecordingIndicatorAC(false, _channelId, from));
+              case 168:
+                return _context9.a(3, 174);
               case 169:
-                return _context8.a(3, 175);
-              case 170:
                 status = args.status;
                 log.info('connection status changed . . . . . ', status);
-                _context8.n = 171;
+                _context9.n = 170;
                 return effects.put(setConnectionStatusAC(status));
-              case 171:
+              case 170:
                 if (!(status === CONNECTION_STATUS.CONNECTED)) {
-                  _context8.n = 173;
+                  _context9.n = 172;
                   break;
                 }
-                _context8.n = 172;
+                _context9.n = 171;
                 return effects.put(getRolesAC());
-              case 172:
-                _context8.n = 173;
+              case 171:
+                _context9.n = 172;
                 return effects.put(resendPendingMessageMutationsAC(status));
+              case 172:
+                return _context9.a(3, 174);
               case 173:
-                return _context8.a(3, 175);
-              case 174:
                 log.warn('UNHANDLED EVENT FROM REDUX-SAGA EVENT-CHANNEL');
-              case 175:
-                _context8.n = 177;
+              case 174:
+                _context9.n = 176;
                 break;
-              case 176:
-                _context8.p = 176;
-                _t4 = _context8.v;
+              case 175:
+                _context9.p = 175;
+                _t4 = _context9.v;
                 log.error('Error in watchForEvents:', _t4);
-              case 177:
-                return _context8.a(2);
+              case 176:
+                return _context9.a(2);
             }
-          }, _callee3, null, [[0, 176]]);
+          }, _callee3, null, [[0, 175]]);
         });
       case 1:
-        return _context9.d(_regeneratorValues(_loop()), 2);
+        return _context0.d(_regeneratorValues(_loop()), 2);
       case 2:
-        _context9.n = 1;
+        _context0.n = 1;
         break;
       case 3:
-        return _context9.a(2);
+        return _context0.a(2);
     }
-  }, _marked6$1);
+  }, _marked7$1);
 }
 
 var _marked$3 = /*#__PURE__*/_regenerator().m(createChannel),
@@ -24249,7 +24281,7 @@ var _marked$3 = /*#__PURE__*/_regenerator().m(createChannel),
   _marked4$2 = /*#__PURE__*/_regenerator().m(getChannelsForForward),
   _marked5$2 = /*#__PURE__*/_regenerator().m(searchChannelsForForward),
   _marked6$2 = /*#__PURE__*/_regenerator().m(channelsLoadMore),
-  _marked7$1 = /*#__PURE__*/_regenerator().m(getChannelMentions),
+  _marked7$2 = /*#__PURE__*/_regenerator().m(getChannelMentions),
   _marked8$1 = /*#__PURE__*/_regenerator().m(channelsForForwardLoadMore),
   _marked9$1 = /*#__PURE__*/_regenerator().m(markMessagesRead),
   _marked0$1 = /*#__PURE__*/_regenerator().m(markVoiceMessageAsPlayed),
@@ -24286,6 +24318,34 @@ var _marked$3 = /*#__PURE__*/_regenerator().m(createChannel),
   _marked39$1 = /*#__PURE__*/_regenerator().m(getChannelsWithUser),
   _marked40$1 = /*#__PURE__*/_regenerator().m(loadMoreMutualChannels),
   _marked41$1 = /*#__PURE__*/_regenerator().m(ChannelsSaga);
+var getUniqueMessageIds = function getUniqueMessageIds(messageIds) {
+  if (messageIds === void 0) {
+    messageIds = [];
+  }
+  return Array.from(new Set(messageIds.filter(Boolean)));
+};
+var getNewestMessageId = function getNewestMessageId(messageIds) {
+  return getUniqueMessageIds(messageIds).reduce(function (latestMessageId, messageId) {
+    return compareMessageIds(messageId, latestMessageId) > 0 ? messageId : latestMessageId;
+  }, '');
+};
+var getLatestIncomingConfirmedMessageId = function getLatestIncomingConfirmedMessageId(channel) {
+  var _channel$lastMessage, _channel$lastMessage2;
+  if (!(channel !== null && channel !== void 0 && channel.id)) {
+    return '';
+  }
+  var latestIncomingConfirmedMessageId = (_channel$lastMessage = channel.lastMessage) !== null && _channel$lastMessage !== void 0 && _channel$lastMessage.incoming && (_channel$lastMessage2 = channel.lastMessage) !== null && _channel$lastMessage2 !== void 0 && _channel$lastMessage2.id ? channel.lastMessage.id : '';
+  var cachedMessages = Object.values(getMessagesFromMap(channel.id) || {});
+  cachedMessages.forEach(function (message) {
+    if (message !== null && message !== void 0 && message.incoming && message.id && compareMessageIds(message.id, latestIncomingConfirmedMessageId) > 0) {
+      latestIncomingConfirmedMessageId = message.id;
+    }
+  });
+  return latestIncomingConfirmedMessageId;
+};
+var getLatestUnreadBoundaryId = function getLatestUnreadBoundaryId(channel) {
+  return (channel === null || channel === void 0 ? void 0 : channel.lastReceivedMsgId) || getLatestIncomingConfirmedMessageId(channel);
+};
 function createChannel(action) {
   var payload, channelData, dontCreateIfNotExists, callback, SceytChatClient, createChannelData, fileToUpload, isSelfChannel, channelIsExistOnAllChannels, createdChannel, allChannels, memberId, whoDoesNotAdded, checkChannelExist, messageToSend, _allChannels, _memberId, _t;
   return _regenerator().w(function (_context) {
@@ -25282,7 +25342,7 @@ function getChannelMentions(action) {
       case 5:
         return _context8.a(2);
     }
-  }, _marked7$1, null, [[0, 4]]);
+  }, _marked7$2, null, [[0, 4]]);
 }
 function channelsForForwardLoadMore(action) {
   var payload, limit, _SceytChatClient4, channelQueryForward, channelsData, channelsToAdd, _yield$call4, mappedChannels, _t0;
@@ -25336,17 +25396,19 @@ function channelsForForwardLoadMore(action) {
   }, _marked8$1, null, [[0, 7]]);
 }
 function markMessagesRead(action) {
-  var payload, channelId, messageIds, connectionStatus, channel, messageListMarker, _iterator6, _step6, messageId, updateParams, _t1;
+  var payload, channelId, messageIds, connectionStatus, channel, previousLastDisplayedMessageId, latestUnreadBoundaryId, messageListMarker, readMessageIds, nextLastDisplayedMessageId, newlyCoveredUnreadCount, nextNewMessageCount, reachedLatestUnreadBoundary, updateData, _iterator6, _step6, messageId, updateParams, _t1;
   return _regenerator().w(function (_context0) {
     while (1) switch (_context0.p = _context0.n) {
       case 0:
         payload = action.payload;
         channelId = payload.channelId, messageIds = payload.messageIds;
+        log.info("[READ_MESSAGE] saga ch=" + channelId + " ids=[" + messageIds.join(',') + "]");
         connectionStatus = store.getState().UserReducer.connectionStatus;
         if (!(connectionStatus !== CONNECTION_STATUS.CONNECTED)) {
           _context0.n = 1;
           break;
         }
+        log.warn("[READ_MESSAGE] saga skip \u2014 not connected (" + connectionStatus + ")");
         return _context0.a(2);
       case 1:
         _context0.n = 2;
@@ -25361,22 +25423,42 @@ function markMessagesRead(action) {
           }
         }
         if (!channel) {
-          _context0.n = 9;
+          _context0.n = 10;
           break;
         }
+        previousLastDisplayedMessageId = channel.lastDisplayedMessageId || '';
+        latestUnreadBoundaryId = getLatestUnreadBoundaryId(channel);
+        log.info("[READ_MESSAGE] calling markMessagesAsDisplayed ch=" + channelId);
         _context0.n = 4;
         return effects.call(channel.markMessagesAsDisplayed, messageIds);
       case 4:
         messageListMarker = _context0.v;
+        readMessageIds = getUniqueMessageIds((messageListMarker === null || messageListMarker === void 0 ? void 0 : messageListMarker.messageIds) || messageIds);
+        nextLastDisplayedMessageId = getNewestMessageId([previousLastDisplayedMessageId].concat(readMessageIds)) || previousLastDisplayedMessageId;
+        newlyCoveredUnreadCount = readMessageIds.filter(function (messageId) {
+          if (compareMessageIds(messageId, previousLastDisplayedMessageId) <= 0) {
+            return false;
+          }
+          return !latestUnreadBoundaryId || compareMessageIds(messageId, latestUnreadBoundaryId) <= 0;
+        }).length;
+        nextNewMessageCount = Math.max(0, (channel.newMessageCount || 0) - newlyCoveredUnreadCount);
+        reachedLatestUnreadBoundary = !!latestUnreadBoundaryId && compareMessageIds(nextLastDisplayedMessageId, latestUnreadBoundaryId) >= 0;
+        updateData = reachedLatestUnreadBoundary || readMessageIds.length > 0 && nextNewMessageCount === 0 ? {
+          lastDisplayedMessageId: nextLastDisplayedMessageId,
+          unread: false,
+          newMessageCount: 0,
+          newMentionCount: 0
+        } : _extends({
+          lastDisplayedMessageId: nextLastDisplayedMessageId
+        }, newlyCoveredUnreadCount > 0 ? {
+          newMessageCount: nextNewMessageCount
+        } : {});
+        log.info("[READ_MESSAGE] marked " + readMessageIds.length + " msgs, newCount=" + nextNewMessageCount);
         _context0.n = 5;
-        return effects.put(updateChannelDataAC(channel.id, {
-          lastDisplayedMessageId: channel.lastDisplayedMessageId
-        }));
+        return effects.put(updateChannelDataAC(channel.id, updateData));
       case 5:
-        updateChannelOnAllChannels(channel.id, {
-          lastDisplayedMessageId: channel.lastDisplayedMessageId
-        });
-        _iterator6 = _createForOfIteratorHelperLoose(messageListMarker.messageIds);
+        updateChannelOnAllChannels(channel.id, updateData);
+        _iterator6 = _createForOfIteratorHelperLoose(readMessageIds);
       case 6:
         if ((_step6 = _iterator6()).done) {
           _context0.n = 9;
@@ -25386,8 +25468,8 @@ function markMessagesRead(action) {
         updateParams = {
           deliveryStatus: MESSAGE_DELIVERY_STATUS.READ,
           userMarkers: [{
-            user: messageListMarker.user,
-            createdAt: messageListMarker.createdAt,
+            user: (messageListMarker === null || messageListMarker === void 0 ? void 0 : messageListMarker.user) || null,
+            createdAt: (messageListMarker === null || messageListMarker === void 0 ? void 0 : messageListMarker.createdAt) || new Date(),
             messageId: messageId,
             name: MESSAGE_DELIVERY_STATUS.READ
           }]
@@ -25406,13 +25488,18 @@ function markMessagesRead(action) {
         _context0.n = 11;
         break;
       case 10:
-        _context0.p = 10;
-        _t1 = _context0.v;
-        log.error(_t1, 'Error on mark messages read');
+        log.warn("[READ_MESSAGE] saga skip \u2014 channel not found ch=" + channelId);
       case 11:
+        _context0.n = 13;
+        break;
+      case 12:
+        _context0.p = 12;
+        _t1 = _context0.v;
+        log.error(_t1, '[READ_MESSAGE] Error on mark messages read');
+      case 13:
         return _context0.a(2);
     }
-  }, _marked9$1, null, [[3, 10]]);
+  }, _marked9$1, null, [[3, 12]]);
 }
 function markVoiceMessageAsPlayed(action) {
   var payload, channelId, messageIds, connectionStatus, channel, messageListMarker, _iterator7, _step7, messageId, updateParams, _t10;
@@ -25835,7 +25922,7 @@ function notificationsTurnOn() {
   }, _marked14$1, null, [[3, 6]]);
 }
 function markChannelAsRead(action) {
-  var channelId, channel, updatedChannel, updateData, _t16;
+  var channelId, channel, updatedChannel, latestUnreadBoundaryId, lastDisplayedCandidates, nextLastDisplayedMessageId, updateData, _t16;
   return _regenerator().w(function (_context16) {
     while (1) switch (_context16.p = _context16.n) {
       case 0:
@@ -25852,11 +25939,14 @@ function markChannelAsRead(action) {
         return effects.call(channel.markAsRead);
       case 2:
         updatedChannel = _context16.v;
+        latestUnreadBoundaryId = getLatestUnreadBoundaryId(channel);
+        lastDisplayedCandidates = [channel.lastDisplayedMessageId || '', (updatedChannel === null || updatedChannel === void 0 ? void 0 : updatedChannel.lastDisplayedMessageId) || '', latestUnreadBoundaryId].filter(Boolean);
+        nextLastDisplayedMessageId = getNewestMessageId(lastDisplayedCandidates) || (updatedChannel === null || updatedChannel === void 0 ? void 0 : updatedChannel.lastDisplayedMessageId) || channel.lastDisplayedMessageId;
         updateData = {
           unread: false,
           newMessageCount: 0,
           newMentionCount: 0,
-          lastDisplayedMessageId: updatedChannel === null || updatedChannel === void 0 ? void 0 : updatedChannel.lastDisplayedMessageId
+          lastDisplayedMessageId: nextLastDisplayedMessageId
         };
         updateChannelOnAllChannels(channel.id, updateData);
         _context16.n = 3;
@@ -27263,7 +27353,7 @@ var _marked$4 = /*#__PURE__*/_regenerator().m(getMembers),
   _marked4$3 = /*#__PURE__*/_regenerator().m(kickMemberFromChannel),
   _marked5$3 = /*#__PURE__*/_regenerator().m(blockMember),
   _marked6$3 = /*#__PURE__*/_regenerator().m(changeMemberRole),
-  _marked7$2 = /*#__PURE__*/_regenerator().m(reportMember),
+  _marked7$3 = /*#__PURE__*/_regenerator().m(reportMember),
   _marked8$2 = /*#__PURE__*/_regenerator().m(getRoles),
   _marked9$2 = /*#__PURE__*/_regenerator().m(MembersSaga);
 function getMembers(action) {
@@ -27726,7 +27816,7 @@ function reportMember(action) {
       case 4:
         return _context7.a(2);
     }
-  }, _marked7$2, null, [[1, 3]]);
+  }, _marked7$3, null, [[1, 3]]);
 }
 function getRoles(action) {
   var _action$payload, timeout, attempts, SceytChatClient, roles, _t1;
@@ -27804,7 +27894,7 @@ var _marked$5 = /*#__PURE__*/_regenerator().m(getContacts),
   _marked4$4 = /*#__PURE__*/_regenerator().m(updateProfile),
   _marked5$4 = /*#__PURE__*/_regenerator().m(getUsers),
   _marked6$4 = /*#__PURE__*/_regenerator().m(loadMoreUsers),
-  _marked7$3 = /*#__PURE__*/_regenerator().m(MembersSaga$1);
+  _marked7$4 = /*#__PURE__*/_regenerator().m(MembersSaga$1);
 function getContacts() {
   var SceytChatClient, contactsData, _t;
   return _regenerator().w(function (_context) {
@@ -28243,7 +28333,7 @@ function MembersSaga$1() {
       case 6:
         return _context7.a(2);
     }
-  }, _marked7$3);
+  }, _marked7$4);
 }
 
 var _marked$6 = /*#__PURE__*/_regenerator().m(rootSaga);
@@ -35919,25 +36009,19 @@ var Message = function Message(_ref) {
       if (setLastVisibleMessageId) {
         setLastVisibleMessageId(message);
       }
-      if (!channel.isLinkedChannel) {
-        dispatch(setVisibleMessageAC(message));
-      }
+      dispatch(setVisibleMessageAC(message));
       if (scrollToNewMessage.scrollToBottom && channel.lastMessage && compareMessagesForList(message, channel.lastMessage) >= 0) {
         dispatch(scrollToNewMessageAC(false, false, false));
       }
     } else {
-      if (!channel.isLinkedChannel) {
-        dispatch(removeVisibleMessageAC(message));
-      }
+      dispatch(removeVisibleMessageAC(message));
     }
-  }, [channel.isLinkedChannel, channel.lastMessage, dispatch, isVisible, message, scrollToNewMessage.scrollToBottom, unreadScrollTo, setLastVisibleMessageId]);
+  }, [channel.lastMessage, dispatch, isVisible, message, scrollToNewMessage.scrollToBottom, unreadScrollTo, setLastVisibleMessageId]);
   React.useEffect(function () {
     return function () {
-      if (!channel.isLinkedChannel) {
-        dispatch(removeVisibleMessageAC(message));
-      }
+      dispatch(removeVisibleMessageAC(message));
     };
-  }, [channel.isLinkedChannel, dispatch, message]);
+  }, [dispatch, message]);
   return /*#__PURE__*/React__default.createElement(Container$c, {
     id: message.id || message.tid,
     ref: messageItemRef,
@@ -38561,7 +38645,7 @@ var Attachment = function Attachment(_ref) {
     height: '48px',
     downloading: downloadingFile,
     file: attachment,
-    src: attachmentUrlFromMap || attachment.attachmentUrl || attachmentUrl,
+    src: attachment.attachmentUrl || attachmentUrl,
     borderRadius: borderRadius,
     setVideoIsReadyToSend: setVideoIsReadyToSend,
     backgroundColor: backgroundColor && backgroundColor !== 'inherit' ? backgroundColor : overlayBackground2,
@@ -40450,7 +40534,8 @@ var OGMetadata = function OGMetadata(_ref) {
     incomingMessageBackgroundX = _useColor[THEME_COLORS.INCOMING_MESSAGE_BACKGROUND_X],
     outgoingMessageBackgroundX = _useColor[THEME_COLORS.OUTGOING_MESSAGE_BACKGROUND_X],
     textSecondary = _useColor[THEME_COLORS.TEXT_SECONDARY],
-    textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY];
+    textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
+    background = _useColor[THEME_COLORS.BACKGROUND];
   var attachment = React.useMemo(function () {
     return attachments.find(function (attachment) {
       return attachment.type === attachmentTypes.link;
@@ -40557,7 +40642,8 @@ var OGMetadata = function OGMetadata(_ref) {
         onLoad: onImageLoad,
         onError: function onError() {
           setImageLoadError(true);
-        }
+        },
+        bgColor: background
       })))
     } : null, {
       key: 'title',
@@ -40682,7 +40768,7 @@ var ImageContainer = styled__default.div(_templateObject2$C || (_templateObject2
   return maxHeight ? maxHeight + "px" : '240px';
 });
 var OGText = styled__default.div(_templateObject3$w || (_templateObject3$w = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: column;\n  gap: 0;\n"])));
-var Title$3 = styled__default.p(_templateObject4$r || (_templateObject4$r = _taggedTemplateLiteralLoose(["\n  font-weight: bold;\n  font-size: 14px;\n  line-height: 18px;\n  letter-spacing: 0px;\n  color: ", ";\n  margin: 4px 0 0 0;\n  padding: ", ";\n  box-sizing: border-box;\n  overflow-wrap: anywhere;\n  ", "\n"])), function (_ref0) {
+var Title$3 = styled__default.p(_templateObject4$r || (_templateObject4$r = _taggedTemplateLiteralLoose(["\n  font-weight: bold;\n  font-size: 14px;\n  line-height: 18px;\n  letter-spacing: 0px;\n  color: ", ";\n  margin: 4px 0 0 0;\n  padding: ", ";\n  box-sizing: border-box;\n  overflow-wrap: anywhere;\n  display: -webkit-box;\n  -webkit-line-clamp: 2;\n  -webkit-box-orient: vertical;\n  overflow: hidden;\n  ", "\n"])), function (_ref0) {
   var color = _ref0.color;
   return color;
 }, function (_ref1) {
@@ -40709,7 +40795,9 @@ var Url = styled__default.p(_templateObject6$j || (_templateObject6$j = _taggedT
   var maxWidth = _ref15.maxWidth;
   return maxWidth && "\n    max-width: " + maxWidth + "px;\n  ";
 });
-var Img = styled__default.img(_templateObject7$i || (_templateObject7$i = _taggedTemplateLiteralLoose(["\n  width: 100%;\n  height: 100%;\n  object-fit: cover;\n  display: block;\n  border-radius: inherit;\n"])));
+var Img = styled__default.img(_templateObject7$i || (_templateObject7$i = _taggedTemplateLiteralLoose(["\n  width: 100%;\n  height: 100%;\n  object-fit: cover;\n  display: block;\n  border-radius: inherit;\n  background: ", ";\n"])), function (props) {
+  return props.bgColor;
+});
 var OGRow = styled__default.div(_templateObject8$g || (_templateObject8$g = _taggedTemplateLiteralLoose(["\n  display: flex;\n  align-items: flex-start;\n  justify-content: space-between;\n  padding: 0;\n"])));
 var OGTextWrapper = styled__default.div(_templateObject9$d || (_templateObject9$d = _taggedTemplateLiteralLoose(["\n  flex: 1 1 auto;\n"])));
 var FaviconContainer = styled__default.div(_templateObject0$c || (_templateObject0$c = _taggedTemplateLiteralLoose(["\n  width: 52px;\n  height: 52px;\n  border-radius: 8px;\n  overflow: hidden;\n  margin: 8px;\n  flex: 0 0 52px;\n"])));
@@ -43251,14 +43339,18 @@ var Message$1 = function Message(_ref) {
         dispatch(markMessagesAsDeliveredAC(channel.id, [message.id]));
       }
     }
-    if (isVisible && message.incoming && !(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
+    var alreadyRead = !!(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
-    })) && !disableAutoReadTracking && isTabActive && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
+    }));
+    if (isVisible && message.incoming && !alreadyRead && !disableAutoReadTracking && isTabActive && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
+      console.log("[READ_MESSAGE] queuing msgId=" + message.id + " ch=" + channel.id);
       if (queueReadMarker) {
         queueReadMarker(channel.id, message.id);
       } else {
         dispatch(markMessagesAsReadAC(channel.id, [message.id]));
       }
+    } else if (isVisible && message.incoming && !alreadyRead) {
+      console.log("[READ_MESSAGE] skip msgId=" + message.id, "disabledTracking=" + disableAutoReadTracking + " tabActive=" + isTabActive, "newMsgCount=" + channel.newMessageCount + " conn=" + connectionStatus);
     }
   }, [dispatch, message.incoming, message.userMarkers, message.id, isVisible, channel.id, channel.newMessageCount, connectionStatus, queueReadMarker, queueDeliveredMarker, disableAutoReadTracking, isTabActive]);
   var handleForwardMessage = React.useCallback(function (channelIds) {
@@ -43303,25 +43395,19 @@ var Message$1 = function Message(_ref) {
         setLastVisibleMessageId(message);
       }
       handleSendReadMarker();
-      if (!channel.isLinkedChannel) {
-        dispatch(setVisibleMessageAC(message));
-      }
+      dispatch(setVisibleMessageAC(message));
       if (scrollToNewMessage.scrollToBottom && channel.lastMessage && compareMessagesForList(message, channel.lastMessage) >= 0) {
         dispatch(scrollToNewMessageAC(false, false, false));
       }
     } else {
-      if (!channel.isLinkedChannel) {
-        dispatch(removeVisibleMessageAC(message));
-      }
+      dispatch(removeVisibleMessageAC(message));
     }
-  }, [isVisible, setLastVisibleMessageId, message.id, handleSendReadMarker, channel.isLinkedChannel, channel.lastMessage, scrollToNewMessage.scrollToBottom, dispatch, message, isTabActive]);
+  }, [isVisible, setLastVisibleMessageId, message.id, handleSendReadMarker, channel.lastMessage, scrollToNewMessage.scrollToBottom, dispatch, message, isTabActive]);
   React.useEffect(function () {
     return function () {
-      if (!channel.isLinkedChannel) {
-        dispatch(removeVisibleMessageAC(message));
-      }
+      dispatch(removeVisibleMessageAC(message));
     };
-  }, [channel.isLinkedChannel, dispatch, message]);
+  }, [dispatch, message]);
   React.useEffect(function () {
     if (!isVisible && infoPopupOpen) {
       setInfoPopupOpen(false);
@@ -44290,6 +44376,7 @@ function useChatController(_ref5) {
   }, [clearJumpScrollingLock]);
   var queueVisibleUnreadCheck = React.useCallback(function () {
     if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo || !tabIsActive) {
+      console.log("[READ_MESSAGE] queueVisibleUnreadCheck blocked", "pendingRaf=" + (pendingVisibleUnreadFrameRef.current !== null) + " unreadScrollTo=" + unreadScrollTo + " tabActive=" + tabIsActive);
       return;
     }
     pendingVisibleUnreadFrameRef.current = requestAnimationFrame(function () {
@@ -44300,6 +44387,7 @@ function useChatController(_ref5) {
       }
       var unreadStartIndex = getUnreadTrackingStartIndex(messages);
       if (unreadStartIndex < 0) {
+        console.log('[READ_MESSAGE] queueVisibleUnreadCheck: no unread start index, skip');
         return;
       }
       var candidateUnreadMessages = messages.slice(unreadStartIndex);
@@ -44325,8 +44413,10 @@ function useChatController(_ref5) {
         return message.id;
       });
       if (!ids.length || !channel.id || !channel.newMessageCount) {
+        console.log("[READ_MESSAGE] queueVisibleUnreadCheck: nothing to mark ids=" + ids.length + " newMsgCount=" + channel.newMessageCount);
         return;
       }
+      console.log("[READ_MESSAGE] queueVisibleUnreadCheck: marking ch=" + channel.id + " ids=[" + ids.join(',') + "]");
       ids.forEach(function (id) {
         visibleUnreadReportedRef.current.add(id);
       });
@@ -45619,9 +45709,7 @@ function useChatController(_ref5) {
     }
     var savedRestoreWindow = channelRestoreWindowMap.get(channel.id);
     if (savedRestoreWindow) {
-      if (!channel.isLinkedChannel) {
-        dispatch(clearVisibleMessagesMapAC());
-      }
+      dispatch(clearVisibleMessagesMapAC());
       if (channel.backToLinkedChannel) {
         restoreRef.current = {
           mode: 'restore-scroll-top',
@@ -45656,9 +45744,7 @@ function useChatController(_ref5) {
       }
       return;
     }
-    if (!channel.isLinkedChannel) {
-      dispatch(clearVisibleMessagesMapAC());
-    }
+    dispatch(clearVisibleMessagesMapAC());
     if (channel.newMessageCount && channel.lastDisplayedMessageId) {
       suppressNextMessageChange();
       dispatch(loadNearUnreadAC(channel));
@@ -45666,7 +45752,7 @@ function useChatController(_ref5) {
       suppressNextMessageChange();
       dispatch(loadDefaultMessagesAC(channel));
     }
-  }, [dispatch, channel === null || channel === void 0 ? void 0 : channel.id, channel.backToLinkedChannel, channel.isLinkedChannel, suppressNextMessageChange]);
+  }, [dispatch, channel === null || channel === void 0 ? void 0 : channel.id, channel.backToLinkedChannel, suppressNextMessageChange]);
   React.useEffect(function () {
     if (!(channel !== null && channel !== void 0 && channel.id) || clearedSelectionChannelIdRef.current === channel.id) {
       return;
@@ -45736,6 +45822,16 @@ function useChatController(_ref5) {
       return m.sortKey === latestLocalRef || m.localRef === latestLocalRef;
     });
     var shouldShow = !isLatestInView || !isViewingLatest && (pendingNewestCount > 0 || !!scrollToMentionedMessage);
+    console.log('[scrollToNewMsg]', {
+      latestLocalRef: latestLocalRef,
+      isLatestInView: !!isLatestInView,
+      isViewingLatest: isViewingLatest,
+      pendingNewestCount: pendingNewestCount,
+      scrollToMentionedMessage: scrollToMentionedMessage,
+      shouldShow: shouldShow,
+      showScrollToNewMessageButton: showScrollToNewMessageButton,
+      latestVisibleMessages: latestVisibleMessages
+    });
     if (showScrollToNewMessageButton !== shouldShow) {
       dispatch(showScrollToNewMessageButtonAC(shouldShow));
     }
@@ -45982,7 +46078,9 @@ var createMessageMarkerBatcher = function createMessageMarkerBatcher(_ref) {
       onFlushDelivered(channelId, Array.from(queue.deliveredIds));
     }
     if (queue.readIds.size > 0) {
-      onFlushRead(channelId, Array.from(queue.readIds));
+      var ids = Array.from(queue.readIds);
+      console.log("[READ_MESSAGE] flush ch=" + channelId + " ids=[" + ids.join(',') + "]");
+      onFlushRead(channelId, ids);
     }
     channelQueues["delete"](channelId);
   };
@@ -45999,6 +46097,7 @@ var createMessageMarkerBatcher = function createMessageMarkerBatcher(_ref) {
     }
     var queue = getQueue(channelId);
     queue.readIds.add(messageId);
+    console.log("[READ_MESSAGE] enqueue msgId=" + messageId + " ch=" + channelId + " queueSize=" + queue.readIds.size);
     scheduleFlush(channelId);
   };
   var enqueueDelivered = function enqueueDelivered(channelId, messageId) {
@@ -46235,6 +46334,7 @@ var MessageList = function MessageList(_ref) {
     markerBatcherRef.current = createMessageMarkerBatcher({
       debounceMs: DEFAULT_MARKER_BATCH_DEBOUNCE_MS,
       onFlushRead: function onFlushRead(channelId, messageIds) {
+        console.log("[READ_MESSAGE] dispatch markAsRead ch=" + channelId + " ids=[" + messageIds.join(',') + "]");
         dispatch(markMessagesAsReadAC(channelId, messageIds));
       },
       onFlushDelivered: function onFlushDelivered(channelId, messageIds) {
@@ -46282,6 +46382,7 @@ var MessageList = function MessageList(_ref) {
   }, [browserTabIsActive]);
   var queueReadMarker = React.useCallback(function (channelId, messageId) {
     var _markerBatcherRef$cur;
+    console.log("[READ_MESSAGE] queueReadMarker ch=" + channelId + " msgId=" + messageId);
     (_markerBatcherRef$cur = markerBatcherRef.current) === null || _markerBatcherRef$cur === void 0 ? void 0 : _markerBatcherRef$cur.enqueueRead(channelId, messageId);
   }, []);
   var queueDeliveredMarker = React.useCallback(function (channelId, messageId) {
@@ -46345,6 +46446,7 @@ var MessageList = function MessageList(_ref) {
     }
     if (channel.lastMessage.id && String(channel.lastMessage.user.id) !== currentUserId) {
       var _markerBatcherRef$cur5;
+      console.log("[READ_MESSAGE] scrollToBottom enqueue ch=" + channel.id + " msgId=" + channel.lastMessage.id);
       (_markerBatcherRef$cur5 = markerBatcherRef.current) === null || _markerBatcherRef$cur5 === void 0 ? void 0 : _markerBatcherRef$cur5.enqueueRead(channel.id, channel.lastMessage.id);
     }
     jumpToLatest(true);
@@ -48532,28 +48634,24 @@ function useFormatMessage(editor, editorState, setMessageBodyAttributes, setMess
               var member = activeChannelMembers.find(function (m) {
                 return m.id === segment.mentionUserId;
               });
-              if (member) {
-                setMentionedMember(member);
-                var mentionNode = $createMentionNode(_extends({}, member, {
-                  name: segment.text
-                }));
-                if (segment.format > 0) {
-                  mentionNode.setFormat(segment.format);
-                }
-                nodes.push(mentionNode);
-              } else {
-                var textNode = lexical.$createTextNode(segment.text);
-                if (segment.format > 0) {
-                  textNode.setFormat(segment.format);
-                }
-                nodes.push(textNode);
+              var mentionData = member ? _extends({}, member, {
+                name: segment.text
+              }) : {
+                id: segment.mentionUserId,
+                name: segment.text
+              };
+              setMentionedMember(mentionData);
+              var mentionNode = $createMentionNode(mentionData);
+              if (segment.format > 0) {
+                mentionNode.setFormat(segment.format);
               }
+              nodes.push(mentionNode);
             } else {
-              var _textNode = lexical.$createTextNode(segment.text);
+              var textNode = lexical.$createTextNode(segment.text);
               if (segment.format > 0) {
-                _textNode.setFormat(segment.format);
+                textNode.setFormat(segment.format);
               }
-              nodes.push(_textNode);
+              nodes.push(textNode);
             }
           });
           if (nodes.length > 0) {