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

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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/screens/chat/ChatScreen.tsx b/src/screens/chat/ChatScreen.tsx
index baf1e23d..3d791f3c 100644
--- a/src/screens/chat/ChatScreen.tsx
+++ b/src/screens/chat/ChatScreen.tsx
@@ -14,6 +14,7 @@ import UpArrowIcon from '../../assets/icons/up_arrow.svg';
 import ChatHeader from '../../components/messages/ChatHeader';
 import {TAGG_LIGHT_BLUE} from '../../constants';
 import {MainStackParams} from '../../routes';
+import {ScreenType} from '../../types';
 import {isIPhoneX} from '../../utils';
 
 type ChatScreenNavigationProp = StackNavigationProp<MainStackParams, 'Chat'>;
@@ -48,7 +49,7 @@ const ChatScreen: React.FC<ChatScreenProps> = () => {
         // unable to figure out the padding issue, a hacky solution
         {paddingBottom: isIPhoneX() ? tabbarHeight + 20 : tabbarHeight + 50},
       ]}>
-      <ChatHeader />
+      <ChatHeader screenType={ScreenType.Chat} />
       <Chat client={chatClient} style={chatTheme}>
         <Channel
           channel={channel}