2 files changed, 30 insertions, 14 deletions
diff --git a/src/screens/suggestedPeople/AnimatedTutorial.tsx b/src/screens/suggestedPeople/AnimatedTutorial.tsx
index d827829c..bf34ba6e 100644
--- a/src/screens/suggestedPeople/AnimatedTutorial.tsx
+++ b/src/screens/suggestedPeople/AnimatedTutorial.tsx
@@ -15,13 +15,7 @@ const AnimatedTutorial: React.FC = () => {
   const {user} = useSelector((state: RootState) => state.user);
 
   const handleCloseAnimationTutorial = async () => {
-    const suggested_people_linked = 2;
-    dispatch(
-      suggestedPeopleAnimatedTutorialFinished(
-        user.userId,
-        suggested_people_linked,
-      ),
-    );
+    dispatch(suggestedPeopleAnimatedTutorialFinished(user.userId));
     navigation.pop();
   };
   return (
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index f16146ad..b49761a0 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -1,5 +1,5 @@
-import { useNavigation } from '@react-navigation/native';
-import React, {useState} from 'react';
+import {useNavigation} from '@react-navigation/native';
+import React, {useEffect, useState} from 'react';
 import {
   Alert,
   Image,
@@ -11,13 +11,17 @@ import {Text} from 'react-native-animatable';
 import {TouchableOpacity} from 'react-native-gesture-handler';
 import ImagePicker from 'react-native-image-crop-picker';
 import {SafeAreaView} from 'react-native-safe-area-context';
-import {useDispatch} from 'react-redux';
+import {useDispatch, useSelector} from 'react-redux';
 import {TaggSquareButton} from '../../components';
 import TaggLoadingIndicator from '../../components/common/TaggLoadingIndicator';
 import {SP_HEIGHT, SP_WIDTH} from '../../constants';
-import {ERROR_UPLOAD} from '../../constants/strings';
-import {sendSuggestedPeoplePhoto} from '../../services';
+import {ERROR_UPLOAD, SUCCESS_PIC_UPLOAD} from '../../constants/strings';
+import {
+  getSuggestedPeopleProfile,
+  sendSuggestedPeoplePhoto,
+} from '../../services';
 import {uploadedSuggestedPeoplePhoto} from '../../store/actions';
+import {RootState} from '../../store/rootReducer';
 import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
 
 const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
@@ -26,6 +30,22 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
   const [loading, setLoading] = useState(false);
   const dispatch = useDispatch();
   const navigation = useNavigation();
+  const {userId: loggedInUserId} = useSelector(
+    (state: RootState) => state.user.user,
+  );
+
+  useEffect(() => {
+    const loadData = async () => {
+      const response = await getSuggestedPeopleProfile(loggedInUserId);
+      if (response) {
+        setImage(response.suggested_people_url);
+      }
+    };
+    // if we're in edit SP, attempt to load current sp image
+    if (goTo === 'Profile') {
+      loadData();
+    }
+  }, []);
 
   const openImagePicker = () => {
     ImagePicker.openPicker({
@@ -55,8 +75,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
     if (image) {
       const success = await sendSuggestedPeoplePhoto(image);
       if (success) {
-        const suggested_people_linked = 1;
-        dispatch(uploadedSuggestedPeoplePhoto(suggested_people_linked));
+        dispatch(uploadedSuggestedPeoplePhoto());
       } else {
         Alert.alert(ERROR_UPLOAD);
       }
@@ -66,6 +85,9 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
     // Navigated back to Profile if user is editing their Suggested People Picture
     if (goTo === 'Profile') {
       navigation.goBack();
+      setTimeout(() => {
+        Alert.alert(SUCCESS_PIC_UPLOAD);
+      }, 500);
     }
   };