Skip to content

feat: match unread separator with web #7750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OtavioStasiak wants to merge 3 commits into
base: develop
Choose a base branch
from
+170 −101
Open

feat: match unread separator with web #7750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
581fbd4
feat: match date separator with web
OtavioStasiak Oct 1, 2026
8f89e7b
test
OtavioStasiak Oct 1, 2026
c662c90
match unread separator with web
OtavioStasiak Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 30 additions & 29 deletions app/containers/Separator/MessageSeparator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,53 @@ import { type ReactElement } from 'react';
import { StyleSheet, Text, View } from 'react-native';

import I18n from '~/i18n';
import { formatLongDate } from '~/lib/dayjs';
import sharedStyles from '~/views/Styles';
import { useTheme } from '~/theme';
import DateSeparator from './DateSeparator';
import DateSeparator, { DateSeparatorLabel } from './DateSeparator';
import { separatorStyles } from './styles';

const styles = StyleSheet.create({
text: {
fontSize: 14,
...sharedStyles.textMedium
fontSize: 12,
lineHeight: 16,
marginLeft: 8,
...sharedStyles.textBold
},
marginRight: {
marginRight: 14
},
marginHorizontal: {
marginHorizontal: 14
dateLabel: {
marginHorizontal: 12
}
});

const MessageSeparator = ({ ts, unread }: { ts?: Date | string | null; unread?: boolean }): ReactElement | null => {
const UnreadSeparator = ({ ts }: { ts?: Date | string | null }): ReactElement => {
const { colors } = useTheme();
const lineStyle = { backgroundColor: colors.strokeError };

return (
<View style={separatorStyles.container}>
<View style={[separatorStyles.line, lineStyle]} />
{ts ? (
<>
<View style={styles.dateLabel}>
<DateSeparatorLabel ts={ts} />
</View>
<View style={[separatorStyles.line, lineStyle]} />
</>
) : null}
<Text style={[styles.text, { color: colors.fontDanger }]}>{I18n.t('unread_messages')}</Text>
</View>
);
};

const MessageSeparator = ({ ts, unread }: { ts?: Date | string | null; unread?: boolean }): ReactElement | null => {
if (!ts && !unread) {
return null;
}

const unreadLine = { backgroundColor: colors.buttonBackgroundDangerDefault };
const unreadText = { color: colors.fontDanger };
if (ts && unread) {
return (
<View style={separatorStyles.container}>
<Text style={[styles.text, unreadText]}>{I18n.t('unread_messages')}</Text>
<View style={[separatorStyles.line, unreadLine, styles.marginHorizontal]} />
<Text style={[styles.text, unreadText]}>{formatLongDate(ts)}</Text>
</View>
);
}
if (ts) {
return <DateSeparator ts={ts} />;
if (unread) {
return <UnreadSeparator ts={ts} />;
}
return (
<View style={separatorStyles.container}>
<Text style={[styles.text, unreadText, styles.marginRight]}>{I18n.t('unread_messages')}</Text>
<View style={[separatorStyles.line, unreadLine]} />
</View>
);

return <DateSeparator ts={ts!} />;
};

export default MessageSeparator;
Loading
Loading