4 files changed, 38 insertions, 26 deletions
diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index 6504300c..ee66aa15 100644
--- a/src/components/common/BadgeDetailView.tsx
+++ b/src/components/common/BadgeDetailView.tsx
@@ -7,9 +7,10 @@ import {useDispatch, useSelector} from 'react-redux';
 import CloseIcon from '../../assets/ionicons/close-outline.svg';
 import {BADGE_GRADIENT_FIRST} from '../../constants';
 import {BADGE_DATA} from '../../constants/badges';
+import {removeUserBadge} from '../../store/actions';
 import {RootState} from '../../store/rootreducer';
 import {ScreenType} from '../../types';
-import {getUniversityBadge, normalize, removeUserBadge} from '../../utils';
+import {getUniversityBadge, normalize} from '../../utils';
 
 interface BadgeDetailModalProps {
   userXId: string | undefined;
@@ -59,7 +60,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
   }, [badges]);
 
   const removeBadgeCell = async (badgeName: string) => {
-    await removeUserBadge(badges, badgeName, user.userId, dispatch);
+    dispatch(removeUserBadge(badgeName, user.userId));
   };
 
   const badgeEditCell = ({item: {id, name, badgeImage}}) => {
diff --git a/src/store/actions/user.ts b/src/store/actions/user.ts
index 941101df..b1cb8719 100644
--- a/src/store/actions/user.ts
+++ b/src/store/actions/user.ts
@@ -4,12 +4,14 @@ import {Action, ThunkAction} from '@reduxjs/toolkit';
 import {
   getProfilePic,
   loadProfileInfo,
+  removeBadgesService,
   sendSuggestedPeopleLinked,
 } from '../../services';
 import {UniversityBadge, UserType} from '../../types/types';
 import {getTokenOrLogout} from '../../utils';
 import {
   clearHeaderAndProfileImages,
+  profileBadgeRemoved,
   profileBadgesUpdated,
   profileCompletionStageUpdated,
   setIsOnboardedUser,
@@ -107,6 +109,27 @@ export const updateUserBadges =
     }
   };
 
+/**
+ * Removes a single badge from logged-in user by badge name.
+ * @param badgeName name of badge to be removed
+ * @param loggedInUserId userId of loggedInUser
+ */
+export const removeUserBadge =
+  (
+    badgeName: string,
+    loggedInUserId: string,
+  ): ThunkAction<Promise<void>, RootState, unknown, Action<string>> =>
+  async (dispatch) => {
+    try {
+      const success = await removeBadgesService([badgeName], loggedInUserId);
+      if (success) {
+        dispatch({type: profileBadgeRemoved.type, payload: {badge: badgeName}});
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
 export const updateProfileCompletionStage =
   (
     stage: number,
diff --git a/src/store/reducers/userReducer.ts b/src/store/reducers/userReducer.ts
index 97bf845c..03fee112 100644
--- a/src/store/reducers/userReducer.ts
+++ b/src/store/reducers/userReducer.ts
@@ -1,4 +1,6 @@
 import {createSlice} from '@reduxjs/toolkit';
+import {ActionSheetIOS} from 'react-native';
+import {Badge} from 'react-native-elements';
 import {NO_USER_DATA} from '../initialStates';
 
 /**
@@ -46,6 +48,12 @@ const userDataSlice = createSlice({
       state.profile.badges = action.payload.badges;
     },
 
+    profileBadgeRemoved: (state, action) => {
+      state.profile.badges = state.profile.badges.filter(
+        (badge) => badge.name !== action.payload.badge,
+      );
+    },
+
     profileCompletionStageUpdated: (state, action) => {
       state.profile.profile_completion_stage = action.payload.stage;
     },
@@ -95,6 +103,6 @@ export const {
   setSuggestedPeopleImage,
   clearHeaderAndProfileImages,
   profileBadgesUpdated,
-  // setChatClientReady,
+  profileBadgeRemoved,
 } = userDataSlice.actions;
 export const userDataReducer = userDataSlice.reducer;
diff --git a/src/utils/users.ts b/src/utils/users.ts
index 8505cde2..64ad10e9 100644
--- a/src/utils/users.ts
+++ b/src/utils/users.ts
@@ -1,7 +1,8 @@
-import {Alert} from 'react-native';
 import AsyncStorage from '@react-native-community/async-storage';
+import {Alert} from 'react-native';
+import ImagePicker from 'react-native-image-crop-picker';
 import {INTEGRATED_SOCIAL_LIST} from '../constants';
-import {isUserBlocked, loadSocialPosts, removeBadgesService} from '../services';
+import {isUserBlocked, loadSocialPosts, patchEditProfile} from '../services';
 import {
   loadAllSocials,
   loadBlockedList,
@@ -11,7 +12,6 @@ import {
   loadUserMoments,
   loadUserNotifications,
   logout,
-  updateUserBadges,
 } from '../store/actions';
 import {NO_SOCIAL_ACCOUNTS} from '../store/initialStates';
 import {loadUserMomentCategories} from './../store/actions/momentCategories';
@@ -23,10 +23,7 @@ import {
   ProfilePreviewType,
   ScreenType,
   UserType,
-  UniversityBadge,
 } from './../types/types';
-import ImagePicker from 'react-native-image-crop-picker';
-import {patchEditProfile} from '../services';
 
 const loadData = async (dispatch: AppDispatch, user: UserType) => {
   await Promise.all([
@@ -205,23 +202,6 @@ export const canViewProfile = (
   return false;
 };
 
-/* Function to call remove badge service,
- * remove selected badge from list passed in and
- * dispatch thunk action to update store
- */
-export const removeUserBadge = async (
-  badges: UniversityBadge[],
-  badgeName: string,
-  userId: string,
-  dispatch: AppDispatch,
-) => {
-  const success = await removeBadgesService([badgeName], userId);
-  if (success === true) {
-    badges = badges.filter((badge) => badge.name !== badgeName);
-    dispatch(updateUserBadges(badges));
-  }
-};
-
 export const navigateToProfile = async (
   state: RootState,
   dispatch: any,