frontend-rw #1

Merged
marcin merged 347 commits from frontend-rw into develop 2024-12-05 15:32:18 -08:00
2 changed files with 15 additions and 9 deletions
Showing only changes of commit a636ebdc40 - Show all commits

View file

@ -287,6 +287,14 @@ const StatusContent: React.FC<IStatusContent> = React.memo(({
output.push(<TranslateButton status={status} />); output.push(<TranslateButton status={status} />);
} }
if (media) {
output.push(media);
}
if (hashtags.length) {
output.push(<HashtagsBar key='hashtags' hashtags={hashtags} />);
}
return <>{output}</>; return <>{output}</>;
} }
}); });

View file

@ -399,15 +399,13 @@ const Status: React.FC<IStatus> = (props) => {
<Stack className='relative z-0'> <Stack className='relative z-0'>
{actualStatus.event ? <EventPreview className='shadow-xl' status={actualStatus} /> : ( {actualStatus.event ? <EventPreview className='shadow-xl' status={actualStatus} /> : (
<Stack space={4}> <StatusContent
<StatusContent status={actualStatus}
status={actualStatus} onClick={handleClick}
onClick={handleClick} collapsable
collapsable translatable
translatable withMedia
withMedia />
/>
</Stack>
)} )}
</Stack> </Stack>