Merge branch 'master' into tma784-style-message-input

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

3 files changed, 16 insertions, 0 deletions

diff --git a/src/constants/api.ts b/src/constants/api.ts
index 43294386..cb45b238 100644
--- a/src/constants/api.ts
+++ b/src/constants/api.ts
@@ -61,6 +61,10 @@ export const UPDATE_BADGES_ENDPOINT: string =
 // Register as FCM device
 export const FCM_ENDPOINT: string = API_URL + 'fcm/';
 
+// Retrieve Stream Chat token
+export const CHAT_ENDPOINT: string = API_URL + 'chat/';
+export const CHAT_TOKEN_ENDPOINT: string = CHAT_ENDPOINT + 'get_token/';
+
 // Register Social Link (Non-integrated)
 export const LINK_SNAPCHAT_ENDPOINT: string = API_URL + 'link-sc/';
 export const LINK_TIKTOK_ENDPOINT: string = API_URL + 'link-tt/';
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 300ceb90..bdb94fba 100644
--- a/src/constants/strings.ts
+++ b/src/constants/strings.ts
@@ -9,6 +9,7 @@ export const ERROR_AUTHENTICATION = 'An error occurred during authentication. Pl
 export const ERROR_BADGES_EXCEED_LIMIT = 'You can\'t have more than 5 badges!';
 export const ERROR_CATEGORY_CREATION = 'There was a problem creating your categories. Please refresh and try again.';
 export const ERROR_CATEGORY_UPDATE = 'There was a problem updating your categories. Please refresh and try again';
+export const ERROR_CHAT_CONNECTION = `Unable to establish chat connection`;
 export const ERROR_DELETE_CATEGORY = 'There was a problem while deleting category. Please try again';
 export const ERROR_DELETE_MOMENT = 'Unable to delete moment, please try again later!';
 export const ERROR_DELETED_OBJECT = 'Oh sad! Looks like the comment / moment was deleted by the user';
@@ -44,6 +45,7 @@ export const ERROR_SOMETHING_WENT_WRONG = 'Oh dear, don’t worry someone will b
 export const ERROR_SOMETHING_WENT_WRONG_REFRESH = "Ha, looks like this one's on us, please refresh and try again";
 export const ERROR_SOMETHING_WENT_WRONG_RELOAD = "You broke it, Just kidding! we don't know what happened... Please reload the app and try again";
 export const ERROR_TWILIO_SERVER_ERROR = 'mhm, looks like that is an invalid phone number or our servers are down, please try again in a few mins';
+export const ERROR_UNABLE_CONNECT_CHAT = 'Unable to connect chat';
 export const ERROR_UNABLE_TO_FIND_PROFILE = 'We were unable to find this profile. Please check username and try again';
 export const ERROR_UNABLE_TO_VIEW_PROFILE = 'Unable to view this profile';
 export const ERROR_UPLOAD = 'An error occurred while uploading. Please try again!';