diff --git a/src/components/NotificationItem/NotificationItem.tsx b/src/components/NotificationItem/NotificationItem.tsx index c64bb4aa..85988632 100644 --- a/src/components/NotificationItem/NotificationItem.tsx +++ b/src/components/NotificationItem/NotificationItem.tsx @@ -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 { @@ -38,7 +37,7 @@ const NotificationItem = ({ {title} - {createdAtToString(new Date(convertUTCToKoreanTime(createdAt)))} + {createdAtToString(new Date(createdAt))} {!read && } diff --git a/src/pages/ChatRoomListPage/components/ChatRoomItem.tsx b/src/pages/ChatRoomListPage/components/ChatRoomItem.tsx index f912235f..a40bf315 100644 --- a/src/pages/ChatRoomListPage/components/ChatRoomItem.tsx +++ b/src/pages/ChatRoomListPage/components/ChatRoomItem.tsx @@ -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 { @@ -53,8 +52,6 @@ export const ChatRoomItem = ({ playTimeMinutes, } = chatRoomItem; - const lastTime = convertUTCToKoreanTime(lastMessageCreatedAt); - return ( @@ -80,7 +77,7 @@ export const ChatRoomItem = ({ - {createdAtToString(new Date(lastTime))} + {createdAtToString(new Date(lastMessageCreatedAt))} ); diff --git a/src/pages/ChattingPage/components/Chat.tsx b/src/pages/ChattingPage/components/Chat.tsx index b7c33060..3e204b4d 100644 --- a/src/pages/ChattingPage/components/Chat.tsx +++ b/src/pages/ChattingPage/components/Chat.tsx @@ -8,8 +8,6 @@ import { ChatMessage } from '@type/models/ChatMessage'; import { CHAT_TYPE } from '@constants/chat'; -import { convertUTCToKoreanTime } from '@utils/convertUTCToKoreanTime'; - import { BalloonContainer, BalloonInfo, @@ -59,7 +57,7 @@ export const Chat = ({ {} - {String(convertUTCToKoreanTime(createdAt)).slice(11, 16)} + {String(createdAt).slice(11, 16)} diff --git a/src/pages/ChattingPage/hooks/useChattingPage.ts b/src/pages/ChattingPage/hooks/useChattingPage.ts index 9423cc0e..26f02569 100644 --- a/src/pages/ChattingPage/hooks/useChattingPage.ts +++ b/src/pages/ChattingPage/hooks/useChattingPage.ts @@ -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, @@ -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); @@ -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); diff --git a/src/pages/ChattingPage/services/formatDate.ts b/src/pages/ChattingPage/services/formatDate.ts index 97f6149d..d5e25c6b 100644 --- a/src/pages/ChattingPage/services/formatDate.ts +++ b/src/pages/ChattingPage/services/formatDate.ts @@ -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(); @@ -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); diff --git a/src/pages/NotificationPage/components/GameNotificationItem/getGameNotificationTitle.ts b/src/pages/NotificationPage/components/GameNotificationItem/getGameNotificationTitle.ts index 4633a4ae..880ed429 100644 --- a/src/pages/NotificationPage/components/GameNotificationItem/getGameNotificationTitle.ts +++ b/src/pages/NotificationPage/components/GameNotificationItem/getGameNotificationTitle.ts @@ -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] + }`; }; diff --git a/src/utils/convertUTCToKoreanTime.ts b/src/utils/convertUTCToKoreanTime.ts deleted file mode 100644 index b7cc5a5a..00000000 --- a/src/utils/convertUTCToKoreanTime.ts +++ /dev/null @@ -1,16 +0,0 @@ -export const convertUTCToKoreanTime = (utcTime: string | Date) => { - const utcDate = new Date(utcTime); - const offset = utcDate.getTimezoneOffset(); - const koreanDate = new Date(utcDate.getTime() - offset * 60 * 1000); - - const formattedTime = `${koreanDate.getFullYear()}-${String( - koreanDate.getMonth() + 1 - ).padStart(2, '0')}-${String(koreanDate.getDate()).padStart(2, '0')}T${String( - koreanDate.getHours() - ).padStart(2, '0')}:${String(koreanDate.getMinutes()).padStart( - 2, - '0' - )}:${String(koreanDate.getSeconds()).padStart(2, '0')}`; - - return formattedTime; -};