fix: 머지 컨플릭트 해결

frontend/src/features/killingParts/components/RegisterPart.tsx

@@ -10,20 +10,18 @@ import { toPlayingTimeText } from '@/shared/utils/convertTime';
 import { postKillingPart } from '../remotes/killingPart';
 
 const RegisterPart = () => {
-  const navigate = useNavigate();
   const { user } = useAuthContext();
   const { interval, partStartTime, songId } = useCollectingPartContext();
   const video = useVideoPlayerContext();
   const { confirmPopup } = useConfirmContext();
-  const { createKillingPart } = usePostKillingPart();
   const voteTimeText = toPlayingTimeText(partStartTime, partStartTime + interval);
   const { mutateData: createKillingPart } = useMutation(postKillingPart);
   const navigate = useNavigate();
 
   // 현재 useMutation 훅이 response 객체를 리턴하지 않고 내부적으로 처리합니다.
   // 때문에 컴포넌트 단에서 createKillingPart 성공 여부에 따라 등록 완료 만료를 처리를 할 수 없어요!
   // 현재 비로그인 시에 등록을 누르면 두 개의 모달이 뜹니다.
-  const handleClickRegisterPart = async () => {
+  const submitKillingPart = async () => {
     video.pause();
 
     const isConfirmed = await confirmPopup({
@@ -44,7 +42,7 @@ const RegisterPart = () => {
     }
   };
 
-  return <RegisterButton onClick={handleClickRegisterPart}>등록</RegisterButton>;
+  return <RegisterButton onClick={submitKillingPart}>등록</RegisterButton>;
 };
 
 export default RegisterPart;

frontend/src/pages/EditProfilePage.tsx

@@ -12,7 +12,6 @@ import { useMutation } from '@/shared/hooks/useMutation';
 const EditProfilePage = () => {
   const { user, logout } = useAuthContext();
   const { confirmPopup } = useConfirmContext();
-  const { mutateData: withdrawMember } = useMutation(deleteMember(user?.memberId));
   const { mutateData: withdrawal } = useMutation(deleteMember);
   const navigate = useNavigate();
 
@@ -30,7 +29,7 @@ const EditProfilePage = () => {
     });
 
     if (isConfirmed) {
-      await withdrawMember();
+      await withdrawal(user.memberId);
       logout();
       navigate(ROUTE_PATH.ROOT, { replace: true });
     }