From 2ed1cc0e0dc508141742a6b31eb923ca4cd94328 Mon Sep 17 00:00:00 2001
From: Chi Hoon Choi <102471757+watchiswatch@users.noreply.github.com>
Date: Sat, 18 Nov 2023 20:17:57 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=B1=8C=EB=A6=B0=EC=A7=80=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=20=ED=9B=84=20=EC=97=90=EB=9F=AC=20&=20=EC=98=A8?=
 =?UTF-8?q?=EB=B3=B4=EB=94=A9=20=EC=A7=A4=EB=A6=BC=ED=98=84=EC=83=81=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20(#263)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../challenge/ChallengeStatusCalendar.tsx     |  2 +-
 src/components/texts/HeaderText.tsx           |  2 +-
 src/screens/Main/ChallengesScreen.tsx         |  2 +-
 src/screens/Main/mypage/MyPageScreen.tsx      | 12 +++---
 .../challenge/CategoryCreateScreen.tsx        | 16 +++----
 src/screens/onboarding/ServiceIntroScreen.tsx | 43 +++++++++++--------
 .../api/followList/followersFollowings.ts     |  4 +-
 7 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/src/components/challenge/ChallengeStatusCalendar.tsx b/src/components/challenge/ChallengeStatusCalendar.tsx
index 0ef0e206..12f38e6c 100644
--- a/src/components/challenge/ChallengeStatusCalendar.tsx
+++ b/src/components/challenge/ChallengeStatusCalendar.tsx
@@ -92,7 +92,7 @@ const OneWeekRow = ({ order = 1, recordedDates, startDate }: OneWeekRowProps) =>
           const targetDate = startDate ? addDaysToDate(startDate, daysAfterStartDate) : '';
           const isRecordedDay = recordedDates?.includes(targetDate);
           return isRecordedDay ? (
-            <View style={styles.recordedCircle}>
+            <View key={index} style={styles.recordedCircle}>
               <Text style={{ ...theme.fonts.text.podkova.bold, color: theme.colors.graphic.white }}>
                 {recordedDates ? recordedDates.indexOf(targetDate) + 1 : 1}
               </Text>
diff --git a/src/components/texts/HeaderText.tsx b/src/components/texts/HeaderText.tsx
index 047db60e..85045ceb 100644
--- a/src/components/texts/HeaderText.tsx
+++ b/src/components/texts/HeaderText.tsx
@@ -45,7 +45,7 @@ function createStyles(theme) {
       justifyContent: 'center',
     },
     header: {
-      width: '80%',
+      width: '100%',
       marginTop: 4,
       fontSize: 26,
       fontWeight: '600',
diff --git a/src/screens/Main/ChallengesScreen.tsx b/src/screens/Main/ChallengesScreen.tsx
index 4d65b55d..22f218f1 100644
--- a/src/screens/Main/ChallengesScreen.tsx
+++ b/src/screens/Main/ChallengesScreen.tsx
@@ -153,7 +153,7 @@ const ChallengesScreen = ({ navigation }) => {
               insightPerWeek={challengeParticipation?.insightPerWeek ?? 0}
               startDate={challengeParticipation?.startDate ?? ''}
               endDate={challengeParticipation?.endDate ?? ''}
-              dayProgresses={userSpecificChallenge?.dayProgresses}
+              dayProgresses={userSpecificChallenge?.dayProgresses ?? []}
             />
           </View>
         ) : (
diff --git a/src/screens/Main/mypage/MyPageScreen.tsx b/src/screens/Main/mypage/MyPageScreen.tsx
index 95e1428c..eb904b54 100644
--- a/src/screens/Main/mypage/MyPageScreen.tsx
+++ b/src/screens/Main/mypage/MyPageScreen.tsx
@@ -122,14 +122,14 @@ const MyPageScreen = ({ navigation, route }) => {
       headerRight: () => {
         return (
           <View style={styles.headerRight}>
-            <Pressable style={{ marginRight: 12 }} onPress={() => modalRef.current?.present()}>
-              <SvgXml xml={ShareIconXml} />
+            <Pressable onPress={() => navigation.navigate('Settings')}>
+              <SvgXml xml={settingsIcon} />
             </Pressable>
             <Pressable
-              style={{ marginHorizontal: 18 }}
-              onPress={() => navigation.navigate('Settings')}
+              style={{ marginRight: 18, marginLeft: 15 }}
+              onPress={() => modalRef.current?.present()}
             >
-              <SvgXml xml={settingsIcon} />
+              <SvgXml xml={ShareIconXml} />
             </Pressable>
           </View>
         );
@@ -296,7 +296,7 @@ export default MyPageScreen;
 const styles = StyleSheet.create({
   headerRight: {
     flexDirection: 'row',
-    justifyContent: 'space-between',
+    justifyContent: 'flex-end',
     alignItems: 'center',
     width: 100,
   },
diff --git a/src/screens/challenge/CategoryCreateScreen.tsx b/src/screens/challenge/CategoryCreateScreen.tsx
index 5f51047d..87f48c32 100644
--- a/src/screens/challenge/CategoryCreateScreen.tsx
+++ b/src/screens/challenge/CategoryCreateScreen.tsx
@@ -62,12 +62,14 @@ const CategoryCreateScreen = ({ navigation, route }) => {
 
   return (
     <SafeAreaView style={styles.container}>
-      <SmallTextInput
-        inputValue={input}
-        setInputValue={setInput}
-        placeholder={'관심사를 입력하세요'}
-        errorMessage={errorMessage}
-      />
+      <View style={{ paddingTop: 20, paddingHorizontal: 17 }}>
+        <SmallTextInput
+          inputValue={input}
+          setInputValue={setInput}
+          placeholder={'관심사를 입력하세요'}
+          errorMessage={errorMessage}
+        />
+      </View>
     </SafeAreaView>
   );
 };
@@ -75,8 +77,6 @@ const CategoryCreateScreen = ({ navigation, route }) => {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    paddingHorizontal: 17,
-    paddingTop: 20,
   },
 });
 
diff --git a/src/screens/onboarding/ServiceIntroScreen.tsx b/src/screens/onboarding/ServiceIntroScreen.tsx
index 68bfe637..b3474ec0 100644
--- a/src/screens/onboarding/ServiceIntroScreen.tsx
+++ b/src/screens/onboarding/ServiceIntroScreen.tsx
@@ -58,38 +58,43 @@ const ServiceIntroScreen = ({ navigation }) => {
           onSnapToItem={(idx) => handleStep(idx)}
           data={[
             <>
-              <Image
-                source={require('../../../assets/images/onboarding_01.png')}
-                style={styles.image}
-              />
-              <View key={1} style={styles.carouselItemCtn}>
-                <HeaderText key={1} header={'기억하고 싶은 콘텐츠, \n지나치지 말고 기록하세요'} />
+              <View key={1} style={{ paddingTop: 32 }}>
+                <Image
+                  source={require('../../../assets/images/onboarding_01.png')}
+                  style={styles.image}
+                />
+                <View style={styles.carouselItemCtn}>
+                  <HeaderText header={'기억하고 싶은 콘텐츠, \n지나치지 말고 기록하세요'} />
+                </View>
               </View>
             </>,
 
             <>
-              <Image
-                source={require('../../../assets/images/onboarding_02.png')}
-                style={styles.image}
-              />
-              <View key={2} style={styles.carouselItemCtn}>
-                <HeaderText key={1} header={'꾸준하기 어렵다면, \n친구들과 함께 도전해요'} />
+              <View key={2} style={{ paddingTop: 32 }}>
+                <Image
+                  source={require('../../../assets/images/onboarding_02.png')}
+                  style={styles.image}
+                />
+                <View style={styles.carouselItemCtn}>
+                  <HeaderText header={'꾸준하기 어렵다면 \n친구들과 함께 도전해요'} />
+                </View>
               </View>
             </>,
 
             <>
-              <Image
-                source={require('../../../assets/images/onboarding_03.png')}
-                style={styles.image}
-              />
-              <View key={3} style={styles.carouselItemCtn}>
-                <HeaderText key={1} header={'함께할수록 쉬워지는 기록, \n키위가 도와줄게요!'} />
+              <View key={3} style={{ paddingTop: 32 }}>
+                <Image
+                  source={require('../../../assets/images/onboarding_03.png')}
+                  style={styles.image}
+                />
+                <View style={styles.carouselItemCtn}>
+                  <HeaderText header={'함께할수록 쉬워지는 기록 \n키위가 도와줄게요!'} />
+                </View>
               </View>
             </>,
           ]}
           renderItem={({ item }) => item}
         />
-        {/* </View> */}
         <View style={styles.nextButtonWithStepper}>
           <Stepper totalStep={3} currentStep={step + 1} />
           <View style={styles.nextButton}>
diff --git a/src/utils/api/followList/followersFollowings.ts b/src/utils/api/followList/followersFollowings.ts
index f2854781..4574531a 100644
--- a/src/utils/api/followList/followersFollowings.ts
+++ b/src/utils/api/followList/followersFollowings.ts
@@ -14,7 +14,7 @@ export const FollowersFollowingsApi = {
     try {
       if (!searchValue) {
         const response = await httpClient.get<FollowersFollowings>(
-          URL + '?' + `cursor=${getTime()}&limit=30`,
+          URL + '?' + `cursor=${getTime()}&limit=40`,
           {
             headers: {
               Authorization: `Bearer ${token}`,
@@ -27,7 +27,7 @@ export const FollowersFollowingsApi = {
         return response.data.data;
       } else {
         const response = await httpClient.get<FollowersFollowings>(
-          `${URL}/search?searchWord=${searchValue}&limit=20`,
+          `${URL}/search?searchWord=${searchValue}&limit=30`,
           {
             headers: {
               Authorization: `Bearer ${token}`,