Merge branch 'master' into hotfix-linting-fixup

# Conflicts:
#	.eslintrc.js
#	src/components/notifications/Notification.tsx
#	src/screens/onboarding/legacy/SocialMedia.tsx
#	src/screens/onboarding/legacy/WaitlistSuccessScreen.tsx
#	src/screens/profile/CategorySelection.tsx

3 files changed, 36 insertions, 3 deletions

diff --git a/src/services/SuggestedPeopleService.ts b/src/services/SuggestedPeopleService.ts
index 4f56feb9..617f3970 100644
--- a/src/services/SuggestedPeopleService.ts
+++ b/src/services/SuggestedPeopleService.ts
@@ -136,11 +136,15 @@ export const getMutualBadgeHolders = async (badge_id: string) => {
   }
 };
 
-export const addBadgesService = async (selectedBadges: string[]) => {
+export const addBadgesService = async (
+  selectedBadges: string[],
+  university: string,
+) => {
   try {
     const token = await AsyncStorage.getItem('token');
     const form = new FormData();
     form.append('badges', JSON.stringify(selectedBadges));
+    form.append('university', JSON.stringify(university));
     const response = await fetch(ADD_BADGES_ENDPOINT, {
       method: 'POST',
       headers: {
@@ -161,11 +165,15 @@ export const addBadgesService = async (selectedBadges: string[]) => {
   }
 };
 
-export const updateBadgesService = async (selectedBadges: string[]) => {
+export const updateBadgesService = async (
+  selectedBadges: string[],
+  university: string,
+) => {
   try {
     const token = await AsyncStorage.getItem('token');
     const form = new FormData();
     form.append('badges', JSON.stringify(selectedBadges));
+    form.append('university', JSON.stringify(university));
     const response = await fetch(UPDATE_BADGES_ENDPOINT, {
       method: 'POST',
       headers: {
diff --git a/src/services/UserFriendsService.ts b/src/services/UserFriendsService.ts
index 5c41e988..deb3ec6d 100644
--- a/src/services/UserFriendsService.ts
+++ b/src/services/UserFriendsService.ts
@@ -233,7 +233,10 @@ export const inviteFriendService = async (
     }),
   });
   if (response.status === 201 || response.status === 200) {
-    return await response.json();
+    const data = await response.json();
+    return data.invites_left;
+  } else if (response.status === 400) {
+    return -1;
   }
   return false;
 };
diff --git a/src/services/UserProfileService.ts b/src/services/UserProfileService.ts
index 9e93d479..c11d874f 100644
--- a/src/services/UserProfileService.ts
+++ b/src/services/UserProfileService.ts
@@ -14,6 +14,7 @@ import {
   SEND_OTP_ENDPOINT,
   TAGG_CUSTOMER_SUPPORT,
   USER_PROFILE_ENDPOINT,
+  USER_PROFILE_VISITED_ENDPOINT,
   VERIFY_OTP_ENDPOINT,
 } from '../constants';
 import {
@@ -410,3 +411,24 @@ export const patchEditProfile = async (form: FormData, userId: string) => {
     throw ERROR_DOUBLE_CHECK_CONNECTION;
   }
 };
+
+export const visitedUserProfile = async (userId: string) => {
+  try {
+    const token = await AsyncStorage.getItem('token');
+    const form = new FormData();
+    form.append('user_id', userId);
+    const response = await fetch(USER_PROFILE_VISITED_ENDPOINT, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'multipart/form-data',
+        Authorization: 'Token ' + token,
+      },
+      body: form,
+    });
+    if (response.status !== 200) {
+      console.error('Failed to submit a profile visit');
+    }
+  } catch (error) {
+    return undefined;
+  }
+};