alerts rearranged

2 files changed, 15 insertions, 9 deletions

diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index 66dca509..d0dcfa4c 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -8,7 +8,10 @@ import LinearGradient from 'react-native-linear-gradient';
 import {useDispatch, useSelector} from 'react-redux';
 import {BACKGROUND_GRADIENT_MAP} from '../../constants';
 import {BADGE_DATA} from '../../constants/badges';
-import {ERROR_BADGES_EXCEED_LIMIT} from '../../constants/strings';
+import {
+  ERROR_BADGES_EXCEED_LIMIT,
+  SUCCESS_BADGES_UPDATE,
+} from '../../constants/strings';
 import {MainStackParams} from '../../routes';
 import {
   addBadgesService,
@@ -71,9 +74,15 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
         style={styles.rightButtonContainer}
         onPress={async () => {
           if (editing) {
-            await updateBadgesService(selectedBadges, university);
-            // Load updated badges to store
-            loadUserBadges();
+            const success = await updateBadgesService(
+              selectedBadges,
+              university,
+            );
+            if (success === true) {
+              // Load updated badges to store
+              loadUserBadges();
+              Alert.alert(SUCCESS_BADGES_UPDATE);
+            }
             if (navigation.canGoBack()) {
               navigation.goBack();
             } else {
diff --git a/src/services/SuggestedPeopleService.ts b/src/services/SuggestedPeopleService.ts
index bdcbc437..2ae8cf55 100644
--- a/src/services/SuggestedPeopleService.ts
+++ b/src/services/SuggestedPeopleService.ts
@@ -2,7 +2,6 @@ import AsyncStorage from '@react-native-community/async-storage';
 import {
   ERROR_BADGES_EXCEED_LIMIT,
   ERROR_UPLOAD_BADGES,
-  SUCCESS_BADGES_UPDATE,
 } from '../constants/strings';
 import {
   ADD_BADGES_ENDPOINT,
@@ -215,11 +214,10 @@ export const updateBadgesService = async (
     });
     if (response.status === 400) {
       Alert.alert(ERROR_BADGES_EXCEED_LIMIT);
-      return;
+      return false;
     }
     if (response.status === 200) {
-      Alert.alert(SUCCESS_BADGES_UPDATE);
-      return;
+      return true;
     }
   } catch (error) {
     console.log(error);
@@ -249,7 +247,6 @@ export const removeBadgesService = async (
       return false;
     }
     if (response.status === 200) {
-      Alert.alert(SUCCESS_BADGES_UPDATE);
       return true;
     }
   } catch (error) {