Merge branch 'master' into tma767-message-button

# Conflicts:
#	src/screens/chat/ChatListScreen.tsx

3 files changed, 27 insertions, 9 deletions

diff --git a/src/constants/api.ts b/src/constants/api.ts
index 15ca6abc..cb45b238 100644
--- a/src/constants/api.ts
+++ b/src/constants/api.ts
@@ -2,7 +2,7 @@
 
 // Dev
 const BASE_URL: string = 'http://127.0.0.1:8000/';
-export const STREAM_CHAT_API = 'g2hvnyqx9cmv'
+export const STREAM_CHAT_API = 'g2hvnyqx9cmv';
 
 // Prod
 // const BASE_URL: string = 'http://app-prod.tagg.id/';
@@ -24,7 +24,9 @@ export const PROFILE_PHOTO_THUMBNAIL_ENDPOINT: string =
 export const GET_IG_POSTS_ENDPOINT: string = API_URL + 'posts-ig/';
 export const GET_FB_POSTS_ENDPOINT: string = API_URL + 'posts-fb/';
 export const GET_TWITTER_POSTS_ENDPOINT: string = API_URL + 'posts-twitter/';
-export const SEARCH_ENDPOINT: string = API_URL + 'search/v2/';
+export const SEARCH_ENDPOINT: string = API_URL + 'search/';
+export const SEARCH_ENDPOINT_MESSAGES: string = API_URL + 'search/messages/';
+export const SEARCH_ENDPOINT_SUGGESTED: string = API_URL + 'search/suggested/';
 export const MOMENTS_ENDPOINT: string = API_URL + 'moments/';
 export const MOMENT_THUMBNAIL_ENDPOINT: string = API_URL + 'moment-thumbnail/';
 export const VERIFY_INVITATION_CODE_ENDPOUNT: string = API_URL + 'verify-code/';
@@ -37,20 +39,24 @@ export const PASSWORD_RESET_ENDPOINT: string = API_URL + 'password-reset/';
 export const MOMENT_CATEGORY_ENDPOINT: string = API_URL + 'moment-category/';
 export const NOTIFICATIONS_ENDPOINT: string = API_URL + 'notifications/';
 export const DISCOVER_ENDPOINT: string = API_URL + 'discover/';
-export const SEARCH_BUTTONS_ENDPOPINT: string = DISCOVER_ENDPOINT + 'search_buttons/';
+export const SEARCH_BUTTONS_ENDPOPINT: string =
+  DISCOVER_ENDPOINT + 'search_buttons/';
 export const WAITLIST_USER_ENDPOINT: string = API_URL + 'waitlist-user/';
 export const COMMENT_THREAD_ENDPOINT: string = API_URL + 'reply/';
 export const USERS_FROM_CONTACTS_ENDPOINT: string =
   API_URL + 'user_contacts/find_friends/';
 export const INVITE_FRIEND_ENDPOINT: string =
-API_URL + 'user_contacts/invite_friend/';
+  API_URL + 'user_contacts/invite_friend/';
 
 // Suggested People
 export const SP_USERS_ENDPOINT: string = API_URL + 'suggested_people/';
-export const SP_UPDATE_PICTURE_ENDPOINT: string = SP_USERS_ENDPOINT + 'update_picture/';
-export const SP_MUTUAL_BADGE_HOLDERS_ENDPOINT: string = SP_USERS_ENDPOINT + 'get_mutual_badge_holders/';
+export const SP_UPDATE_PICTURE_ENDPOINT: string =
+  SP_USERS_ENDPOINT + 'update_picture/';
+export const SP_MUTUAL_BADGE_HOLDERS_ENDPOINT: string =
+  SP_USERS_ENDPOINT + 'get_mutual_badge_holders/';
 export const ADD_BADGES_ENDPOINT: string = SP_USERS_ENDPOINT + 'add_badges/';
-export const UPDATE_BADGES_ENDPOINT: string = SP_USERS_ENDPOINT + 'update_badges/';
+export const UPDATE_BADGES_ENDPOINT: string =
+  SP_USERS_ENDPOINT + 'update_badges/';
 
 // Register as FCM device
 export const FCM_ENDPOINT: string = API_URL + 'fcm/';
@@ -75,6 +81,7 @@ export const LINK_IG_OAUTH: string = `https://www.instagram.com/oauth/authorize/
 export const LINK_FB_OAUTH: string = `https://www.facebook.com/v8.0/dialog/oauth?client_id=1308555659343609&redirect_uri=${DEEPLINK}&scope=user_posts,public_profile&response_type=code`;
 export const LINK_TWITTER_OAUTH: string = API_URL + 'link-twitter-request/';
 
-// Profile Links 
-export const COMMUNITY_GUIDELINES: string = 'https://www.tagg.id/community-guidelines';
+// Profile Links
+export const COMMUNITY_GUIDELINES: string =
+  'https://www.tagg.id/community-guidelines';
 export const PRIVACY_POLICY: string = 'https://www.tagg.id/privacy-policy';
diff --git a/src/constants/badges.ts b/src/constants/badges.ts
index b4cecefb..d7e9357b 100644
--- a/src/constants/badges.ts
+++ b/src/constants/badges.ts
@@ -23,10 +23,12 @@ export const _brownBadgeImages = {
   football: require('../assets/badges/brown/football.png'),
   gymnastics: require('../assets/badges/brown/gymnastics.png'),
   hockey: require('../assets/badges/brown/hockey.png'),
+  iff: require('../assets/badges/brown/iff.png'),
   impulse: require('../assets/badges/brown/impulse.png'),
   kappa_delta: require('../assets/badges/brown/kappa_delta.png'),
   lacrosse: require('../assets/badges/brown/lacrosse.png'),
   latin_at_brown: require('../assets/badges/brown/latin_at_brown.png'),
+  sailing: require('../assets/badges/brown/sailing.png'),
   soccer: require('../assets/badges/brown/soccer.png'),
   softball: require('../assets/badges/brown/softball.png'),
   tap: require('../assets/badges/brown/tap.png'),
@@ -167,6 +169,10 @@ const _brownBadges = [
         badgeName: 'Brown Baseball',
         badgeImage: _brownBadgeImages.baseball,
       },
+      {
+        badgeName: 'Brown Sailing',
+        badgeImage: _brownBadgeImages.sailing,
+      },
     ],
   },
 
@@ -266,6 +272,10 @@ const _brownBadges = [
         badgeName: 'Impulse',
         badgeImage: _brownBadgeImages.impulse,
       },
+      {
+        badgeName: 'Ivy Film Festival',
+        badgeImage: _brownBadgeImages.iff,
+      },
     ],
   },
   {
diff --git a/src/constants/strings.ts b/src/constants/strings.ts
index 106032b0..94f5552f 100644
--- a/src/constants/strings.ts
+++ b/src/constants/strings.ts
@@ -17,6 +17,7 @@ export const ERROR_DUP_OLD_PWD = 'You may not use a previously used password';
 export const ERROR_EMAIL_IN_USE = 'Email already in use, please try another one';
 export const ERROR_FAILED_LOGIN_INFO = 'Login failed, please try re-entering your login information';
 export const ERROR_FAILED_TO_COMMENT = 'Unable to post comment, refresh and try again!';
+export const ERROR_FAILED_TO_CREATE_CHANNEL = 'Failed to create a channel, Please try again!';
 export const ERROR_FAILED_TO_DELETE_COMMENT = 'Unable to delete comment, refresh and try again!';
 export const ERROR_INVALID_INVITATION_CODE = 'Invitation code invalid, try again or talk to the friend that sent it 😬';
 export const ERROR_INVALID_LOGIN = 'Invalid login, Please login again';