diff --git a/app/views/CannedResponsesListView/Dropdown/index.tsx b/app/views/CannedResponsesListView/Dropdown/index.tsx
index a2f9156d7..9da55f407 100644
--- a/app/views/CannedResponsesListView/Dropdown/index.tsx
+++ b/app/views/CannedResponsesListView/Dropdown/index.tsx
@@ -1,10 +1,8 @@
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
 import { Animated, Easing, FlatList, TouchableWithoutFeedback } from 'react-native';
-import { withSafeAreaInsets } from 'react-native-safe-area-context';
 
 import styles from '../styles';
-import { themes } from '../../../lib/constants';
-import { TSupportedThemes, withTheme } from '../../../theme';
+import { useTheme } from '../../../theme';
 import * as List from '../../../containers/List';
 import DropdownItemFilter from './DropdownItemFilter';
 import DropdownItemHeader from './DropdownItemHeader';
@@ -12,35 +10,31 @@ import { ROW_HEIGHT } from './DropdownItem';
 import { ILivechatDepartment } from '../../../definitions/ILivechatDepartment';
 
 const ANIMATION_DURATION = 200;
+const HEIGHT_DESTINATION = 0;
+const MAX_ROWS = 5;
 
 interface IDropdownProps {
-	theme?: TSupportedThemes;
 	currentDepartment: ILivechatDepartment;
 	onClose: () => void;
 	onDepartmentSelected: (value: ILivechatDepartment) => void;
 	departments: ILivechatDepartment[];
 }
 
-class Dropdown extends React.Component<IDropdownProps> {
-	private animatedValue: Animated.Value;
+const Dropdown = ({ currentDepartment, onClose, onDepartmentSelected, departments }: IDropdownProps) => {
+	const animatedValue = useRef(new Animated.Value(0)).current;
+	const { colors } = useTheme();
 
-	constructor(props: IDropdownProps) {
-		super(props);
-		this.animatedValue = new Animated.Value(0);
-	}
-
-	componentDidMount() {
-		Animated.timing(this.animatedValue, {
+	useEffect(() => {
+		Animated.timing(animatedValue, {
 			toValue: 1,
 			duration: ANIMATION_DURATION,
 			easing: Easing.inOut(Easing.quad),
 			useNativeDriver: true
 		}).start();
-	}
+	}, [animatedValue]);
 
-	close = () => {
-		const { onClose } = this.props;
-		Animated.timing(this.animatedValue, {
+	const close = () => {
+		Animated.timing(animatedValue, {
 			toValue: 0,
 			duration: ANIMATION_DURATION,
 			easing: Easing.inOut(Easing.quad),
@@ -48,58 +42,54 @@ class Dropdown extends React.Component<IDropdownProps> {
 		}).start(() => onClose());
 	};
 
-	render() {
-		const { theme, currentDepartment, onDepartmentSelected, departments } = this.props;
-		const heightDestination = 0;
-		const translateY = this.animatedValue.interpolate({
-			inputRange: [0, 1],
-			outputRange: [-300, heightDestination] // approximated height of the component when closed/open
-		});
-		const backdropOpacity = this.animatedValue.interpolate({
-			inputRange: [0, 1],
-			outputRange: [0, themes[theme!].backdropOpacity]
-		});
+	const translateY = animatedValue.interpolate({
+		inputRange: [0, 1],
+		outputRange: [-300, HEIGHT_DESTINATION] // approximated height of the component when closed/open
+	});
 
-		const maxRows = 5;
-		return (
-			<>
-				<TouchableWithoutFeedback onPress={this.close}>
-					<Animated.View
-						style={[
-							styles.backdrop,
-							{
-								backgroundColor: themes[theme!].backdropColor,
-								opacity: backdropOpacity,
-								top: heightDestination
-							}
-						]}
-					/>
-				</TouchableWithoutFeedback>
+	const backdropOpacity = animatedValue.interpolate({
+		inputRange: [0, 1],
+		outputRange: [0, colors.backdropOpacity]
+	});
+
+	return (
+		<>
+			<TouchableWithoutFeedback onPress={close}>
 				<Animated.View
 					style={[
-						styles.dropdownContainer,
+						styles.backdrop,
 						{
-							transform: [{ translateY }],
-							backgroundColor: themes[theme!].backgroundColor,
-							borderColor: themes[theme!].separatorColor
+							backgroundColor: colors.backdropColor,
+							opacity: backdropOpacity,
+							top: HEIGHT_DESTINATION
 						}
 					]}
-				>
-					<DropdownItemHeader department={currentDepartment} onPress={this.close} />
-					<List.Separator />
-					<FlatList
-						style={{ maxHeight: maxRows * ROW_HEIGHT }}
-						data={departments}
-						keyExtractor={item => item._id}
-						renderItem={({ item }) => (
-							<DropdownItemFilter onPress={onDepartmentSelected} currentDepartment={currentDepartment} value={item} />
-						)}
-						keyboardShouldPersistTaps='always'
-					/>
-				</Animated.View>
-			</>
-		);
-	}
-}
+				/>
+			</TouchableWithoutFeedback>
+			<Animated.View
+				style={[
+					styles.dropdownContainer,
+					{
+						transform: [{ translateY }],
+						backgroundColor: colors.backgroundColor,
+						borderColor: colors.separatorColor
+					}
+				]}
+			>
+				<DropdownItemHeader department={currentDepartment} onPress={close} />
+				<List.Separator />
+				<FlatList
+					style={{ maxHeight: MAX_ROWS * ROW_HEIGHT }}
+					data={departments}
+					keyExtractor={item => item._id}
+					renderItem={({ item }) => (
+						<DropdownItemFilter onPress={onDepartmentSelected} currentDepartment={currentDepartment} value={item} />
+					)}
+					keyboardShouldPersistTaps='always'
+				/>
+			</Animated.View>
+		</>
+	);
+};
 
-export default withTheme(withSafeAreaInsets(Dropdown));
+export default Dropdown;
diff --git a/app/views/DirectoryView/Options.tsx b/app/views/DirectoryView/Options.tsx
index 43c84fc09..4003dc13f 100644
--- a/app/views/DirectoryView/Options.tsx
+++ b/app/views/DirectoryView/Options.tsx
@@ -1,13 +1,13 @@
-import React, { PureComponent } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { Animated, Easing, Switch, Text, TouchableWithoutFeedback, View } from 'react-native';
 
 import Touch from '../../containers/Touch';
 import { CustomIcon, TIconsName } from '../../containers/CustomIcon';
 import Check from '../../containers/Check';
 import I18n from '../../i18n';
-import { SWITCH_TRACK_COLOR, themes } from '../../lib/constants';
+import { SWITCH_TRACK_COLOR } from '../../lib/constants';
 import styles from './styles';
-import { TSupportedThemes } from '../../theme';
+import { useTheme } from '../../theme';
 
 const ANIMATION_DURATION = 200;
 const ANIMATION_PROPS = {
@@ -23,34 +23,34 @@ interface IDirectoryOptionsProps {
 	close: Function;
 	changeType: Function;
 	toggleWorkspace(): void;
-	theme: TSupportedThemes;
 }
 
-export default class DirectoryOptions extends PureComponent<IDirectoryOptionsProps, any> {
-	private animatedValue: Animated.Value;
+const DirectoryOptions = ({
+	type: propType,
+	globalUsers,
+	isFederationEnabled,
+	close: onClose,
+	changeType,
+	toggleWorkspace
+}: IDirectoryOptionsProps) => {
+	const animatedValue = useRef(new Animated.Value(0)).current;
+	const { colors } = useTheme();
 
-	constructor(props: IDirectoryOptionsProps) {
-		super(props);
-		this.animatedValue = new Animated.Value(0);
-	}
-
-	componentDidMount() {
-		Animated.timing(this.animatedValue, {
+	useEffect(() => {
+		Animated.timing(animatedValue, {
 			toValue: 1,
 			...ANIMATION_PROPS
 		}).start();
-	}
+	}, [animatedValue]);
 
-	close = () => {
-		const { close } = this.props;
-		Animated.timing(this.animatedValue, {
+	const close = () => {
+		Animated.timing(animatedValue, {
 			toValue: 0,
 			...ANIMATION_PROPS
-		}).start(() => close());
+		}).start(() => onClose());
 	};
 
-	renderItem = (itemType: string) => {
-		const { changeType, type: propType, theme } = this.props;
+	const renderItem = (itemType: string) => {
 		let text = 'Users';
 		let icon: TIconsName = 'user';
 		if (itemType === 'channels') {
@@ -66,70 +66,61 @@ export default class DirectoryOptions extends PureComponent<IDirectoryOptionsPro
 		return (
 			<Touch onPress={() => changeType(itemType)} style={styles.dropdownItemButton} accessibilityLabel={I18n.t(text)}>
 				<View style={styles.dropdownItemContainer}>
-					<CustomIcon name={icon} size={22} color={themes[theme].bodyText} style={styles.dropdownItemIcon} />
-					<Text style={[styles.dropdownItemText, { color: themes[theme].bodyText }]}>{I18n.t(text)}</Text>
+					<CustomIcon name={icon} size={22} color={colors.bodyText} style={styles.dropdownItemIcon} />
+					<Text style={[styles.dropdownItemText, { color: colors.bodyText }]}>{I18n.t(text)}</Text>
 					{propType === itemType ? <Check /> : null}
 				</View>
 			</Touch>
 		);
 	};
 
-	render() {
-		const translateY = this.animatedValue.interpolate({
-			inputRange: [0, 1],
-			outputRange: [-326, 0]
-		});
-		const { globalUsers, toggleWorkspace, isFederationEnabled, theme } = this.props;
-		const backdropOpacity = this.animatedValue.interpolate({
-			inputRange: [0, 1],
-			outputRange: [0, themes[theme].backdropOpacity]
-		});
-		return (
-			<>
-				<TouchableWithoutFeedback onPress={this.close}>
-					<Animated.View style={[styles.backdrop, { backgroundColor: themes[theme].backdropColor, opacity: backdropOpacity }]} />
-				</TouchableWithoutFeedback>
-				<Animated.View
-					style={[styles.dropdownContainer, { transform: [{ translateY }], backgroundColor: themes[theme].backgroundColor }]}
-				>
-					<Touch onPress={this.close} accessibilityLabel={I18n.t('Search_by')}>
-						<View
-							style={[
-								styles.dropdownContainerHeader,
-								styles.dropdownItemContainer,
-								{ borderColor: themes[theme].separatorColor }
-							]}
-						>
-							<Text style={[styles.dropdownToggleText, { color: themes[theme].auxiliaryText }]}>{I18n.t('Search_by')}</Text>
-							<CustomIcon
-								style={[styles.dropdownItemIcon, styles.inverted]}
-								size={22}
-								name='chevron-down'
-								color={themes[theme].auxiliaryTintColor}
-							/>
-						</View>
-					</Touch>
-					{this.renderItem('channels')}
-					{this.renderItem('users')}
-					{this.renderItem('teams')}
-					{isFederationEnabled ? (
-						<>
-							<View style={[styles.dropdownSeparator, { backgroundColor: themes[theme].separatorColor }]} />
-							<View style={[styles.dropdownItemContainer, styles.globalUsersContainer]}>
-								<View style={styles.globalUsersTextContainer}>
-									<Text style={[styles.dropdownItemText, { color: themes[theme].infoText }]}>
-										{I18n.t('Search_global_users')}
-									</Text>
-									<Text style={[styles.dropdownItemDescription, { color: themes[theme].infoText }]}>
-										{I18n.t('Search_global_users_description')}
-									</Text>
-								</View>
-								<Switch value={globalUsers} onValueChange={toggleWorkspace} trackColor={SWITCH_TRACK_COLOR} />
+	const translateY = animatedValue.interpolate({
+		inputRange: [0, 1],
+		outputRange: [-326, 0]
+	});
+
+	const backdropOpacity = animatedValue.interpolate({
+		inputRange: [0, 1],
+		outputRange: [0, colors.backdropOpacity]
+	});
+
+	return (
+		<>
+			<TouchableWithoutFeedback onPress={close}>
+				<Animated.View style={[styles.backdrop, { backgroundColor: colors.backdropColor, opacity: backdropOpacity }]} />
+			</TouchableWithoutFeedback>
+			<Animated.View style={[styles.dropdownContainer, { transform: [{ translateY }], backgroundColor: colors.backgroundColor }]}>
+				<Touch onPress={close} accessibilityLabel={I18n.t('Search_by')}>
+					<View style={[styles.dropdownContainerHeader, styles.dropdownItemContainer, { borderColor: colors.separatorColor }]}>
+						<Text style={[styles.dropdownToggleText, { color: colors.auxiliaryText }]}>{I18n.t('Search_by')}</Text>
+						<CustomIcon
+							style={[styles.dropdownItemIcon, styles.inverted]}
+							size={22}
+							name='chevron-down'
+							color={colors.auxiliaryTintColor}
+						/>
+					</View>
+				</Touch>
+				{renderItem('channels')}
+				{renderItem('users')}
+				{renderItem('teams')}
+				{isFederationEnabled ? (
+					<>
+						<View style={[styles.dropdownSeparator, { backgroundColor: colors.separatorColor }]} />
+						<View style={[styles.dropdownItemContainer, styles.globalUsersContainer]}>
+							<View style={styles.globalUsersTextContainer}>
+								<Text style={[styles.dropdownItemText, { color: colors.infoText }]}>{I18n.t('Search_global_users')}</Text>
+								<Text style={[styles.dropdownItemDescription, { color: colors.infoText }]}>
+									{I18n.t('Search_global_users_description')}
+								</Text>
 							</View>
-						</>
-					) : null}
-				</Animated.View>
-			</>
-		);
-	}
-}
+							<Switch value={globalUsers} onValueChange={toggleWorkspace} trackColor={SWITCH_TRACK_COLOR} />
+						</View>
+					</>
+				) : null}
+			</Animated.View>
+		</>
+	);
+};
+
+export default DirectoryOptions;
diff --git a/app/views/DirectoryView/index.tsx b/app/views/DirectoryView/index.tsx
index ee5f9a357..131ef2cb4 100644
--- a/app/views/DirectoryView/index.tsx
+++ b/app/views/DirectoryView/index.tsx
@@ -315,7 +315,6 @@ class DirectoryView extends React.Component<IDirectoryViewProps, IDirectoryViewS
 				/>
 				{showOptionsDropdown ? (
 					<Options
-						theme={theme}
 						type={type}
 						globalUsers={globalUsers}
 						close={this.toggleDropdown}
diff --git a/app/views/RoomsListView/ServerDropdown.tsx b/app/views/RoomsListView/ServerDropdown.tsx
index 3c0f7c0e9..d2cefc43f 100644
--- a/app/views/RoomsListView/ServerDropdown.tsx
+++ b/app/views/RoomsListView/ServerDropdown.tsx
@@ -1,8 +1,8 @@
-import React, { Component } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { View, Text, Animated, Easing, TouchableWithoutFeedback, TouchableOpacity, FlatList, Linking } from 'react-native';
-import { batch, connect } from 'react-redux';
-import { withSafeAreaInsets } from 'react-native-safe-area-context';
+import { batch, useDispatch } from 'react-redux';
 import { Subscription } from 'rxjs';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import * as List from '../../containers/List';
 import Button from '../../containers/Button';
@@ -13,82 +13,73 @@ import I18n from '../../i18n';
 import EventEmitter from '../../lib/methods/helpers/events';
 import ServerItem from '../../containers/ServerItem';
 import database from '../../lib/database';
-import { themes, TOKEN_KEY } from '../../lib/constants';
-import { withTheme } from '../../theme';
+import { TOKEN_KEY } from '../../lib/constants';
+import { useTheme } from '../../theme';
 import { localAuthenticate } from '../../lib/methods/helpers/localAuthentication';
 import { showConfirmationAlert } from '../../lib/methods/helpers/info';
 import log, { events, logEvent } from '../../lib/methods/helpers/log';
 import { headerHeight } from '../../lib/methods/helpers/navigation';
 import { goRoom } from '../../lib/methods/helpers/goRoom';
 import UserPreferences from '../../lib/methods/userPreferences';
-import { IApplicationState, IBaseScreen, RootEnum, TServerModel } from '../../definitions';
+import { RootEnum, TServerModel } from '../../definitions';
 import styles from './styles';
-import { ChatsStackParamList } from '../../stacks/types';
 import { removeServer } from '../../lib/methods';
+import { useAppSelector } from '../../lib/hooks';
 
 const ROW_HEIGHT = 68;
 const ANIMATION_DURATION = 200;
+const MAX_ROWS = 4;
 
-interface IServerDropdownProps extends IBaseScreen<ChatsStackParamList, 'RoomsListView'> {
-	insets?: {
-		top: number;
-	};
-	closeServerDropdown: boolean;
-	server: string;
-	isMasterDetail: boolean;
-}
+const ServerDropdown = () => {
+	const animatedValue = useRef(new Animated.Value(0)).current;
+	const subscription = useRef<Subscription>();
+	const newServerTimeout = useRef<ReturnType<typeof setTimeout> | false>();
+	const isMounted = useRef(false);
+	const [servers, setServers] = useState<TServerModel[]>([]);
+	const dispatch = useDispatch();
+	const closeServerDropdown = useAppSelector(state => state.rooms.closeServerDropdown);
+	const server = useAppSelector(state => state.server.server);
+	const isMasterDetail = useAppSelector(state => state.app.isMasterDetail);
+	const { colors } = useTheme();
+	const insets = useSafeAreaInsets();
 
-interface IServerDropdownState {
-	servers: TServerModel[];
-}
+	useEffect(() => {
+		if (isMounted.current) close();
+	}, [closeServerDropdown]);
 
-class ServerDropdown extends Component<IServerDropdownProps, IServerDropdownState> {
-	private animatedValue: Animated.Value;
-	private subscription?: Subscription;
-	private newServerTimeout?: ReturnType<typeof setTimeout> | false;
+	useEffect(() => {
+		isMounted.current = true;
 
-	constructor(props: IServerDropdownProps) {
-		super(props);
-		this.state = { servers: [] };
-		this.animatedValue = new Animated.Value(0);
-	}
+		const init = async () => {
+			const serversDB = database.servers;
+			const observable = await serversDB.get('servers').query().observeWithColumns(['name']);
 
-	async componentDidMount() {
-		const serversDB = database.servers;
-		const observable = await serversDB.get('servers').query().observeWithColumns(['name']);
+			subscription.current = observable.subscribe(data => {
+				setServers(data);
+			});
 
-		this.subscription = observable.subscribe(data => {
-			this.setState({ servers: data });
-		});
+			Animated.timing(animatedValue, {
+				toValue: 1,
+				duration: ANIMATION_DURATION,
+				easing: Easing.inOut(Easing.quad),
+				useNativeDriver: true
+			}).start();
+		};
+		init();
 
-		Animated.timing(this.animatedValue, {
-			toValue: 1,
-			duration: ANIMATION_DURATION,
-			easing: Easing.inOut(Easing.quad),
-			useNativeDriver: true
-		}).start();
-	}
+		return () => {
+			if (newServerTimeout.current) {
+				clearTimeout(newServerTimeout.current);
+				newServerTimeout.current = false;
+			}
+			if (subscription.current && subscription.current.unsubscribe) {
+				subscription.current.unsubscribe();
+			}
+		};
+	}, []);
 
-	componentDidUpdate(prevProps: IServerDropdownProps) {
-		const { closeServerDropdown } = this.props;
-		if (prevProps.closeServerDropdown !== closeServerDropdown) {
-			this.close();
-		}
-	}
-
-	componentWillUnmount() {
-		if (this.newServerTimeout) {
-			clearTimeout(this.newServerTimeout);
-			this.newServerTimeout = false;
-		}
-		if (this.subscription && this.subscription.unsubscribe) {
-			this.subscription.unsubscribe();
-		}
-	}
-
-	close = () => {
-		const { dispatch } = this.props;
-		Animated.timing(this.animatedValue, {
+	const close = () => {
+		Animated.timing(animatedValue, {
 			toValue: 0,
 			duration: ANIMATION_DURATION,
 			easing: Easing.inOut(Easing.quad),
@@ -96,7 +87,7 @@ class ServerDropdown extends Component<IServerDropdownProps, IServerDropdownStat
 		}).start(() => dispatch(toggleServerDropdown()));
 	};
 
-	createWorkspace = async () => {
+	const createWorkspace = async () => {
 		logEvent(events.RL_CREATE_NEW_WORKSPACE);
 		try {
 			await Linking.openURL('https://cloud.rocket.chat/trial');
@@ -105,52 +96,49 @@ class ServerDropdown extends Component<IServerDropdownProps, IServerDropdownStat
 		}
 	};
 
-	navToNewServer = (previousServer: string) => {
-		const { dispatch } = this.props;
+	const navToNewServer = (previousServer: string) => {
 		batch(() => {
 			dispatch(appStart({ root: RootEnum.ROOT_OUTSIDE }));
 			dispatch(serverInitAdd(previousServer));
 		});
 	};
 
-	addServer = () => {
+	const addServer = () => {
 		logEvent(events.RL_ADD_SERVER);
-		const { server } = this.props;
-		this.close();
+		close();
 		setTimeout(() => {
-			this.navToNewServer(server);
+			navToNewServer(server);
 		}, ANIMATION_DURATION);
 	};
 
-	select = async (server: string, version?: string) => {
-		const { server: currentServer, dispatch, isMasterDetail } = this.props;
-		this.close();
-		if (currentServer !== server) {
+	const select = async (serverParam: string, version?: string) => {
+		close();
+		if (server !== serverParam) {
 			logEvent(events.RL_CHANGE_SERVER);
-			const userId = UserPreferences.getString(`${TOKEN_KEY}-${server}`);
+			const userId = UserPreferences.getString(`${TOKEN_KEY}-${serverParam}`);
 			if (isMasterDetail) {
 				goRoom({ item: {}, isMasterDetail });
 			}
 			if (!userId) {
 				setTimeout(() => {
-					this.navToNewServer(currentServer);
-					this.newServerTimeout = setTimeout(() => {
-						EventEmitter.emit('NewServer', { server });
+					navToNewServer(server);
+					newServerTimeout.current = setTimeout(() => {
+						EventEmitter.emit('NewServer', { server: serverParam });
 					}, ANIMATION_DURATION);
 				}, ANIMATION_DURATION);
 			} else {
-				await localAuthenticate(server);
-				dispatch(selectServerRequest(server, version, true, true));
+				await localAuthenticate(serverParam);
+				dispatch(selectServerRequest(serverParam, version, true, true));
 			}
 		}
 	};
 
-	remove = (server: string) =>
+	const remove = (server: string) =>
 		showConfirmationAlert({
 			message: I18n.t('This_will_remove_all_data_from_this_server'),
 			confirmationText: I18n.t('Delete'),
 			onPress: async () => {
-				this.close();
+				close();
 				try {
 					await removeServer({ server });
 				} catch {
@@ -159,93 +147,81 @@ class ServerDropdown extends Component<IServerDropdownProps, IServerDropdownStat
 			}
 		});
 
-	renderServer = ({ item }: { item: { id: string; iconURL: string; name: string; version: string } }) => {
-		const { server } = this.props;
+	const renderItem = ({ item }: { item: { id: string; iconURL: string; name: string; version: string } }) => (
+		<ServerItem
+			item={item}
+			onPress={() => select(item.id, item.version)}
+			onLongPress={() => item.id === server || remove(item.id)}
+			hasCheck={item.id === server}
+		/>
+	);
 
-		return (
-			<ServerItem
-				item={item}
-				onPress={() => this.select(item.id, item.version)}
-				onLongPress={() => item.id === server || this.remove(item.id)}
-				hasCheck={item.id === server}
-			/>
-		);
-	};
+	const initialTop = 87 + Math.min(servers.length, MAX_ROWS) * ROW_HEIGHT;
+	const statusBarHeight = insets?.top ?? 0;
+	const heightDestination = isMasterDetail ? headerHeight + statusBarHeight : 0;
 
-	render() {
-		const { servers } = this.state;
-		const { theme, isMasterDetail, insets } = this.props;
-		const maxRows = 4;
-		const initialTop = 87 + Math.min(servers.length, maxRows) * ROW_HEIGHT;
-		const statusBarHeight = insets?.top ?? 0;
-		const heightDestination = isMasterDetail ? headerHeight + statusBarHeight : 0;
-		const translateY = this.animatedValue.interpolate({
-			inputRange: [0, 1],
-			outputRange: [-initialTop, heightDestination]
-		});
-		const backdropOpacity = this.animatedValue.interpolate({
-			inputRange: [0, 1],
-			outputRange: [0, themes[theme].backdropOpacity]
-		});
-		return (
-			<>
-				<TouchableWithoutFeedback onPress={this.close}>
-					<Animated.View
-						style={[
-							styles.backdrop,
-							{
-								backgroundColor: themes[theme].backdropColor,
-								opacity: backdropOpacity,
-								top: heightDestination
-							}
-						]}
-					/>
-				</TouchableWithoutFeedback>
+	const translateY = animatedValue.interpolate({
+		inputRange: [0, 1],
+		outputRange: [-initialTop, heightDestination]
+	});
+
+	const backdropOpacity = animatedValue.interpolate({
+		inputRange: [0, 1],
+		outputRange: [0, colors.backdropOpacity]
+	});
+
+	return (
+		<>
+			<TouchableWithoutFeedback onPress={close}>
 				<Animated.View
 					style={[
-						styles.dropdownContainer,
+						styles.backdrop,
 						{
-							transform: [{ translateY }],
-							backgroundColor: themes[theme].backgroundColor,
-							borderColor: themes[theme].separatorColor
+							backgroundColor: colors.backdropColor,
+							opacity: backdropOpacity,
+							top: heightDestination
 						}
 					]}
-					testID='rooms-list-header-server-dropdown'
-				>
-					<View style={[styles.dropdownContainerHeader, styles.serverHeader, { borderColor: themes[theme].separatorColor }]}>
-						<Text style={[styles.serverHeaderText, { color: themes[theme].auxiliaryText }]}>{I18n.t('Server')}</Text>
-						<TouchableOpacity onPress={this.addServer} testID='rooms-list-header-server-add'>
-							<Text style={[styles.serverHeaderAdd, { color: themes[theme].tintColor }]}>{I18n.t('Add_Server')}</Text>
-						</TouchableOpacity>
-					</View>
-					<FlatList
-						style={{ maxHeight: maxRows * ROW_HEIGHT }}
-						data={servers}
-						keyExtractor={item => item.id}
-						renderItem={this.renderServer}
-						ItemSeparatorComponent={List.Separator}
-						keyboardShouldPersistTaps='always'
-					/>
-					<List.Separator />
-					<Button
-						title={I18n.t('Create_a_new_workspace')}
-						type='secondary'
-						onPress={this.createWorkspace}
-						testID='rooms-list-header-create-workspace-button'
-						style={styles.buttonCreateWorkspace}
-						color={themes[theme].tintColor}
-						styleText={[styles.serverHeaderAdd, { textAlign: 'center' }]}
-					/>
-				</Animated.View>
-			</>
-		);
-	}
-}
+				/>
+			</TouchableWithoutFeedback>
+			<Animated.View
+				style={[
+					styles.dropdownContainer,
+					{
+						transform: [{ translateY }],
+						backgroundColor: colors.backgroundColor,
+						borderColor: colors.separatorColor
+					}
+				]}
+				testID='rooms-list-header-server-dropdown'
+			>
+				<View style={[styles.dropdownContainerHeader, styles.serverHeader, { borderColor: colors.separatorColor }]}>
+					<Text style={[styles.serverHeaderText, { color: colors.auxiliaryText }]}>{I18n.t('Server')}</Text>
+					<TouchableOpacity onPress={addServer} testID='rooms-list-header-server-add'>
+						<Text style={[styles.serverHeaderAdd, { color: colors.tintColor }]}>{I18n.t('Add_Server')}</Text>
+					</TouchableOpacity>
+				</View>
+				<FlatList
+					style={{ maxHeight: MAX_ROWS * ROW_HEIGHT }}
+					data={servers}
+					keyExtractor={item => item.id}
+					renderItem={renderItem}
+					ItemSeparatorComponent={List.Separator}
+					keyboardShouldPersistTaps='always'
+				/>
+				<List.Separator />
+				<Button
+					title={I18n.t('Create_a_new_workspace')}
+					type='secondary'
+					onPress={createWorkspace}
+					testID='rooms-list-header-create-workspace-button'
+					style={styles.buttonCreateWorkspace}
+					color={colors.tintColor}
+					styleText={[styles.serverHeaderAdd, { textAlign: 'center' }]}
+				/>
+			</Animated.View>
+		</>
+	);
+};
 
-const mapStateToProps = (state: IApplicationState) => ({
-	closeServerDropdown: state.rooms.closeServerDropdown,
-	server: state.server.server,
-	isMasterDetail: state.app.isMasterDetail
-});
-
-export default connect(mapStateToProps)(withSafeAreaInsets(withTheme(ServerDropdown)));
+export default ServerDropdown;
diff --git a/app/views/RoomsListView/index.tsx b/app/views/RoomsListView/index.tsx
index c5b2639d6..fb69dd106 100644
--- a/app/views/RoomsListView/index.tsx
+++ b/app/views/RoomsListView/index.tsx
@@ -986,16 +986,14 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 
 	render = () => {
 		console.count(`${this.constructor.name}.render calls`);
-		const { showServerDropdown, theme, navigation } = this.props;
+		const { showServerDropdown, theme } = this.props;
 
 		return (
 			<SafeAreaView testID='rooms-list-view' style={{ backgroundColor: themes[theme].backgroundColor }}>
 				<StatusBar />
 				{this.renderHeader()}
 				{this.renderScroll()}
-				{/* TODO - this ts-ignore is here because the route props, on IBaseScreen*/}
-				{/* @ts-ignore*/}
-				{showServerDropdown ? <ServerDropdown navigation={navigation} theme={theme} /> : null}
+				{showServerDropdown ? <ServerDropdown /> : null}
 			</SafeAreaView>
 		);
 	};
diff --git a/app/views/ThreadMessagesView/Dropdown/index.tsx b/app/views/ThreadMessagesView/Dropdown/index.tsx
index d50a7e330..a2c1b74b7 100644
--- a/app/views/ThreadMessagesView/Dropdown/index.tsx
+++ b/app/views/ThreadMessagesView/Dropdown/index.tsx
@@ -1,47 +1,40 @@
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
 import { Animated, Easing, TouchableWithoutFeedback } from 'react-native';
-import { EdgeInsets, withSafeAreaInsets } from 'react-native-safe-area-context';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import styles from '../styles';
-import { themes } from '../../../lib/constants';
-import { TSupportedThemes, withTheme } from '../../../theme';
 import { headerHeight } from '../../../lib/methods/helpers/navigation';
 import * as List from '../../../containers/List';
 import { Filter } from '../filters';
 import DropdownItemFilter from './DropdownItemFilter';
 import DropdownItemHeader from './DropdownItemHeader';
+import { useTheme } from '../../../theme';
 
 const ANIMATION_DURATION = 200;
 
 interface IDropdownProps {
 	isMasterDetail?: boolean;
-	theme: TSupportedThemes;
-	insets?: EdgeInsets;
 	currentFilter: Filter;
 	onClose: () => void;
 	onFilterSelected: (value: Filter) => void;
 }
 
-class Dropdown extends React.Component<IDropdownProps> {
-	private animatedValue: Animated.Value;
+const Dropdown = ({ isMasterDetail, currentFilter, onClose, onFilterSelected }: IDropdownProps) => {
+	const animatedValue = useRef(new Animated.Value(0)).current;
+	const { colors } = useTheme();
+	const insets = useSafeAreaInsets();
 
-	constructor(props: IDropdownProps) {
-		super(props);
-		this.animatedValue = new Animated.Value(0);
-	}
-
-	componentDidMount() {
-		Animated.timing(this.animatedValue, {
+	useEffect(() => {
+		Animated.timing(animatedValue, {
 			toValue: 1,
 			duration: ANIMATION_DURATION,
 			easing: Easing.inOut(Easing.quad),
 			useNativeDriver: true
 		}).start();
-	}
+	}, [animatedValue]);
 
-	close = () => {
-		const { onClose } = this.props;
-		Animated.timing(this.animatedValue, {
+	const close = () => {
+		Animated.timing(animatedValue, {
 			toValue: 0,
 			duration: ANIMATION_DURATION,
 			easing: Easing.inOut(Easing.quad),
@@ -49,51 +42,50 @@ class Dropdown extends React.Component<IDropdownProps> {
 		}).start(() => onClose());
 	};
 
-	render() {
-		const { isMasterDetail, insets, theme, currentFilter, onFilterSelected } = this.props;
-		const statusBarHeight = insets?.top ?? 0;
-		const heightDestination = isMasterDetail ? headerHeight + statusBarHeight : 0;
-		const translateY = this.animatedValue.interpolate({
-			inputRange: [0, 1],
-			outputRange: [-300, heightDestination] // approximated height of the component when closed/open
-		});
-		const backdropOpacity = this.animatedValue.interpolate({
-			inputRange: [0, 1],
-			outputRange: [0, themes[theme].backdropOpacity]
-		});
-		return (
-			<>
-				<TouchableWithoutFeedback onPress={this.close}>
-					<Animated.View
-						style={[
-							styles.backdrop,
-							{
-								backgroundColor: themes[theme].backdropColor,
-								opacity: backdropOpacity,
-								top: heightDestination
-							}
-						]}
-					/>
-				</TouchableWithoutFeedback>
+	const heightDestination = isMasterDetail ? headerHeight + insets.top : 0;
+
+	const translateY = animatedValue.interpolate({
+		inputRange: [0, 1],
+		outputRange: [-300, heightDestination] // approximated height of the component when closed/open
+	});
+
+	const backdropOpacity = animatedValue.interpolate({
+		inputRange: [0, 1],
+		outputRange: [0, colors.backdropOpacity]
+	});
+
+	return (
+		<>
+			<TouchableWithoutFeedback onPress={close}>
 				<Animated.View
 					style={[
-						styles.dropdownContainer,
+						styles.backdrop,
 						{
-							transform: [{ translateY }],
-							backgroundColor: themes[theme].backgroundColor,
-							borderColor: themes[theme].separatorColor
+							backgroundColor: colors.backdropColor,
+							opacity: backdropOpacity,
+							top: heightDestination
 						}
 					]}
-				>
-					<DropdownItemHeader currentFilter={currentFilter} onPress={this.close} />
-					<List.Separator />
-					<DropdownItemFilter currentFilter={currentFilter} value={Filter.All} onPress={onFilterSelected} />
-					<DropdownItemFilter currentFilter={currentFilter} value={Filter.Following} onPress={onFilterSelected} />
-					<DropdownItemFilter currentFilter={currentFilter} value={Filter.Unread} onPress={onFilterSelected} />
-				</Animated.View>
-			</>
-		);
-	}
-}
+				/>
+			</TouchableWithoutFeedback>
+			<Animated.View
+				style={[
+					styles.dropdownContainer,
+					{
+						transform: [{ translateY }],
+						backgroundColor: colors.backgroundColor,
+						borderColor: colors.separatorColor
+					}
+				]}
+			>
+				<DropdownItemHeader currentFilter={currentFilter} onPress={close} />
+				<List.Separator />
+				<DropdownItemFilter currentFilter={currentFilter} value={Filter.All} onPress={onFilterSelected} />
+				<DropdownItemFilter currentFilter={currentFilter} value={Filter.Following} onPress={onFilterSelected} />
+				<DropdownItemFilter currentFilter={currentFilter} value={Filter.Unread} onPress={onFilterSelected} />
+			</Animated.View>
+		</>
+	);
+};
 
-export default withTheme(withSafeAreaInsets(Dropdown));
+export default Dropdown;
diff --git a/app/views/ThreadMessagesView/index.tsx b/app/views/ThreadMessagesView/index.tsx
index d22aa534f..a8fafa8ed 100644
--- a/app/views/ThreadMessagesView/index.tsx
+++ b/app/views/ThreadMessagesView/index.tsx
@@ -516,19 +516,13 @@ class ThreadMessagesView extends React.Component<IThreadMessagesViewProps, IThre
 	render() {
 		console.count(`${this.constructor.name}.render calls`);
 		const { showFilterDropdown, currentFilter } = this.state;
-		const { theme } = this.props;
 
 		return (
 			<SafeAreaView testID='thread-messages-view'>
 				<StatusBar />
 				{this.renderContent()}
 				{showFilterDropdown ? (
-					<Dropdown
-						currentFilter={currentFilter}
-						onFilterSelected={this.onFilterSelected}
-						onClose={this.closeFilterDropdown}
-						theme={theme}
-					/>
+					<Dropdown currentFilter={currentFilter} onFilterSelected={this.onFilterSelected} onClose={this.closeFilterDropdown} />
 				) : null}
 			</SafeAreaView>
 		);