ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scheduled Messages: Fix render errors (#2851)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-03-19 22:33:53 -05:00
parent cbbbd0d374
commit 356c8cd497
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/middle/MessageList.tsx
View File

@ -248,10 +248,12 @@ const MessageList: FC<OwnProps & StateProps> = ({
} }
const listedMessages = viewportIds.map((id) => messagesById[id]).filter(Boolean); const listedMessages = viewportIds.map((id) => messagesById[id]).filter(Boolean);
const orderRule: (keyof ApiMessage)[] = type === 'scheduled' ? ['date', 'id'] : ['id'];
return listedMessages.length return listedMessages.length
? groupMessages(orderBy(listedMessages, 'id'), memoUnreadDividerBeforeIdRef.current) ? groupMessages(orderBy(listedMessages, orderRule), memoUnreadDividerBeforeIdRef.current)
: undefined; : undefined;
}, [messageIds, messagesById, threadFirstMessageId, threadTopMessageId]); }, [messageIds, messagesById, threadFirstMessageId, threadTopMessageId, type]);
useInterval(() => { useInterval(() => {
if (!messageIds || !messagesById) { if (!messageIds || !messagesById) {

2
src/components/middle/composer/AttachmentModal.tsx
View File

@ -581,7 +581,7 @@ const AttachmentModal: FC<OwnProps & StateProps> = ({
onClick={handleSendClick} onClick={handleSendClick}
onContextMenu={canShowCustomSendMenu ? handleContextMenu : undefined} onContextMenu={canShowCustomSendMenu ? handleContextMenu : undefined}
> >
{lang('Send')} {shouldSchedule ? lang('Next') : lang('Send')}
</Button> </Button>
{canShowCustomSendMenu && ( {canShowCustomSendMenu && (
<CustomSendMenu <CustomSendMenu

1
src/components/middle/composer/Composer.tsx
View File

@ -1248,6 +1248,7 @@ const Composer: FC<OwnProps & StateProps> = ({
shouldForceCompression={shouldForceCompression} shouldForceCompression={shouldForceCompression}
shouldForceAsFile={shouldForceAsFile} shouldForceAsFile={shouldForceAsFile}
isForCurrentMessageList={isForCurrentMessageList} isForCurrentMessageList={isForCurrentMessageList}
shouldSchedule={shouldSchedule}
onCaptionUpdate={onCaptionUpdate} onCaptionUpdate={onCaptionUpdate}
onSendSilent={handleSendSilentAttachments} onSendSilent={handleSendSilentAttachments}
onSend={handleSendAttachments} onSend={handleSendAttachments}