Skip to content

Commit

Permalink
fix lint error
Browse files Browse the repository at this point in the history
  • Loading branch information
Dnouv committed Apr 12, 2023
1 parent 08a8552 commit a5362d1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
10 changes: 7 additions & 3 deletions apps/meteor/client/views/admin/moderation/MessageReportInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@ import { useQuery } from '@tanstack/react-query';
import React from 'react';

import UserAvatar from '../../../components/avatar/UserAvatar';
import { formatDate } from '../../../lib/utils/formatDate';
import { formatDateAndTime } from '../../../lib/utils/formatDateAndTime';
import { formatTime } from '../../../lib/utils/formatTime';
import { useFormatDate } from '../../../hooks/useFormatDate';
import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
import { useFormatTime } from '../../../hooks/useFormatTime';

const MessageReportInfo = ({ msgId }: { msgId: string }): JSX.Element => {
const t = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();
const getReportsByMessage = useEndpoint('GET', `/v1/moderation.reportsByMessage`);

const formatDateAndTime = useFormatDateAndTime();
const formatTime = useFormatTime();
const formatDate = useFormatDate();

const {
data: reportsByMessage,
isLoading: isLoadingReportsByMessage,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { TableRow, TableCell, Box } from '@rocket.chat/fuselage';
import React from 'react';

import UserAvatar from '../../../components/avatar/UserAvatar';
import { formatDateAndTime } from '../../../lib/utils/formatDateAndTime';
import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
import ModerationConsoleActions from './ModerationConsoleActions';

export type MonderationConsoleRowProps = {
Expand All @@ -24,6 +24,8 @@ const ModerationConsoleTableRow = ({ report, onClick, onChange, onReload, mediaQ
return room.fname || room.name;
});

const formatDateAndTime = useFormatDateAndTime();

const concatenatedRoomNames = roomNames.join(', ');

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import UserAvatar from '../../../../components/avatar/UserAvatar';
import MessageContentBody from '../../../../components/message/MessageContentBody';
import Attachments from '../../../../components/message/content/Attachments';
import UiKitSurface from '../../../../components/message/content/UiKitSurface';
import { formatDate } from '../../../../lib/utils/formatDate';
import { formatDateAndTime } from '../../../../lib/utils/formatDateAndTime';
import { formatTime } from '../../../../lib/utils/formatTime';
import { useFormatDate } from '../../../../hooks/useFormatDate';
import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
import { useFormatTime } from '../../../../hooks/useFormatTime';
import useDeleteMessage from '../hooks/useDeleteMessage';

const ContextMessage = ({
Expand All @@ -34,6 +34,10 @@ const ContextMessage = ({

const deleteMessage = useDeleteMessage(message._id, message.rid, onChange, onReload);

const formatDateAndTime = useFormatDateAndTime();
const formatTime = useFormatTime();
const formatDate = useFormatDate();

return (
<>
<Message.Divider>{formatDate(message._updatedAt)}</Message.Divider>
Expand Down Expand Up @@ -62,7 +66,7 @@ const ContextMessage = ({
message.msg
)}
{message.blocks && <UiKitSurface mid={message._id} blocks={message.blocks} appId rid={message.rid} />}
{message.attachments && <Attachments attachments={message.attachments} file={message.file} />}
{message.attachments && <Attachments attachments={message.attachments} />}
</Message.Body>
</Message.Container>
<MessageToolboxWrapper>
Expand Down

0 comments on commit a5362d1

Please sign in to comment.