Merge branch 'master' into tma698-api-profile

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

2 files changed, 14 insertions, 5 deletions

diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index 87e22d9e..0a4e5718 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -98,7 +98,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
       if (success) {
         dispatch(uploadedSuggestedPeoplePhoto(image));
         if (!editing) {
-          navigation.push('BadgeSelection', {editing: false});
+          navigation.navigate('BadgeSelection', {editing: false});
         }
       } else {
         Alert.alert(ERROR_UPLOAD);
@@ -106,12 +106,12 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
       setLoading(false);
       // Navigated back to Profile if user is editing their Suggested People Picture
       if (editing) {
+        navigation.goBack();
         setTimeout(() => {
           Alert.alert(success ? SUCCESS_PIC_UPLOAD : ERROR_UPLOAD_SP_PHOTO);
         }, 500);
       }
     }
-    navigation.goBack();
   };
 
   return (
@@ -161,7 +161,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
         {editing && (
           <TouchableOpacity
             onPress={() => {
-              navigation.push('BadgeSelection', {editing: true});
+              navigation.navigate('BadgeSelection', {editing: true});
             }}>
             <View style={styles.editBadgesMainContainer}>
               <View style={styles.editBadgesSubContainer}>
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx
index 10f3b3a5..2f12d909 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleWelcomeScreen.tsx
@@ -1,6 +1,6 @@
 import {BlurView} from '@react-native-community/blur';
 import {useNavigation} from '@react-navigation/native';
-import React from 'react';
+import React, {Fragment, useEffect} from 'react';
 import {Image, StatusBar, StyleSheet, TouchableOpacity} from 'react-native';
 import {Text} from 'react-native-animatable';
 import {SafeAreaView} from 'react-native-safe-area-context';
@@ -9,6 +9,13 @@ import {isIPhoneX, normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
 
 const SuggestedPeopleWelcomeScreen: React.FC = () => {
   const navigation = useNavigation();
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerBackImage: () => <Fragment />,
+    });
+  }, []);
+
   return (
     <>
       <StatusBar barStyle={'light-content'} />
@@ -35,7 +42,9 @@ const SuggestedPeopleWelcomeScreen: React.FC = () => {
       </BlurView>
       <TouchableOpacity
         style={styles.nextButton}
-        onPress={() => navigation.push('UploadPicture')}>
+        onPress={() =>
+          navigation.navigate('UpdateSPPicture', {editing: false})
+        }>
         <UpArrow color={'white'} />
       </TouchableOpacity>
     </>