diff --git a/app/containers/ActionSheet/ActionSheet.tsx b/app/containers/ActionSheet/ActionSheet.tsx
index 84d304eb8..6513152e8 100644
--- a/app/containers/ActionSheet/ActionSheet.tsx
+++ b/app/containers/ActionSheet/ActionSheet.tsx
@@ -169,7 +169,7 @@ const ActionSheet = React.memo(forwardRef(({ children, theme }: {children: JSX.E
 							]}
 						/>
 					</TapGestureHandler>
-					<ScrollBottomSheet<any>
+					<ScrollBottomSheet
 						testID='action-sheet'
 						ref={bottomSheetRef}
 						componentType='FlatList'
@@ -187,7 +187,7 @@ const ActionSheet = React.memo(forwardRef(({ children, theme }: {children: JSX.E
 						// FlatList props
 						data={data?.options}
 						renderItem={renderItem}
-						keyExtractor={item => item.title}
+						keyExtractor={(item: any) => item.title}
 						style={{ backgroundColor: themes[theme].focusedBackground }}
 						contentContainerStyle={styles.content}
 						ItemSeparatorComponent={List.Separator}
diff --git a/app/containers/Avatar/Avatar.tsx b/app/containers/Avatar/Avatar.tsx
index c5f33d936..acbdde20a 100644
--- a/app/containers/Avatar/Avatar.tsx
+++ b/app/containers/Avatar/Avatar.tsx
@@ -119,11 +119,4 @@ const Avatar = React.memo(({
 	);
 });
 
-// Avatar.defaultProps = {
-// 	text: '',
-// 	size: 25,
-// 	type: 'd',
-// 	borderRadius: 4
-// };
-
 export default Avatar;
diff --git a/app/containers/OrSeparator.tsx b/app/containers/OrSeparator.tsx
index 7964e0db7..957a0ce4f 100644
--- a/app/containers/OrSeparator.tsx
+++ b/app/containers/OrSeparator.tsx
@@ -33,9 +33,7 @@ const OrSeparator = React.memo(({ theme }: IOrSeparator) => {
 	return (
 		<View style={styles.container}>
 			<View style={[styles.line, line]} />
-			{/*TODO - see if this line is wrong, probably the correct is styles.text.marginRight*/}
-			{/*@ts-ignore*/}
-			<Text style={[styles.text, styles.marginRight, styles.marginLeft, text]}>{I18n.t('OR')}</Text>
+			<Text style={[styles.text, text]}>{I18n.t('OR')}</Text>
 			<View style={[styles.line, line]} />
 		</View>
 	);
diff --git a/app/externalModules.d.ts b/app/externalModules.d.ts
index d8e87d66c..d68109836 100644
--- a/app/externalModules.d.ts
+++ b/app/externalModules.d.ts
@@ -6,3 +6,4 @@ declare module 'react-native-image-progress';
 declare module 'react-native-platform-touchable';
 declare module 'react-native-ui-lib/keyboard';
 declare module '@rocket.chat/ui-kit';
+declare module 'react-native-config-reader';