Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/components/NotificationItem/NotificationItem.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Flex } from '@components/shared/Flex';
import { Text } from '@components/shared/Text';

import { convertUTCToKoreanTime } from '@utils/convertUTCToKoreanTime';
import { createdAtToString } from '@utils/createdAtToString';

import {
Expand Down Expand Up @@ -38,7 +37,7 @@ const NotificationItem = ({
{title}
</Text>
<AgoText size={8} weight={300} nowrap>
{createdAtToString(new Date(convertUTCToKoreanTime(createdAt)))}
{createdAtToString(new Date(createdAt))}
{!read && <Badge />}
</AgoText>
</Flex>
Expand Down
5 changes: 1 addition & 4 deletions src/pages/ChatRoomListPage/components/ChatRoomItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { ChatRoom } from '@type/models/ChatRoom.ts';

import { CHAT_ROOM_TAB_TITLE } from '@constants/chat.ts';

import { convertUTCToKoreanTime } from '@utils/convertUTCToKoreanTime.ts';
import { createdAtToString } from '@utils/createdAtToString.ts';

import {
Expand Down Expand Up @@ -53,8 +52,6 @@ export const ChatRoomItem = ({
playTimeMinutes,
} = chatRoomItem;

const lastTime = convertUTCToKoreanTime(lastMessageCreatedAt);

return (
<Flex justify="space-between" onClick={onClickChatRoomItem}>
<Flex gap={8}>
Expand All @@ -80,7 +77,7 @@ export const ChatRoomItem = ({
</MessageContainer>
</Flex>
<DateText size={8} color={theme.PALETTE.GRAY_500} nowrap>
{createdAtToString(new Date(lastTime))}
{createdAtToString(new Date(lastMessageCreatedAt))}
</DateText>
</Flex>
);
Expand Down
4 changes: 1 addition & 3 deletions src/pages/ChattingPage/components/Chat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import { ChatMessage } from '@type/models/ChatMessage';

import { CHAT_TYPE } from '@constants/chat';

import { convertUTCToKoreanTime } from '@utils/convertUTCToKoreanTime';

import {
BalloonContainer,
BalloonInfo,
Expand Down Expand Up @@ -59,7 +57,7 @@ export const Chat = ({
{}
</Text>
<Text size={10} weight={300}>
{String(convertUTCToKoreanTime(createdAt)).slice(11, 16)}
{String(createdAt).slice(11, 16)}
</Text>
</BalloonInfo>
</Flex>
Expand Down
12 changes: 7 additions & 5 deletions src/pages/ChattingPage/hooks/useChattingPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { CHAT_TYPE } from '@constants/chat';
import { PATH_NAME } from '@constants/pathName';

import { MODAL_CONTENTS } from '../constants/modalContents';
import { formatDateString, getKoreanDay } from '../services/formatDate';
import { formatDateString, getSlicedTime } from '../services/formatDate';
import { useQuitCondition } from '../services/quitChatCondition';
import {
connect,
Expand Down Expand Up @@ -75,8 +75,10 @@ export const useChattingPage = () => {
return [...prevChats, dateSystemMessage, chat];
}

const prevCreatedAt = getKoreanDay(prevChatMessages[idx - 1].createdAt);
const curCreatedAt = getKoreanDay(chat.createdAt);
const prevCreatedAt = getSlicedTime(
prevChatMessages[idx - 1].createdAt
);
const curCreatedAt = getSlicedTime(chat.createdAt);

if (prevCreatedAt !== curCreatedAt) {
const dateSystemMessage = createDateSystemMessage(chat);
Expand Down Expand Up @@ -115,11 +117,11 @@ export const useChattingPage = () => {
roomId,
subscribeEvent: (received: ChatMessage) =>
setChatMessages((prev: ChatMessage[]) => {
const prevCreatedAt = getKoreanDay(
const prevCreatedAt = getSlicedTime(
prev[prev.length - 1].createdAt
);

const curCreatedAt = getKoreanDay(received.createdAt);
const curCreatedAt = getSlicedTime(received.createdAt);

if (prevCreatedAt !== curCreatedAt) {
const dateSystemMessage = createDateSystemMessage(received);
Expand Down
5 changes: 1 addition & 4 deletions src/pages/ChattingPage/services/formatDate.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { WEEKDAY } from '@constants/weekday';

import { convertUTCToKoreanTime } from '@utils/convertUTCToKoreanTime';

export const formatDateString = (created: Date) => {
const date = new Date(created);
const year = date.getFullYear();
Expand All @@ -12,5 +10,4 @@ export const formatDateString = (created: Date) => {
return `${year}년 ${month}월 ${day}일 ${daysOfWeek}요일`;
};

export const getKoreanDay = (date: Date) =>
String(convertUTCToKoreanTime(date)).slice(0, 10);
export const getSlicedTime = (date: Date) => String(date).slice(0, 10);
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ export const getGameNotificationTitle = (
playDate: string,
mainAddress: string
) => {
return `${playDate.split('-').slice(1)} ${mainAddress.split(' ')[0]}`;
return `${playDate.split('-').slice(1).join('.')} ${
mainAddress.split(' ')[0]
}`;
};
16 changes: 0 additions & 16 deletions src/utils/convertUTCToKoreanTime.ts

This file was deleted.