Message: Fix incorrect replies display (#3314)
This commit is contained in:
parent
0812ddecad
commit
23a65bcd0d
@ -288,7 +288,7 @@ const MessageList: FC<OwnProps & StateProps> = ({
|
||||
}, [messageIds, messagesById, threadFirstMessageId, threadTopMessageId, type, isServiceNotificationsChat]);
|
||||
|
||||
useInterval(() => {
|
||||
if (!messageIds || !messagesById) {
|
||||
if (!messageIds || !messagesById || type === 'scheduled') {
|
||||
return;
|
||||
}
|
||||
const ids = messageIds.filter((id) => messagesById[id]?.reactions);
|
||||
@ -299,7 +299,7 @@ const MessageList: FC<OwnProps & StateProps> = ({
|
||||
}, MESSAGE_REACTIONS_POLLING_INTERVAL);
|
||||
|
||||
useInterval(() => {
|
||||
if (!messageIds || !messagesById || threadId !== MAIN_THREAD_ID) {
|
||||
if (!messageIds || !messagesById || threadId !== MAIN_THREAD_ID || type === 'scheduled') {
|
||||
return;
|
||||
}
|
||||
const ids = messageIds.filter((id) => messagesById[id]?.repliesThreadInfo?.isComments
|
||||
|
||||
@ -223,7 +223,7 @@ const MessageListContent: FC<OwnProps> = ({
|
||||
threadId={threadId}
|
||||
messageListType={type}
|
||||
noComments={noComments}
|
||||
noReplies={!noComments || threadId !== MAIN_THREAD_ID}
|
||||
noReplies={!noComments || threadId !== MAIN_THREAD_ID || type === 'scheduled'}
|
||||
appearanceOrder={messageCountToAnimate - ++appearanceIndex}
|
||||
isJustAdded={position.isLastInList && isNewMessage}
|
||||
isFirstInGroup={position.isFirstInGroup}
|
||||
|
||||
@ -56,7 +56,7 @@ import {
|
||||
selectTabState,
|
||||
} from '../../selectors';
|
||||
import {
|
||||
getMessageContent, isUserId, isMessageLocal, getMessageText, checkIfHasUnreadReactions,
|
||||
getMessageContent, isUserId, isMessageLocal, getMessageText, checkIfHasUnreadReactions, isActionMessage,
|
||||
} from '../../helpers';
|
||||
import { onTickEnd } from '../../../util/schedulers';
|
||||
import { updateUnreadReactions } from '../../reducers/reactions';
|
||||
@ -810,7 +810,7 @@ function updateListedAndViewportIds<T extends GlobalState>(
|
||||
lastMessageId: message.id,
|
||||
});
|
||||
|
||||
if (!isMessageLocal(message)) {
|
||||
if (!isMessageLocal(message) && !isActionMessage(message)) {
|
||||
global = updateThreadInfo(global, chatId, threadInfo.threadId, {
|
||||
messagesCount: (threadInfo.messagesCount || 0) + 1,
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user