Merge pull request #255 from IvanIFChen/hotfix-merge-issue

[HOTFIX] fixed merge conflict

3 files changed, 18 insertions, 13 deletions

diff --git a/src/components/taggs/TaggsBar.tsx b/src/components/taggs/TaggsBar.tsx
index 05ee18bb..641677e3 100644
--- a/src/components/taggs/TaggsBar.tsx
+++ b/src/components/taggs/TaggsBar.tsx
@@ -153,7 +153,6 @@ const styles = StyleSheet.create({
     marginBottom: 25,
   },
   container: {
-    backgroundColor: 'white',
     shadowColor: '#000',
     shadowRadius: 10,
     shadowOffset: {width: 0, height: 2},
diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
index b9dee55a..89528a92 100644
--- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
+++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
@@ -130,13 +130,14 @@ const SuggestedPeopleScreen: React.FC = () => {
         <View style={styles.mainContainer}>
           <Text style={styles.title}>{firstItem && 'Suggested People'}</Text>
           <View style={styles.body}>
-            <View style={styles.addUserContainer}>
-              <View style={styles.nameInfoContainer}>
-                <Text style={styles.firstName}>{data.user.first_name}</Text>
-                <Text style={styles.username}>{'@' + data.user.username}</Text>
-              </View>
-              {/* TODO: Finish me ?! */}
-              {/* <TouchableOpacity
+            <View style={styles.marginManager}>
+              <View style={styles.addUserContainer}>
+                <View style={styles.nameInfoContainer}>
+                  <Text style={styles.firstName}>{data.user.first_name}</Text>
+                  <Text style={styles.username}>@{data.user.username}</Text>
+                </View>
+                {/* TODO: Finish me ?! */}
+                {/* <TouchableOpacity
                 activeOpacity={0.5}
                 // TODO: Call function to Add Friend
                 onPress={() => console.log('Call add friend function')}>
@@ -144,14 +145,18 @@ const SuggestedPeopleScreen: React.FC = () => {
                   <Text style={styles.addButtonTitle}>{'Add Friend'}</Text>
                 </View>
               </TouchableOpacity> */}
+              </View>
             </View>
             <TaggsBar
               y={y}
               userXId={data.user.id}
               profileBodyHeight={0}
-              screenType={ScreenType.SuggestedPeople}
+              screenType={screenType}
+              whiteRing={true}
             />
-            <MutualFriends user={data.user} friends={data.mutual_friends} />
+            <View style={styles.marginManager}>
+              <MutualFriends user={data.user} friends={data.mutual_friends} />
+            </View>
           </View>
         </View>
       </>
@@ -182,7 +187,7 @@ const SuggestedPeopleScreen: React.FC = () => {
 const styles = StyleSheet.create({
   mainContainer: {
     flexDirection: 'column',
-    width: SCREEN_WIDTH * 0.9,
+    width: SCREEN_WIDTH,
     height: SCREEN_HEIGHT,
     paddingVertical: '15%',
     paddingBottom: '20%',
diff --git a/src/services/SuggestedPeopleService.ts b/src/services/SuggestedPeopleService.ts
index 34a31662..aa1fabde 100644
--- a/src/services/SuggestedPeopleService.ts
+++ b/src/services/SuggestedPeopleService.ts
@@ -2,9 +2,9 @@ import AsyncStorage from '@react-native-community/async-storage';
 import {
   EDIT_PROFILE_ENDPOINT,
   SP_UPDATE_PICTURE_ENDPOINT,
-  SP_USERS_ENDPOINT
+  SP_USERS_ENDPOINT,
 } from '../constants';
-import { SuggestedPeopleDataType } from '../types';
+import {SuggestedPeopleDataType} from '../types';
 
 export const sendSuggestedPeopleLinked = async (
   userId: string,
@@ -96,3 +96,4 @@ export const getSuggestedPeopleProfile = async (userId: string) => {
     console.log('Error retrieving SP info');
     return undefined;
   }
+};