Skip to content
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

feat(messages): added date info to messages #437

Merged
merged 7 commits into from
Feb 8, 2024
Merged

feat(messages): added date info to messages #437

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56a0cff
feat(messages): added date info to messages
EgeOnder Feb 5, 2024
9adc6cf
refactor(messages): switched to the utility function
EgeOnder Feb 5, 2024
41ff919
fix: miscommit cocoapods version
EgeOnder Feb 5, 2024
1fedf0b
Merge branch 'main' into feat/date-info
EgeOnder Feb 6, 2024
eb51bc2
refactor(messages): changed formatting
EgeOnder Feb 8, 2024
53c163c
Merge branch 'feat/date-info' of https://github.com/EgeOnder/students…
EgeOnder Feb 8, 2024
d355d71
Merge branch 'main' into feat/date-info
EgeOnder Feb 8, 2024
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
12 changes: 12 additions & 0 deletions src/features/user/components/MessageScreenContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { Message } from '@polito/api-client';

import { HtmlView } from '../../../core/components/HtmlView';
import { useGetPerson } from '../../../core/queries/peopleHooks';
import { formatDateTime } from '../../../utils/dates';
import { linkUrls } from '../../../utils/html';

export type Props = {
Expand All @@ -23,8 +24,10 @@ export const MessageScreenContent = ({ message, modal }: Props) => {
const { t } = useTranslation();
const styles = useStylesheet(createStyles);
const hasSender = !!message?.senderId;
const hasDate = !isNaN(message?.sentAt.getDate());
const title = message?.title;
const text = message?.message;
const date = formatDateTime(message?.sentAt);
const personQuery = useGetPerson(message?.senderId || undefined);

// replace every url in string with a link
Expand All @@ -39,6 +42,11 @@ export const MessageScreenContent = ({ message, modal }: Props) => {
<Text variant="title" role="heading" style={styles.heading}>
{title ?? ''}
</Text>
{!!hasDate && (
<Text variant="secondaryText" role="contentinfo" style={styles.date}>
{date}
</Text>
)}
{!!text && (
<View style={styles.textMessage}>
<HtmlView source={{ html }} baseStyle={{ padding: 0 }} />
Expand Down Expand Up @@ -72,6 +80,10 @@ const createStyles = ({ spacing, fontWeights }: Theme) =>
paddingTop: spacing[3],
fontWeight: fontWeights.bold,
},
date: {
paddingHorizontal: spacing[5],
paddingTop: spacing[1],
},
textMessage: {
paddingHorizontal: spacing[5],
paddingTop: spacing[3],
Expand Down
Loading