sceyt-chat-react-uikit 1.8.7-beta.17 → 1.8.7-beta.19

package/components/Messages/MessageList/useChatController.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { IChannel, IMessage } from '../../../types';
+import { VisibleMessagesMap } from '../../../store/message/reducers';
 export declare const PRELOAD_TRIGGER_PX = 5;
 export declare const LATEST_EDGE_GAP_PX = 0;
 declare type TimelineItem = {
@@ -41,12 +42,13 @@ export interface UseChatControllerParams {
     showScrollToNewMessageButton: boolean;
     unreadScrollTo: boolean | string;
     unreadMessageId: string;
+    visibleMessagesMap: VisibleMessagesMap;
     selectedMessagesMap: Map<string, any>;
     allowEditDeleteIncomingMessage: boolean;
     dispatch: (...args: any[]) => void;
     tabIsActive?: boolean;
 }
-export declare function useChatController({ messages, channel, hasPrevMessages, hasNextMessages, loadingPrevMessages, loadingNextMessages, connectionStatus, scrollToNewMessage, scrollToMentionedMessage, showScrollToNewMessageButton, unreadScrollTo, unreadMessageId, selectedMessagesMap, allowEditDeleteIncomingMessage, tabIsActive, dispatch }: UseChatControllerParams): {
+export declare function useChatController({ messages, channel, hasPrevMessages, hasNextMessages, loadingPrevMessages, loadingNextMessages, connectionStatus, scrollToNewMessage, scrollToMentionedMessage, showScrollToNewMessageButton, unreadScrollTo, unreadMessageId, visibleMessagesMap, selectedMessagesMap, allowEditDeleteIncomingMessage, tabIsActive, dispatch }: UseChatControllerParams): {
     scrollRef: import("react").MutableRefObject<HTMLDivElement | null>;
     setLastVisibleMessageId: (message: IMessage) => void;
     handleScrollToRepliedMessage: (itemId: string, smooth?: boolean) => Promise<void>;

package/index.js

@@ -9410,6 +9410,7 @@ var channelSlice = createSlice({
       state.channels = sortChannelByLastMessage([].concat(updatedChannels));
     },
     updateChannelLastMessage: function updateChannelLastMessage(state, action) {
+      var _updateChannel2, _updateChannel3, _state$activeChannel2;
       var _action$payload5 = action.payload,
         channel = _action$payload5.channel,
         message = _action$payload5.message;
@@ -9440,6 +9441,9 @@ var channelSlice = createSlice({
           state.channels = sortChannelByLastMessage([updateChannel].concat(updatedChannels));
         }
       }
+      if ((_updateChannel2 = updateChannel) !== null && _updateChannel2 !== void 0 && _updateChannel2.id && ((_updateChannel3 = updateChannel) === null || _updateChannel3 === void 0 ? void 0 : _updateChannel3.id) === ((_state$activeChannel2 = state.activeChannel) === null || _state$activeChannel2 === void 0 ? void 0 : _state$activeChannel2.id)) {
+        state.activeChannel = updateChannel;
+      }
     },
     updateChannelLastMessageStatus: function updateChannelLastMessageStatus(state, action) {
       var _action$payload6 = action.payload,
@@ -10693,6 +10697,19 @@ function showScrollToNewMessageButtonAC(state) {
     state: state
   });
 }
+function setVisibleMessageAC(message) {
+  return setVisibleMessage({
+    message: message
+  });
+}
+function removeVisibleMessageAC(message) {
+  return removeVisibleMessage({
+    message: message
+  });
+}
+function clearVisibleMessagesMapAC() {
+  return clearVisibleMessagesMap();
+}
 function setUnreadScrollToAC(state) {
   return setUnreadScrollTo({
     state: state
@@ -11971,27 +11988,6 @@ var removeAudioRecordingFromMap = function removeAudioRecordingFromMap(channelId
 var setDraftMessageToMap = function setDraftMessageToMap(channelId, draftMessage) {
   draftMessagesMap[channelId] = draftMessage;
 };
-var visibleMessagesMap = {};
-var getVisibleMessagesMap = function getVisibleMessagesMap() {
-  return visibleMessagesMap;
-};
-var clearVisibleMessagesMap = function clearVisibleMessagesMap() {
-  visibleMessagesMap = {};
-};
-var setMessageToVisibleMessagesMap = function setMessageToVisibleMessagesMap(message) {
-  var localRef = getMessageLocalRef(message);
-  if (!localRef) {
-    return;
-  }
-  visibleMessagesMap[localRef] = {
-    id: message.id,
-    localRef: localRef,
-    sortKey: getMessageSortKey(message).toString()
-  };
-};
-var removeMessageFromVisibleMessagesMap = function removeMessageFromVisibleMessagesMap(message) {
-  delete visibleMessagesMap[getMessageLocalRef(message)];
-};
 var checkPendingPollActionConflict = function checkPendingPollActionConflict(action) {
   var messageId = action.message.id || action.message.tid;
   if (!messageId) return {
@@ -12162,7 +12158,8 @@ var initialState$1 = {
   stableUnreadAnchor: {
     channelId: '',
     messageId: ''
-  }
+  },
+  visibleMessagesMap: {}
 };
 var isPendingMessage = function isPendingMessage(message) {
   return !message.id && !!message.tid;
@@ -12267,6 +12264,24 @@ var messageSlice = createSlice({
     setShowScrollToNewMessageButton: function setShowScrollToNewMessageButton(state, action) {
       state.showScrollToNewMessageButton = action.payload.state;
     },
+    setVisibleMessage: function setVisibleMessage(state, action) {
+      var message = action.payload.message;
+      var localRef = getMessageLocalRef(message);
+      if (!localRef) {
+        return;
+      }
+      state.visibleMessagesMap[localRef] = {
+        id: message.id,
+        localRef: localRef,
+        sortKey: getMessageSortKey(message).toString()
+      };
+    },
+    removeVisibleMessage: function removeVisibleMessage(state, action) {
+      delete state.visibleMessagesMap[getMessageLocalRef(action.payload.message)];
+    },
+    clearVisibleMessagesMap: function clearVisibleMessagesMap(state) {
+      state.visibleMessagesMap = {};
+    },
     setUnreadScrollTo: function setUnreadScrollTo(state, action) {
       state.unreadScrollTo = action.payload.state;
     },
@@ -12802,6 +12817,9 @@ var _messageSlice$actions = messageSlice.actions,
   setScrollToMentionedMessage = _messageSlice$actions.setScrollToMentionedMessage,
   setScrollToNewMessage = _messageSlice$actions.setScrollToNewMessage,
   setShowScrollToNewMessageButton = _messageSlice$actions.setShowScrollToNewMessageButton,
+  setVisibleMessage = _messageSlice$actions.setVisibleMessage,
+  removeVisibleMessage = _messageSlice$actions.removeVisibleMessage,
+  clearVisibleMessagesMap = _messageSlice$actions.clearVisibleMessagesMap,
   setUnreadScrollTo = _messageSlice$actions.setUnreadScrollTo,
   setMessages = _messageSlice$actions.setMessages,
   addMessages = _messageSlice$actions.addMessages,
@@ -22223,8 +22241,8 @@ var getResolvedChannelLastMessage$1 = function getResolvedChannelLastMessage(cha
   return storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe2 = storedChannel.lastMessage) !== null && _storedChannel$lastMe2 !== void 0 && _storedChannel$lastMe2.id ? storedChannel.lastMessage : null;
 };
 function handleChannelMessageEvent(args, SceytChatClient) {
-  var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$parentMessag, _message$attachments;
-  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, shouldUpdateLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, _storedChannel$lastMe7, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
+  var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$attachments;
+  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, shouldUpdateLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, _store$getState$Messa2, _storedChannel$lastMe7, visibleMessagesMap, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.n) {
       case 0:
@@ -22279,7 +22297,8 @@ function handleChannelMessageEvent(args, SceytChatClient) {
           _context.n = 10;
           break;
         }
-        lastMessageIsVisible = storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe7 = storedChannel.lastMessage) !== null && _storedChannel$lastMe7 !== void 0 && _storedChannel$lastMe7.id ? Object.values(getVisibleMessagesMap()).some(function (visibleMessage) {
+        visibleMessagesMap = ((_store$getState$Messa2 = store.getState().MessageReducer) === null || _store$getState$Messa2 === void 0 ? void 0 : _store$getState$Messa2.visibleMessagesMap) || {};
+        lastMessageIsVisible = storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe7 = storedChannel.lastMessage) !== null && _storedChannel$lastMe7 !== void 0 && _storedChannel$lastMe7.id ? Object.values(visibleMessagesMap).some(function (visibleMessage) {
           var _storedChannel$lastMe8;
           return visibleMessage.id === ((_storedChannel$lastMe8 = storedChannel.lastMessage) === null || _storedChannel$lastMe8 === void 0 ? void 0 : _storedChannel$lastMe8.id);
         }) : false;
@@ -22388,19 +22407,13 @@ function handleChannelMessageEvent(args, SceytChatClient) {
           return att.type !== attachmentTypes.link;
         }) : undefined);
       case 15:
-        if (!(message.repliedInThread && (_message$parentMessag = message.parentMessage) !== null && _message$parentMessag !== void 0 && _message$parentMessag.id)) {
-          _context.n = 17;
+        if (!(message.user.id !== SceytChatClient.user.id)) {
+          _context.n = 16;
           break;
         }
         _context.n = 16;
-        return effects.put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-      case 16:
-        _context.n = 18;
-        break;
-      case 17:
-        _context.n = 18;
         return effects.put(markMessagesAsDeliveredAC(channel.id, [message.id]));
-      case 18:
+      case 16:
         updateChannelOnAllChannels(channel.id, channelDataUpdate);
         if (shouldUpdateLastMessage) {
           updateChannelLastMessageOnAllChannels(channel.id, resolvedLastMessageUpdate);
@@ -22408,7 +22421,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         if ((_message$attachments = message.attachments) !== null && _message$attachments !== void 0 && _message$attachments.length) {
           updateTabAttachmentCache(channel.id, message.attachments, message.user);
         }
-      case 19:
+      case 17:
         return _context.a(2);
     }
   }, _marked$2);
@@ -23020,7 +23033,7 @@ 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$Messa2, 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;
+          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) {
               case 0:
@@ -23669,7 +23682,7 @@ function watchForEvents() {
                   break;
                 }
                 key = pollDetailsData.id + "_" + obj.vote.optionId;
-                hasNext = ((_store$getState$Messa2 = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa2 === void 0 ? void 0 : _store$getState$Messa2[key]) || false;
+                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;
                   break;
@@ -24564,22 +24577,27 @@ function getChannels(action) {
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var channelId, pendingLastMessage, mappedChannel, mapEntry;
+          var _store$getState$Chann;
+          var channelId, pendingLastMessage, currentReduxLastMessage, resolvedLastMessage, mappedChannel, mapEntry;
           return _regenerator().w(function (_context2) {
             while (1) switch (_context2.n) {
               case 0:
                 channelId = _Object$keys[_i];
                 pendingLastMessage = pendingLastMessages[channelId];
+                currentReduxLastMessage = (_store$getState$Chann = store.getState().ChannelReducer.channels.find(function (ch) {
+                  return ch.id === channelId;
+                })) === null || _store$getState$Chann === void 0 ? void 0 : _store$getState$Chann.lastMessage;
+                resolvedLastMessage = currentReduxLastMessage !== null && currentReduxLastMessage !== void 0 && currentReduxLastMessage.id && !pendingLastMessage.id ? currentReduxLastMessage : pendingLastMessage;
                 mappedChannel = mappedChannels.find(function (ch) {
                   return ch.id === channelId;
                 });
                 if (mappedChannel) {
-                  mappedChannel.lastMessage = pendingLastMessage;
+                  mappedChannel.lastMessage = resolvedLastMessage;
                 }
                 mapEntry = getChannelFromMap(channelId);
                 if (mapEntry) {
                   setChannelInMap(_extends({}, mapEntry, {
-                    lastMessage: pendingLastMessage
+                    lastMessage: resolvedLastMessage
                   }));
                 }
               case 1:
@@ -28672,6 +28690,9 @@ var scrollToMentionedMessageSelector = function scrollToMentionedMessageSelector
 var showScrollToNewMessageButtonSelector = function showScrollToNewMessageButtonSelector(store) {
   return store.MessageReducer.showScrollToNewMessageButton;
 };
+var visibleMessagesMapSelector = function visibleMessagesMapSelector(store) {
+  return store.MessageReducer.visibleMessagesMap;
+};
 var sendMessageInputHeightSelector = function sendMessageInputHeightSelector(store) {
   return store.MessageReducer.sendMessageInputHeight;
 };
@@ -35895,24 +35916,24 @@ var Message = function Message(_ref) {
         setLastVisibleMessageId(message);
       }
       if (!channel.isLinkedChannel) {
-        setMessageToVisibleMessagesMap(message);
+        dispatch(setVisibleMessageAC(message));
       }
       if (scrollToNewMessage.scrollToBottom && channel.lastMessage && compareMessagesForList(message, channel.lastMessage) >= 0) {
         dispatch(scrollToNewMessageAC(false, false, false));
       }
     } else {
       if (!channel.isLinkedChannel) {
-        removeMessageFromVisibleMessagesMap(message);
+        dispatch(removeVisibleMessageAC(message));
       }
     }
   }, [channel.isLinkedChannel, channel.lastMessage, dispatch, isVisible, message, scrollToNewMessage.scrollToBottom, unreadScrollTo, setLastVisibleMessageId]);
   React.useEffect(function () {
     return function () {
       if (!channel.isLinkedChannel) {
-        removeMessageFromVisibleMessagesMap(message);
+        dispatch(removeVisibleMessageAC(message));
       }
     };
-  }, [channel.isLinkedChannel, message]);
+  }, [channel.isLinkedChannel, dispatch, message]);
   return /*#__PURE__*/React__default.createElement(Container$c, {
     id: message.id || message.tid,
     ref: messageItemRef,
@@ -43279,24 +43300,24 @@ var Message$1 = function Message(_ref) {
       }
       handleSendReadMarker();
       if (!channel.isLinkedChannel) {
-        setMessageToVisibleMessagesMap(message);
+        dispatch(setVisibleMessageAC(message));
       }
       if (scrollToNewMessage.scrollToBottom && channel.lastMessage && compareMessagesForList(message, channel.lastMessage) >= 0) {
         dispatch(scrollToNewMessageAC(false, false, false));
       }
     } else {
       if (!channel.isLinkedChannel) {
-        removeMessageFromVisibleMessagesMap(message);
+        dispatch(removeVisibleMessageAC(message));
       }
     }
   }, [isVisible, setLastVisibleMessageId, message.id, handleSendReadMarker, channel.isLinkedChannel, channel.lastMessage, scrollToNewMessage.scrollToBottom, dispatch, message, isTabActive]);
   React.useEffect(function () {
     return function () {
       if (!channel.isLinkedChannel) {
-        removeMessageFromVisibleMessagesMap(message);
+        dispatch(removeVisibleMessageAC(message));
       }
     };
-  }, [channel.isLinkedChannel, message]);
+  }, [channel.isLinkedChannel, dispatch, message]);
   React.useEffect(function () {
     if (!isVisible && infoPopupOpen) {
       setInfoPopupOpen(false);
@@ -43983,6 +44004,7 @@ function useChatController(_ref5) {
     showScrollToNewMessageButton = _ref5.showScrollToNewMessageButton,
     unreadScrollTo = _ref5.unreadScrollTo,
     unreadMessageId = _ref5.unreadMessageId,
+    visibleMessagesMap = _ref5.visibleMessagesMap,
     selectedMessagesMap = _ref5.selectedMessagesMap,
     allowEditDeleteIncomingMessage = _ref5.allowEditDeleteIncomingMessage,
     _ref5$tabIsActive = _ref5.tabIsActive,
@@ -43992,6 +44014,7 @@ function useChatController(_ref5) {
   var itemElementsRef = React.useRef(new Map());
   var messagesIndexMapRef = React.useRef({});
   var messagesRef = React.useRef(messages);
+  var visibleMessagesMapRef = React.useRef(visibleMessagesMap);
   var channelRef = React.useRef(channel);
   var lastVisibleMessageIdRef = React.useRef('');
   var lastVisibleAnchorIdRef = React.useRef('');
@@ -44125,6 +44148,7 @@ function useChatController(_ref5) {
   }, []);
   React.useLayoutEffect(function () {
     messagesRef.current = messages;
+    visibleMessagesMapRef.current = visibleMessagesMap;
     channelRef.current = channel;
     connectionStatusRef.current = connectionStatus;
   });
@@ -45594,7 +45618,7 @@ function useChatController(_ref5) {
     var savedRestoreWindow = channelRestoreWindowMap.get(channel.id);
     if (savedRestoreWindow) {
       if (!channel.isLinkedChannel) {
-        clearVisibleMessagesMap();
+        dispatch(clearVisibleMessagesMapAC());
       }
       if (channel.backToLinkedChannel) {
         restoreRef.current = {
@@ -45615,7 +45639,7 @@ function useChatController(_ref5) {
       }
     }
     if (channel.backToLinkedChannel) {
-      var visibleMessages = getVisibleMessagesMap();
+      var visibleMessages = visibleMessagesMapRef.current;
       var visibleMessagesIds = Object.values(visibleMessages).filter(function (message) {
         return !!message.id;
       }).sort(function (left, right) {
@@ -45631,7 +45655,7 @@ function useChatController(_ref5) {
       return;
     }
     if (!channel.isLinkedChannel) {
-      clearVisibleMessagesMap();
+      dispatch(clearVisibleMessagesMapAC());
     }
     if (channel.newMessageCount && channel.lastDisplayedMessageId) {
       suppressNextMessageChange();
@@ -45675,7 +45699,7 @@ function useChatController(_ref5) {
     invalidateEdgeDirection('previous');
     invalidateEdgeDirection('next');
     suppressNextMessageChange();
-    var isHistoryTopVisible = messagesRef.current[0] ? Object.values(getVisibleMessagesMap()).some(function (visibleMessage) {
+    var isHistoryTopVisible = messagesRef.current[0] ? Object.values(visibleMessagesMapRef.current).some(function (visibleMessage) {
       var _messagesRef$current$;
       return visibleMessage.id === ((_messagesRef$current$ = messagesRef.current[0]) === null || _messagesRef$current$ === void 0 ? void 0 : _messagesRef$current$.id);
     }) : false;
@@ -45705,7 +45729,7 @@ function useChatController(_ref5) {
   }, [dispatch, isViewingLatest, jumpToLatest, scrollToNewMessage]);
   React.useEffect(function () {
     var latestLocalRef = getMessageLocalRef(channel.lastMessage);
-    var latestVisibleMessages = Object.values(getVisibleMessagesMap());
+    var latestVisibleMessages = Object.values(visibleMessagesMap);
     var isLatestInView = latestVisibleMessages.find(function (m) {
       return m.sortKey === latestLocalRef || m.localRef === latestLocalRef;
     });
@@ -45713,7 +45737,7 @@ function useChatController(_ref5) {
     if (showScrollToNewMessageButton !== shouldShow) {
       dispatch(showScrollToNewMessageButtonAC(shouldShow));
     }
-  }, [channel.lastMessage, dispatch, isViewingLatest, lastVisibleMessageId, pendingNewestCount, scrollToMentionedMessage, showScrollToNewMessageButton]);
+  }, [channel.lastMessage, dispatch, isViewingLatest, lastVisibleMessageId, pendingNewestCount, scrollToMentionedMessage, showScrollToNewMessageButton, visibleMessagesMap]);
   React.useEffect(function () {
     if (!unreadScrollTo || !messages.length || loadingPrevMessages !== LOADING_STATE.LOADED || loadingNextMessages !== LOADING_STATE.LOADED) {
       return;
@@ -46191,6 +46215,7 @@ var MessageList = function MessageList(_ref) {
   var unreadScrollTo = useSelector(unreadScrollToSelector, reactRedux.shallowEqual);
   var messages = useSelector(activeChannelMessagesSelector, reactRedux.shallowEqual) || [];
   var unreadMessageId = useSelector(unreadMessageIdSelector, reactRedux.shallowEqual);
+  var visibleMessagesMap = useSelector(visibleMessagesMapSelector, reactRedux.shallowEqual);
   var _useState = React.useState(null),
     mediaFile = _useState[0],
     setMediaFile = _useState[1];
@@ -46228,6 +46253,7 @@ var MessageList = function MessageList(_ref) {
       showScrollToNewMessageButton: showScrollToNewMessageButton,
       unreadScrollTo: unreadScrollTo,
       unreadMessageId: unreadMessageId,
+      visibleMessagesMap: visibleMessagesMap,
       selectedMessagesMap: selectedMessagesMap,
       allowEditDeleteIncomingMessage: allowEditDeleteIncomingMessage,
       dispatch: dispatch,

package/index.modern.js

@@ -9409,6 +9409,7 @@ var channelSlice = createSlice({
       state.channels = sortChannelByLastMessage([].concat(updatedChannels));
     },
     updateChannelLastMessage: function updateChannelLastMessage(state, action) {
+      var _updateChannel2, _updateChannel3, _state$activeChannel2;
       var _action$payload5 = action.payload,
         channel = _action$payload5.channel,
         message = _action$payload5.message;
@@ -9439,6 +9440,9 @@ var channelSlice = createSlice({
           state.channels = sortChannelByLastMessage([updateChannel].concat(updatedChannels));
         }
       }
+      if ((_updateChannel2 = updateChannel) !== null && _updateChannel2 !== void 0 && _updateChannel2.id && ((_updateChannel3 = updateChannel) === null || _updateChannel3 === void 0 ? void 0 : _updateChannel3.id) === ((_state$activeChannel2 = state.activeChannel) === null || _state$activeChannel2 === void 0 ? void 0 : _state$activeChannel2.id)) {
+        state.activeChannel = updateChannel;
+      }
     },
     updateChannelLastMessageStatus: function updateChannelLastMessageStatus(state, action) {
       var _action$payload6 = action.payload,
@@ -10692,6 +10696,19 @@ function showScrollToNewMessageButtonAC(state) {
     state: state
   });
 }
+function setVisibleMessageAC(message) {
+  return setVisibleMessage({
+    message: message
+  });
+}
+function removeVisibleMessageAC(message) {
+  return removeVisibleMessage({
+    message: message
+  });
+}
+function clearVisibleMessagesMapAC() {
+  return clearVisibleMessagesMap();
+}
 function setUnreadScrollToAC(state) {
   return setUnreadScrollTo({
     state: state
@@ -11970,27 +11987,6 @@ var removeAudioRecordingFromMap = function removeAudioRecordingFromMap(channelId
 var setDraftMessageToMap = function setDraftMessageToMap(channelId, draftMessage) {
   draftMessagesMap[channelId] = draftMessage;
 };
-var visibleMessagesMap = {};
-var getVisibleMessagesMap = function getVisibleMessagesMap() {
-  return visibleMessagesMap;
-};
-var clearVisibleMessagesMap = function clearVisibleMessagesMap() {
-  visibleMessagesMap = {};
-};
-var setMessageToVisibleMessagesMap = function setMessageToVisibleMessagesMap(message) {
-  var localRef = getMessageLocalRef(message);
-  if (!localRef) {
-    return;
-  }
-  visibleMessagesMap[localRef] = {
-    id: message.id,
-    localRef: localRef,
-    sortKey: getMessageSortKey(message).toString()
-  };
-};
-var removeMessageFromVisibleMessagesMap = function removeMessageFromVisibleMessagesMap(message) {
-  delete visibleMessagesMap[getMessageLocalRef(message)];
-};
 var checkPendingPollActionConflict = function checkPendingPollActionConflict(action) {
   var messageId = action.message.id || action.message.tid;
   if (!messageId) return {
@@ -12161,7 +12157,8 @@ var initialState$1 = {
   stableUnreadAnchor: {
     channelId: '',
     messageId: ''
-  }
+  },
+  visibleMessagesMap: {}
 };
 var isPendingMessage = function isPendingMessage(message) {
   return !message.id && !!message.tid;
@@ -12266,6 +12263,24 @@ var messageSlice = createSlice({
     setShowScrollToNewMessageButton: function setShowScrollToNewMessageButton(state, action) {
       state.showScrollToNewMessageButton = action.payload.state;
     },
+    setVisibleMessage: function setVisibleMessage(state, action) {
+      var message = action.payload.message;
+      var localRef = getMessageLocalRef(message);
+      if (!localRef) {
+        return;
+      }
+      state.visibleMessagesMap[localRef] = {
+        id: message.id,
+        localRef: localRef,
+        sortKey: getMessageSortKey(message).toString()
+      };
+    },
+    removeVisibleMessage: function removeVisibleMessage(state, action) {
+      delete state.visibleMessagesMap[getMessageLocalRef(action.payload.message)];
+    },
+    clearVisibleMessagesMap: function clearVisibleMessagesMap(state) {
+      state.visibleMessagesMap = {};
+    },
     setUnreadScrollTo: function setUnreadScrollTo(state, action) {
       state.unreadScrollTo = action.payload.state;
     },
@@ -12801,6 +12816,9 @@ var _messageSlice$actions = messageSlice.actions,
   setScrollToMentionedMessage = _messageSlice$actions.setScrollToMentionedMessage,
   setScrollToNewMessage = _messageSlice$actions.setScrollToNewMessage,
   setShowScrollToNewMessageButton = _messageSlice$actions.setShowScrollToNewMessageButton,
+  setVisibleMessage = _messageSlice$actions.setVisibleMessage,
+  removeVisibleMessage = _messageSlice$actions.removeVisibleMessage,
+  clearVisibleMessagesMap = _messageSlice$actions.clearVisibleMessagesMap,
   setUnreadScrollTo = _messageSlice$actions.setUnreadScrollTo,
   setMessages = _messageSlice$actions.setMessages,
   addMessages = _messageSlice$actions.addMessages,
@@ -22222,8 +22240,8 @@ var getResolvedChannelLastMessage$1 = function getResolvedChannelLastMessage(cha
   return storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe2 = storedChannel.lastMessage) !== null && _storedChannel$lastMe2 !== void 0 && _storedChannel$lastMe2.id ? storedChannel.lastMessage : null;
 };
 function handleChannelMessageEvent(args, SceytChatClient) {
-  var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$parentMessag, _message$attachments;
-  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, shouldUpdateLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, _storedChannel$lastMe7, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
+  var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$attachments;
+  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, shouldUpdateLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, _store$getState$Messa2, _storedChannel$lastMe7, visibleMessagesMap, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.n) {
       case 0:
@@ -22278,7 +22296,8 @@ function handleChannelMessageEvent(args, SceytChatClient) {
           _context.n = 10;
           break;
         }
-        lastMessageIsVisible = storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe7 = storedChannel.lastMessage) !== null && _storedChannel$lastMe7 !== void 0 && _storedChannel$lastMe7.id ? Object.values(getVisibleMessagesMap()).some(function (visibleMessage) {
+        visibleMessagesMap = ((_store$getState$Messa2 = store.getState().MessageReducer) === null || _store$getState$Messa2 === void 0 ? void 0 : _store$getState$Messa2.visibleMessagesMap) || {};
+        lastMessageIsVisible = storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe7 = storedChannel.lastMessage) !== null && _storedChannel$lastMe7 !== void 0 && _storedChannel$lastMe7.id ? Object.values(visibleMessagesMap).some(function (visibleMessage) {
           var _storedChannel$lastMe8;
           return visibleMessage.id === ((_storedChannel$lastMe8 = storedChannel.lastMessage) === null || _storedChannel$lastMe8 === void 0 ? void 0 : _storedChannel$lastMe8.id);
         }) : false;
@@ -22387,19 +22406,13 @@ function handleChannelMessageEvent(args, SceytChatClient) {
           return att.type !== attachmentTypes.link;
         }) : undefined);
       case 15:
-        if (!(message.repliedInThread && (_message$parentMessag = message.parentMessage) !== null && _message$parentMessag !== void 0 && _message$parentMessag.id)) {
-          _context.n = 17;
+        if (!(message.user.id !== SceytChatClient.user.id)) {
+          _context.n = 16;
           break;
         }
         _context.n = 16;
-        return put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-      case 16:
-        _context.n = 18;
-        break;
-      case 17:
-        _context.n = 18;
         return put(markMessagesAsDeliveredAC(channel.id, [message.id]));
-      case 18:
+      case 16:
         updateChannelOnAllChannels(channel.id, channelDataUpdate);
         if (shouldUpdateLastMessage) {
           updateChannelLastMessageOnAllChannels(channel.id, resolvedLastMessageUpdate);
@@ -22407,7 +22420,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         if ((_message$attachments = message.attachments) !== null && _message$attachments !== void 0 && _message$attachments.length) {
           updateTabAttachmentCache(channel.id, message.attachments, message.user);
         }
-      case 19:
+      case 17:
         return _context.a(2);
     }
   }, _marked$2);
@@ -23019,7 +23032,7 @@ 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$Messa2, 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;
+          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) {
               case 0:
@@ -23668,7 +23681,7 @@ function watchForEvents() {
                   break;
                 }
                 key = pollDetailsData.id + "_" + obj.vote.optionId;
-                hasNext = ((_store$getState$Messa2 = store.getState().MessageReducer.pollVotesHasMore) === null || _store$getState$Messa2 === void 0 ? void 0 : _store$getState$Messa2[key]) || false;
+                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;
                   break;
@@ -24563,22 +24576,27 @@ function getChannels(action) {
         mappedChannels = _yield$call.channels;
         channelsForUpdateLastReactionMessage = _yield$call.channelsForUpdateLastReactionMessage;
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var channelId, pendingLastMessage, mappedChannel, mapEntry;
+          var _store$getState$Chann;
+          var channelId, pendingLastMessage, currentReduxLastMessage, resolvedLastMessage, mappedChannel, mapEntry;
           return _regenerator().w(function (_context2) {
             while (1) switch (_context2.n) {
               case 0:
                 channelId = _Object$keys[_i];
                 pendingLastMessage = pendingLastMessages[channelId];
+                currentReduxLastMessage = (_store$getState$Chann = store.getState().ChannelReducer.channels.find(function (ch) {
+                  return ch.id === channelId;
+                })) === null || _store$getState$Chann === void 0 ? void 0 : _store$getState$Chann.lastMessage;
+                resolvedLastMessage = currentReduxLastMessage !== null && currentReduxLastMessage !== void 0 && currentReduxLastMessage.id && !pendingLastMessage.id ? currentReduxLastMessage : pendingLastMessage;
                 mappedChannel = mappedChannels.find(function (ch) {
                   return ch.id === channelId;
                 });
                 if (mappedChannel) {
-                  mappedChannel.lastMessage = pendingLastMessage;
+                  mappedChannel.lastMessage = resolvedLastMessage;
                 }
                 mapEntry = getChannelFromMap(channelId);
                 if (mapEntry) {
                   setChannelInMap(_extends({}, mapEntry, {
-                    lastMessage: pendingLastMessage
+                    lastMessage: resolvedLastMessage
                   }));
                 }
               case 1:
@@ -28671,6 +28689,9 @@ var scrollToMentionedMessageSelector = function scrollToMentionedMessageSelector
 var showScrollToNewMessageButtonSelector = function showScrollToNewMessageButtonSelector(store) {
   return store.MessageReducer.showScrollToNewMessageButton;
 };
+var visibleMessagesMapSelector = function visibleMessagesMapSelector(store) {
+  return store.MessageReducer.visibleMessagesMap;
+};
 var sendMessageInputHeightSelector = function sendMessageInputHeightSelector(store) {
   return store.MessageReducer.sendMessageInputHeight;
 };
@@ -35894,24 +35915,24 @@ var Message = function Message(_ref) {
         setLastVisibleMessageId(message);
       }
       if (!channel.isLinkedChannel) {
-        setMessageToVisibleMessagesMap(message);
+        dispatch(setVisibleMessageAC(message));
       }
       if (scrollToNewMessage.scrollToBottom && channel.lastMessage && compareMessagesForList(message, channel.lastMessage) >= 0) {
         dispatch(scrollToNewMessageAC(false, false, false));
       }
     } else {
       if (!channel.isLinkedChannel) {
-        removeMessageFromVisibleMessagesMap(message);
+        dispatch(removeVisibleMessageAC(message));
       }
     }
   }, [channel.isLinkedChannel, channel.lastMessage, dispatch, isVisible, message, scrollToNewMessage.scrollToBottom, unreadScrollTo, setLastVisibleMessageId]);
   useEffect(function () {
     return function () {
       if (!channel.isLinkedChannel) {
-        removeMessageFromVisibleMessagesMap(message);
+        dispatch(removeVisibleMessageAC(message));
       }
     };
-  }, [channel.isLinkedChannel, message]);
+  }, [channel.isLinkedChannel, dispatch, message]);
   return /*#__PURE__*/React__default.createElement(Container$c, {
     id: message.id || message.tid,
     ref: messageItemRef,
@@ -43278,24 +43299,24 @@ var Message$1 = function Message(_ref) {
       }
       handleSendReadMarker();
       if (!channel.isLinkedChannel) {
-        setMessageToVisibleMessagesMap(message);
+        dispatch(setVisibleMessageAC(message));
       }
       if (scrollToNewMessage.scrollToBottom && channel.lastMessage && compareMessagesForList(message, channel.lastMessage) >= 0) {
         dispatch(scrollToNewMessageAC(false, false, false));
       }
     } else {
       if (!channel.isLinkedChannel) {
-        removeMessageFromVisibleMessagesMap(message);
+        dispatch(removeVisibleMessageAC(message));
       }
     }
   }, [isVisible, setLastVisibleMessageId, message.id, handleSendReadMarker, channel.isLinkedChannel, channel.lastMessage, scrollToNewMessage.scrollToBottom, dispatch, message, isTabActive]);
   useEffect(function () {
     return function () {
       if (!channel.isLinkedChannel) {
-        removeMessageFromVisibleMessagesMap(message);
+        dispatch(removeVisibleMessageAC(message));
       }
     };
-  }, [channel.isLinkedChannel, message]);
+  }, [channel.isLinkedChannel, dispatch, message]);
   useEffect(function () {
     if (!isVisible && infoPopupOpen) {
       setInfoPopupOpen(false);
@@ -43982,6 +44003,7 @@ function useChatController(_ref5) {
     showScrollToNewMessageButton = _ref5.showScrollToNewMessageButton,
     unreadScrollTo = _ref5.unreadScrollTo,
     unreadMessageId = _ref5.unreadMessageId,
+    visibleMessagesMap = _ref5.visibleMessagesMap,
     selectedMessagesMap = _ref5.selectedMessagesMap,
     allowEditDeleteIncomingMessage = _ref5.allowEditDeleteIncomingMessage,
     _ref5$tabIsActive = _ref5.tabIsActive,
@@ -43991,6 +44013,7 @@ function useChatController(_ref5) {
   var itemElementsRef = useRef(new Map());
   var messagesIndexMapRef = useRef({});
   var messagesRef = useRef(messages);
+  var visibleMessagesMapRef = useRef(visibleMessagesMap);
   var channelRef = useRef(channel);
   var lastVisibleMessageIdRef = useRef('');
   var lastVisibleAnchorIdRef = useRef('');
@@ -44124,6 +44147,7 @@ function useChatController(_ref5) {
   }, []);
   useLayoutEffect(function () {
     messagesRef.current = messages;
+    visibleMessagesMapRef.current = visibleMessagesMap;
     channelRef.current = channel;
     connectionStatusRef.current = connectionStatus;
   });
@@ -45593,7 +45617,7 @@ function useChatController(_ref5) {
     var savedRestoreWindow = channelRestoreWindowMap.get(channel.id);
     if (savedRestoreWindow) {
       if (!channel.isLinkedChannel) {
-        clearVisibleMessagesMap();
+        dispatch(clearVisibleMessagesMapAC());
       }
       if (channel.backToLinkedChannel) {
         restoreRef.current = {
@@ -45614,7 +45638,7 @@ function useChatController(_ref5) {
       }
     }
     if (channel.backToLinkedChannel) {
-      var visibleMessages = getVisibleMessagesMap();
+      var visibleMessages = visibleMessagesMapRef.current;
       var visibleMessagesIds = Object.values(visibleMessages).filter(function (message) {
         return !!message.id;
       }).sort(function (left, right) {
@@ -45630,7 +45654,7 @@ function useChatController(_ref5) {
       return;
     }
     if (!channel.isLinkedChannel) {
-      clearVisibleMessagesMap();
+      dispatch(clearVisibleMessagesMapAC());
     }
     if (channel.newMessageCount && channel.lastDisplayedMessageId) {
       suppressNextMessageChange();
@@ -45674,7 +45698,7 @@ function useChatController(_ref5) {
     invalidateEdgeDirection('previous');
     invalidateEdgeDirection('next');
     suppressNextMessageChange();
-    var isHistoryTopVisible = messagesRef.current[0] ? Object.values(getVisibleMessagesMap()).some(function (visibleMessage) {
+    var isHistoryTopVisible = messagesRef.current[0] ? Object.values(visibleMessagesMapRef.current).some(function (visibleMessage) {
       var _messagesRef$current$;
       return visibleMessage.id === ((_messagesRef$current$ = messagesRef.current[0]) === null || _messagesRef$current$ === void 0 ? void 0 : _messagesRef$current$.id);
     }) : false;
@@ -45704,7 +45728,7 @@ function useChatController(_ref5) {
   }, [dispatch, isViewingLatest, jumpToLatest, scrollToNewMessage]);
   useEffect(function () {
     var latestLocalRef = getMessageLocalRef(channel.lastMessage);
-    var latestVisibleMessages = Object.values(getVisibleMessagesMap());
+    var latestVisibleMessages = Object.values(visibleMessagesMap);
     var isLatestInView = latestVisibleMessages.find(function (m) {
       return m.sortKey === latestLocalRef || m.localRef === latestLocalRef;
     });
@@ -45712,7 +45736,7 @@ function useChatController(_ref5) {
     if (showScrollToNewMessageButton !== shouldShow) {
       dispatch(showScrollToNewMessageButtonAC(shouldShow));
     }
-  }, [channel.lastMessage, dispatch, isViewingLatest, lastVisibleMessageId, pendingNewestCount, scrollToMentionedMessage, showScrollToNewMessageButton]);
+  }, [channel.lastMessage, dispatch, isViewingLatest, lastVisibleMessageId, pendingNewestCount, scrollToMentionedMessage, showScrollToNewMessageButton, visibleMessagesMap]);
   useEffect(function () {
     if (!unreadScrollTo || !messages.length || loadingPrevMessages !== LOADING_STATE.LOADED || loadingNextMessages !== LOADING_STATE.LOADED) {
       return;
@@ -46190,6 +46214,7 @@ var MessageList = function MessageList(_ref) {
   var unreadScrollTo = useSelector(unreadScrollToSelector, shallowEqual);
   var messages = useSelector(activeChannelMessagesSelector, shallowEqual) || [];
   var unreadMessageId = useSelector(unreadMessageIdSelector, shallowEqual);
+  var visibleMessagesMap = useSelector(visibleMessagesMapSelector, shallowEqual);
   var _useState = useState(null),
     mediaFile = _useState[0],
     setMediaFile = _useState[1];
@@ -46227,6 +46252,7 @@ var MessageList = function MessageList(_ref) {
       showScrollToNewMessageButton: showScrollToNewMessageButton,
       unreadScrollTo: unreadScrollTo,
       unreadMessageId: unreadMessageId,
+      visibleMessagesMap: visibleMessagesMap,
       selectedMessagesMap: selectedMessagesMap,
       allowEditDeleteIncomingMessage: allowEditDeleteIncomingMessage,
       dispatch: dispatch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.8.7-beta.17",
+  "version": "1.8.7-beta.19",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",