diff --git a/app/views/ChangePasscodeView.tsx b/app/views/ChangePasscodeView.tsx
index 2768522c1..5ed58a27d 100644
--- a/app/views/ChangePasscodeView.tsx
+++ b/app/views/ChangePasscodeView.tsx
@@ -80,10 +80,10 @@ const ChangePasscodeView = React.memo(() => {
 
 	return (
 		<Modal useNativeDriver isVisible={visible} hideModalContentWhileAnimating style={styles.modal}>
-			<PasscodeChoose theme={theme!} finishProcess={onSubmit} force={data?.force} />
+			<PasscodeChoose theme={theme} finishProcess={onSubmit} force={data?.force} />
 			{!data?.force ? (
 				<Touchable onPress={onCancel} style={styles.close}>
-					<CustomIcon name='close' color={themes[theme!].passcodePrimary} size={30} />
+					<CustomIcon name='close' color={themes[theme].passcodePrimary} size={30} />
 				</Touchable>
 			) : null}
 		</Modal>
diff --git a/app/views/DiscussionsView/index.tsx b/app/views/DiscussionsView/index.tsx
index 0dc076e97..01282095b 100644
--- a/app/views/DiscussionsView/index.tsx
+++ b/app/views/DiscussionsView/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useLayoutEffect, useState } from 'react';
-import { FlatList } from 'react-native';
+import { FlatList, StyleSheet } from 'react-native';
 import { useSelector } from 'react-redux';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { HeaderBackButton, StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
@@ -24,10 +24,15 @@ import RocketChat from '../../lib/rocketchat';
 import SearchHeader from '../../containers/SearchHeader';
 import { TThreadModel } from '../../definitions/IThread';
 import Item from './Item';
-import styles from './styles';
 
 const API_FETCH_COUNT = 50;
 
+const styles = StyleSheet.create({
+	contentContainer: {
+		marginBottom: 30
+	}
+});
+
 interface IDiscussionsViewProps {
 	navigation: StackNavigationProp<ChatsStackParamList, 'DiscussionsView'>;
 	route: RouteProp<ChatsStackParamList, 'DiscussionsView'>;
@@ -121,7 +126,7 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): JSX.Elem
 
 		options = {
 			headerLeft: () => (
-				<HeaderBackButton labelVisible={false} onPress={() => navigation.pop()} tintColor={themes[theme!].headerTintColor} />
+				<HeaderBackButton labelVisible={false} onPress={() => navigation.pop()} tintColor={themes[theme].headerTintColor} />
 			),
 			headerTitleAlign: 'center',
 			headerTitle: I18n.t('Discussions'),
@@ -187,7 +192,7 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): JSX.Elem
 				data={isSearching ? search : discussions}
 				renderItem={renderItem}
 				keyExtractor={(item: any) => item.msg}
-				style={{ backgroundColor: themes[theme!].backgroundColor }}
+				style={{ backgroundColor: themes[theme].backgroundColor }}
 				contentContainerStyle={styles.contentContainer}
 				onEndReachedThreshold={0.5}
 				removeClippedSubviews={isIOS}
diff --git a/app/views/DiscussionsView/styles.ts b/app/views/DiscussionsView/styles.ts
deleted file mode 100644
index c6478a8b5..000000000
--- a/app/views/DiscussionsView/styles.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { StyleSheet } from 'react-native';
-
-export default StyleSheet.create({
-	contentContainer: {
-		marginBottom: 30
-	}
-});