1 files changed, 10 insertions, 14 deletions
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 1d222040..37867151 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -1,11 +1,6 @@
 import AsyncStorage from '@react-native-community/async-storage';
 import {RouteProp} from '@react-navigation/native';
-import {
-  StackNavigationOptions,
-  createStackNavigator,
-  TransitionSpecs,
-} from '@react-navigation/stack';
-import {NavigationContainer} from '@react-navigation/native';
+import {StackNavigationOptions} from '@react-navigation/stack';
 import React, {useEffect, useState} from 'react';
 import {StyleSheet, Text} from 'react-native';
 import {normalize} from 'react-native-elements';
@@ -16,6 +11,8 @@ import {
   BadgeSelection,
   CaptionScreen,
   CategorySelection,
+  ChatListScreen,
+  ChatScreen,
   CreateCustomCategory,
   DiscoverUsers,
   EditProfile,
@@ -24,19 +21,17 @@ import {
   InviteFriendsScreen,
   MomentCommentsScreen,
   MomentUploadPromptScreen,
+  NewChatModal,
   NotificationsScreen,
-  ProfileScreen,
   PrivacyScreen,
+  ProfileScreen,
   RequestContactsAccess,
   SearchScreen,
+  SettingsScreen,
   SocialMediaTaggs,
   SuggestedPeopleScreen,
   SuggestedPeopleUploadPictureScreen,
   SuggestedPeopleWelcomeScreen,
-  SettingsScreen,
-  ChatListScreen,
-  ChatScreen,
-  NewChatModal,
 } from '../../screens';
 import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import {ScreenType} from '../../types';
@@ -58,8 +53,6 @@ type MainStackRouteProps = RouteProp<MainStackParams, 'Profile'>;
 interface MainStackProps {
   route: MainStackRouteProps;
 }
-const RootStack = createStackNavigator();
-const tempStack = createStackNavigator();
 const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
   const {screenType} = route.params;
 
@@ -322,7 +315,10 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
         <MainStack.Screen
           name="Chat"
           component={ChatScreen}
-          options={{headerShown: true}}
+          options={{
+            ...headerBarOptions('black', ''),
+            headerStyle: {height: ChatHeaderHeight},
+          }}
         />
         <MainStack.Screen
           name="NewChatModal"