Merge pull request #177 from team-ppointer/fix/native-QA-173

b0nsu · web-flow · commit 97e5778a0989 · 2026-01-29T20:56:54.000+09:00
Fix/native qa 173
diff --git a/apps/native/src/features/student/menu/screens/info/MyInfoScreen.tsx b/apps/native/src/features/student/menu/screens/info/MyInfoScreen.tsx
@@ -189,7 +189,9 @@ const MyInfoScreen = () => {
         isInitialized.current = false;
         hasLocalChanges.current = false;
         setLocalData({});
+        navigation.goBack();
       },
+
       onError: (error) => {
         showToast('error', error.message || '정보 저장에 실패했습니다.');
       },
diff --git a/apps/native/src/features/student/menu/screens/info/edit/EditPhoneNumberScreen.tsx b/apps/native/src/features/student/menu/screens/info/edit/EditPhoneNumberScreen.tsx
@@ -12,7 +12,7 @@ import {
 import { useNavigation } from '@react-navigation/native';
 import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { Container } from '@components/common';
-import { ChevronLeft, ChevronDown, CircleCheck } from 'lucide-react-native';
+import { ChevronLeft, ChevronDown, CircleCheck, CircleAlert } from 'lucide-react-native';
 import { useGetMe, usePutMe, postPhoneSend, postPhoneResend, postPhoneVerify } from '@apis';
 import { MenuStackParamList } from '@navigation/student/MenuNavigator';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -29,8 +29,9 @@ const EditPhoneNumberScreen = () => {
   const [phoneNumber, setPhoneNumber] = useState(data?.phoneNumber || '');
   const [carrier, setCarrier] = useState<CarrierValue | null>(null);
   const [verificationCode, setVerificationCode] = useState('');
+  const [verifyFeedbackMessage, setVerifyFeedbackMessage] = useState<string | null>(null);
   const [isCodeSent, setIsCodeSent] = useState(false);
-  const [carrierModalVisible, setCarrierModalVisible] = useState(false);
+  // const [carrierModalVisible, setCarrierModalVisible] = useState(false);
   const [timer, setTimer] = useState(120); // 2분 = 120초
 
   useEffect(() => {
@@ -43,6 +44,14 @@ const EditPhoneNumberScreen = () => {
   }, [isCodeSent, timer]);
 
   const handleSendCode = async () => {
+    if (phoneNumber.length >= 2 && !phoneNumber.startsWith('01')) {
+      showToast('error', '01로 시작하는 숫자를 입력해 주세요.');
+      return;
+    }
+    if (phoneNumber.length !== 11) {
+      showToast('error', '휴대폰 번호는 11자를 입력해 주세요.');
+      return;
+    }
     try {
       const response = await postPhoneSend(phoneNumber);
       if (response.data?.success) {
@@ -74,22 +83,22 @@ const EditPhoneNumberScreen = () => {
     }
   };
 
-  const handleVerify = async () => {
-    if (!verificationCode || verificationCode.length !== 6) {
-      showToast('error', '인증번호 6자리를 입력해주세요.');
-      return;
+  const handleVerifyCodeChange = (text: string) => {
+    if (/^[0-9]*$/.test(text) && text.length <= 6) {
+      setVerificationCode(text);
     }
+  };
 
+  const handleVerify = async () => {
     try {
       const response = await postPhoneVerify(phoneNumber, verificationCode);
       if (response.data?.success) {
-        const verifyMessage = response.data.message || '인증이 완료되었습니다.';
         // 인증 성공 시 휴대폰 번호 업데이트
         putMeMutate(
           { phoneNumber },
           {
             onSuccess: () => {
-              showToast('success', verifyMessage);
+              showToast('success', '휴대폰 번호 변경이 완료되었습니다.');
               navigation.goBack();
             },
             onError: () => {
@@ -98,11 +107,11 @@ const EditPhoneNumberScreen = () => {
           }
         );
       } else {
-        showToast('error', response.data?.message || '인증에 실패했습니다.');
+        setVerifyFeedbackMessage(response.data?.message || '인증번호를 다시 확인해주세요.');
       }
     } catch (error) {
       console.error('Failed to verify verification code:', error);
-      showToast('error', '인증에 실패했습니다.');
+      showToast('error', (error as Error).message || '인증에 실패했습니다.');
     }
   };
 
@@ -117,6 +126,18 @@ const EditPhoneNumberScreen = () => {
     return `${minutes}:${secs.toString().padStart(2, '0')}`;
   };
 
+  const isValidPhone = /^01\d{9}$/.test(phoneNumber);
+
+  const getPhoneFeedbackMessage = (): string | null => {
+    if (phoneNumber.length >= 2 && !phoneNumber.startsWith('01')) {
+      return '01로 시작하는 숫자를 입력해 주세요.';
+    }
+    if (phoneNumber.length > 0 && phoneNumber.length !== 11) {
+      return '휴대폰 번호는 11자를 입력해 주세요.';
+    }
+    return null;
+  };
+
   const handlePhoneNumberChange = (text: string) => {
     const phoneRegex = /^[0-9]*$/;
     if (phoneRegex.test(text) && text.length <= 11) {
@@ -159,19 +180,29 @@ const EditPhoneNumberScreen = () => {
                   />
                   {isCodeSent && (
                     <Pressable
+                      disabled={timer > 0}
                       className='bg-primary-500 items-center justify-center rounded-[8px]'
-                      style={{ width: 100, height: 48 }}
+                      style={{ width: 100, height: 48, opacity: timer > 0 ? 0.5 : 1 }}
                       onPress={handleResendCode}>
                       <Text className='text-16m text-white'>재전송</Text>
                     </Pressable>
                   )}
                 </View>
-                {isCodeSent && (
-                  <View className='flex-row items-center gap-2'>
-                    <CircleCheck color={colors['blue-500']} size={14} />
-                    <Text className='text-12r text-blue-500'>문자로 인증번호를 전송했어요</Text>
-                  </View>
-                )}
+                <View className='flex-row items-center gap-2'>
+                  {isCodeSent ? (
+                    <>
+                      <CircleCheck color={colors['blue-500']} size={14} />
+                      <Text className='text-12r text-blue-500'>문자로 인증번호를 전송했어요</Text>
+                    </>
+                  ) : (
+                    <>
+                      {getPhoneFeedbackMessage() && (
+                        <CircleAlert size={14} color={colors['red-500']} />
+                      )}
+                      <Text className='text-12r text-red-500'>{getPhoneFeedbackMessage()}</Text>
+                    </>
+                  )}
+                </View>
               </View>
               {/* <View className='gap-[10px]'>
               <View className='gap-[6px]'>
@@ -197,7 +228,7 @@ const EditPhoneNumberScreen = () => {
                 <View className='w-full' style={{ position: 'relative' }}>
                   <TextInput
                     value={verificationCode}
-                    onChangeText={setVerificationCode}
+                    onChangeText={handleVerifyCodeChange}
                     placeholder='인증번호 6자리'
                     keyboardType='number-pad'
                     maxLength={6}
@@ -215,6 +246,12 @@ const EditPhoneNumberScreen = () => {
                     <Text className='text-14m text-primary-500'>{formatTime(timer)}</Text>
                   </View>
                 </View>
+                {verifyFeedbackMessage && (
+                  <View className='flex-row items-center gap-2'>
+                    <CircleAlert size={14} color={colors['red-500']} />
+                    <Text className='text-12r text-red-500'>{verifyFeedbackMessage}</Text>
+                  </View>
+                )}
               </View>
             )}
           </View>
@@ -224,8 +261,8 @@ const EditPhoneNumberScreen = () => {
           {!isCodeSent || timer == 0 ? (
             <Pressable
               onPress={handleSendCode}
-              disabled={phoneNumber.length !== 11}
-              className={`bg-primary-500 items-center rounded-[8px] px-[12px] py-[10px] ${phoneNumber.length !== 11 ? 'opacity-50' : ''}`}>
+              disabled={!isValidPhone}
+              className={`bg-primary-500 items-center rounded-[8px] px-[12px] py-[10px] ${!isValidPhone ? 'opacity-50' : ''}`}>
               <Text className='text-16m text-white'>인증번호 받기</Text>
             </Pressable>
           ) : (
diff --git a/apps/native/src/features/student/scrap/components/Header/ScrapHeader.tsx b/apps/native/src/features/student/scrap/components/Header/ScrapHeader.tsx
@@ -48,7 +48,7 @@ const ScrapHeader = ({
   const isActionEnabled = reducerState.selectedItems.length > 0;
 
   return (
-    <View className={`bg-${!reducerState.isSelecting ? 'background' : 'gray-200'}`}>
+    <View className={`bg-${!reducerState.isSelecting ? 'gray-100' : 'gray-200'}`}>
       {!reducerState.isSelecting && (
         <Container className='flex-row items-center justify-between bg-gray-100 py-[14px]'>
           {navigateback && navigateback.canGoBack() && (
diff --git a/apps/native/src/features/student/scrap/screens/ScrapDetailScreen.tsx b/apps/native/src/features/student/scrap/screens/ScrapDetailScreen.tsx
@@ -261,9 +261,9 @@ const ScrapDetailScreen = () => {
   // Derived state - Pointings with labels
   const pointingsWithLabels = useMemo(() => {
     if (!scrapDetail?.pointings) return [];
-    return scrapDetail.pointings.map((pointing, idx) => ({
+    return scrapDetail.pointings.map((pointing) => ({
       ...pointing,
-      label: toAlphabetSequence(idx),
+      label: toAlphabetSequence(pointing.no - 1),
     }));
   }, [scrapDetail?.pointings]);
 
