From 557b40f5fd562483f28494aa00e264f79278a9b2 Mon Sep 17 00:00:00 2001
From: Emithen <86219540+Emithen@users.noreply.github.com>
Date: Wed, 11 Feb 2026 18:06:05 +0900
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=ED=95=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20UX=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pages/my/edit/editPage.tsx     | 43 ++++++++++++-------
 .../pages/onboarding/mbtiBottomSheet.tsx      | 12 +++---
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/components/pages/my/edit/editPage.tsx b/src/components/pages/my/edit/editPage.tsx
index 4b2b2ee..9fe21db 100644
--- a/src/components/pages/my/edit/editPage.tsx
+++ b/src/components/pages/my/edit/editPage.tsx
@@ -68,25 +68,35 @@ const EditPage = () => {
   const debouncedNickname = useDebounce<string>(nickname || '', 500)
 
   useEffect(() => {
-    if (debouncedNickname && debouncedNickname.length > 0) {
-      async function validateNickname() {
-        try {
-          const res = await checkNickname(debouncedNickname)
-          if (!res.isAvailable) {
-            setNickNameMessage('이미 사용 중인 닉네임입니다.')
-          } else if (!res.isMeaningful) {
-            setNickNameMessage('의미 있는 닉네임을 입력해주세요.')
-          } else if (!res.isClean) {
-            setNickNameMessage('욕설을 포함한 닉네임은 사용할 수 없습니다.')
-          } else {
-            setNickNameMessage(null)
-          }
-        } catch {
-          setNickNameMessage('닉네임 체크 중 오류가 발생했습니다.')
+    // 닉네임을 입력하지 않았거나 빈 문자열이라면 초기화 후 리턴
+    if (!debouncedNickname || debouncedNickname.length === 0) {
+      setNickNameMessage(null)
+      return
+    }
+
+    // 현재 내 닉네임과 같다면 중복 체크를 하지 않음
+    if (debouncedNickname === myPageData?.nickname) {
+      setNickNameMessage(null)
+      return
+    }
+
+    async function validateNickname() {
+      try {
+        const res = await checkNickname(debouncedNickname)
+        if (!res.isAvailable) {
+          setNickNameMessage('이미 사용 중인 닉네임입니다.')
+        } else if (!res.isMeaningful) {
+          setNickNameMessage('의미 있는 닉네임을 입력해주세요.')
+        } else if (!res.isClean) {
+          setNickNameMessage('욕설을 포함한 닉네임은 사용할 수 없습니다.')
+        } else {
+          setNickNameMessage(null)
         }
+      } catch {
+        setNickNameMessage('닉네임 체크 중 오류가 발생했습니다.')
       }
-      validateNickname()
     }
+    validateNickname()
   }, [debouncedNickname])
 
   useEffect(() => {
@@ -258,6 +268,7 @@ const EditPage = () => {
         <MBTIBottomSheet
           onClose={() => setMbtiBottomSheetOpen(false)}
           setMbti={setMbti}
+          mbti={mbti as MBTI}
         />
       )}
 
diff --git a/src/components/pages/onboarding/mbtiBottomSheet.tsx b/src/components/pages/onboarding/mbtiBottomSheet.tsx
index 29cd15d..3d830e2 100644
--- a/src/components/pages/onboarding/mbtiBottomSheet.tsx
+++ b/src/components/pages/onboarding/mbtiBottomSheet.tsx
@@ -7,13 +7,15 @@ import { MBTI } from '@/types/member'
 interface MBTIBottomSheetProps {
   onClose: () => void
   setMbti: (mbti: MBTI) => void
+  mbti?: MBTI
 }
 
-const MBTIBottomSheet = ({ onClose, setMbti }: MBTIBottomSheetProps) => {
-  const [selectedEI, setSelectedEI] = useState('')
-  const [selectedNS, setSelectedNS] = useState('')
-  const [selectedTF, setSelectedTF] = useState('')
-  const [selectedPJ, setSelectedPJ] = useState('')
+const MBTIBottomSheet = ({ onClose, setMbti, mbti }: MBTIBottomSheetProps) => {
+  console.log('[MBTIBottomSheet] ', mbti?.[0])
+  const [selectedEI, setSelectedEI] = useState(mbti?.[0] ?? '')
+  const [selectedNS, setSelectedNS] = useState(mbti?.[1] ?? '')
+  const [selectedTF, setSelectedTF] = useState(mbti?.[2] ?? '')
+  const [selectedPJ, setSelectedPJ] = useState(mbti?.[3] ?? '')
 
   const handleSelectMBTI = () => {
     onClose()

From 392083a73f423fdc5bdfd2e1bd11bcaaae32705f Mon Sep 17 00:00:00 2001
From: Emithen <86219540+Emithen@users.noreply.github.com>
Date: Wed, 11 Feb 2026 18:17:31 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=A6=AC=EB=B7=B0=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pages/my/edit/editPage.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/pages/my/edit/editPage.tsx b/src/components/pages/my/edit/editPage.tsx
index 9fe21db..ae4aaaa 100644
--- a/src/components/pages/my/edit/editPage.tsx
+++ b/src/components/pages/my/edit/editPage.tsx
@@ -69,7 +69,7 @@ const EditPage = () => {
 
   useEffect(() => {
     // 닉네임을 입력하지 않았거나 빈 문자열이라면 초기화 후 리턴
-    if (!debouncedNickname || debouncedNickname.length === 0) {
+    if (!debouncedNickname) {
       setNickNameMessage(null)
       return
     }
@@ -97,7 +97,7 @@ const EditPage = () => {
       }
     }
     validateNickname()
-  }, [debouncedNickname])
+  }, [debouncedNickname, myPageData])
 
   useEffect(() => {
     console.log('전역 상태 nickname', myPageData?.nickname)