From 364d56a5974c64c7bddc75a1f92c8d31f74cd09e Mon Sep 17 00:00:00 2001
From: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
Date: Mon, 11 May 2020 11:19:28 -0300
Subject: [PATCH] [FIX] Blink header DM (#2093)

* [FIX] Blink header DM

* Remove query

* [FIX] Push RoomInfoView

* remove unnecessary try/catch

* [FIX] RoomInfo > Message (Tablet)

Co-authored-by: Diego Mello <diegolmello@gmail.com>
---
 app/views/RoomInfoView/index.js | 40 ++++++++++++++++++++++++---------
 app/views/RoomView/index.js     |  2 +-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/app/views/RoomInfoView/index.js b/app/views/RoomInfoView/index.js
index 273c5c215..7cc2cff56 100644
--- a/app/views/RoomInfoView/index.js
+++ b/app/views/RoomInfoView/index.js
@@ -21,9 +21,11 @@ import StatusBar from '../../containers/StatusBar';
 import log from '../../utils/log';
 import { themes } from '../../constants/colors';
 import { withTheme } from '../../theme';
+import { withSplit } from '../../split';
 import { themedHeader } from '../../utils/navigation';
 import { getUserSelector } from '../../selectors/login';
 import Markdown from '../../containers/markdown';
+import Navigation from '../../lib/Navigation';
 
 import Livechat from './Livechat';
 import Channel from './Channel';
@@ -78,6 +80,8 @@ class RoomInfoView extends React.Component {
 			token: PropTypes.string
 		}),
 		baseUrl: PropTypes.string,
+		rooms: PropTypes.array,
+		split: PropTypes.bool,
 		theme: PropTypes.string
 	}
 
@@ -229,16 +233,31 @@ class RoomInfoView extends React.Component {
 		}
 	}
 
-	goRoom = async() => {
+	goRoom = () => {
 		const { roomUser, room } = this.state;
-		const { navigation } = this.props;
-		try {
-			if (room.rid) {
-				await navigation.navigate('RoomsListView');
-				navigation.navigate('RoomView', { rid: room.rid, name: RocketChat.getRoomTitle(roomUser), t: 'd' });
+		const { name, username } = roomUser;
+		const { rooms, navigation, split } = this.props;
+
+		if (room.rid) {
+			let navigate = navigation.push;
+
+			// if this is a room focused
+			if (rooms.includes(room.rid)) {
+				({ navigate } = navigation);
+			} else if (split) {
+				({ navigate } = Navigation);
 			}
-		} catch (e) {
-			// do nothing
+
+			navigate('RoomView', {
+				rid: room.rid,
+				name: RocketChat.getRoomTitle({
+					t: room.t,
+					fname: name,
+					name: username
+				}),
+				t: room.t,
+				roomUserId: RocketChat.getUidDirectMessage(room)
+			});
 		}
 	}
 
@@ -326,7 +345,8 @@ class RoomInfoView extends React.Component {
 
 const mapStateToProps = state => ({
 	baseUrl: state.server.server,
-	user: getUserSelector(state)
+	user: getUserSelector(state),
+	rooms: state.room.rooms
 });
 
-export default connect(mapStateToProps)(withTheme(RoomInfoView));
+export default connect(mapStateToProps)(withSplit(withTheme(RoomInfoView)));
diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js
index dc8317fea..5dba91af7 100644
--- a/app/views/RoomView/index.js
+++ b/app/views/RoomView/index.js
@@ -766,7 +766,7 @@ class RoomView extends React.Component {
 			navigation.navigate('RoomActionsView', { rid: this.rid, t: this.t, room });
 			ModalNavigation.navigate('RoomInfoView', navParam);
 		} else {
-			navigation.navigate('RoomInfoView', navParam);
+			navigation.push('RoomInfoView', navParam);
 		}
 	}