diff --git a/app/stacks/MasterDetailStack/types.ts b/app/stacks/MasterDetailStack/types.ts
index 2e5246c25..c91dda847 100644
--- a/app/stacks/MasterDetailStack/types.ts
+++ b/app/stacks/MasterDetailStack/types.ts
@@ -32,6 +32,7 @@ export type ModalStackParamList = {
 		rid: string;
 		t: RoomType;
 		joined: boolean;
+		showCloseModal?: boolean;
 	};
 	RoomInfoView: {
 		room: IRoom;
diff --git a/app/views/RoomView/Banner.tsx b/app/views/RoomView/Banner.tsx
index 55eafc625..606c71ad7 100644
--- a/app/views/RoomView/Banner.tsx
+++ b/app/views/RoomView/Banner.tsx
@@ -14,7 +14,6 @@ interface IRoomBannerProps {
 	theme: string;
 	bannerClosed: boolean;
 	closeBanner(): void;
-	rid?: string; // TODO - verify if this props exist
 }
 
 const Banner = React.memo(
diff --git a/app/views/RoomView/LeftButtons.tsx b/app/views/RoomView/LeftButtons.tsx
index 1fbc3833a..01818f192 100644
--- a/app/views/RoomView/LeftButtons.tsx
+++ b/app/views/RoomView/LeftButtons.tsx
@@ -1,9 +1,10 @@
 import React, { useCallback } from 'react';
 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: {
@@ -15,7 +16,7 @@ const styles = StyleSheet.create({
 interface IRoomLeftButtonsProps {
 	tmid?: string;
 	unreadsCount: number;
-	navigation: any; // TODO - change this after merge react navigation
+	navigation: StackNavigationProp<ChatsStackParamList>;
 	baseUrl: string;
 	userId: string;
 	token: string;
diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx
index c18c8463c..2c4afe22d 100644
--- a/app/views/RoomView/index.tsx
+++ b/app/views/RoomView/index.tsx
@@ -1238,7 +1238,6 @@ class RoomView extends React.Component<IRoomViewProps, any> {
 			<SafeAreaView style={{ backgroundColor: themes[theme].backgroundColor }} testID='room-view'>
 				<StatusBar />
 				<Banner
-					rid={rid}
 					title={I18n.t('Announcement')}
 					text={announcement}
 					bannerClosed={bannerClosed}