diff --git a/src/components/middle/MessageList.tsx b/src/components/middle/MessageList.tsx index 94c0c6b76..3d145fca8 100644 --- a/src/components/middle/MessageList.tsx +++ b/src/components/middle/MessageList.tsx @@ -567,6 +567,7 @@ const MessageList: FC = ({ const withUsers = Boolean((!isPrivate && !isChannelChat) || isChatWithSelf || isRepliesChat || isAnonymousForwards); const noAvatars = Boolean(!withUsers || isChannelChat); const shouldRenderGreeting = isUserId(chatId) && !isChatWithSelf && !isBot && !isAnonymousForwards + && type === 'thread' && ( ( !messageGroups && !lastMessage && messageIds diff --git a/src/components/middle/message/ContextMenuContainer.tsx b/src/components/middle/message/ContextMenuContainer.tsx index be3476549..dd8b86bfd 100644 --- a/src/components/middle/message/ContextMenuContainer.tsx +++ b/src/components/middle/message/ContextMenuContainer.tsx @@ -700,7 +700,8 @@ export default memo(withGlobal( && !isMessageUnread && readDateExpiresAt && message.date > Date.now() / 1000 - readDateExpiresAt - && !userStatus?.isReadDateRestricted, + && !userStatus?.isReadDateRestricted + && messageListType !== 'scheduled', ); const shouldRenderShowWhen = Boolean( canLoadReadDate && isPrivate && selectUserStatus(global, chat.id)?.isReadDateRestrictedByMe, diff --git a/src/global/reducers/messages.ts b/src/global/reducers/messages.ts index a667e7bec..f196b2813 100644 --- a/src/global/reducers/messages.ts +++ b/src/global/reducers/messages.ts @@ -419,7 +419,19 @@ export function deleteChatScheduledMessages( }); } - global = updateScheduledMessages(global, chatId, newById); + global = { + ...global, + scheduledMessages: { + byChatId: { + ...global.scheduledMessages.byChatId, + [chatId]: { + byId: { + ...newById, + }, + }, + }, + }, + }; return global; }