Merge branch 'master' into tma258-sp-pagination-2

# Conflicts:
#	src/constants/api.ts
#	src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
#	src/services/SuggestedPeopleService.ts

1 files changed, 1 insertions, 15 deletions

diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
index 78b810d1..b9dee55a 100644
--- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
+++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
@@ -45,15 +45,6 @@ const SuggestedPeopleScreen: React.FC = () => {
   const [page, setPage] = useState(0);
   const [refreshing, setRefreshing] = useState(false);
   const [hideStatusBar, setHideStatusBar] = useState(false);
-  // const [onFirstPage, setOnFirstPage] = useState(false);
-
-  // DEBUG
-  // useEffect(() => {
-  //   console.log(
-  //     'people updated',
-  //     people.map((ppl) => ppl.user.username),
-  //   );
-  // }, [people]);
 
   // loads data and append it to users based on current page
   useEffect(() => {
@@ -85,7 +76,6 @@ const SuggestedPeopleScreen: React.FC = () => {
       }
     };
     await Promise.all(users.map((user) => loadUserData(user)));
-    // console.log('done loading');
   };
   const resetPage = () => {
     const reset = async () => {
@@ -130,14 +120,11 @@ const SuggestedPeopleScreen: React.FC = () => {
     const firstItem = item.index === 0;
     return (
       <>
-        {/* {statusBar} */}
-        {/* <StatusBar barStyle={'light-content'} hidden={item.index !== 0} /> */}
         <StatusBar barStyle={'light-content'} hidden={hideStatusBar} />
         <Image
           source={{
             uri: data.suggested_people_url,
           }}
-          // source={require('../../assets/images/sarah_miller_full.jpeg')}
           style={styles.image}
         />
         <View style={styles.mainContainer}>
@@ -175,7 +162,6 @@ const SuggestedPeopleScreen: React.FC = () => {
     <SuggestedPeopleOnboardingStackScreen />
   ) : (
     <>
-      {/* <StatusBar barStyle={'light-content'} hidden/> */}
       <FlatList
         data={people}
         renderItem={(item) => <SPBody item={item} />}
@@ -202,8 +188,8 @@ const styles = StyleSheet.create({
     paddingBottom: '20%',
     justifyContent: 'space-between',
     alignSelf: 'center',
-    marginHorizontal: '5%',
   },
+  marginManager: {marginHorizontal: '5%'},
   image: {
     position: 'absolute',
     width: SCREEN_WIDTH,