2 files changed, 17 insertions, 4 deletions
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index 91617377..38a2b01c 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -66,10 +66,14 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
         style={styles.rightButtonContainer}
         onPress={async () => {
           if (editing) {
-            updateBadgesService(selectedBadges, university);
-            navigation.navigate('UpdateSPPicture', {
-              editing: true,
-            });
+            await updateBadgesService(selectedBadges, university);
+            if (navigation.canGoBack()) {
+              navigation.goBack();
+            } else {
+              navigation.navigate('UpdateSPPicture', {
+                editing: true,
+              });
+            }
           } else {
             if (selectedBadges.length !== 0) {
               const success = await addBadgesService(
diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
index 388a1ba7..f1981111 100644
--- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
+++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
@@ -1,3 +1,4 @@
+import AsyncStorage from '@react-native-community/async-storage';
 import {useFocusEffect, useNavigation} from '@react-navigation/native';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
 import {FlatList, RefreshControl, StatusBar, ViewToken} from 'react-native';
@@ -57,6 +58,14 @@ const SuggestedPeopleScreen: React.FC = () => {
 
   const stausBarRef = useRef(hideStatusBar);
 
+  useEffect(() => {
+    AsyncStorage.getItem('respondedToAccessContacts').then((value) => {
+      if (value === null) {
+        navigation.navigate('RequestContactsAccess');
+      }
+    });
+  }, []);
+
   // loads data and append it to users based on current page
   useEffect(() => {
     loadMore();