minor tweak

app/containers/MessageActions/index.tsx

@@ -15,15 +15,11 @@ import { showConfirmationAlert } from '../../utils/info';
 import { useActionSheet } from '../ActionSheet';
 import Header, { HEADER_HEIGHT } from './Header';
 import events from '../../utils/log/events';
+import { IRoom } from '../../definitions/IRoom';
 
 interface IMessageActions {
-	room: {
-		rid: string | number;
-		autoTranslateLanguage: any;
-		autoTranslate: any;
-		reactWhenReadOnly: any;
-	};
-	tmid: string;
+	room: IRoom;
+	tmid?: string;
 	user: {
 		id: string | number;
 	};

app/containers/TextInput.tsx

@@ -69,11 +69,6 @@ interface IRCTextInputProps extends TextInputProps {
 }
 
 export default class RCTextInput extends React.PureComponent<IRCTextInputProps, any> {
-	static defaultProps = {
-		error: {},
-		theme: 'light'
-	};
-
 	state = {
 		showPassword: false
 	};

app/definitions/IMention.ts

@@ -0,0 +1,6 @@
+export interface IMention {
+	_id: string;
+	name: string;
+	username: string;
+	type: string;
+}

app/definitions/IMessage.ts

@@ -1,3 +1,44 @@
-export interface IMessage {
-	msg: string;
+import Model from '@nozbe/watermelondb/Model';
+
+import { ISubscriptions } from './ISubscriptions';
+
+export interface IMessage extends ISubscriptions {
+	id: string;
+	rid: string;
+	ts: number;
+	u: string;
+	alias: string;
+	parse_urls: string;
+	_updated_at: number;
+	msg?: string;
+	t?: string;
+	groupable?: boolean;
+	avatar?: string;
+	emoji?: string;
+	attachments?: string;
+	urls?: string;
+	status?: number;
+	pinned?: boolean;
+	starred?: boolean;
+	edited_by?: string;
+	reactions?: string;
+	role?: string;
+	drid?: string;
+	dcount?: number;
+	dlm?: number;
+	tmid?: string;
+	tcount?: number;
+	tlm?: number;
+	replies?: string;
+	mentions?: string;
+	channels?: string;
+	auto_translate?: boolean;
+	translations?: string;
+	tmsg?: string;
+	blocks?: string;
+	e2e?: string;
+	tshow?: boolean;
+	md?: string;
 }
+
+export type TMessageModel = IMessage & Model;

app/definitions/IReaction.ts

@@ -0,0 +1,5 @@
+export interface IReaction {
+	_id: string;
+	emoji: string;
+	usernames: string[];
+}

app/definitions/IRoom.ts

@@ -1,14 +1,18 @@
+import Model from '@nozbe/watermelondb/Model';
+
 import { IRocketChatRecord } from './IRocketChatRecord';
+import { ISubscriptions } from './ISubscriptions';
 
 export enum RoomType {
 	GROUP = 'p',
 	DIRECT = 'd',
 	CHANNEL = 'c',
 	OMNICHANNEL = 'l',
-	THREAD = 'thread'
+	THREAD = 'thread',
+	E2E_MESSAGE_TYPE = 'e2e'
 }
 
-export interface IRoom extends IRocketChatRecord {
+export interface IRoom extends IRocketChatRecord, ISubscriptions {
 	rid: string;
 	t: RoomType;
 	name: string;
@@ -20,8 +24,10 @@ export interface IRoom extends IRocketChatRecord {
 	teamId?: string;
 	encrypted?: boolean;
 	visitor?: boolean;
-	autoTranslateLanguage?: boolean;
-	autoTranslate?: boolean;
-	observe?: Function;
-	usedCannedResponse: string;
+	usedCannedResponse?: string;
+	bannerClosed: boolean;
+	lastOpen?: Date;
+	draftMessage?: string;
 }
+
+export type TRoomModel = IRoom & Model;

app/definitions/ISubscriptions.ts

@@ -0,0 +1,33 @@
+import Model from '@nozbe/watermelondb/Model';
+
+export interface ISubscriptions {
+	_id: string;
+	name: string;
+	fname: string;
+	rid: string;
+	unread: number;
+	tunread: string;
+	tunreadUser: string;
+	tunreadGroup: string;
+	joinCodeRequired: boolean;
+	alert: boolean;
+	userMentions: object;
+	ls: Date;
+	jitsiTimeout: number;
+	ignored: any;
+	announcement: string;
+	sysMes: string;
+	archived: string;
+	broadcast: string;
+	autoTranslateLanguage: string;
+	autoTranslate: boolean;
+	reactWhenReadOnly: boolean;
+	f: boolean;
+	ro: boolean;
+	blocked: boolean;
+	blocker: boolean;
+	muted: boolean;
+	roles: string;
+}
+
+export type TSubscriptionsModel = ISubscriptions & Model;

app/definitions/IThread.ts

@@ -0,0 +1,45 @@
+import Model from '@nozbe/watermelondb/Model';
+
+import { IAttachment } from './IAttachment';
+import { IMention } from './IMention';
+import { IReaction } from './IReaction';
+import { RoomType } from './IRoom';
+import { IUrl } from './IUrl';
+
+export interface IThread {
+	id: string;
+	msg: string;
+	t: RoomType;
+	rid: string;
+	_updatedAt: Date;
+	ts: Date;
+	u: { _id: string; username: string; name: string };
+	alias: any;
+	parseUrls: any;
+	groupable: boolean;
+	avatar: string;
+	emoji: any;
+	attachments: IAttachment[];
+	urls: IUrl[];
+	status: number;
+	pinned: boolean;
+	starred: boolean;
+	editedBy: { username: string };
+	reactions: IReaction[];
+	role: string;
+	drid: string;
+	dcount: number;
+	dlm: number;
+	tmid: string;
+	tcount: number;
+	tlm: Date;
+	replies: string[];
+	mentions: IMention[];
+	channels: [];
+	unread: boolean;
+	autoTranslate: boolean;
+	translations: any;
+	e2e: any;
+}
+
+export type TThreadModel = IThread & Model;

app/definitions/IUrl.ts

@@ -0,0 +1,6 @@
+export interface IUrl {
+	title: string;
+	description: string;
+	image: string;
+	url: string;
+}

app/stacks/MasterDetailStack/types.ts

@@ -32,6 +32,7 @@ export type ModalStackParamList = {
 		rid: string;
 		t: RoomType;
 		joined: boolean;
+		showCloseModal?: boolean;
 	};
 	RoomInfoView: {
 		room: IRoom;
@@ -61,6 +62,9 @@ export type ModalStackParamList = {
 		t: RoomType;
 		encrypted?: boolean;
 		showCloseModal?: boolean;
+		room?: IRoom;
+		member?: any;
+		joined?: boolean;
 	};
 	SelectedUsersView: {
 		maxUsers: number;

app/stacks/types.ts

@@ -6,9 +6,12 @@ import { IOptionsField } from '../views/NotificationPreferencesView/options';
 import { IServer } from '../definitions/IServer';
 import { IAttachment } from '../definitions/IAttachment';
 import { IMessage } from '../definitions/IMessage';
-import { IRoom, RoomType } from '../definitions/IRoom';
+import { IRoom, TRoomModel, RoomType } from '../definitions/IRoom';
+import { ModalStackParamList } from './MasterDetailStack/types';
 
 export type ChatsStackParamList = {
+	ModalStackNavigator: NavigatorScreenParams<ModalStackParamList>;
+	E2ESaveYourPasswordStackNavigator: NavigatorScreenParams<E2ESaveYourPasswordStackParamList>;
 	RoomsListView: undefined;
 	RoomView: {
 		rid: string;
@@ -18,10 +21,11 @@ export type ChatsStackParamList = {
 		name?: string;
 		fname?: string;
 		prid?: string;
-		room: IRoom;
+		room?: TRoomModel;
 		jumpToMessageId?: string;
 		jumpToThreadId?: string;
 		roomUserId?: string;
+		usedCannedResponse?: boolean;
 	};
 	RoomActionsView: {
 		room: IRoom;
@@ -45,6 +49,7 @@ export type ChatsStackParamList = {
 		member: any;
 		rid: string;
 		t: RoomType;
+		showCloseModal?: boolean;
 	};
 	RoomInfoEditView: {
 		rid: string;
@@ -79,7 +84,7 @@ export type ChatsStackParamList = {
 	};
 	AutoTranslateView: {
 		rid: string;
-		room: IRoom;
+		room: TRoomModel;
 	};
 	DirectoryView: undefined;
 	NotificationPrefView: {
@@ -143,6 +148,9 @@ export type ChatsStackParamList = {
 		};
 		room: IRoom;
 	};
+	AttachmentView: {
+		attachment: IAttachment;
+	};
 };
 
 export type ProfileStackParamList = {

app/views/MessagesView/index.tsx

@@ -20,7 +20,7 @@ import SafeAreaView from '../../containers/SafeAreaView';
 import getThreadName from '../../lib/methods/getThreadName';
 import styles from './styles';
 import { ChatsStackParamList } from '../../stacks/types';
-import { IRoom, RoomType } from '../../definitions/IRoom';
+import { IRoom, RoomType, TRoomModel } from '../../definitions/IRoom';
 
 interface IMessagesViewProps {
 	user: {
@@ -78,7 +78,7 @@ interface IParams {
 	name?: string;
 	fname?: string;
 	prid?: string;
-	room: IRoom;
+	room: TRoomModel;
 	jumpToMessageId?: string;
 	jumpToThreadId?: string;
 	roomUserId?: string;

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;

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;

app/views/RoomView/JoinCode.tsx

@@ -1,5 +1,4 @@
 import React, { forwardRef, useImperativeHandle, useState } from 'react';
-import PropTypes from 'prop-types';
 import { InteractionManager, StyleSheet, Text, View } from 'react-native';
 import Modal from 'react-native-modal';
 import { connect } from 'react-redux';
@@ -41,10 +40,18 @@ const styles = StyleSheet.create({
 	}
 });
 
+interface IRoomJoinCodeProps {
+	rid: string;
+	t: string;
+	onJoin: Function;
+	isMasterDetail: boolean;
+	theme: string;
+}
+
 const JoinCode = React.memo(
-	forwardRef(({ rid, t, onJoin, isMasterDetail, theme }, ref) => {
+	forwardRef(({ rid, t, onJoin, isMasterDetail, theme }: IRoomJoinCodeProps, ref) => {
 		const [visible, setVisible] = useState(false);
-		const [error, setError] = useState(false);
+		const [error, setError] = useState<any>(false);
 		const [code, setCode] = useState('');
 
 		const show = () => setVisible(true);
@@ -64,7 +71,7 @@ const JoinCode = React.memo(
 		useImperativeHandle(ref, () => ({ show }));
 
 		return (
-			<Modal transparent avoidKeyboard useNativeDriver isVisible={visible} hideModalContentWhileAnimating>
+			<Modal avoidKeyboard useNativeDriver isVisible={visible} hideModalContentWhileAnimating>
 				<View style={styles.container} testID='join-code'>
 					<View
 						style={[
@@ -76,7 +83,7 @@ const JoinCode = React.memo(
 						<TextInput
 							value={code}
 							theme={theme}
-							inputRef={e => InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())}
+							inputRef={(e: any) => InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())}
 							returnKeyType='send'
 							autoCapitalize='none'
 							onChangeText={setCode}
@@ -111,15 +118,8 @@ const JoinCode = React.memo(
 		);
 	})
 );
-JoinCode.propTypes = {
-	rid: PropTypes.string,
-	t: PropTypes.string,
-	onJoin: PropTypes.func,
-	isMasterDetail: PropTypes.bool,
-	theme: PropTypes.string
-};
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state: any) => ({
 	isMasterDetail: state.app.isMasterDetail
 });
 export default connect(mapStateToProps, null, null, { forwardRef: true })(JoinCode);

app/views/RoomView/LeftButtons.tsx

@@ -1,10 +1,10 @@
 import React, { useCallback } from 'react';
-import PropTypes from 'prop-types';
 import { StyleSheet } from 'react-native';
-import { HeaderBackButton } from '@react-navigation/stack';
+import { HeaderBackButton, StackNavigationProp } from '@react-navigation/stack';
 
 import { themes } from '../../constants/colors';
 import Avatar from '../../containers/Avatar';
+import { ChatsStackParamList } from '../../stacks/types';
 
 const styles = StyleSheet.create({
 	avatar: {
@@ -13,10 +13,36 @@ const styles = StyleSheet.create({
 	}
 });
 
+interface IRoomLeftButtonsProps {
+	tmid?: string;
+	unreadsCount: number & string;
+	navigation: StackNavigationProp<ChatsStackParamList>;
+	baseUrl: string;
+	userId: string;
+	token: string;
+	title: string;
+	t: string;
+	theme: string;
+	goRoomActionsView: Function;
+	isMasterDetail: boolean;
+}
+
 const LeftButtons = React.memo(
-	({ tmid, unreadsCount, navigation, baseUrl, userId, token, title, t, theme, goRoomActionsView, isMasterDetail }) => {
+	({
+		tmid,
+		unreadsCount,
+		navigation,
+		baseUrl,
+		userId,
+		token,
+		title,
+		t,
+		theme,
+		goRoomActionsView,
+		isMasterDetail
+	}: IRoomLeftButtonsProps) => {
 		if (!isMasterDetail || tmid) {
-			const onPress = useCallback(() => navigation.goBack());
+			const onPress = useCallback(() => navigation.goBack(), []);
 			const label = unreadsCount > 99 ? '+99' : unreadsCount || ' ';
 			const labelLength = label.length ? label.length : 1;
 			const marginLeft = -2 * labelLength;
@@ -39,18 +65,4 @@ const LeftButtons = React.memo(
 	}
 );
 
-LeftButtons.propTypes = {
-	tmid: PropTypes.string,
-	unreadsCount: PropTypes.number,
-	navigation: PropTypes.object,
-	baseUrl: PropTypes.string,
-	userId: PropTypes.string,
-	token: PropTypes.string,
-	title: PropTypes.string,
-	t: PropTypes.string,
-	theme: PropTypes.string,
-	goRoomActionsView: PropTypes.func,
-	isMasterDetail: PropTypes.bool
-};
-
 export default LeftButtons;

app/views/RoomView/List/List.tsx

@@ -1,10 +1,11 @@
 import React from 'react';
-import { FlatList, StyleSheet } from 'react-native';
+import { FlatList, FlatListProps, StyleSheet } from 'react-native';
 import Animated from 'react-native-reanimated';
-import PropTypes from 'prop-types';
 
 import { isIOS } from '../../../utils/deviceInfo';
 import scrollPersistTaps from '../../../utils/scrollPersistTaps';
+import { IRoomItem } from '../index';
+import { IMessage } from '../../../definitions/IMessage';
 
 const AnimatedFlatList = Animated.createAnimatedComponent(FlatList);
 
@@ -17,11 +18,16 @@ const styles = StyleSheet.create({
 	}
 });
 
-const List = ({ listRef, ...props }) => (
+interface IRoomListProps extends FlatListProps<IRoomItem | IMessage> {
+	listRef: React.Ref<FlatList>;
+}
+
+const List = ({ listRef, ...props }: IRoomListProps): JSX.Element => (
 	<AnimatedFlatList
 		testID='room-view-messages'
 		ref={listRef}
-		keyExtractor={item => item.id}
+		// @ts-ignore
+		keyExtractor={(item: IRoomItem) => item.id}
 		contentContainerStyle={styles.contentContainer}
 		style={styles.list}
 		inverted
@@ -35,8 +41,4 @@ const List = ({ listRef, ...props }) => (
 	/>
 );
 
-List.propTypes = {
-	listRef: PropTypes.object
-};
-
 export default List;

app/views/RoomView/List/NavBottomFAB.tsx

@@ -1,7 +1,6 @@
 import React, { useCallback, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
-import PropTypes from 'prop-types';
-import Animated, { call, cond, greaterOrEq, useCode } from 'react-native-reanimated';
+import Animated, { call, cond, greaterOrEq, useCode, Value } from 'react-native-reanimated';
 
 import { themes } from '../../../constants/colors';
 import { CustomIcon } from '../../../lib/Icons';
@@ -30,11 +29,17 @@ const styles = StyleSheet.create({
 	}
 });
 
-const NavBottomFAB = ({ y, onPress, isThread }) => {
+interface IRoomNavBottomFAB {
+	y: Value<number>;
+	onPress: Function;
+	isThread: boolean;
+}
+
+const NavBottomFAB = ({ y, onPress, isThread }: IRoomNavBottomFAB) => {
 	const { theme } = useTheme();
 	const [show, setShow] = useState(false);
-	const handleOnPress = useCallback(() => onPress());
-	const toggle = v => setShow(v);
+	const handleOnPress = useCallback(() => onPress(), []);
+	const toggle = (v: boolean) => setShow(v);
 
 	useCode(
 		() =>
@@ -65,10 +70,4 @@ const NavBottomFAB = ({ y, onPress, isThread }) => {
 	);
 };
 
-NavBottomFAB.propTypes = {
-	y: Animated.Value,
-	onPress: PropTypes.func,
-	isThread: PropTypes.bool
-};
-
 export default NavBottomFAB;

app/views/RoomView/List/index.tsx

@@ -1,10 +1,11 @@
 import React from 'react';
-import { RefreshControl } from 'react-native';
-import PropTypes from 'prop-types';
+import { FlatList, NativeScrollEvent, NativeSyntheticEvent, RefreshControl, ViewToken } from 'react-native';
 import { Q } from '@nozbe/watermelondb';
 import moment from 'moment';
 import { dequal } from 'dequal';
 import { Value, event } from 'react-native-reanimated';
+import { Observable, Subscription } from 'rxjs';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import database from '../../../lib/database';
 import RocketChat from '../../../lib/rocketchat';
@@ -17,10 +18,14 @@ import debounce from '../../../utils/debounce';
 import { compareServerVersion, methods } from '../../../lib/utils';
 import List from './List';
 import NavBottomFAB from './NavBottomFAB';
+import { ChatsStackParamList } from '../../../stacks/types';
+import { IRoomItem } from '../index';
+import { IThread } from '../../../definitions/IThread';
+import { IMessage, TMessageModel } from '../../../definitions/IMessage';
 
 const QUERY_SIZE = 50;
 
-const onScroll = ({ y }) =>
+const onScroll = ({ y }: { y: Value<number> }) =>
 	event(
 		[
 			{
@@ -32,23 +37,43 @@ const onScroll = ({ y }) =>
 		{ useNativeDriver: true }
 	);
 
-class ListContainer extends React.Component {
-	static propTypes = {
-		renderRow: PropTypes.func,
-		rid: PropTypes.string,
-		tmid: PropTypes.string,
-		theme: PropTypes.string,
-		loading: PropTypes.bool,
-		listRef: PropTypes.func,
-		hideSystemMessages: PropTypes.array,
-		tunread: PropTypes.array,
-		ignored: PropTypes.array,
-		navigation: PropTypes.object,
-		showMessageInMainThread: PropTypes.bool,
-		serverVersion: PropTypes.string
-	};
+interface IRoomListContainerProps {
+	renderRow: Function;
+	rid: string;
+	tmid?: string;
+	theme: string;
+	loading: boolean;
+	listRef: React.RefObject<FlatList>;
+	hideSystemMessages: any[];
+	tunread: string;
+	ignored: [];
+	navigation: StackNavigationProp<ChatsStackParamList>;
+	showMessageInMainThread: boolean;
+	serverVersion: string;
+}
 
-	constructor(props) {
+interface IRoomListContainerState {
+	messages: TMessageModel[];
+	refreshing: boolean;
+	highlightedMessage: string | null;
+}
+
+class ListContainer extends React.Component<IRoomListContainerProps, IRoomListContainerState> {
+	private count: number;
+	private mounted: boolean;
+	private animated: boolean;
+	private jumping: boolean;
+	private y: Value<number>;
+	private onScroll: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
+	private unsubscribeFocus: () => void;
+	private viewabilityConfig: { itemVisiblePercentThreshold: number };
+	private highlightedMessageTimeout?: ReturnType<typeof setTimeout> | false;
+	private thread?: IThread;
+	private messagesObservable?: Observable<TMessageModel[]>;
+	private messagesSubscription?: Subscription;
+	private viewableItems?: ViewToken[];
+
+	constructor(props: IRoomListContainerProps) {
 		super(props);
 		console.time(`${this.constructor.name} init`);
 		console.time(`${this.constructor.name} mount`);
@@ -78,7 +103,7 @@ class ListContainer extends React.Component {
 		console.timeEnd(`${this.constructor.name} mount`);
 	}
 
-	shouldComponentUpdate(nextProps, nextState) {
+	shouldComponentUpdate(nextProps: IRoomListContainerProps, nextState: IRoomListContainerState) {
 		const { refreshing, highlightedMessage } = this.state;
 		const { hideSystemMessages, theme, tunread, ignored, loading } = this.props;
 		if (theme !== nextProps.theme) {
@@ -105,7 +130,7 @@ class ListContainer extends React.Component {
 		return false;
 	}
 
-	componentDidUpdate(prevProps) {
+	componentDidUpdate(prevProps: IRoomListContainerProps) {
 		const { hideSystemMessages } = this.props;
 		if (!dequal(hideSystemMessages, prevProps.hideSystemMessages)) {
 			this.reload();
@@ -114,9 +139,6 @@ class ListContainer extends React.Component {
 
 	componentWillUnmount() {
 		this.unsubscribeMessages();
-		if (this.onEndReached && this.onEndReached.stop) {
-			this.onEndReached.stop();
-		}
 		if (this.unsubscribeFocus) {
 			this.unsubscribeFocus();
 		}
@@ -160,6 +182,7 @@ class ListContainer extends React.Component {
 				Q.experimentalTake(this.count)
 			];
 			if (!showMessageInMainThread) {
+				// @ts-ignore
 				whereClause.push(Q.or(Q.where('tmid', null), Q.where('tshow', Q.eq(true))));
 			}
 			this.messagesObservable = db.collections
@@ -170,8 +193,9 @@ class ListContainer extends React.Component {
 
 		if (rid) {
 			this.unsubscribeMessages();
-			this.messagesSubscription = this.messagesObservable.subscribe(messages => {
+			this.messagesSubscription = this.messagesObservable?.subscribe((messages: TMessageModel[]) => {
 				if (tmid && this.thread) {
+					// @ts-ignore
 					messages = [...messages, this.thread];
 				}
 
@@ -180,12 +204,13 @@ class ListContainer extends React.Component {
 				 * hide system message is enabled
 				 */
 				if (compareServerVersion(serverVersion, '3.16.0', methods.lowerThan) || hideSystemMessages.length) {
-					messages = messages.filter(m => !m.t || !hideSystemMessages?.includes(m.t));
+					messages = messages.filter((m: TMessageModel) => !m.t || !hideSystemMessages?.includes(m.t));
 				}
 
 				if (this.mounted) {
 					this.setState({ messages }, () => this.update());
 				} else {
+					// @ts-ignore
 					this.state.messages = messages;
 				}
 				// TODO: move it away from here
@@ -254,21 +279,21 @@ class ListContainer extends React.Component {
 		return null;
 	};
 
-	handleScrollToIndexFailed = params => {
+	handleScrollToIndexFailed = (params: { highestMeasuredFrameIndex: number }) => {
 		const { listRef } = this.props;
-		listRef.current.getNode().scrollToIndex({ index: params.highestMeasuredFrameIndex, animated: false });
+		listRef.current?.scrollToIndex({ index: params.highestMeasuredFrameIndex, animated: false });
 	};
 
-	jumpToMessage = messageId =>
+	jumpToMessage = (messageId: string): Promise<void> =>
 		new Promise(async resolve => {
 			this.jumping = true;
 			const { messages } = this.state;
 			const { listRef } = this.props;
-			const index = messages.findIndex(item => item.id === messageId);
+			const index = messages.findIndex((item: TMessageModel) => item.id === messageId);
 			if (index > -1) {
-				listRef.current.getNode().scrollToIndex({ index, viewPosition: 0.5, viewOffset: 100 });
+				listRef.current?.scrollToIndex({ index, viewPosition: 0.5, viewOffset: 100 });
 				await new Promise(res => setTimeout(res, 300));
-				if (!this.viewableItems.map(vi => vi.key).includes(messageId)) {
+				if (!this.viewableItems?.map((vi: { key: string }) => vi.key).includes(messageId)) {
 					if (!this.jumping) {
 						return resolve();
 					}
@@ -282,7 +307,7 @@ class ListContainer extends React.Component {
 				}, 10000);
 				await setTimeout(() => resolve(), 300);
 			} else {
-				listRef.current.getNode().scrollToIndex({ index: messages.length - 1, animated: false });
+				listRef.current?.scrollToIndex({ index: messages.length - 1, animated: false });
 				if (!this.jumping) {
 					return resolve();
 				}
@@ -297,7 +322,7 @@ class ListContainer extends React.Component {
 
 	jumpToBottom = () => {
 		const { listRef } = this.props;
-		listRef.current.getNode().scrollToOffset({ offset: -100 });
+		listRef.current?.scrollToOffset({ offset: -100 });
 	};
 
 	renderFooter = () => {
@@ -308,13 +333,13 @@ class ListContainer extends React.Component {
 		return null;
 	};
 
-	renderItem = ({ item, index }) => {
+	renderItem = ({ item, index }: { item: IRoomItem | IMessage; index: number }) => {
 		const { messages, highlightedMessage } = this.state;
 		const { renderRow } = this.props;
 		return renderRow(item, messages[index + 1], highlightedMessage);
 	};
 
-	onViewableItemsChanged = ({ viewableItems }) => {
+	onViewableItemsChanged = ({ viewableItems }: { viewableItems: ViewToken[] }) => {
 		this.viewableItems = viewableItems;
 	};
 

app/views/RoomView/LoadMore/LoadMore.stories.tsx

@@ -28,7 +28,7 @@ stories.add('basic', () => (
 	</>
 ));
 
-const ThemeStory = ({ theme }) => (
+const ThemeStory = ({ theme }: { theme: string }) => (
 	<ThemeContext.Provider value={{ theme }}>
 		<ScrollView style={{ backgroundColor: themes[theme].backgroundColor }}>
 			<LoadMore load={load} type={MESSAGE_TYPE_LOAD_PREVIOUS_CHUNK} />

app/views/RoomView/LoadMore/index.tsx

@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { ActivityIndicator, StyleSheet, Text } from 'react-native';
-import PropTypes from 'prop-types';
 
 import { themes } from '../../../constants/colors';
 import { MESSAGE_TYPE_LOAD_NEXT_CHUNK, MESSAGE_TYPE_LOAD_PREVIOUS_CHUNK } from '../../../constants/messageTypeLoad';
@@ -21,7 +20,13 @@ const styles = StyleSheet.create({
 	}
 });
 
-const LoadMore = ({ load, type, runOnRender }) => {
+interface IRoomLoadMoreProps {
+	load(): any;
+	type?: string;
+	runOnRender?: boolean;
+}
+
+const LoadMore = ({ load, type, runOnRender }: IRoomLoadMoreProps) => {
 	const { theme } = useTheme();
 	const [loading, setLoading] = useState(false);
 
@@ -62,10 +67,4 @@ const LoadMore = ({ load, type, runOnRender }) => {
 	);
 };
 
-LoadMore.propTypes = {
-	load: PropTypes.func,
-	type: PropTypes.string,
-	runOnRender: PropTypes.bool
-};
-
 export default LoadMore;

app/views/RoomView/ReactionPicker.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { View } from 'react-native';
 import { connect } from 'react-redux';
 import Modal from 'react-native-modal';
@@ -9,29 +8,30 @@ import { isAndroid } from '../../utils/deviceInfo';
 import { themes } from '../../constants/colors';
 import { withTheme } from '../../theme';
 import styles from './styles';
+import { IMessage } from '../../definitions/IMessage';
+
+interface IRoomReactionPickerProps {
+	baseUrl: string;
+	message: IMessage;
+	show: boolean;
+	isMasterDetail: boolean;
+	reactionClose(): void;
+	onEmojiSelected(shortname: string, messageId: string): void;
+	width: number;
+	height: number;
+	theme: string;
+}
 
 const margin = isAndroid ? 40 : 20;
 const maxSize = 400;
 
-class ReactionPicker extends React.Component {
-	static propTypes = {
-		baseUrl: PropTypes.string.isRequired,
-		message: PropTypes.object,
-		show: PropTypes.bool,
-		isMasterDetail: PropTypes.bool,
-		reactionClose: PropTypes.func,
-		onEmojiSelected: PropTypes.func,
-		width: PropTypes.number,
-		height: PropTypes.number,
-		theme: PropTypes.string
-	};
-
-	shouldComponentUpdate(nextProps) {
+class ReactionPicker extends React.Component<IRoomReactionPickerProps, any> {
+	shouldComponentUpdate(nextProps: IRoomReactionPickerProps) {
 		const { show, width, height } = this.props;
 		return nextProps.show !== show || width !== nextProps.width || height !== nextProps.height;
 	}
 
-	onEmojiSelected = (emoji, shortname) => {
+	onEmojiSelected = (emoji: string, shortname: string) => {
 		// standard emojis: `emoji` is unicode and `shortname` is :joy:
 		// custom emojis: only `emoji` is returned with shortname type (:joy:)
 		// to set reactions, we need shortname type
@@ -68,20 +68,17 @@ class ReactionPicker extends React.Component {
 						}
 					]}
 					testID='reaction-picker'>
-					<EmojiPicker
-						// tabEmojiStyle={tabEmojiStyle}
-						onEmojiSelected={this.onEmojiSelected}
-						baseUrl={baseUrl}
-					/>
+					<EmojiPicker onEmojiSelected={this.onEmojiSelected} baseUrl={baseUrl} />
 				</View>
 			</Modal>
 		) : null;
 	}
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state: any) => ({
 	baseUrl: state.server.server,
 	isMasterDetail: state.app.isMasterDetail
 });
 
-export default connect(mapStateToProps)(withTheme(ReactionPicker));
+// TODO remove this any after merge the HOCs PR
+export default connect(mapStateToProps)(withTheme(ReactionPicker)) as any;

app/views/RoomView/RightButtons.tsx

@@ -1,30 +1,38 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { dequal } from 'dequal';
+import { Subscription } from 'rxjs';
+import { StackNavigationProp } from '@react-navigation/stack';
 
 import * as HeaderButton from '../../containers/HeaderButton';
 import database from '../../lib/database';
 import { getUserSelector } from '../../selectors/login';
 import { events, logEvent } from '../../utils/log';
 import { isTeamRoom } from '../../utils/room';
+import { ChatsStackParamList } from '../../stacks/types';
+import { RoomType } from '../../definitions/IRoom';
+import { IThread, TThreadModel } from '../../definitions/IThread';
+import { ISubscriptions, TSubscriptionsModel } from '../../definitions/ISubscriptions';
 
-class RightButtonsContainer extends Component {
-	static propTypes = {
-		userId: PropTypes.string,
-		threadsEnabled: PropTypes.bool,
-		rid: PropTypes.string,
-		t: PropTypes.string,
-		tmid: PropTypes.string,
-		teamId: PropTypes.string,
-		navigation: PropTypes.object,
-		isMasterDetail: PropTypes.bool,
-		toggleFollowThread: PropTypes.func,
-		joined: PropTypes.bool,
-		encrypted: PropTypes.bool
-	};
+interface IRoomRightButtonsContainerProps {
+	userId: string;
+	threadsEnabled: boolean;
+	rid: string;
+	t: RoomType;
+	tmid?: string;
+	teamId: string;
+	navigation: StackNavigationProp<ChatsStackParamList>;
+	isMasterDetail: boolean;
+	toggleFollowThread: Function;
+	joined: boolean;
+	encrypted: boolean;
+}
 
-	constructor(props) {
+class RightButtonsContainer extends Component<IRoomRightButtonsContainerProps, any> {
+	private threadSubscription?: Subscription;
+	private subSubscription?: Subscription;
+
+	constructor(props: IRoomRightButtonsContainerProps) {
 		super(props);
 		this.state = {
 			isFollowingThread: true,
@@ -56,7 +64,7 @@ class RightButtonsContainer extends Component {
 		}
 	}
 
-	shouldComponentUpdate(nextProps, nextState) {
+	shouldComponentUpdate(nextProps: IRoomRightButtonsContainerProps, nextState: any) {
 		const { isFollowingThread, tunread, tunreadUser, tunreadGroup } = this.state;
 		const { teamId } = this.props;
 		if (nextProps.teamId !== teamId) {
@@ -86,26 +94,26 @@ class RightButtonsContainer extends Component {
 		}
 	}
 
-	observeThread = threadRecord => {
+	observeThread = (threadRecord: TThreadModel) => {
 		const threadObservable = threadRecord.observe();
 		this.threadSubscription = threadObservable.subscribe(thread => this.updateThread(thread));
 	};
 
-	updateThread = thread => {
+	updateThread = (thread: IThread) => {
 		const { userId } = this.props;
 		this.setState({
-			isFollowingThread: thread.replies && !!thread.replies.find(t => t === userId)
+			isFollowingThread: thread.replies && !!thread.replies.find((t: string) => t === userId)
 		});
 	};
 
-	observeSubscription = subRecord => {
+	observeSubscription = (subRecord: TSubscriptionsModel) => {
 		const subObservable = subRecord.observe();
 		this.subSubscription = subObservable.subscribe(sub => {
 			this.updateSubscription(sub);
 		});
 	};
 
-	updateSubscription = sub => {
+	updateSubscription = (sub: ISubscriptions) => {
 		this.setState({
 			tunread: sub?.tunread,
 			tunreadUser: sub?.tunreadUser,
@@ -142,7 +150,7 @@ class RightButtonsContainer extends Component {
 		if (isMasterDetail) {
 			navigation.navigate('ModalStackNavigator', {
 				screen: 'SearchMessagesView',
-				params: { rid, showCloseModal: true, encrypted }
+				params: { rid, t, showCloseModal: true, encrypted }
 			});
 		} else {
 			navigation.navigate('SearchMessagesView', { rid, t, encrypted });
@@ -194,7 +202,7 @@ class RightButtonsContainer extends Component {
 	}
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state: any) => ({
 	userId: getUserSelector(state).id,
 	threadsEnabled: state.settings.Threads_enabled,
 	isMasterDetail: state.app.isMasterDetail

app/views/RoomView/Separator.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
-import PropTypes from 'prop-types';
 import moment from 'moment';
 
 import I18n from '../../i18n';
@@ -34,7 +33,13 @@ const styles = StyleSheet.create({
 	}
 });
 
-const DateSeparator = React.memo(({ ts, unread, theme }) => {
+interface IRoomDateSeparatorProps {
+	ts?: Date | null;
+	unread: boolean;
+	theme: string;
+}
+
+const DateSeparator = React.memo(({ ts, unread, theme }: IRoomDateSeparatorProps) => {
 	const date = ts ? moment(ts).format('LL') : null;
 	const unreadLine = { backgroundColor: themes[theme].dangerColor };
 	const unreadText = { color: themes[theme].dangerColor };
@@ -63,10 +68,4 @@ const DateSeparator = React.memo(({ ts, unread, theme }) => {
 	);
 });
 
-DateSeparator.propTypes = {
-	ts: PropTypes.instanceOf(Date),
-	unread: PropTypes.bool,
-	theme: PropTypes.string
-};
-
 export default DateSeparator;

app/views/RoomView/UploadProgress.tsx

@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 import { ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
-import PropTypes from 'prop-types';
 import { Q } from '@nozbe/watermelondb';
+import { Observable, Subscription } from 'rxjs';
+import Model from '@nozbe/watermelondb/Model';
 
 import database from '../../lib/database';
 import RocketChat from '../../lib/rocketchat';
@@ -51,20 +52,34 @@ const styles = StyleSheet.create({
 	}
 });
 
-class UploadProgress extends Component {
-	static propTypes = {
-		width: PropTypes.number,
-		rid: PropTypes.string,
-		theme: PropTypes.string,
-		user: PropTypes.shape({
-			id: PropTypes.string.isRequired,
-			username: PropTypes.string.isRequired,
-			token: PropTypes.string.isRequired
-		}),
-		baseUrl: PropTypes.string.isRequired
+interface IRoomUploadProgressProps {
+	width: number;
+	rid: string;
+	theme: string;
+	user: {
+		id: string;
+		username: string;
+		token: string;
 	};
+	baseUrl: string;
+}
 
-	constructor(props) {
+interface IItem {
+	name: string;
+	error: boolean;
+	progress: number;
+	path: string;
+	update(param: () => void): void;
+	destroyPermanently(): Promise<void>;
+}
+
+class UploadProgress extends Component<IRoomUploadProgressProps, any> {
+	private mounted: boolean;
+	private ranInitialUploadCheck: boolean;
+	private uploadsSubscription?: Subscription;
+	private uploadsObservable?: Observable<Model>;
+
+	constructor(props: IRoomUploadProgressProps) {
 		super(props);
 		this.mounted = false;
 		this.ranInitialUploadCheck = false;
@@ -93,10 +108,11 @@ class UploadProgress extends Component {
 		const db = database.active;
 		this.uploadsObservable = db.collections.get('uploads').query(Q.where('rid', rid)).observeWithColumns(['progress', 'error']);
 
-		this.uploadsSubscription = this.uploadsObservable.subscribe(uploads => {
+		this.uploadsSubscription = this.uploadsObservable?.subscribe(uploads => {
 			if (this.mounted) {
 				this.setState({ uploads });
 			} else {
+				// @ts-ignore
 				this.state.uploads = uploads;
 			}
 			if (!this.ranInitialUploadCheck) {
@@ -108,7 +124,7 @@ class UploadProgress extends Component {
 	uploadCheck = () => {
 		this.ranInitialUploadCheck = true;
 		const { uploads } = this.state;
-		uploads.forEach(async u => {
+		uploads.forEach(async (u: IItem) => {
 			if (!RocketChat.isUploadActive(u.path)) {
 				try {
 					const db = database.active;
@@ -124,7 +140,7 @@ class UploadProgress extends Component {
 		});
 	};
 
-	deleteUpload = async item => {
+	deleteUpload = async (item: IItem) => {
 		try {
 			const db = database.active;
 			await db.action(async () => {
@@ -135,7 +151,7 @@ class UploadProgress extends Component {
 		}
 	};
 
-	cancelUpload = async item => {
+	cancelUpload = async (item: { path: string }) => {
 		try {
 			await RocketChat.cancelUpload(item);
 		} catch (e) {
@@ -143,7 +159,7 @@ class UploadProgress extends Component {
 		}
 	};
 
-	tryAgain = async item => {
+	tryAgain = async (item: IItem) => {
 		const { rid, baseUrl: server, user } = this.props;
 
 		try {
@@ -159,7 +175,7 @@ class UploadProgress extends Component {
 		}
 	};
 
-	renderItemContent = item => {
+	renderItemContent = (item: IItem) => {
 		const { width, theme } = this.props;
 
 		if (!item.error) {
@@ -196,7 +212,7 @@ class UploadProgress extends Component {
 	};
 
 	// TODO: transform into stateless and update based on its own observable changes
-	renderItem = (item, index) => {
+	renderItem = (item: IItem, index: number) => {
 		const { theme } = this.props;
 
 		return (
@@ -217,7 +233,7 @@ class UploadProgress extends Component {
 
 	render() {
 		const { uploads } = this.state;
-		return <ScrollView style={styles.container}>{uploads.map((item, i) => this.renderItem(item, i))}</ScrollView>;
+		return <ScrollView style={styles.container}>{uploads.map((item: IItem, i: number) => this.renderItem(item, i))}</ScrollView>;
 	}
 }
 

app/views/RoomView/index.tsx

@@ -1,5 +1,4 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { ForwardedRef } from 'react';
 import { InteractionManager, Text, View } from 'react-native';
 import { connect } from 'react-redux';
 import parse from 'url-parse';
@@ -8,6 +7,8 @@ import * as Haptics from 'expo-haptics';
 import { Q } from '@nozbe/watermelondb';
 import { dequal } from 'dequal';
 import { withSafeAreaInsets } from 'react-native-safe-area-context';
+import { StackNavigationProp } from '@react-navigation/stack';
+import { NavigatorScreenParams, RouteProp } from '@react-navigation/core';
 
 import Touch from '../../utils/touch';
 import { replyBroadcast as replyBroadcastAction } from '../../actions/messages';
@@ -64,8 +65,29 @@ import JoinCode from './JoinCode';
 import UploadProgress from './UploadProgress';
 import ReactionPicker from './ReactionPicker';
 import List from './List';
+import { ChatsStackParamList } from '../../stacks/types';
+import { IRoom, TRoomModel, RoomType } from '../../definitions/IRoom';
+import { IAttachment } from '../../definitions/IAttachment';
+import { IThread } from '../../definitions/IThread';
+import { ISubscriptions } from '../../definitions/ISubscriptions';
+import { ModalStackParamList } from '../../stacks/MasterDetailStack/types';
+import { IMessage } from '../../definitions/IMessage';
 
-const stateAttrsUpdate = [
+type TStateAttrsUpdate =
+	| 'joined'
+	| 'lastOpen'
+	| 'reactionsModalVisible'
+	| 'canAutoTranslate'
+	| 'selectedMessage'
+	| 'loading'
+	| 'editing'
+	| 'replying'
+	| 'reacting'
+	| 'readOnly'
+	| 'member'
+	| 'showingBlockingLoader';
+
+const stateAttrsUpdate: TStateAttrsUpdate[] = [
 	'joined',
 	'lastOpen',
 	'reactionsModalVisible',
@@ -79,7 +101,30 @@ const stateAttrsUpdate = [
 	'member',
 	'showingBlockingLoader'
 ];
-const roomAttrsUpdate = [
+
+type TRoomAttrsUpdate =
+	| 'f'
+	| 'ro'
+	| 'blocked'
+	| 'blocker'
+	| 'archived'
+	| 'tunread'
+	| 'muted'
+	| 'ignored'
+	| 'jitsiTimeout'
+	| 'announcement'
+	| 'sysMes'
+	| 'topic'
+	| 'name'
+	| 'fname'
+	| 'roles'
+	| 'bannerClosed'
+	| 'visitor'
+	| 'joinCodeRequired'
+	| 'teamMain'
+	| 'teamId';
+
+const roomAttrsUpdate: TRoomAttrsUpdate[] = [
 	'f',
 	'ro',
 	'blocked',
@@ -102,52 +147,135 @@ const roomAttrsUpdate = [
 	'teamId'
 ];
 
-class RoomView extends React.Component {
-	static propTypes = {
-		navigation: PropTypes.object,
-		route: PropTypes.object,
-		user: PropTypes.shape({
-			id: PropTypes.string.isRequired,
-			username: PropTypes.string.isRequired,
-			token: PropTypes.string.isRequired,
-			showMessageInMainThread: PropTypes.bool
-		}),
-		appState: PropTypes.string,
-		useRealName: PropTypes.bool,
-		isAuthenticated: PropTypes.bool,
-		Message_GroupingPeriod: PropTypes.number,
-		Message_TimeFormat: PropTypes.string,
-		Message_Read_Receipt_Enabled: PropTypes.bool,
-		Hide_System_Messages: PropTypes.array,
-		baseUrl: PropTypes.string,
-		serverVersion: PropTypes.string,
-		customEmojis: PropTypes.object,
-		isMasterDetail: PropTypes.bool,
-		theme: PropTypes.string,
-		replyBroadcast: PropTypes.func,
-		width: PropTypes.number,
-		height: PropTypes.number,
-		insets: PropTypes.object
+interface IRoomViewProps {
+	navigation: StackNavigationProp<ChatsStackParamList, 'RoomView'>;
+	route: RouteProp<ChatsStackParamList, 'RoomView'>;
+	user: {
+		id: string;
+		username: string;
+		token: string;
+		showMessageInMainThread: boolean;
 	};
+	appState: string;
+	useRealName: boolean;
+	isAuthenticated: boolean;
+	Message_GroupingPeriod: number;
+	Message_TimeFormat: string;
+	Message_Read_Receipt_Enabled: boolean;
+	Hide_System_Messages: [];
+	baseUrl: string;
+	serverVersion: string;
+	customEmojis: { [key: string]: string };
+	isMasterDetail: boolean;
+	theme: string;
+	replyBroadcast(message: string): void;
+	width: number;
+	height: number;
+	insets: {
+		left: number;
+		right: number;
+	};
+}
 
-	constructor(props) {
+interface IRoomViewState {
+	joined: boolean;
+	room: TRoomModel;
+	roomUpdate: Partial<IRoom>;
+	member: {
+		statusText?: string;
+	};
+	lastOpen: Date | null;
+	reactionsModalVisible: boolean;
+	selectedMessage: {};
+	canAutoTranslate: boolean;
+	loading: boolean;
+	showingBlockingLoader: boolean;
+	editing: boolean;
+	replying: boolean;
+	replyWithMention: boolean;
+	reacting: boolean;
+	readOnly: boolean;
+	unreadsCount: number | null;
+	roomUserId: string;
+}
+
+export interface IRoomItem {
+	id: string;
+	t: string;
+	rid: string;
+	tmid?: string;
+	ts: Date;
+	status?: string;
+	u?: { _id: string };
+	loaderItem: {
+		t: string;
+		ts: Date;
+	};
+}
+
+interface INavToThread {
+	id?: string;
+	tmsg?: string;
+	t?: string;
+	e2e?: string;
+	tmid?: string;
+	tlm?: string;
+}
+
+interface IBlockAction {
+	actionId: string;
+	appId: string;
+	value: string;
+	blockId: string;
+	rid: string;
+	mid: string;
+}
+
+class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
+	private rid: string;
+	private t: RoomType;
+	private tmid?: string;
+	private jumpToMessageId?: string;
+	private jumpToThreadId?: string;
+	private messagebox: React.RefObject<typeof MessageBox>;
+	private list: React.RefObject<List>;
+	private joinCode?: React.ForwardedRef<typeof JoinCode>;
+	private flatList: any;
+	private mounted: boolean;
+	private sub?: RoomClass;
+	private offset?: number;
+	private didMountInteraction?: { cancel: () => void };
+
+	private willBlurListener?: { remove(): void };
+	private subSubscription?: { unsubscribe(): void };
+	private queryUnreads?: { unsubscribe(): void };
+	private retryInit?: number;
+	private retryInitTimeout?: ReturnType<typeof setTimeout>;
+	private retryFindCount?: number;
+	private retryFindTimeout?: ReturnType<typeof setTimeout>;
+	private messageErrorActions?: React.ForwardedRef<typeof MessageErrorActions>;
+	private messageActions?: React.ForwardedRef<typeof MessageActions>;
+
+	constructor(props: IRoomViewProps) {
 		super(props);
 		console.time(`${this.constructor.name} init`);
 		console.time(`${this.constructor.name} mount`);
-		this.rid = props.route.params?.rid;
-		this.t = props.route.params?.t;
+		this.rid = props.route.params.rid;
+		this.t = props.route.params.t;
 		this.tmid = props.route.params?.tmid;
 		const selectedMessage = props.route.params?.message;
 		const name = props.route.params?.name;
 		const fname = props.route.params?.fname;
 		const prid = props.route.params?.prid;
-		const room = props.route.params?.room ?? {
-			rid: this.rid,
-			t: this.t,
-			name,
-			fname,
-			prid
-		};
+		const room =
+			props.route.params?.room ??
+			({
+				rid: this.rid,
+				t: this.t,
+				name,
+				fname,
+				prid
+			} as TRoomModel);
 		this.jumpToMessageId = props.route.params?.jumpToMessageId;
 		this.jumpToThreadId = props.route.params?.jumpToThreadId;
 		const roomUserId = props.route.params?.roomUserId ?? RocketChat.getUidDirectMessage(room);
@@ -172,7 +300,7 @@ class RoomView extends React.Component {
 		};
 		this.setHeader();
 
-		if (room && room.observe) {
+		if (room && room.observe()) {
 			this.observeRoom(room);
 		} else if (this.rid) {
 			this.findAndObserveRoom(this.rid);
@@ -224,7 +352,7 @@ class RoomView extends React.Component {
 		console.timeEnd(`${this.constructor.name} mount`);
 	}
 
-	shouldComponentUpdate(nextProps, nextState) {
+	shouldComponentUpdate(nextProps: IRoomViewProps, nextState: IRoomViewState) {
 		const { state } = this;
 		const { roomUpdate, member } = state;
 		const { appState, theme, insets, route } = this.props;
@@ -250,7 +378,7 @@ class RoomView extends React.Component {
 		return roomAttrsUpdate.some(key => !dequal(nextState.roomUpdate[key], roomUpdate[key]));
 	}
 
-	componentDidUpdate(prevProps, prevState) {
+	componentDidUpdate(prevProps: IRoomViewProps, prevState: IRoomViewState) {
 		const { roomUpdate } = this.state;
 		const { appState, insets, route } = this.props;
 
@@ -304,7 +432,8 @@ class RoomView extends React.Component {
 		this.mounted = false;
 		if (!editing && this.messagebox && this.messagebox.current) {
 			const { text } = this.messagebox.current;
-			let obj;
+			let obj = room; // TODO - test the threadsCollection.find return to change this any;
+
 			if (this.tmid) {
 				try {
 					const threadsCollection = db.get('threads');
@@ -312,13 +441,13 @@ class RoomView extends React.Component {
 				} catch (e) {
 					// Do nothing
 				}
-			} else {
-				obj = room;
 			}
+
 			if (obj) {
 				try {
 					await db.action(async () => {
 						await obj.update(r => {
+							// TODO - change this any
 							r.draftMessage = text;
 						});
 					});
@@ -360,7 +489,7 @@ class RoomView extends React.Component {
 		const prid = room?.prid;
 		const isGroupChat = RocketChat.isGroupChat(room);
 		let title = route.params?.name;
-		let parentTitle;
+		let parentTitle: string;
 		if ((room.id || room.rid) && !tmid) {
 			title = RocketChat.getRoomTitle(room);
 		}
@@ -397,7 +526,8 @@ class RoomView extends React.Component {
 			headerLeft: () => (
 				<LeftButtons
 					tmid={tmid}
-					unreadsCount={unreadsCount}
+					// TODO - remove this type after craete the Room state
+					unreadsCount={unreadsCount as number & string}
 					navigation={navigation}
 					baseUrl={baseUrl}
 					userId={userId}
@@ -430,11 +560,10 @@ class RoomView extends React.Component {
 				<RightButtons
 					rid={rid}
 					tmid={tmid}
-					teamId={teamId}
-					teamMain={teamMain}
+					teamId={teamId!}
 					joined={joined}
 					t={t}
-					encrypted={encrypted}
+					encrypted={encrypted!}
 					navigation={navigation}
 					toggleFollowThread={this.toggleFollowThread}
 				/>
@@ -442,7 +571,7 @@ class RoomView extends React.Component {
 		});
 	};
 
-	goRoomActionsView = screen => {
+	goRoomActionsView = (screen?: 'SearchMessagesView' | 'RoomActionsView') => {
 		logEvent(events.ROOM_GO_RA);
 		const { room, member, joined } = this.state;
 		const { navigation, isMasterDetail } = this.props;
@@ -493,7 +622,8 @@ class RoomView extends React.Component {
 					} else {
 						this.setLastOpen(null);
 					}
-					RoomServices.readMessages(room.rid, newLastOpen, true).catch(e => console.log(e));
+					// RoomServices.readMessages(room.rid, newLastOpen, true).catch(e => console.log(e)); this function receives true automatic
+					RoomServices.readMessages(room.rid, newLastOpen).catch(e => console.log(e));
 				}
 			}
 
@@ -503,7 +633,7 @@ class RoomView extends React.Component {
 			this.setState({ canAutoTranslate, member, loading: false });
 		} catch (e) {
 			this.setState({ loading: false });
-			this.retryInit = this.retryInit + 1 || 1;
+			this.retryInit = this.retryInit! + 1 || 1;
 			if (this.retryInit <= 1) {
 				this.retryInitTimeout = setTimeout(() => {
 					this.init();
@@ -533,7 +663,7 @@ class RoomView extends React.Component {
 		return {};
 	};
 
-	findAndObserveRoom = async rid => {
+	findAndObserveRoom = async (rid: string) => {
 		try {
 			const db = database.active;
 			const subCollection = await db.get('subscriptions');
@@ -551,7 +681,7 @@ class RoomView extends React.Component {
 			if (this.rid) {
 				// We navigate to RoomView before the Room is inserted to the local db
 				// So we retry just to make sure we have the right content
-				this.retryFindCount = this.retryFindCount + 1 || 1;
+				this.retryFindCount = this.retryFindCount! + 1 || 1;
 				if (this.retryFindCount <= 3) {
 					this.retryFindTimeout = setTimeout(() => {
 						this.findAndObserveRoom(rid);
@@ -569,27 +699,32 @@ class RoomView extends React.Component {
 		delete this.sub;
 	};
 
-	observeRoom = room => {
-		const observable = room.observe();
-		this.subSubscription = observable.subscribe(changes => {
-			const roomUpdate = roomAttrsUpdate.reduce((ret, attr) => {
-				ret[attr] = changes[attr];
-				return ret;
-			}, {});
-			if (this.mounted) {
-				this.internalSetState({ room: changes, roomUpdate });
-			} else {
-				this.state.room = changes;
-				this.state.roomUpdate = roomUpdate;
-			}
-		});
+	observeRoom = (room: TRoomModel) => {
+		if (room.observe) {
+			const observable = room.observe();
+			this.subSubscription = observable.subscribe(changes => {
+				const roomUpdate = roomAttrsUpdate.reduce((ret: any, attr) => {
+					ret[attr] = changes[attr];
+					return ret;
+				}, {});
+				if (this.mounted) {
+					this.internalSetState({ room: changes, roomUpdate });
+				} else {
+					// @ts-ignore
+					this.state.room = changes;
+					// @ts-ignore
+					this.state.roomUpdate = roomUpdate;
+				}
+			});
+		}
 	};
 
-	errorActionsShow = message => {
+	errorActionsShow = (message: string) => {
+		// @ts-ignore
 		this.messageErrorActions?.showMessageErrorActions(message);
 	};
 
-	onEditInit = message => {
+	onEditInit = (message: { id: string; subscription: { id: string }; attachments: IAttachment[]; msg: string }) => {
 		const newMessage = {
 			id: message.id,
 			subscription: {
@@ -604,7 +739,7 @@ class RoomView extends React.Component {
 		this.setState({ selectedMessage: {}, editing: false });
 	};
 
-	onEditRequest = async message => {
+	onEditRequest = async (message: string) => {
 		this.setState({ selectedMessage: {}, editing: false });
 		try {
 			await RocketChat.editMessage(message);
@@ -613,7 +748,7 @@ class RoomView extends React.Component {
 		}
 	};
 
-	onReplyInit = (message, mention) => {
+	onReplyInit = (message: IMessage, mention: boolean) => {
 		this.setState({
 			selectedMessage: message,
 			replying: true,
@@ -625,7 +760,7 @@ class RoomView extends React.Component {
 		this.setState({ selectedMessage: {}, replying: false, replyWithMention: false });
 	};
 
-	onReactionInit = message => {
+	onReactionInit = (message: string) => {
 		this.setState({ selectedMessage: message, reacting: true });
 	};
 
@@ -633,16 +768,17 @@ class RoomView extends React.Component {
 		this.setState({ selectedMessage: {}, reacting: false });
 	};
 
-	onMessageLongPress = message => {
+	onMessageLongPress = (message: string) => {
+		// @ts-ignore
 		this.messageActions?.showMessageActions(message);
 	};
 
-	showAttachment = attachment => {
+	showAttachment = (attachment: IAttachment) => {
 		const { navigation } = this.props;
 		navigation.navigate('AttachmentView', { attachment });
 	};
 
-	onReactionPress = async (shortname, messageId) => {
+	onReactionPress = async (shortname: string, messageId: string) => {
 		try {
 			await RocketChat.setReaction(shortname, messageId);
 			this.onReactionClose();
@@ -652,7 +788,7 @@ class RoomView extends React.Component {
 		}
 	};
 
-	onReactionLongPress = message => {
+	onReactionLongPress = (message: string) => {
 		this.setState({ selectedMessage: message, reactionsModalVisible: true });
 		Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
 	};
@@ -665,7 +801,7 @@ class RoomView extends React.Component {
 		logEvent(events.ROOM_ENCRYPTED_PRESS);
 		const { navigation, isMasterDetail } = this.props;
 
-		const screen = { screen: 'E2EHowItWorksView', params: { showCloseModal: true } };
+		const screen: NavigatorScreenParams<ModalStackParamList> = { screen: 'E2EHowItWorksView', params: { showCloseModal: true } };
 
 		if (isMasterDetail) {
 			return navigation.navigate('ModalStackNavigator', screen);
@@ -674,13 +810,13 @@ class RoomView extends React.Component {
 	};
 
 	onDiscussionPress = debounce(
-		item => {
+		(item: IThread) => {
 			const { navigation } = this.props;
 			navigation.push('RoomView', {
 				rid: item.drid,
 				prid: item.rid,
 				name: item.msg,
-				t: 'p'
+				t: RoomType.GROUP
 			});
 		},
 		1000,
@@ -695,7 +831,7 @@ class RoomView extends React.Component {
 			.query(Q.where('archived', false), Q.where('open', true), Q.where('rid', Q.notEq(this.rid)))
 			.observeWithColumns(['unread']);
 
-		this.queryUnreads = observable.subscribe(data => {
+		this.queryUnreads = observable.subscribe((data: ISubscriptions[]) => {
 			const { unreadsCount } = this.state;
 			const newUnreadsCount = data.filter(s => s.unread > 0).reduce((a, b) => a + (b.unread || 0), 0);
 			if (unreadsCount !== newUnreadsCount) {
@@ -704,9 +840,9 @@ class RoomView extends React.Component {
 		});
 	};
 
-	onThreadPress = debounce(item => this.navToThread(item), 1000, true);
+	onThreadPress = debounce((item: IRoomItem) => this.navToThread(item), 1000, true);
 
-	shouldNavigateToRoom = message => {
+	shouldNavigateToRoom = (message: { tmid: string; rid: string }) => {
 		if (message.tmid && message.tmid === this.tmid) {
 			return false;
 		}
@@ -716,7 +852,7 @@ class RoomView extends React.Component {
 		return true;
 	};
 
-	jumpToMessageByUrl = async messageUrl => {
+	jumpToMessageByUrl = async (messageUrl: string) => {
 		if (!messageUrl) {
 			return;
 		}
@@ -732,10 +868,10 @@ class RoomView extends React.Component {
 		}
 	};
 
-	jumpToMessage = async messageId => {
+	jumpToMessage = async (messageId?: string) => {
 		try {
 			this.setState({ showingBlockingLoader: true });
-			const message = await RoomServices.getMessageInfo(messageId);
+			const message = await RoomServices.getMessageInfo(messageId!);
 
 			if (!message) {
 				return;
@@ -755,8 +891,8 @@ class RoomView extends React.Component {
 				if (message.fromServer && !message.tmid) {
 					await RocketChat.loadSurroundingMessages({ messageId, rid: this.rid });
 				}
-				await Promise.race([this.list.current.jumpToMessage(message.id), new Promise(res => setTimeout(res, 5000))]);
-				this.list.current.cancelJumpToMessage();
+				await Promise.race([this.list.current?.jumpToMessage(message.id), new Promise(res => setTimeout(res, 5000))]);
+				this.list.current?.cancelJumpToMessage();
 			}
 		} catch (e) {
 			log(e);
@@ -765,7 +901,7 @@ class RoomView extends React.Component {
 		}
 	};
 
-	replyBroadcast = message => {
+	replyBroadcast = (message: string) => {
 		const { replyBroadcast } = this.props;
 		replyBroadcast(message);
 	};
@@ -775,7 +911,7 @@ class RoomView extends React.Component {
 		EventEmitter.removeListener('connected', this.handleConnected);
 	};
 
-	handleRoomRemoved = ({ rid }) => {
+	handleRoomRemoved = ({ rid }: { rid: string }) => {
 		const { room } = this.state;
 		if (rid === this.rid) {
 			Navigation.navigate('RoomsListView');
@@ -784,14 +920,15 @@ class RoomView extends React.Component {
 		}
 	};
 
-	internalSetState = (...args) => {
+	internalSetState = (...args: any) => {
 		if (!this.mounted) {
 			return;
 		}
+		// @ts-ignore
 		this.setState(...args);
 	};
 
-	sendMessage = (message, tmid, tshow) => {
+	sendMessage = (message: string, tmid: string, tshow: string) => {
 		logEvent(events.ROOM_SEND_MESSAGE);
 		const { user } = this.props;
 		RocketChat.sendMessage(this.rid, message, this.tmid || tmid, user, tshow).then(() => {
@@ -803,7 +940,7 @@ class RoomView extends React.Component {
 		});
 	};
 
-	getCustomEmoji = name => {
+	getCustomEmoji = (name: string) => {
 		const { customEmojis } = this.props;
 		const emoji = customEmojis[name];
 		if (emoji) {
@@ -812,7 +949,7 @@ class RoomView extends React.Component {
 		return null;
 	};
 
-	setLastOpen = lastOpen => this.setState({ lastOpen });
+	setLastOpen = (lastOpen: Date | null) => this.setState({ lastOpen });
 
 	onJoin = () => {
 		this.internalSetState({
@@ -831,7 +968,8 @@ class RoomView extends React.Component {
 			} else {
 				const { joinCodeRequired } = room;
 				if (joinCodeRequired) {
-					this.joinCode.current?.show();
+					// @ts-ignore
+					this.joinCode?.current?.show();
 				} else {
 					await RocketChat.joinRoom(this.rid, null, this.t);
 					this.onJoin();
@@ -842,9 +980,9 @@ class RoomView extends React.Component {
 		}
 	};
 
-	getThreadName = (tmid, messageId) => getThreadName(this.rid, tmid, messageId);
+	getThreadName = (tmid: string, messageId?: string) => getThreadName(this.rid, tmid, messageId);
 
-	toggleFollowThread = async (isFollowingThread, tmid) => {
+	toggleFollowThread = async (isFollowingThread: boolean, tmid: string) => {
 		try {
 			await RocketChat.toggleFollowMessage(tmid ?? this.tmid, !isFollowingThread);
 			EventEmitter.emit(LISTENER, { message: isFollowingThread ? I18n.t('Unfollowed_thread') : I18n.t('Following_thread') });
@@ -853,13 +991,13 @@ class RoomView extends React.Component {
 		}
 	};
 
-	getBadgeColor = messageId => {
+	getBadgeColor = (messageId?: string) => {
 		const { room } = this.state;
 		const { theme } = this.props;
 		return getBadgeColor({ subscription: room, theme, messageId });
 	};
 
-	navToRoomInfo = navParam => {
+	navToRoomInfo = (navParam: ChatsStackParamList['RoomInfoView']) => {
 		const { navigation, user, isMasterDetail } = this.props;
 		logEvent(events[`ROOM_GO_${navParam.t === 'd' ? 'USER' : 'ROOM'}_INFO`]);
 		if (navParam.rid === user.id) {
@@ -873,7 +1011,7 @@ class RoomView extends React.Component {
 		}
 	};
 
-	navToThread = async item => {
+	navToThread = async (item: INavToThread) => {
 		const { roomUserId } = this.state;
 		const { navigation } = this.props;
 
@@ -894,7 +1032,7 @@ class RoomView extends React.Component {
 				rid: this.rid,
 				tmid: item.tmid,
 				name,
-				t: 'thread',
+				t: RoomType.THREAD,
 				roomUserId,
 				jumpToMessageId: item.id
 			});
@@ -905,15 +1043,15 @@ class RoomView extends React.Component {
 				rid: this.rid,
 				tmid: item.id,
 				name: makeThreadName(item),
-				t: 'thread',
+				t: RoomType.THREAD,
 				roomUserId
 			});
 		}
 	};
 
-	navToRoom = async message => {
+	navToRoom = async (message: { rid: string; id: string }) => {
 		const { navigation, isMasterDetail } = this.props;
-		const roomInfo = await getRoomInfo(message.rid);
+		const roomInfo = (await getRoomInfo(message.rid)) as IRoom;
 		return goRoom({
 			item: roomInfo,
 			isMasterDetail,
@@ -932,12 +1070,12 @@ class RoomView extends React.Component {
 		}
 	};
 
-	handleCommands = ({ event }) => {
+	handleCommands = ({ event }: { event: { input: string } }) => {
 		if (this.rid) {
 			const { input } = event;
 			if (handleCommandScroll(event)) {
-				const offset = input === 'UIKeyInputUpArrow' ? 100 : -100;
-				this.offset += offset;
+				const offset: number = input === 'UIKeyInputUpArrow' ? 100 : -100;
+				this.offset! += offset;
 				this.flatList?.scrollToOffset({ offset: this.offset });
 			} else if (handleCommandRoomActions(event)) {
 				this.goRoomActionsView();
@@ -945,14 +1083,14 @@ class RoomView extends React.Component {
 				this.goRoomActionsView('SearchMessagesView');
 			} else if (handleCommandReplyLatest(event)) {
 				if (this.list && this.list.current) {
-					const message = this.list.current.getLastMessage();
+					const message = this.list.current.getLastMessage() as IMessage;
 					this.onReplyInit(message, false);
 				}
 			}
 		}
 	};
 
-	blockAction = ({ actionId, appId, value, blockId, rid, mid }) =>
+	blockAction = ({ actionId, appId, value, blockId, rid, mid }: IBlockAction) =>
 		RocketChat.triggerBlockAction({
 			blockId,
 			actionId,
@@ -971,7 +1109,7 @@ class RoomView extends React.Component {
 		try {
 			const db = database.active;
 			await db.action(async () => {
-				await room.update(r => {
+				await room.update((r: IRoom) => {
 					r.bannerClosed = true;
 				});
 			});
@@ -980,12 +1118,12 @@ class RoomView extends React.Component {
 		}
 	};
 
-	isIgnored = message => {
+	isIgnored = (message: IRoomItem) => {
 		const { room } = this.state;
 		return room?.ignored?.includes?.(message?.u?._id) ?? false;
 	};
 
-	onLoadMoreMessages = loaderItem =>
+	onLoadMoreMessages = (loaderItem: IRoomItem) =>
 		RoomServices.getMoreMessages({
 			rid: this.rid,
 			tmid: this.tmid,
@@ -993,7 +1131,7 @@ class RoomView extends React.Component {
 			loaderItem
 		});
 
-	renderItem = (item, previousItem, highlightedMessage) => {
+	renderItem = (item: IRoomItem, previousItem: IRoomItem, highlightedMessage: string) => {
 		const { room, lastOpen, canAutoTranslate } = this.state;
 		const { user, Message_GroupingPeriod, Message_TimeFormat, useRealName, baseUrl, Message_Read_Receipt_Enabled, theme } =
 			this.props;
@@ -1004,7 +1142,7 @@ class RoomView extends React.Component {
 			dateSeparator = item.ts;
 			showUnreadSeparator = moment(item.ts).isAfter(lastOpen);
 		} else {
-			showUnreadSeparator = lastOpen && moment(item.ts).isSameOrAfter(lastOpen) && moment(previousItem.ts).isBefore(lastOpen);
+			showUnreadSeparator = lastOpen! && moment(item.ts).isSameOrAfter(lastOpen) && moment(previousItem.ts).isBefore(lastOpen);
 			if (!moment(item.ts).isSame(previousItem.ts, 'day')) {
 				dateSeparator = item.ts;
 			}
@@ -1150,7 +1288,7 @@ class RoomView extends React.Component {
 		return (
 			<>
 				<MessageActions
-					ref={ref => (this.messageActions = ref)}
+					ref={(ref: ForwardedRef<typeof MessageActions>) => (this.messageActions = ref)}
 					tmid={this.tmid}
 					room={room}
 					user={user}
@@ -1160,7 +1298,10 @@ class RoomView extends React.Component {
 					onReactionPress={this.onReactionPress}
 					isReadOnly={readOnly}
 				/>
-				<MessageErrorActions ref={ref => (this.messageErrorActions = ref)} tmid={this.tmid} />
+				<MessageErrorActions
+					ref={(ref: ForwardedRef<typeof MessageErrorActions>) => (this.messageErrorActions = ref)}
+					tmid={this.tmid}
+				/>
 			</>
 		);
 	};
@@ -1175,7 +1316,6 @@ class RoomView extends React.Component {
 			<SafeAreaView style={{ backgroundColor: themes[theme].backgroundColor }} testID='room-view'>
 				<StatusBar />
 				<Banner
-					rid={rid}
 					title={I18n.t('Announcement')}
 					text={announcement}
 					bannerClosed={bannerClosed}
@@ -1186,7 +1326,6 @@ class RoomView extends React.Component {
 					ref={this.list}
 					listRef={this.flatList}
 					rid={rid}
-					t={t}
 					tmid={this.tmid}
 					theme={theme}
 					tunread={room?.tunread}
@@ -1225,7 +1364,7 @@ class RoomView extends React.Component {
 	}
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state: any) => ({
 	user: getUserSelector(state),
 	isMasterDetail: state.app.isMasterDetail,
 	appState: state.app.ready && state.app.foreground ? 'foreground' : 'background',
@@ -1240,8 +1379,8 @@ const mapStateToProps = state => ({
 	Hide_System_Messages: state.settings.Hide_System_Messages
 });
 
-const mapDispatchToProps = dispatch => ({
-	replyBroadcast: message => dispatch(replyBroadcastAction(message))
+const mapDispatchToProps = (dispatch: any) => ({
+	replyBroadcast: (message: any) => dispatch(replyBroadcastAction(message))
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(withDimensions(withTheme(withSafeAreaInsets(RoomView))));

app/views/RoomView/services/getMessageInfo.ts

@@ -2,7 +2,7 @@ import { getMessageById } from '../../../lib/database/services/Message';
 import { getThreadMessageById } from '../../../lib/database/services/ThreadMessage';
 import getSingleMessage from '../../../lib/methods/getSingleMessage';
 
-const getMessageInfo = async messageId => {
+const getMessageInfo = async (messageId: string) => {
 	let result;
 	result = await getMessageById(messageId);
 	if (result) {

app/views/RoomView/services/getMessages.ts

@@ -1,10 +1,10 @@
 import RocketChat from '../../../lib/rocketchat';
+import { IRoom } from '../../../definitions/IRoom';
 
-const getMessages = room => {
+const getMessages = (room: IRoom): Promise<void> => {
 	if (room.lastOpen) {
 		return RocketChat.loadMissedMessages(room);
-	} else {
-		return RocketChat.loadMessagesForRoom(room);
 	}
+	return RocketChat.loadMessagesForRoom(room);
 };
 export default getMessages;

app/views/RoomView/services/getMoreMessages.ts

@@ -5,7 +5,17 @@ import {
 } from '../../../constants/messageTypeLoad';
 import RocketChat from '../../../lib/rocketchat';
 
-const getMoreMessages = ({ rid, t, tmid, loaderItem }) => {
+interface IGetMoreMessages {
+	rid: string;
+	t?: string;
+	tmid?: string;
+	loaderItem: {
+		t: string;
+		ts: Date;
+	};
+}
+
+const getMoreMessages = ({ rid, t, tmid, loaderItem }: IGetMoreMessages) => {
 	if ([MESSAGE_TYPE_LOAD_MORE, MESSAGE_TYPE_LOAD_PREVIOUS_CHUNK].includes(loaderItem.t)) {
 		return RocketChat.loadMessagesForRoom({
 			rid,

app/views/RoomView/services/getThreadMessages.ts

@@ -1,6 +1,6 @@
 import RocketChat from '../../../lib/rocketchat';
 
 // unlike getMessages, sync isn't required for threads, because loadMissedMessages does it already
-const getThreadMessages = (tmid, rid) => RocketChat.loadThreadMessages({ tmid, rid });
+const getThreadMessages = (tmid: string, rid: string) => RocketChat.loadThreadMessages({ tmid, rid });
 
 export default getThreadMessages;

app/views/RoomView/services/readMessages.js

@@ -1,5 +0,0 @@
-import RocketChat from '../../../lib/rocketchat';
-
-const readMessages = (rid, newLastOpen) => RocketChat.readMessages(rid, newLastOpen, true);
-
-export default readMessages;

app/views/RoomView/services/readMessages.ts

@@ -0,0 +1,5 @@
+import RocketChat from '../../../lib/rocketchat';
+
+const readMessages = (rid: string, newLastOpen: Date): Promise<void> => RocketChat.readMessages(rid, newLastOpen, true);
+
+export default readMessages;

ios/Podfile.lock

@@ -950,7 +950,7 @@ SPEC CHECKSUMS:
   EXVideoThumbnails: 442c3abadb51a81551a3b53705b7560de390e6f7
   EXWebBrowser: 76783ba5dcb8699237746ecf41a9643d428a4cc5
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
-  FBReactNativeSpec: 686ac17e193dcf7d5df4d772b224504dd2f3ad81
+  FBReactNativeSpec: 110d69378fce79af38271c39894b59fec7890221
   Firebase: 919186c8e119dd9372a45fd1dd17a8a942bc1892
   FirebaseAnalytics: 5fa308e1b13f838d0f6dc74719ac2a72e8c5afc4
   FirebaseCore: 8cd4f8ea22075e0ee582849b1cf79d8816506085