diff --git a/app/views/RoomView/Banner.js b/app/views/RoomView/Banner.tsx
similarity index 87%
rename from app/views/RoomView/Banner.js
rename to app/views/RoomView/Banner.tsx
index 860f80b73..606c71ad7 100644
--- a/app/views/RoomView/Banner.js
+++ b/app/views/RoomView/Banner.tsx
@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 import { Text, View } from 'react-native';
-import PropTypes from 'prop-types';
 import { BorderlessButton, ScrollView } from 'react-native-gesture-handler';
 import Modal from 'react-native-modal';
 
@@ -9,8 +8,16 @@ import { CustomIcon } from '../../lib/Icons';
 import { themes } from '../../constants/colors';
 import styles from './styles';
 
+interface IRoomBannerProps {
+	text: string;
+	title: string;
+	theme: string;
+	bannerClosed: boolean;
+	closeBanner(): void;
+}
+
 const Banner = React.memo(
-	({ text, title, theme, bannerClosed, closeBanner }) => {
+	({ text, title, theme, bannerClosed, closeBanner }: IRoomBannerProps) => {
 		const [showModal, openModal] = useState(false);
 
 		const toggleModal = () => openModal(prevState => !prevState);
@@ -22,6 +29,7 @@ const Banner = React.memo(
 						style={[styles.bannerContainer, { backgroundColor: themes[theme].bannerBackground }]}
 						testID='room-view-banner'
 						onPress={toggleModal}>
+						{/* @ts-ignore*/}
 						<Markdown msg={text} theme={theme} numberOfLines={1} style={[styles.bannerText]} preview />
 						<BorderlessButton onPress={closeBanner}>
 							<CustomIcon color={themes[theme].auxiliaryText} name='close' size={20} />
@@ -37,6 +45,7 @@ const Banner = React.memo(
 						<View style={[styles.modalView, { backgroundColor: themes[theme].bannerBackground }]}>
 							<Text style={[styles.bannerModalTitle, { color: themes[theme].auxiliaryText }]}>{title}</Text>
 							<ScrollView style={styles.modalScrollView}>
+								{/* @ts-ignore*/}
 								<Markdown msg={text} theme={theme} />
 							</ScrollView>
 						</View>
@@ -51,12 +60,4 @@ const Banner = React.memo(
 		prevProps.text === nextProps.text && prevProps.theme === nextProps.theme && prevProps.bannerClosed === nextProps.bannerClosed
 );
 
-Banner.propTypes = {
-	text: PropTypes.string,
-	title: PropTypes.string,
-	theme: PropTypes.string,
-	bannerClosed: PropTypes.bool,
-	closeBanner: PropTypes.func
-};
-
 export default Banner;
diff --git a/app/views/RoomView/EmptyRoom.js b/app/views/RoomView/EmptyRoom.tsx
similarity index 61%
rename from app/views/RoomView/EmptyRoom.js
rename to app/views/RoomView/EmptyRoom.tsx
index 1a9a248f2..69b3a3a04 100644
--- a/app/views/RoomView/EmptyRoom.js
+++ b/app/views/RoomView/EmptyRoom.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { ImageBackground, StyleSheet } from 'react-native';
-import PropTypes from 'prop-types';
 
 const styles = StyleSheet.create({
 	image: {
@@ -10,17 +9,18 @@ const styles = StyleSheet.create({
 	}
 });
 
-const EmptyRoom = React.memo(({ length, mounted, theme, rid }) => {
+interface IEmptyRoomProps {
+	length: number;
+	mounted: boolean;
+	theme: string;
+	rid: string;
+}
+
+const EmptyRoom = React.memo(({ length, mounted, theme, rid }: IEmptyRoomProps) => {
 	if ((length === 0 && mounted) || !rid) {
 		return <ImageBackground source={{ uri: `message_empty_${theme}` }} style={styles.image} />;
 	}
 	return null;
 });
 
-EmptyRoom.propTypes = {
-	length: PropTypes.number.isRequired,
-	mounted: PropTypes.bool,
-	theme: PropTypes.string,
-	rid: PropTypes.string
-};
 export default EmptyRoom;
diff --git a/app/views/RoomView/styles.js b/app/views/RoomView/styles.ts
similarity index 100%
rename from app/views/RoomView/styles.js
rename to app/views/RoomView/styles.ts