From c5bb48a9340e1d357563e7e0327830756c2be587 Mon Sep 17 00:00:00 2001 From: jellie Date: Fri, 22 Aug 2025 22:41:31 +0900 Subject: [PATCH] fix: conflict --- src/components/common/post-template/CommentTemplate.tsx | 6 +++++- src/pages/LoginCheck.tsx | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/common/post-template/CommentTemplate.tsx b/src/components/common/post-template/CommentTemplate.tsx index 95c6cbf..9239414 100644 --- a/src/components/common/post-template/CommentTemplate.tsx +++ b/src/components/common/post-template/CommentTemplate.tsx @@ -134,7 +134,11 @@ export default function CommentTemplate({ postId }: CommentTemplateProps) { isEditingComment.commentId === id ? (
- onEditSubmit({ editedContent, commentId: id }), + onEditSubmit({ + editedContent, + commentId: id, + rate: -1, + }), )} className="flex flex-col" > diff --git a/src/pages/LoginCheck.tsx b/src/pages/LoginCheck.tsx index f409a58..20d23f1 100644 --- a/src/pages/LoginCheck.tsx +++ b/src/pages/LoginCheck.tsx @@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom'; import { loginCheck } from '@/services/auth/authQueries'; -import { ACCESS_TOKEN_KEY, HEADER_ACCESS_TOKEN_KEY } from '@/constants'; +import { HEADER_ACCESS_TOKEN_KEY } from '@/constants'; import { useDialogContext } from '@/hooks'; import { getCookie } from '@/utils'; import axios from 'axios'; @@ -34,7 +34,6 @@ export default function LoginCheck() { const accessToken = !!getCookie(HEADER_ACCESS_TOKEN_KEY); - if (accessToken) { handleLoginPost(); } else {