From 0f3ca2b1025f30eeeea3ff7011718e44cbd13d13 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 13:06:11 +0900
Subject: [PATCH 01/26] =?UTF-8?q?design:=20=EB=A7=8C=EB=93=A4=EA=B8=B0=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=98=81=EC=97=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/molecules/group-create-button/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/molecules/group-create-button/index.tsx b/src/components/molecules/group-create-button/index.tsx
index 73f32cf2..337e52a6 100644
--- a/src/components/molecules/group-create-button/index.tsx
+++ b/src/components/molecules/group-create-button/index.tsx
@@ -21,7 +21,7 @@ export const WriteGroupButton = () => {
   };
 
   return (
-    <div className="fixed md:absolute bottom-0 md:top-0 right-0 my-6 z-10">
+    <div className="fixed md:absolute bottom-0 md:top-0 md:bottom-auto right-0 my-6 z-10">
       <Button
         onClick={writeButtonClickHandler}
         className="cursor-pointer rounded-[50%] md:hidden"

From e468df2d550f86ba7a4a8fedca396d536d771674 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 14:11:52 +0900
Subject: [PATCH 02/26] =?UTF-8?q?fix:=20=EC=A0=9C=EB=AA=A9=20=EC=B5=9C?=
 =?UTF-8?q?=EB=8C=80=20=EA=B8=B8=EC=9D=B4=20=EC=88=98=EC=A0=95(30->100)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/organisms/write-form/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/organisms/write-form/index.tsx b/src/components/organisms/write-form/index.tsx
index f8db7726..31bbcab7 100644
--- a/src/components/organisms/write-form/index.tsx
+++ b/src/components/organisms/write-form/index.tsx
@@ -38,8 +38,8 @@ const formSchema = z
       .string()
       .trim()
       .nonempty({ message: '제목을 입력해주세요.' })
-      .max(30, {
-        message: '제목이 너무 길어요. 30자 이내로 줄여주세요.',
+      .max(100, {
+        message: '제목이 너무 길어요. 100자 이내로 줄여주세요.',
       }),
     maxParticipants: z.coerce
       .number({ message: '모임의 정원을 설정해주세요.' })

From ba4cb82ebddfa452bcfd233a259fe366727620a4 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 14:42:30 +0900
Subject: [PATCH 03/26] =?UTF-8?q?fix:=20=EB=AA=A8=EC=A7=91=20=EC=A0=95?=
 =?UTF-8?q?=EC=9B=90=EC=9D=84=20=EC=9E=90=EC=9C=A0=EB=A1=AD=EA=B2=8C=20?=
 =?UTF-8?q?=EC=9E=85=EB=A0=A5=ED=95=98=EB=90=98=20=EB=B2=94=EC=9C=84?=
 =?UTF-8?q?=EB=A5=BC=20=EB=B2=97=EC=96=B4=EB=82=A0=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EB=B3=B4=EC=A0=95=ED=95=B4=EC=A3=BC=EA=B3=A0=20=ED=88=B4?=
 =?UTF-8?q?=ED=8C=81=EC=9D=B4=20=EB=B3=B4=EC=9D=B4=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../atoms/write-form/form-label.tsx           |  4 +-
 .../molecules/write-form/maxParticipants.tsx  | 44 ++++++++++++++-----
 src/components/organisms/write-form/index.tsx |  1 -
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/components/atoms/write-form/form-label.tsx b/src/components/atoms/write-form/form-label.tsx
index 0cd60f7c..987e5701 100644
--- a/src/components/atoms/write-form/form-label.tsx
+++ b/src/components/atoms/write-form/form-label.tsx
@@ -11,6 +11,7 @@ type WriteFormLabelProps = {
   text: string;
   className?: string;
   info?: string;
+  isTooltipOpen?: boolean;
 };
 
 export const WriteFormLabel = ({
@@ -18,6 +19,7 @@ export const WriteFormLabel = ({
   text,
   className,
   info,
+  isTooltipOpen,
 }: WriteFormLabelProps) => {
   return (
     <div className="flex gap-1">
@@ -28,7 +30,7 @@ export const WriteFormLabel = ({
         {text}
       </FormLabel>
       {info && (
-        <Tooltip>
+        <Tooltip open={isTooltipOpen}>
           <TooltipTrigger>
             <CircleInfo />
           </TooltipTrigger>
diff --git a/src/components/molecules/write-form/maxParticipants.tsx b/src/components/molecules/write-form/maxParticipants.tsx
index f745c752..ed237f28 100644
--- a/src/components/molecules/write-form/maxParticipants.tsx
+++ b/src/components/molecules/write-form/maxParticipants.tsx
@@ -7,7 +7,7 @@ import {
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { WriteForm } from '@/types';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { UseFormReturn } from 'react-hook-form';
 
 type TitleProps = {
@@ -15,22 +15,39 @@ type TitleProps = {
 };
 
 export const MaxParticipants = ({ form }: TitleProps) => {
-  const [maxParticipants, setMaxParticipants] = useState(2);
+  const [isTooltipOpen, setIsTooltipOpen] = useState(false);
 
-  const inputChangeHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const inputBlurHandler = (e: React.ChangeEvent<HTMLInputElement>) => {
     const value = Number(e.target.value);
-    if (value > 30) {
-      setMaxParticipants(30);
-      return;
-    }
-    if (value < 2) {
-      setMaxParticipants(2);
+
+    if (value === 0) {
+      // 입력값이 없거나 0이면 2로 세팅
+      form.setValue('maxParticipants', 2);
       return;
     }
 
-    setMaxParticipants(value);
+    if (value < 2 || value > 30) {
+      const settedValue = Math.max(2, Math.min(30, value));
+      form.setValue('maxParticipants', settedValue);
+
+      setIsTooltipOpen(true);
+    }
   };
 
+  /**
+   * 정원 보정 후 툴팁이 3초뒤에 사라지게 하기
+   */
+
+  useEffect(() => {
+    if (isTooltipOpen) {
+      const timer = setTimeout(() => {
+        setIsTooltipOpen(false);
+      }, 3000); // 3초
+
+      return () => clearTimeout(timer);
+    }
+  }, [isTooltipOpen]);
+
   return (
     <>
       <FormField
@@ -42,6 +59,7 @@ export const MaxParticipants = ({ form }: TitleProps) => {
               htmlFor="maxParticipants"
               text="정원"
               info="최소 2명 ~ 최대 30명까지 가능합니다"
+              isTooltipOpen={isTooltipOpen}
             />
             <FormControl>
               <Input
@@ -51,8 +69,10 @@ export const MaxParticipants = ({ form }: TitleProps) => {
                 placeholder="정원을 입력해주세요"
                 {...field}
                 type="number"
-                onChange={inputChangeHandler}
-                value={maxParticipants}
+                onBlur={(e) => {
+                  inputBlurHandler(e);
+                  field.onBlur();
+                }}
               />
             </FormControl>
             <FormMessage />
diff --git a/src/components/organisms/write-form/index.tsx b/src/components/organisms/write-form/index.tsx
index 31bbcab7..d2f02fcd 100644
--- a/src/components/organisms/write-form/index.tsx
+++ b/src/components/organisms/write-form/index.tsx
@@ -120,7 +120,6 @@ export const WriteForm = ({ userId }: WriteFormProps) => {
     reValidateMode: 'onSubmit', // submit 시에만 유효성 검사
     defaultValues: {
       title: '',
-      maxParticipants: 2,
       description: '',
       autoAllow: false,
       type: GroupType.STUDY,

From a83ea2ac100907485173c6b54d8d8576f41503a5 Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 14:46:22 +0900
Subject: [PATCH 04/26] =?UTF-8?q?feat:=20maxFileSize=20=EB=94=94=ED=8F=B4?=
 =?UTF-8?q?=ED=8A=B8=20=EA=B0=92=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/user/utils/validateImageFile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/user/utils/validateImageFile.ts b/src/features/user/utils/validateImageFile.ts
index 185ca88c..774e9d90 100644
--- a/src/features/user/utils/validateImageFile.ts
+++ b/src/features/user/utils/validateImageFile.ts
@@ -13,7 +13,7 @@
  */
 export const validateImageFile = (
   file: File,
-  maxFileSize = 5 * 1024 * 1024,
+  maxFileSize = 1024 * 1024,
 ): { isValid: boolean; errorMessage?: string } => {
   if (!file.type.startsWith('image/')) {
     return {

From 4554c432c9158fe2874cfa1af100fbf7bd88cebc Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 14:46:57 +0900
Subject: [PATCH 05/26] =?UTF-8?q?feat:=20=EC=84=9C=EB=B2=84=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=9D=91=EB=8B=B5=ED=95=98=EB=8A=94=20=EB=A9=94?=
 =?UTF-8?q?=EC=8B=9C=EC=A7=80=EB=A5=BC=20=EC=95=8C=EB=A6=AC=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/user/hooks/useChangePassword.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/features/user/hooks/useChangePassword.ts b/src/features/user/hooks/useChangePassword.ts
index 56f9a2be..b145035b 100644
--- a/src/features/user/hooks/useChangePassword.ts
+++ b/src/features/user/hooks/useChangePassword.ts
@@ -33,9 +33,10 @@ export const useChangePassword = () => {
         description: '비밀번호가 변경되었어요',
       });
     },
-    onError() {
+    onError(error) {
+      const errInfo = JSON.parse(error.message.split('-')[1]);
       toast.error('비밀번호 변경 실패', {
-        description: '비밀번호 변경에 실패했어요. 잠시 후 다시 시도해주세요.',
+        description: errInfo.status.message,
       });
     },
   });

From b92700943b5889eb29d93b5e64da128bb414231e Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 14:47:19 +0900
Subject: [PATCH 06/26] =?UTF-8?q?feat:=20=EC=BF=BC=EB=A6=AC=20gcTime=20?=
 =?UTF-8?q?=EC=98=B5=EC=85=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/user/follow/components/followers-list.tsx | 1 +
 src/features/user/follow/components/following-list.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/features/user/follow/components/followers-list.tsx b/src/features/user/follow/components/followers-list.tsx
index ed3bde74..d0ca3070 100644
--- a/src/features/user/follow/components/followers-list.tsx
+++ b/src/features/user/follow/components/followers-list.tsx
@@ -36,6 +36,7 @@ export const FollowersList = () => {
         refetchOnMount: true,
         staleTime: 0,
         retry: 0,
+        gcTime: 0,
       },
     });
 
diff --git a/src/features/user/follow/components/following-list.tsx b/src/features/user/follow/components/following-list.tsx
index 9db37b4c..5cea4cb8 100644
--- a/src/features/user/follow/components/following-list.tsx
+++ b/src/features/user/follow/components/following-list.tsx
@@ -33,6 +33,7 @@ export const FollowingList = () => {
         refetchOnMount: true,
         staleTime: 0,
         retry: 0,
+        gcTime: 0,
       },
     });
 

From 26b110a60533e23d302b5f0d37de5c4d08b58e7c Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 14:48:47 +0900
Subject: [PATCH 07/26] =?UTF-8?q?feat:=20'Skills'=EC=99=80=20'E-mail'=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/user/components/current-user-profile.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/user/components/current-user-profile.tsx b/src/features/user/components/current-user-profile.tsx
index 8bf675a7..dcf833d0 100644
--- a/src/features/user/components/current-user-profile.tsx
+++ b/src/features/user/components/current-user-profile.tsx
@@ -45,7 +45,7 @@ export const CurrentUserProfile = () => {
           </div>
           <div className="flex flex-col gap-y-1 min-w-0">
             <div className="flex gap-x-2 min-w-0">
-              <span className="text-sm font-medium shrink-0">Skills</span>
+              <span className="text-sm font-medium shrink-0">기술스택</span>
               {skills && skills.length === 0 ? (
                 <p className="text-gray-700 text-sm">
                   설정된 기술스택이 없어요.
@@ -64,7 +64,7 @@ export const CurrentUserProfile = () => {
               )}
             </div>
             <div className="flex gap-x-1.5">
-              <span className="text-sm font-medium">E-mail</span>
+              <span className="text-sm font-medium">이메일</span>
               <span className="text-sm font-normal text-gray-700 line-clamp-1">
                 {email}
               </span>

From f4cd18682350ca0dd92396b097a32b59370f0ab2 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 14:45:52 +0900
Subject: [PATCH 08/26] =?UTF-8?q?fix:=20=EB=82=B4=EC=9A=A9=EC=9D=B4=20?=
 =?UTF-8?q?=EA=B8=B8=EC=96=B4=EC=A7=80=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/molecules/write-form/tiptap/desctiption.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/molecules/write-form/tiptap/desctiption.tsx b/src/components/molecules/write-form/tiptap/desctiption.tsx
index ba8bf75b..c445888f 100644
--- a/src/components/molecules/write-form/tiptap/desctiption.tsx
+++ b/src/components/molecules/write-form/tiptap/desctiption.tsx
@@ -101,7 +101,7 @@ export const Description = ({ form }: DescriptionProps) => {
     editorProps: {
       attributes: {
         class: clsx(
-          'h-[500px] w-full mt-0 py-2 px-3 text-sm rounded-md border border-input bg-background ring-offset-background shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px]',
+          'h-[500px] overflow-y-auto w-full mt-0 py-2 px-3 text-sm rounded-md border border-input bg-background ring-offset-background shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px]',
           hasError
             ? 'text-red-500 border-red-500 focus-visible:ring-red-500/20'
             : 'focus-visible:border-ring focus-visible:ring-ring/50',

From 087960f466ea34b76ef369415ea3f60aa05912c5 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 15:02:53 +0900
Subject: [PATCH 09/26] =?UTF-8?q?fix:=20=EB=B6=88=ED=95=84=EC=9A=94=20prop?=
 =?UTF-8?q?s=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/write/page.tsx                        | 4 ++--
 src/components/organisms/write-form/index.tsx | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/app/write/page.tsx b/src/app/write/page.tsx
index 81207e9b..74cef58d 100644
--- a/src/app/write/page.tsx
+++ b/src/app/write/page.tsx
@@ -1,11 +1,11 @@
 'use client';
 
 import { WriteForm } from '@/components/organisms/write-form';
+import useIsClient from '@/hooks/useIsClient';
 import useAuthStore from '@/stores/useAuthStore';
 import { routes } from '@/utils/routes';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
-import useIsClient from '@/hooks/useIsClient';
 
 export default function Page() {
   const user = useAuthStore((state) => state.user);
@@ -34,7 +34,7 @@ export default function Page() {
 
   return (
     <div className="relative w-[300px] sm:w-[370px] md:w-[740px] m-auto mb-10">
-      <WriteForm userId={user.userId} />
+      <WriteForm />
     </div>
   );
 }
diff --git a/src/components/organisms/write-form/index.tsx b/src/components/organisms/write-form/index.tsx
index d2f02fcd..d5cee5af 100644
--- a/src/components/organisms/write-form/index.tsx
+++ b/src/components/organisms/write-form/index.tsx
@@ -87,11 +87,7 @@ const formSchema = z
     path: ['endDate'],
   });
 
-type WriteFormProps = {
-  userId: number;
-};
-
-export const WriteForm = ({ userId }: WriteFormProps) => {
+export const WriteForm = () => {
   const [isDeadlineCalendarOpen, setIsDeadlineCalendarOpen] = useState(false);
   const [isStartDateCalendarOpen, setIsStartDateCalendarOpen] = useState(false);
   const [isEndDateCalendarOpen, setIsEndDateCalendarOpen] = useState(false);
@@ -144,7 +140,7 @@ export const WriteForm = ({ userId }: WriteFormProps) => {
 
     try {
       const result = await request.post(
-        `/v2/groups?userId=${userId}`,
+        `/v2/groups`,
         { 'Content-Type': 'application/json' },
         JSON.stringify({ ...values, skills, position }),
         { credentials: 'include' },

From e5772e4fe257fc8d302b6410f9822181c0eb6220 Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 15:07:15 +0900
Subject: [PATCH 10/26] =?UTF-8?q?feat:=20'refresh=20=EB=A7=8C=EB=A3=8C'=20?=
 =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=EB=A5=BC=20=ED=8F=AC=ED=95=A8?=
 =?UTF-8?q?=ED=95=9C=20=EC=9D=B8=EC=A6=9D=20=EC=97=90=EB=9F=AC=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/error-boundary/error-handler.tsx | 2 +-
 src/components/error-fallback/index.tsx         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/error-boundary/error-handler.tsx b/src/components/error-boundary/error-handler.tsx
index 20f2d7e7..cfb91a98 100644
--- a/src/components/error-boundary/error-handler.tsx
+++ b/src/components/error-boundary/error-handler.tsx
@@ -26,7 +26,7 @@ export const handleError = ({
     }
     
     // 인증 에러
-    if (error.message.includes('401') || error.message.toLowerCase().includes('unauthorized')) {
+    if (error.message.includes('401') || error.message.toLowerCase().includes('unauthorized') || error.message.includes('refresh 만료')) {
       return (
         <ErrorFallback error={error} resetErrorBoundary={resetErrorBoundary}>
           로그인이 필요합니다
diff --git a/src/components/error-fallback/index.tsx b/src/components/error-fallback/index.tsx
index ec5ce68a..a78df166 100644
--- a/src/components/error-fallback/index.tsx
+++ b/src/components/error-fallback/index.tsx
@@ -30,7 +30,8 @@ export const ErrorFallback = ({
   const handleClick = () => {
     if (
       error?.message.includes('401') ||
-      error?.message.toLowerCase().includes('unauthorized')
+      error?.message.toLowerCase().includes('unauthorized') ||
+      error?.message.toLowerCase().includes('refresh 만료')
     ) {
       clearUser();
       console.log('401 에러 발생');
@@ -54,7 +55,8 @@ export const ErrorFallback = ({
         className="mt-2 text-white text-sm cursor-pointer bg-green-600"
       >
         {error?.message.includes('401') ||
-        error?.message.toLowerCase().includes('unauthorized')
+        error?.message.toLowerCase().includes('unauthorized') ||
+        error?.message.toLowerCase().includes('refresh 만료')
           ? '로그인하기'
           : '다시 시도'}
       </Button>

From 0f8db425fe0631ee1ea6eb355d19987190645476 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 15:47:15 +0900
Subject: [PATCH 11/26] =?UTF-8?q?fix:=20=EC=B0=B8=EA=B0=80=20=EC=9D=B8?=
 =?UTF-8?q?=EC=9B=90=EC=9D=B4=20=EB=AA=A8=EB=91=90=20=EC=B1=84=EC=9B=8C?=
 =?UTF-8?q?=EC=A7=84=20=EA=B2=BD=EC=9A=B0=20=EB=AA=A8=EC=A7=91=20=EC=A2=85?=
 =?UTF-8?q?=EB=A3=8C=20=EC=BB=A4=EB=B2=84=20=EC=94=8C=EC=9B=8C=EC=A4=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/molecules/group/group-card.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/molecules/group/group-card.tsx b/src/components/molecules/group/group-card.tsx
index 0d088d9e..722192d4 100644
--- a/src/components/molecules/group/group-card.tsx
+++ b/src/components/molecules/group/group-card.tsx
@@ -19,7 +19,9 @@ type GroupCardProps = {
 
 // TODO : 섹션별로 component 나누기
 export const GroupCard = ({ item }: GroupCardProps) => {
-  const isClosed = isBeforeToday(item.deadline);
+  const isClosed =
+    isBeforeToday(item.deadline) ||
+    item.participants.length >= item.maxParticipants;
 
   return (
     <div className="relative p-5 h-[280px] lg:h-[316px] bg-white shadow-sm ring-2 ring-gray-300/30 rounded-xl">

From 0e5e48dee7e499e119a182db70e9302e17e2c810 Mon Sep 17 00:00:00 2001
From: Lee Yuna <leeyuna7689@gmail.com>
Date: Mon, 23 Jun 2025 16:30:24 +0900
Subject: [PATCH 12/26] =?UTF-8?q?fix:=20=EB=B6=81=EB=A7=88=ED=81=AC=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=95=84=ED=84=B0=EB=A7=81=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20items=20=EB=8C=80=EC=8B=A0=20b?=
 =?UTF-8?q?ookmarkItems=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/bookmark/BookmarkPageClient.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/bookmark/BookmarkPageClient.tsx b/src/app/bookmark/BookmarkPageClient.tsx
index ab779621..4caadc0e 100644
--- a/src/app/bookmark/BookmarkPageClient.tsx
+++ b/src/app/bookmark/BookmarkPageClient.tsx
@@ -73,7 +73,7 @@ export function BookmarkPageClient() {
   });
 
   const items = flattenPages(data.pages);
-  const bookmarkItems = items.filter((item) => !item.isBookmark);
+  const bookmarkItems = items.filter((item) => item.isBookmark);
 
   // 탭 변경 핸들러
   const handleValueChange = (value: GroupType) => {
@@ -117,7 +117,7 @@ export function BookmarkPageClient() {
             ) : (
               <>
                 <ul className="grid mt-8 gap-4 md:grid-cols-2 xl:grid-cols-4">
-                  {items.map((group) => (
+                  {bookmarkItems.map((group) => (
                     <li key={group.id}>
                       <GroupCard item={group} />
                     </li>

From 483129c0cbb748d776d3bf558ed2e66cfb7d0916 Mon Sep 17 00:00:00 2001
From: Lee Yuna <leeyuna7689@gmail.com>
Date: Mon, 23 Jun 2025 16:44:14 +0900
Subject: [PATCH 13/26] =?UTF-8?q?fix:=20=EA=B0=99=EC=9D=80=20=EC=B0=B8?=
 =?UTF-8?q?=EC=97=AC=EC=9E=90=EA=B0=80=203=EB=B2=88=EC=94=A9=20=EB=B3=B4?=
 =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/components/participant-list-modal.tsx  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/features/group/components/participant-list-modal.tsx b/src/features/group/components/participant-list-modal.tsx
index 55f1864b..300b5de8 100644
--- a/src/features/group/components/participant-list-modal.tsx
+++ b/src/features/group/components/participant-list-modal.tsx
@@ -35,22 +35,6 @@ export const ParticipantListModal = ({
         </DialogHeader>
         <div className="overflow-y-auto max-h-[60vh] px-4 pt-6 pb-4 -z-20">
           <ul className="flex flex-col gap-4">
-            {participants.map((participant) => (
-              <li
-                key={participant.userId}
-                className="pb-5 border-b-2 border-gray-300 last:border-none border-dashed flex justify-between"
-              >
-                <MemberInfo {...participant} />
-              </li>
-            ))}{' '}
-            {participants.map((participant) => (
-              <li
-                key={participant.userId}
-                className="pb-5 border-b-2 border-gray-300 last:border-none border-dashed flex justify-between"
-              >
-                <MemberInfo {...participant} />
-              </li>
-            ))}{' '}
             {participants.map((participant) => (
               <li
                 key={participant.userId}

From d20d7186e332cf67745612e9df49e8721be27b3e Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 16:53:19 +0900
Subject: [PATCH 14/26] =?UTF-8?q?fix:=20filter=20content=20=EC=98=81?=
 =?UTF-8?q?=EC=97=AD=EC=9D=B4=20=EA=B7=B8=EB=A3=B9=EC=B9=B4=EB=93=9C=20?=
 =?UTF-8?q?=EC=9C=84=EB=A1=9C=20=EC=98=AC=EB=9D=BC=EC=98=A4=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/molecules/group/filter.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/molecules/group/filter.tsx b/src/components/molecules/group/filter.tsx
index f42b4ddb..7c1e34ec 100644
--- a/src/components/molecules/group/filter.tsx
+++ b/src/components/molecules/group/filter.tsx
@@ -88,7 +88,7 @@ export const Filter = ({ updateQueryParams }: FilterProps) => {
             기술 스택
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="flex gap-1 mt-1 p-3 bg-white ring-1 ring-gray-200 rounded-md">
+        <PopoverContent className="flex gap-1 mt-1 p-3 bg-white ring-1 ring-gray-200 rounded-md z-10">
           <Button
             variant="outline"
             onClick={() => skillSelectHandler('')}
@@ -123,7 +123,7 @@ export const Filter = ({ updateQueryParams }: FilterProps) => {
             포지션
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="flex gap-1 mt-2 p-2  bg-white ring-1 ring-gray-200 rounded-md">
+        <PopoverContent className="flex gap-1 mt-2 p-2  bg-white ring-1 ring-gray-200 rounded-md z-10">
           <Button
             variant="outline"
             onClick={() => positionSelectHandler('')}

From c0c1338993a9f3f97b9ec0ad7c30d1a4b2702c05 Mon Sep 17 00:00:00 2001
From: Lee Yuna <leeyuna7689@gmail.com>
Date: Mon, 23 Jun 2025 17:17:02 +0900
Subject: [PATCH 15/26] =?UTF-8?q?fix:=20=EA=B3=B5=EC=9C=A0=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=ED=81=B4=EB=A6=AD=20=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=EC=97=90=EC=84=9C=20url=EC=9D=84=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EB=8F=84=EB=A1=9D=20=ED=95=98=EC=97=AC=20=ED=98=84?=
 =?UTF-8?q?=EC=9E=AC=20=EC=A3=BC=EC=86=8C=EB=A5=BC=20=EC=A0=9C=EB=8C=80?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B0=98=EC=98=81=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/atoms/share-button/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/atoms/share-button/index.tsx b/src/components/atoms/share-button/index.tsx
index 6e5db4f1..1728b5fc 100644
--- a/src/components/atoms/share-button/index.tsx
+++ b/src/components/atoms/share-button/index.tsx
@@ -4,11 +4,11 @@ import { Button } from '@/components/ui/button';
 import { toast } from 'sonner';
 
 export const ShareButton = () => {
-  const currentUrl = window.location.href;
-
   const shareButtonClickHandler = async () => {
+    const currentUrl = window.location.href;
+
     try {
-      await navigator.clipboard.writeText(currentUrl);
+      await navigator.clipboard.writeText(`${currentUrl}`);
       toast.success('링크가 복사되었습니다.');
     } catch {
       toast.error('링크 복사에 실패하였습니다.');

From 602f3d8f2df53dd029930fa42d61e7d4013256f7 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 17:05:19 +0900
Subject: [PATCH 16/26] =?UTF-8?q?fix:=20=EA=B0=9C=EB=B0=9C=EC=9E=90?=
 =?UTF-8?q?=EB=AA=A8=EB=93=9C=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- button 안에 button이 있는 케이스 수정
- input의 defaultValue 지정
---
 src/components/molecules/position-badge/index.tsx   | 13 +++++++++++--
 src/components/molecules/skill-badge/index.tsx      | 11 +++++++++--
 .../molecules/write-form/selectPosition.tsx         | 13 +++++--------
 src/components/molecules/write-form/selectSkill.tsx | 13 +++++--------
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/components/molecules/position-badge/index.tsx b/src/components/molecules/position-badge/index.tsx
index b22d851a..53bb2d63 100644
--- a/src/components/molecules/position-badge/index.tsx
+++ b/src/components/molecules/position-badge/index.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import { Badge } from '@/components/atoms/badge';
 import {
   Tooltip,
@@ -37,13 +39,20 @@ allPositionlKeys.forEach((position) => {
 
 type PositionBadgeProps = {
   name: string;
+  positionClickHandler?: (name: string) => void;
 };
 
-export const PositionBadge = ({ name }: PositionBadgeProps) => {
+export const PositionBadge = ({
+  name,
+  positionClickHandler,
+}: PositionBadgeProps) => {
   return (
     <Tooltip>
       <div className="position-badge flex flex-row cursor-pointer">
-        <TooltipTrigger type="button">
+        <TooltipTrigger
+          type="button"
+          onClick={() => positionClickHandler?.(name)}
+        >
           <Badge
             text={name}
             className="text-sm font-medium bg-gray-100 text-gray-600 px-1"
diff --git a/src/components/molecules/skill-badge/index.tsx b/src/components/molecules/skill-badge/index.tsx
index 82624b00..b839fd3f 100644
--- a/src/components/molecules/skill-badge/index.tsx
+++ b/src/components/molecules/skill-badge/index.tsx
@@ -1,3 +1,5 @@
+'use client';
+
 import {
   Tooltip,
   TooltipContent,
@@ -21,13 +23,18 @@ allSkillKeys.forEach((skill) => {
 type SkillBadgeProps = {
   name: SkillName;
   isDefault?: boolean;
+  skillClickHandler?: (name: SkillName) => void;
 };
 
-export const SkillBadge = ({ name, isDefault = true }: SkillBadgeProps) => {
+export const SkillBadge = ({
+  name,
+  isDefault = true,
+  skillClickHandler,
+}: SkillBadgeProps) => {
   return (
     <Tooltip>
       <div className="skill-badge flex w-full h-full flex-row border p-1 items-center justify-center rounded-full cursor-pointer">
-        <TooltipTrigger type="button">
+        <TooltipTrigger type="button" onClick={() => skillClickHandler?.(name)}>
           {isDefault && (
             <Image src={skillLogoMap[name]} alt="logo" width={20} height={20} />
           )}
diff --git a/src/components/molecules/write-form/selectPosition.tsx b/src/components/molecules/write-form/selectPosition.tsx
index 74f7619d..fd57dc7c 100644
--- a/src/components/molecules/write-form/selectPosition.tsx
+++ b/src/components/molecules/write-form/selectPosition.tsx
@@ -65,6 +65,7 @@ export const SelectPosition = ({ form }: SelectPositionProps) => {
                       : 'border-none outline-none',
                   )}
                   aria-hidden="true"
+                  value={field.value ?? ''}
                 />
               </FormControl>
               <ul className="flex gap-2">
@@ -77,14 +78,10 @@ export const SelectPosition = ({ form }: SelectPositionProps) => {
                         : ''
                     }
                   >
-                    <button
-                      type="button"
-                      onClick={() => {
-                        positionClickHandler(position);
-                      }}
-                    >
-                      <PositionBadge name={position} />
-                    </button>
+                    <PositionBadge
+                      name={position}
+                      positionClickHandler={positionClickHandler}
+                    />
                   </li>
                 ))}
               </ul>
diff --git a/src/components/molecules/write-form/selectSkill.tsx b/src/components/molecules/write-form/selectSkill.tsx
index e88b0e62..ef192458 100644
--- a/src/components/molecules/write-form/selectSkill.tsx
+++ b/src/components/molecules/write-form/selectSkill.tsx
@@ -60,6 +60,7 @@ export const SelectSkill = ({ form }: SelectSkillProps) => {
                       : 'border-none outline-none',
                   )}
                   aria-hidden="true"
+                  value={field.value ?? ''}
                 />
               </FormControl>
               <ul className="flex gap-2">
@@ -72,14 +73,10 @@ export const SelectSkill = ({ form }: SelectSkillProps) => {
                         : ''
                     }
                   >
-                    <button
-                      type="button"
-                      onClick={() => {
-                        skillClickHandler(skill);
-                      }}
-                    >
-                      <SkillBadge name={skill} />
-                    </button>
+                    <SkillBadge
+                      name={skill}
+                      skillClickHandler={skillClickHandler}
+                    />
                   </li>
                 ))}
               </ul>

From e14c19a90ae9ae04af116cd4f36376b62b436382 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 17:42:44 +0900
Subject: [PATCH 17/26] =?UTF-8?q?rename:=20=EB=B6=88=ED=95=84=EC=9A=94=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/molecules/write-form/selectPosition.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/molecules/write-form/selectPosition.tsx b/src/components/molecules/write-form/selectPosition.tsx
index fd57dc7c..d9c7bd6b 100644
--- a/src/components/molecules/write-form/selectPosition.tsx
+++ b/src/components/molecules/write-form/selectPosition.tsx
@@ -20,10 +20,6 @@ export const SelectPosition = ({ form }: SelectPositionProps) => {
     [],
   );
   const hasError = !!form.formState.errors.position;
-  // const { field, fieldState } = useController({
-  //   name: 'position',
-  //   control: form.control,
-  // });
 
   const positionClickHandler = (position: PositionName) => {
     const isSelected = selectedPositions.find(

From 925e1fc7d797808013b33b23869ccecf73792d0f Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 17:43:32 +0900
Subject: [PATCH 18/26] =?UTF-8?q?feat:=20=EB=AA=A8=EC=9E=84=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B6=80=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 참여 중인 모임의 경우, API 요청 시 type 쿼리 파라미터 전달하지 않도록 변경
- 참여 중인 모임에서 종료된 모임은 보이지 않도록 변경
---
 src/features/user/group/components/group-list.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/features/user/group/components/group-list.tsx b/src/features/user/group/components/group-list.tsx
index e12c2beb..97f0a20a 100644
--- a/src/features/user/group/components/group-list.tsx
+++ b/src/features/user/group/components/group-list.tsx
@@ -35,7 +35,7 @@ export const GroupList = ({ status }: GroupListProps) => {
     useFetchItems<Group>({
       url: `/v2/groups/usergroup/${id}`,
       queryParams: {
-        type: type ?? 'study',
+        ...(status !== 'PARTICIPATING' && { type: type ?? 'study' }),
         status: 'PARTICIPATING',
         size: status !== 'ENDED' ? 10 : 50,
         ...(search && { search }),
@@ -65,6 +65,10 @@ export const GroupList = ({ status }: GroupListProps) => {
     groupList = groupList.filter((group) => group.createUserId === Number(id));
   }
 
+  if (status === 'PARTICIPATING') {
+    groupList = groupList.filter((group) => !isBeforeToday(group.endDate));
+  }
+
   return (
     <>
       {groupList.length === 0 ? (

From 5941bb11e1494a737a6636e403b69b5855174d0e Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 17:45:45 +0900
Subject: [PATCH 19/26] =?UTF-8?q?design:=20UI=20=EA=B9=A8=EC=A7=80?=
 =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/user/components/other-user-profile.tsx           | 4 ++--
 src/features/user/group/components/group-list-item.tsx        | 2 +-
 .../group/components/member-list-modal/member-list-dialog.tsx | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/features/user/components/other-user-profile.tsx b/src/features/user/components/other-user-profile.tsx
index ed4e0ddc..29163c66 100644
--- a/src/features/user/components/other-user-profile.tsx
+++ b/src/features/user/components/other-user-profile.tsx
@@ -71,8 +71,8 @@ export const OtherUserProfile = () => {
           />
         </div>
         <div className="flex flex-col gap-y-9 mt-4 flex-1 min-w-0">
-          <div className="flex items-center justify-between md:gap-x-5 md:justify-start">
-            <span className="font-semibold">
+          <div className="flex items-center justify-between md:gap-x-5 md:justify-start flex-1">
+            <span className="font-semibold truncate">
               {getDisplayNickname(nickname, email)}
             </span>
             <ToggleFollowButton
diff --git a/src/features/user/group/components/group-list-item.tsx b/src/features/user/group/components/group-list-item.tsx
index 9e505882..a82dc457 100644
--- a/src/features/user/group/components/group-list-item.tsx
+++ b/src/features/user/group/components/group-list-item.tsx
@@ -49,7 +49,7 @@ export const GroupListItem = ({
               </span>
             ) : (
               <span
-                className={`text-sm inline-block font-medium px-3 py-1 rounded-lg bg-green-50 text-green-500`}
+                className={`text-sm inline-block font-medium px-3 py-1 rounded-lg bg-green-50 text-green-500 shrink-0`}
               >
                 {type === 'study' ? '스터디' : '프로젝트'}
               </span>
diff --git a/src/features/user/group/components/member-list-modal/member-list-dialog.tsx b/src/features/user/group/components/member-list-modal/member-list-dialog.tsx
index e36c8c0d..76705f46 100644
--- a/src/features/user/group/components/member-list-modal/member-list-dialog.tsx
+++ b/src/features/user/group/components/member-list-modal/member-list-dialog.tsx
@@ -40,7 +40,7 @@ export const MemberListDialog = ({
         </DialogTrigger>
         <DialogContent className="max-w-80 h-[25rem] overflow-y-auto scrollbar-hide flex flex-col">
           <DialogHeader>
-            <DialogTitle>
+            <DialogTitle className="mt-2">
               <span className="text-green-500">{`"${groupTitle}"`}</span> 모임의
               참여/신청자 목록
             </DialogTitle>

From cc1e674aa10fca42d72ff793e8358fb34edfd4d2 Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 17:47:02 +0900
Subject: [PATCH 20/26] =?UTF-8?q?feat:=20=EC=8B=A0=EC=B2=AD=EC=9E=90,=20?=
 =?UTF-8?q?=EC=B0=B8=EC=97=AC=EC=9E=90=20=EB=AA=A9=EB=A1=9D=20=EB=A1=9C?=
 =?UTF-8?q?=EB=94=A9=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member-list-modal/member-list-loading.tsx | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/features/user/group/components/member-list-modal/member-list-loading.tsx

diff --git a/src/features/user/group/components/member-list-modal/member-list-loading.tsx b/src/features/user/group/components/member-list-modal/member-list-loading.tsx
new file mode 100644
index 00000000..7cece3b9
--- /dev/null
+++ b/src/features/user/group/components/member-list-modal/member-list-loading.tsx
@@ -0,0 +1,19 @@
+'use client';
+
+import { Skeleton } from '@/components/ui/skeleton';
+
+export const MemberListLoading = () => {
+  return (
+    <ul className="flex flex-col gap-y-3">
+      {Array.from({ length: 3 }).map((_, index) => (
+        <li key={index} className="flex gap-x-6 pb-5">
+          <Skeleton className="size-14 rounded-full" />
+          <div className="flex flex-col gap-y-1">
+            <Skeleton className="w-20 h-6" />
+            <Skeleton className="w-40 h-4" />
+          </div>
+        </li>
+      ))}
+    </ul>
+  );
+};

From d777901ca8583db5cf1a5f9718dfadba3417b3c5 Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 17:48:56 +0900
Subject: [PATCH 21/26] =?UTF-8?q?feat:=20=EC=8B=A0=EC=B2=AD=EC=9E=90=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EB=A1=9C=EB=94=A9=20UI=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/components/member-list-modal/applicants-list.tsx    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/features/user/group/components/member-list-modal/applicants-list.tsx b/src/features/user/group/components/member-list-modal/applicants-list.tsx
index 55660890..4da3094c 100644
--- a/src/features/user/group/components/member-list-modal/applicants-list.tsx
+++ b/src/features/user/group/components/member-list-modal/applicants-list.tsx
@@ -6,6 +6,7 @@ import { MemberInfo } from '@/features/user/group/components/member-list-modal/m
 import { useManageParticipation } from '@/features/user/group/hooks/useManageParticipation';
 import { UserSummary } from '@/types';
 import { useQuery } from '@tanstack/react-query';
+import { MemberListLoading } from '@/features/user/group/components/member-list-modal/member-list-loading';
 
 type ApplicantsListProps = {
   groupId: string;
@@ -35,11 +36,12 @@ export const ApplicantsList = ({ groupId }: ApplicantsListProps) => {
     },
     staleTime: 0,
     refetchOnWindowFocus: false,
+    gcTime: 0,
   });
 
   return (
     <div className="flex-1">
-      {isLoading && <>Loading...</>}
+      {isLoading && <MemberListLoading />}
       {isError && <>Error</>}
       {applicantsList && applicantsList.length === 0 && (
         <div className="flex flex-col items-center justify-center h-full ">

From d5e2f98cd09487092011a11d91c19a7245eeb13e Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 17:49:11 +0900
Subject: [PATCH 22/26] =?UTF-8?q?feat:=20=EC=B0=B8=EA=B0=80=EC=9E=90=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EB=A1=9C=EB=94=A9=20UI=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/components/member-list-modal/participants-list.tsx  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/features/user/group/components/member-list-modal/participants-list.tsx b/src/features/user/group/components/member-list-modal/participants-list.tsx
index d89124e5..dd70e871 100644
--- a/src/features/user/group/components/member-list-modal/participants-list.tsx
+++ b/src/features/user/group/components/member-list-modal/participants-list.tsx
@@ -4,6 +4,7 @@ import { request } from '@/api/request';
 import { MemberInfo } from '@/features/user/group/components/member-list-modal/member-info';
 import { UserSummary } from '@/types';
 import { useQuery } from '@tanstack/react-query';
+import { MemberListLoading } from '@/features/user/group/components/member-list-modal/member-list-loading';
 
 type ParticipantsListProps = {
   groupId: string;
@@ -31,11 +32,12 @@ export const ParticipantsList = ({ groupId }: ParticipantsListProps) => {
     },
     staleTime: 0,
     refetchOnWindowFocus: false,
+    gcTime: 0,
   });
 
   return (
     <div>
-      {isLoading && <>Loading...</>}
+      {isLoading && <MemberListLoading />}
       {isError && <>Error</>}
       {participantsList && (
         <ul className="flex flex-col gap-y-3">

From ed5612d10047d4b71065cd30cfb212e003681842 Mon Sep 17 00:00:00 2001
From: seomi <seomi.lee@gmail.com>
Date: Mon, 23 Jun 2025 17:59:40 +0900
Subject: [PATCH 23/26] =?UTF-8?q?fix:=20=EC=A0=95=EC=9B=90=EC=9D=98=20?=
 =?UTF-8?q?=ED=88=B4=ED=8C=81=EC=9D=B4=20=EB=B3=B4=EC=9D=B4=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20isTooltipOpen=EC=9D=B4=20true=EC=9D=BC=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=EC=97=90=EB=A7=8C=20props=EB=A1=9C=20=EB=82=B4?=
 =?UTF-8?q?=EB=A0=A4=EC=A7=80=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/atoms/write-form/form-label.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/atoms/write-form/form-label.tsx b/src/components/atoms/write-form/form-label.tsx
index 987e5701..487b52f3 100644
--- a/src/components/atoms/write-form/form-label.tsx
+++ b/src/components/atoms/write-form/form-label.tsx
@@ -30,7 +30,7 @@ export const WriteFormLabel = ({
         {text}
       </FormLabel>
       {info && (
-        <Tooltip open={isTooltipOpen}>
+        <Tooltip {...(isTooltipOpen ? { open: true } : {})}>
           <TooltipTrigger>
             <CircleInfo />
           </TooltipTrigger>

From 7c3c8dde066ff12b529d3db4e7cd5aed7b569fd4 Mon Sep 17 00:00:00 2001
From: Lee Yuna <leeyuna7689@gmail.com>
Date: Mon, 23 Jun 2025 18:01:03 +0900
Subject: [PATCH 24/26] =?UTF-8?q?fix:=20=EB=8C=93=EA=B8=80=20=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A1=A4=20=ED=9B=85=EC=97=90=EC=84=9C=20=EB=8C=80?=
 =?UTF-8?q?=EB=8C=93=EA=B8=80=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=EC=97=90?=
 =?UTF-8?q?=EB=8F=84=20=EC=BF=BC=EB=A6=AC=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?=
 =?UTF-8?q?=ED=84=B0=EC=97=90=EC=84=9C=20replyId=20=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/reply/hooks/useReplyScrollIntoView.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/features/reply/hooks/useReplyScrollIntoView.ts b/src/features/reply/hooks/useReplyScrollIntoView.ts
index d804106e..89f7d01f 100644
--- a/src/features/reply/hooks/useReplyScrollIntoView.ts
+++ b/src/features/reply/hooks/useReplyScrollIntoView.ts
@@ -44,13 +44,16 @@ export const useReplyScrollIntoView = ({
 
   const clearTargetQueryAndState = () => {
     const params = new URLSearchParams(searchParams.toString());
+
     if (replyType === 'reply') {
       params.delete('replyId');
       setTargetReply({ targetReplyId: null });
     } else {
+      params.delete('replyId');
       params.delete('rereplyId');
       setTargetReply({ targetRereplyId: null });
     }
+
     const query = params.toString();
     const newUrl = query ? `${pathname}?${query}` : pathname;
     window.history.replaceState(null, '', newUrl);

From 84fbafc5e2ad77dd36e8af8048473c26569368ef Mon Sep 17 00:00:00 2001
From: Kim Kangmin <rlarkdals1202@gmail.com>
Date: Mon, 23 Jun 2025 18:51:23 +0900
Subject: [PATCH 25/26] =?UTF-8?q?fix:=20Page=20props=20=ED=83=80=EC=9E=85?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20await=20=ED=82=A4=EC=9B=8C?=
 =?UTF-8?q?=EB=93=9C=20=EC=82=AC=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../(user)/users/[id]/groups/created/page.tsx  | 18 ++++++++++--------
 .../(user)/users/[id]/groups/ended/page.tsx    | 16 +++++++++-------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/app/(user)/users/[id]/groups/created/page.tsx b/src/app/(user)/users/[id]/groups/created/page.tsx
index d0d59954..0ad0b757 100644
--- a/src/app/(user)/users/[id]/groups/created/page.tsx
+++ b/src/app/(user)/users/[id]/groups/created/page.tsx
@@ -20,12 +20,12 @@ type CreatedGroupsPageWrapperProps = {
 }
 
 type CreatedGroupsPageProps = {
-  params: Promise<{ id: string }>;
-  searchParams: Promise<{
+  params: { id: string };
+  searchParams: {
     search: string;
     type: string;
     order: string;
-  }>;
+  };
 };
 
 /**
@@ -37,11 +37,13 @@ export default async function CreatedGroupsPageWrapper({
   params,
   searchParams,
 }: CreatedGroupsPageWrapperProps) {
+  const awaitedSearchParams = await searchParams;
+  const awaitedParams = await params;
   return (
-    <Suspense fallback={<GroupListLoading />} key={JSON.stringify(searchParams)}>
+    <Suspense fallback={<GroupListLoading />} key={JSON.stringify(awaitedSearchParams)}>
       <CreatedGroupsPage
-        params={params}
-        searchParams={searchParams}
+        params={awaitedParams}
+        searchParams={awaitedSearchParams}
       />
     </Suspense>
   )
@@ -51,9 +53,9 @@ const CreatedGroupsPage = async ({
   params,
   searchParams,
 }: CreatedGroupsPageProps) => {
-  const { search, type, order } = await searchParams;
+  const { search, type, order } = searchParams;
 
-  const { id } = await params;
+  const { id } = params;
 
   const cookieHeaderValue = await getAuthCookieHeader();
 
diff --git a/src/app/(user)/users/[id]/groups/ended/page.tsx b/src/app/(user)/users/[id]/groups/ended/page.tsx
index b619256a..286c8b22 100644
--- a/src/app/(user)/users/[id]/groups/ended/page.tsx
+++ b/src/app/(user)/users/[id]/groups/ended/page.tsx
@@ -20,23 +20,25 @@ type EndedGroupsPageWrapperProps = {
 };
 
 type EndedGroupsPageProps = {
-  params: Promise<{ id: string }>;
-  searchParams: Promise<{
+  params: { id: string };
+  searchParams: {
     search: string;
     type: string;
-  }>;
+  };
 };
 
 export default async function EndedGroupsPageWrapper({
   params,
   searchParams,
 }: EndedGroupsPageWrapperProps) {
+  const awaitedSearchParams = await searchParams;
+  const awaitedParams = await params;
   return (
     <Suspense
       fallback={<GroupListLoading />}
-      key={JSON.stringify(searchParams)}
+      key={JSON.stringify(awaitedSearchParams)}
     >
-      <EndedGroupsPage params={params} searchParams={searchParams} />
+      <EndedGroupsPage params={awaitedParams} searchParams={awaitedSearchParams} />
     </Suspense>
   );
 }
@@ -45,9 +47,9 @@ const EndedGroupsPage = async ({
   params,
   searchParams,
 }: EndedGroupsPageProps) => {
-  const { id } = await params;
+  const { id } = params;
 
-  const { search, type } = await searchParams;
+  const { search, type } = searchParams;
 
   const queryClient = new QueryClient();
 

From 95c0e8e4d9e40c3cafd945d0956b29f31dc96981 Mon Sep 17 00:00:00 2001
From: Lee Yuna <leeyuna7689@gmail.com>
Date: Mon, 23 Jun 2025 19:28:57 +0900
Subject: [PATCH 26/26] =?UTF-8?q?feature:=20=EB=8C=93=EA=B8=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=B7=A8=EC=86=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/features/reply/components/reply-content.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/features/reply/components/reply-content.tsx b/src/features/reply/components/reply-content.tsx
index b6d77a6c..819f97cb 100644
--- a/src/features/reply/components/reply-content.tsx
+++ b/src/features/reply/components/reply-content.tsx
@@ -84,6 +84,15 @@ export const ReplyContent = ({
         <ReplyMeta writer={writer} createdAt={createdAt} />
         {isWriter && !isLocallyDeleted && (
           <div className="flex gap-2 items-center max-[500px]:w-full max-[500px]:justify-start max-[500px]:mb-5 ">
+            {isEditing && (
+              <Button
+                onClick={() => setIsEditing(false)}
+                variant="outline"
+                className="cursor-pointer"
+              >
+                취소
+              </Button>
+            )}
             <Button
               onClick={
                 isEditing ? saveButtonClickHandler : editButtonClickHandler