2 files changed, 6 insertions, 3 deletions
diff --git a/src/screens/chat/ChatListScreen.tsx b/src/screens/chat/ChatListScreen.tsx
index daea9984..61a16c93 100644
--- a/src/screens/chat/ChatListScreen.tsx
+++ b/src/screens/chat/ChatListScreen.tsx
@@ -1,4 +1,6 @@
 import AsyncStorage from '@react-native-community/async-storage';
+import type {DeepPartial, Theme} from 'stream-chat-react-native';
+import {useBottomTabBarHeight} from '@react-navigation/bottom-tabs';
 import {StackNavigationProp} from '@react-navigation/stack';
 import React, {useContext, useEffect, useMemo, useState} from 'react';
 import {SafeAreaView, StatusBar, StyleSheet, View} from 'react-native';
@@ -30,8 +32,8 @@ interface ChatListScreenProps {
 /*
  * Screen that displays all of the user's active conversations.
  */
-const ChatListScreen: React.FC<ChatListScreenProps> = ({navigation}) => {
-  const {chatClient, setChannel} = useContext(ChatContext);
+const ChatListScreen: React.FC<ChatListScreenProps> = () => {
+  const {chatClient} = useContext(ChatContext);
   const [modalVisible, setChatModalVisible] = useState(false);
 
   const [clientReady, setClientReady] = useState(false);
diff --git a/src/screens/chat/ChatScreen.tsx b/src/screens/chat/ChatScreen.tsx
index 59c53c99..feb95b83 100644
--- a/src/screens/chat/ChatScreen.tsx
+++ b/src/screens/chat/ChatScreen.tsx
@@ -10,6 +10,7 @@ import {
   MessageList,
 } from 'stream-chat-react-native';
 import {ChatContext} from '../../App';
+import {ChatInput} from '../../components';
 import ChatHeader from '../../components/messages/ChatHeader';
 import {MainStackParams} from '../../routes';
 import {isIPhoneX} from '../../utils';
@@ -36,7 +37,7 @@ const ChatScreen: React.FC<ChatScreenProps> = () => {
       <Chat client={chatClient}>
         <Channel channel={channel} keyboardVerticalOffset={0}>
           <MessageList onThreadSelect={() => {}} />
-          <MessageInput />
+          <MessageInput Input={ChatInput} />
         </Channel>
       </Chat>
     </SafeAreaView>