Merge branch 'master' into tma698-api-profile

# Conflicts:
#	src/components/search/SearchBar.tsx

2 files changed, 16 insertions, 156 deletions

diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx
index 06d3efb3..8e0801c2 100644
--- a/src/screens/suggestedPeople/SPBody.tsx
+++ b/src/screens/suggestedPeople/SPBody.tsx
@@ -121,7 +121,7 @@ const SPBody: React.FC<SPBodyProps> = ({
       <TouchableOpacity
         onPress={() => {
           navigation.push('Profile', {
-            userXId: user.id,
+            userXId: loggedInUserId === user.id ? undefined : user.id,
             screenType,
           });
         }}
diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
index 4094b0a3..76889657 100644
--- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
+++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
@@ -1,37 +1,31 @@
 import {useFocusEffect, useNavigation} from '@react-navigation/native';
-import React, {useCallback, useEffect, useState, useRef} from 'react';
-import {
-  FlatList,
-  RefreshControl,
-  StatusBar,
-  StyleSheet,
-  ViewToken,
-} from 'react-native';
-
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import {FlatList, RefreshControl, StatusBar, ViewToken} from 'react-native';
 import {useDispatch, useSelector, useStore} from 'react-redux';
-import {TabsGradient, TaggLoadingIndicator, Background} from '../../components';
+import {Background, TabsGradient, TaggLoadingIndicator} from '../../components';
 import {SP_PAGE_SIZE} from '../../constants';
+import {MainStack} from '../../routes';
+import MainStackScreen from '../../routes/main/MainStackScreen';
 import SuggestedPeopleOnboardingStackScreen from '../../routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen';
 import {getSuggestedPeople} from '../../services/SuggestedPeopleService';
 import {cancelFriendRequest, resetScreenType} from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
 import {
+  BackgroundGradientType,
   FriendshipStatusType,
   ProfilePreviewType,
   ScreenType,
   SuggestedPeopleDataType,
-  BackgroundGradientType,
 } from '../../types';
 import {
   fetchUserX,
   getUserAsProfilePreviewType,
   handleAddFriend,
-  normalize,
-  SCREEN_HEIGHT,
-  SCREEN_WIDTH,
 } from '../../utils';
+import {SuggestedPeopleWelcomeScreen} from '../suggestedPeopleOnboarding';
 import {userXInStore} from './../../utils/';
 import SPBody from './SPBody';
+
 /**
  * Bare bones for suggested people consisting of:
  * * Image, title, name, username, add friend button [w/o functionality]
@@ -209,9 +203,13 @@ const SuggestedPeopleScreen: React.FC = () => {
     [],
   );
 
-  return suggested_people_linked === 0 ? (
-    <SuggestedPeopleOnboardingStackScreen />
-  ) : loading ? (
+  useFocusEffect(() => {
+    if (suggested_people_linked === 0) {
+      navigation.navigate('SPWelcomeScreen');
+    }
+  });
+
+  return loading ? (
     <>
       <TaggLoadingIndicator fullscreen />
       <Background gradientType={BackgroundGradientType.Dark} />
@@ -245,142 +243,4 @@ const SuggestedPeopleScreen: React.FC = () => {
   );
 };
 
-const styles = StyleSheet.create({
-  mainContainer: {
-    flexDirection: 'column',
-    width: SCREEN_WIDTH,
-    height: SCREEN_HEIGHT,
-    paddingVertical: '15%',
-    paddingBottom: '20%',
-    justifyContent: 'space-between',
-    alignSelf: 'center',
-  },
-  marginManager: {marginHorizontal: '5%'},
-  image: {
-    position: 'absolute',
-    width: SCREEN_WIDTH,
-    height: SCREEN_HEIGHT,
-    zIndex: 0,
-  },
-  title: {
-    zIndex: 1,
-    paddingTop: '3%',
-    alignSelf: 'center',
-    fontSize: normalize(22),
-    lineHeight: normalize(26),
-    fontWeight: '800',
-    letterSpacing: normalize(3),
-    color: '#FFFEFE',
-    textShadowColor: 'rgba(0, 0, 0, 0.4)',
-    textShadowOffset: {width: normalize(2), height: normalize(2)},
-    textShadowRadius: normalize(2),
-  },
-  firstName: {
-    color: '#fff',
-    fontWeight: '800',
-    fontSize: normalize(24),
-    lineHeight: normalize(29),
-    textShadowColor: 'rgba(0, 0, 0, 0.3)',
-    textShadowOffset: {width: normalize(2), height: normalize(2)},
-    textShadowRadius: normalize(2),
-    letterSpacing: normalize(2.5),
-    alignSelf: 'baseline',
-  },
-  username: {
-    color: '#fff',
-    fontWeight: '600',
-    fontSize: normalize(15),
-    lineHeight: normalize(18),
-    textShadowColor: 'rgba(0, 0, 0, 0.3)',
-    textShadowOffset: {width: normalize(2), height: normalize(2)},
-    textShadowRadius: normalize(2),
-    letterSpacing: normalize(2),
-  },
-  nameInfoContainer: {},
-  addButton: {
-    justifyContent: 'center',
-    alignItems: 'center',
-    width: SCREEN_WIDTH * 0.3,
-    height: SCREEN_WIDTH * 0.085,
-    padding: 0,
-    borderWidth: 2,
-    borderColor: '#fff',
-    borderRadius: 1,
-    marginLeft: '1%',
-    marginTop: '4%',
-    shadowColor: 'rgb(0, 0, 0)',
-    shadowRadius: 2,
-    shadowOffset: {width: 2, height: 2},
-    shadowOpacity: 0.5,
-  },
-  addButtonTitle: {
-    color: 'white',
-    padding: 0,
-    fontSize: normalize(15),
-    lineHeight: normalize(18),
-    fontWeight: 'bold',
-    textAlign: 'center',
-    letterSpacing: normalize(1),
-  },
-  addUserContainer: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    alignItems: 'flex-start',
-    marginBottom: '5%',
-  },
-  requestedButton: {
-    justifyContent: 'center',
-    alignItems: 'center',
-    width: SCREEN_WIDTH * 0.3,
-    height: SCREEN_WIDTH * 0.085,
-    padding: 0,
-    borderWidth: 2,
-    borderColor: 'transparent',
-    borderRadius: 1,
-    marginLeft: '1%',
-    marginTop: '4%',
-    shadowColor: 'rgb(0, 0, 0)',
-    shadowRadius: 2,
-    shadowOffset: {width: 2, height: 2},
-    shadowOpacity: 0.5,
-  },
-  requestedButtonTitle: {
-    backgroundColor: 'transparent',
-    fontSize: normalize(15),
-    lineHeight: normalize(18),
-    fontWeight: 'bold',
-    textAlign: 'center',
-    letterSpacing: normalize(1),
-  },
-  body: {},
-
-  button: {
-    justifyContent: 'center',
-    alignItems: 'center',
-    width: SCREEN_WIDTH * 0.4,
-    aspectRatio: 154 / 33,
-    borderWidth: 2,
-    borderColor: '#fff',
-    borderRadius: 3,
-    marginRight: '2%',
-    marginLeft: '1%',
-  },
-  transparentBG: {
-    backgroundColor: 'transparent',
-  },
-  lightBlueBG: {
-    backgroundColor: '#fff',
-  },
-  label: {
-    fontSize: normalize(15),
-    fontWeight: '700',
-    letterSpacing: 1,
-  },
-  blueLabel: {
-    color: '#fff',
-  },
-  whiteLabel: {
-    color: 'white',
-  },
-});
 export default SuggestedPeopleScreen;