2 files changed, 21 insertions, 15 deletions
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index ed3f199d..ba2e6af4 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -59,7 +59,9 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({navigation, route}) => {
           }
         }}>
         <Text style={styles.rightButton}>
-          {selectedBadges.length !== 0 ? 'Done' : 'Skip'}
+          {selectedBadges.length !== 0 || route?.params.editing
+            ? 'Done'
+            : 'Skip'}
         </Text>
       </TouchableOpacity>
     ),
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index eb8494f4..c5a4ce61 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -25,11 +25,12 @@ import {
 import {uploadedSuggestedPeoplePhoto} from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
 import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
-import BackArrow from '../../assets/icons/back-arrow.svg';
+import FrontArrow from '../../assets/icons/front-arrow.svg';
 
 const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
   const {editing} = route.params;
   const [image, setImage] = useState<string | undefined>(undefined);
+  const [oldImage, setOldImage] = useState<string | undefined>(undefined);
   const [selectedBadges, setSelectedBadges] = useState<UniversityBadge[]>([]);
   const [loading, setLoading] = useState(false);
   const dispatch = useDispatch();
@@ -44,6 +45,8 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
       if (response) {
         setImage(response.suggested_people_url);
         setSelectedBadges(response.badges);
+        setOldImage(response.suggested_people_url);
+        console.log('Current Image: ', response.suggested_people_url);
       }
     };
     // if we're in edit SP, attempt to load current sp image
@@ -76,8 +79,8 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
   };
 
   const uploadImage = async () => {
-    setLoading(true);
-    if (image) {
+    if (image && oldImage !== image) {
+      setLoading(true);
       const success = await sendSuggestedPeoplePhoto(image);
       if (success) {
         dispatch(uploadedSuggestedPeoplePhoto(image));
@@ -87,16 +90,15 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
       } else {
         Alert.alert(ERROR_UPLOAD);
       }
+      setLoading(false);
+      // Navigated back to Profile if user is editing their Suggested People Picture
+      if (editing) {
+        setTimeout(() => {
+          Alert.alert(SUCCESS_PIC_UPLOAD);
+        }, 500);
+      }
     }
-    setLoading(false);
-
-    // Navigated back to Profile if user is editing their Suggested People Picture
-    if (editing) {
-      navigation.goBack();
-      setTimeout(() => {
-        Alert.alert(SUCCESS_PIC_UPLOAD);
-      }, 500);
-    }
+    navigation.goBack();
   };
 
   return (
@@ -152,9 +154,11 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
             </View>
             <TouchableOpacity
               onPress={() => {
-                navigation.push('BadgeSelection', {selectedBadges});
+                navigation.push('BadgeSelection', {
+                  selectedBadges,
+                });
               }}>
-              <BackArrow style={styles.rightArrow} />
+              <FrontArrow style={styles.rightArrow} />
             </TouchableOpacity>
           </View>
         )}