Merge branch 'master' into tma739-bugfix-profile-onboarding-tutorial

# Conflicts:
#	src/components/profile/Content.tsx

1 files changed, 2 insertions, 7 deletions

diff --git a/src/services/UserFriendsService.ts b/src/services/UserFriendsService.ts
index da39380f..5c41e988 100644
--- a/src/services/UserFriendsService.ts
+++ b/src/services/UserFriendsService.ts
@@ -1,17 +1,12 @@
-//Abstracted common friends api calls out here
-
 import AsyncStorage from '@react-native-community/async-storage';
 import {Alert} from 'react-native';
-import {ContactType, FriendshipStatusType} from '../types';
 import {
   FRIENDS_ENDPOINT,
   INVITE_FRIEND_ENDPOINT,
   USERS_FROM_CONTACTS_ENDPOINT,
 } from '../constants';
-import {
-  ERROR_SOMETHING_WENT_WRONG,
-  ERROR_SOMETHING_WENT_WRONG_REFRESH,
-} from '../constants/strings';
+import {ERROR_SOMETHING_WENT_WRONG_REFRESH} from '../constants/strings';
+import {ContactType, FriendshipStatusType} from '../types';
 
 export const loadFriends = async (userId: string, token: string) => {
   try {