Merge branch 'master' into tma684-search-for-badges

# Conflicts:
#	src/components/search/SearchResultCell.tsx
#	src/components/search/SearchResultList.tsx

4 files changed, 2 insertions, 3 deletions

diff --git a/src/services/ExploreService.ts b/src/services/ExploreService.ts
index 4f7875dc..9b0b4f71 100644
--- a/src/services/ExploreService.ts
+++ b/src/services/ExploreService.ts
@@ -51,6 +51,7 @@ export const getAllExploreSections = async () => {
       return EMPTY_PROFILE_PREVIEW_LIST;
     }
     const data = await response.json();
+    // TODO (if we return to original explore format): get keys from backend API
     const exploreSections: Record<ExploreSectionType, ProfilePreviewType[]> = {
       'New to Tagg': data.categories.new_to_tagg,
       'People You May Know': data.categories.people_you_may_know,
diff --git a/src/services/SocialLinkingService.ts b/src/services/SocialLinkingService.ts
index d1c5c2ff..90b26c96 100644
--- a/src/services/SocialLinkingService.ts
+++ b/src/services/SocialLinkingService.ts
@@ -13,7 +13,6 @@ import {
   LINK_TWITTER_OAUTH,
 } from '../constants';
 import {COMING_SOON_MSG, ERROR_LINK, SUCCESS_LINK} from '../constants/strings';
-import {CategorySelection} from '../screens';
 
 // A list of endpoint strings for all the integrated socials
 export const integratedEndpoints: {[social: string]: [string, string]} = {
diff --git a/src/services/SuggestedPeopleService.ts b/src/services/SuggestedPeopleService.ts
index c57de59d..d0032458 100644
--- a/src/services/SuggestedPeopleService.ts
+++ b/src/services/SuggestedPeopleService.ts
@@ -99,7 +99,7 @@ export const getSuggestedPeopleProfile = async (userId: string) => {
   }
 };
 
-export const getMutualBadgeHolders = async (badgeId: string) => {
+export const getMutualBadgeHolders = async () => {
   try {
     const token = await AsyncStorage.getItem('token');
     const response = await fetch(SP_MUTUAL_BADGE_HOLDERS_ENDPOINT, {
diff --git a/src/services/UserFriendsService.ts b/src/services/UserFriendsService.ts
index a0bf7ac7..dbec1974 100644
--- a/src/services/UserFriendsService.ts
+++ b/src/services/UserFriendsService.ts
@@ -25,7 +25,6 @@ export const loadFriends = async (userId: string, token: string) => {
 };
 
 export const friendOrUnfriendUser = async (
-  user: string,
   friend: string,
   token: string,
   friendship_status: FriendshipStatusType,