From 1dc978cc8806130ec9277c01c245dca24315f704 Mon Sep 17 00:00:00 2001
From: AlexAlexandre <alexalexandrejr@gmail.com>
Date: Wed, 8 Dec 2021 00:45:19 -0300
Subject: [PATCH] chore: resolving problems with the RightButtons

---
 app/views/RoomView/RightButtons.tsx | 10 ++++++----
 app/views/RoomView/index.tsx        |  1 -
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/RoomView/RightButtons.tsx b/app/views/RoomView/RightButtons.tsx
index 125566fde..c97e14ecf 100644
--- a/app/views/RoomView/RightButtons.tsx
+++ b/app/views/RoomView/RightButtons.tsx
@@ -3,26 +3,28 @@ import { connect } from 'react-redux';
 import { dequal } from 'dequal';
 import { Subscription } from 'rxjs';
 import Model from '@nozbe/watermelondb/Model';
+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';
 
 interface IRoomRightButtonsContainerProps {
 	userId: string;
 	threadsEnabled: boolean;
 	rid: string;
-	t: string;
+	t: RoomType;
 	tmid?: string;
 	teamId: string;
-	navigation: any; // TODO - change this after merge react navigation
+	navigation: StackNavigationProp<ChatsStackParamList>;
 	isMasterDetail: boolean;
 	toggleFollowThread: Function;
 	joined: boolean;
 	encrypted: boolean;
-	teamMain?: string; // TODO - verify if this props exist
 }
 
 class RightButtonsContainer extends Component<IRoomRightButtonsContainerProps, any> {
@@ -147,7 +149,7 @@ class RightButtonsContainer extends Component<IRoomRightButtonsContainerProps, a
 		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 });
diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx
index d055143e0..c18c8463c 100644
--- a/app/views/RoomView/index.tsx
+++ b/app/views/RoomView/index.tsx
@@ -489,7 +489,6 @@ class RoomView extends React.Component<IRoomViewProps, any> {
 					rid={rid}
 					tmid={tmid}
 					teamId={teamId}
-					teamMain={teamMain}
 					joined={joined}
 					t={t}
 					encrypted={encrypted}