Merge branch 'master' into tma872-purple-indicator

# Conflicts:
#	src/constants/constants.ts
#	src/utils/common.ts

1 files changed, 3 insertions, 23 deletions

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,