Merge branch 'master' into hotfix-badge-name-fix

# Conflicts:
#	src/screens/suggestedPeople/SPBody.tsx

1 files changed, 24 insertions, 22 deletions

diff --git a/src/services/ExploreService.ts b/src/services/ExploreService.ts
index 9b0b4f71..07af91ad 100644
--- a/src/services/ExploreService.ts
+++ b/src/services/ExploreService.ts
@@ -68,13 +68,10 @@ export const getAllExploreSections = async () => {
   }
 };
 
-export const getDiscoverUsers = async (id: number, category_type: string) => {
+export const getDiscoverUsers = async (categoryName: string) => {
   try {
     const token = await AsyncStorage.getItem('token');
-    let url = DISCOVER_ENDPOINT + `${id}/`;
-    if (category_type === 'badges') {
-      url += '?type=badge';
-    }
+    const url = `${DISCOVER_ENDPOINT}get_users/?category=${categoryName}`;
     const response = await fetch(url, {
       method: 'GET',
       headers: {
@@ -82,31 +79,36 @@ export const getDiscoverUsers = async (id: number, category_type: string) => {
       },
     });
     if (response.status !== 200) {
-      return EMPTY_PROFILE_PREVIEW_LIST;
+      return undefined;
     }
-    const data = await response.json();
-    const users: ProfilePreviewType[] = data.users;
+    const users: ProfilePreviewType[] = await response.json();
     return users;
   } catch (error) {
     console.log('Error fetching SP user data');
     console.log(error);
-    return [];
+    return undefined;
   }
 };
 
-export const getButtons = async () => {
-  const token = await AsyncStorage.getItem('token');
-  const response = await fetch(SEARCH_BUTTONS_ENDPOPINT, {
-    method: 'GET',
-    headers: {
-      Authorization: 'Token ' + token,
-    },
-  });
+export const getSuggestedSearchBubbleSuggestions = async () => {
+  try {
+    const token = await AsyncStorage.getItem('token');
+    const response = await fetch(SEARCH_BUTTONS_ENDPOPINT, {
+      method: 'GET',
+      headers: {
+        Authorization: 'Token ' + token,
+      },
+    });
+
+    if (response.status !== 200) {
+      return undefined;
+    }
 
-  if (response.status !== 200) {
-    return [];
+    const data: SearchCategoryType[] = await response.json();
+    return data;
+  } catch (error) {
+    console.log('Error fetching suggested search bubble suggestions');
+    console.log(error);
+    return undefined;
   }
-
-  const data: SearchCategoryType[] = await response.json();
-  return data;
 };