3 files changed, 40 insertions, 3 deletions
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index deaefb52..2fec8ea3 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -66,13 +66,16 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
         style={styles.rightButtonContainer}
         onPress={async () => {
           if (editing) {
-            updateBadgesService(selectedBadges);
+            updateBadgesService(selectedBadges, university);
             navigation.navigate('UpdateSPPicture', {
               editing: true,
             });
           } else {
             if (selectedBadges.length !== 0) {
-              const success = await addBadgesService(selectedBadges);
+              const success = await addBadgesService(
+                selectedBadges,
+                university,
+              );
               if (success) {
                 dispatch(suggestedPeopleBadgesFinished());
                 navigation.navigate('SuggestedPeople');
diff --git a/src/screens/chat/ChatScreen.tsx b/src/screens/chat/ChatScreen.tsx
index 656c1c47..57f2232e 100644
--- a/src/screens/chat/ChatScreen.tsx
+++ b/src/screens/chat/ChatScreen.tsx
@@ -16,7 +16,9 @@ import {ChatContext} from '../../App';
 import {
   ChatHeader,
   ChatInput,
+  DateHeader,
   MessageAvatar,
+  MessageFooter,
   TabsGradient,
   TypingIndicator,
 } from '../../components';
@@ -37,6 +39,9 @@ const ChatScreen: React.FC<ChatScreenProps> = () => {
   const {setTopInset} = useAttachmentPickerContext();
   const insets = useSafeAreaInsets();
   const chatTheme: DeepPartial<Theme> = {
+    colors: {
+      accent_blue: '#6EE7E7',
+    },
     messageList: {
       container: {
         backgroundColor: 'white',
@@ -70,6 +75,24 @@ const ChatScreen: React.FC<ChatScreenProps> = () => {
         flexDirection: 'row',
       },
       content: {
+        deletedContainer: {},
+        deletedContainerInner: {
+          borderColor: 'transparent',
+          borderBottomLeftRadius: 10,
+          borderTopLeftRadius: 10,
+          borderBottomRightRadius: 10,
+          borderTopRightRadius: 10,
+        },
+        deletedMetaText: {
+          paddingHorizontal: 10,
+        },
+        deletedText: {
+          em: {
+            fontSize: 15,
+            fontStyle: 'italic',
+            fontWeight: '400',
+          },
+        },
         metaContainer: {
           marginLeft: 5,
         },
@@ -123,6 +146,10 @@ const ChatScreen: React.FC<ChatScreenProps> = () => {
             copyMessage,
             deleteMessage,
           ]}
+          InlineDateSeparator={DateHeader}
+          StickyHeader={() => null}
+          ScrollToBottomButton={() => null}
+          MessageFooter={MessageFooter}
           TypingIndicator={TypingIndicator}
           myMessageTheme={loggedInUsersMessageTheme}
           MessageAvatar={MessageAvatar}>
diff --git a/src/screens/profile/ProfileScreen.tsx b/src/screens/profile/ProfileScreen.tsx
index 6d9ef020..3dd142e1 100644
--- a/src/screens/profile/ProfileScreen.tsx
+++ b/src/screens/profile/ProfileScreen.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import {StatusBar} from 'react-native';
 import {Content, TabsGradient} from '../../components';
 import {RouteProp} from '@react-navigation/native';
 import {MainStackParams} from '../../routes/';
+import {visitedUserProfile} from '../../services';
 
 type ProfileScreenRouteProps = RouteProp<MainStackParams, 'Profile'>;
 
@@ -14,6 +15,12 @@ const ProfileScreen: React.FC<ProfileOnboardingProps> = ({route}) => {
   const {screenType} = route.params;
   let {userXId} = route.params;
 
+  useEffect(() => {
+    if (userXId) {
+      visitedUserProfile(userXId);
+    }
+  });
+
   return (
     <>
       <StatusBar barStyle="dark-content" />