From 888211825731a4012912e33b8090c50769f9ced3 Mon Sep 17 00:00:00 2001
From: Gabriel Henriques <gabriel.henriques@rocket.chat>
Date: Mon, 23 Dec 2019 10:37:31 -0300
Subject: [PATCH 1/2] changed user not found message

---
 app/ui/client/views/404/roomNotFound.html | 14 +++++++-------
 app/ui/client/views/404/roomNotFound.js   |  9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/ui/client/views/404/roomNotFound.html b/app/ui/client/views/404/roomNotFound.html
index 036ca2046c52a..ccb7647e71605 100644
--- a/app/ui/client/views/404/roomNotFound.html
+++ b/app/ui/client/views/404/roomNotFound.html
@@ -1,10 +1,10 @@
 <template name="roomNotFound">
 	<section class="page-container page-list content-background-color">
-		{{> header sectionName="Room_not_found"}}
-		<div class="content room-not-found error-color">
-			<i class="icon-attention"></i>
-			<div>
-				{{#with data}}
+		{{#with data}}
+			{{> header sectionName=headerMessage}}
+			<div class="content room-not-found error-color">
+				<i class="icon-attention"></i>
+				<div>
 					{{#if $eq type 'c'}}
 						{{{_ 'No_channel_with_name_%s_was_found' name}}}
 					{{/if}}
@@ -22,8 +22,8 @@
 							{{/if}}
 						{{/if}}
 					{{/if}}
-				{{/with}}
+				</div>
 			</div>
-		</div>
+		{{/with}}
 	</section>
 </template>
diff --git a/app/ui/client/views/404/roomNotFound.js b/app/ui/client/views/404/roomNotFound.js
index da7ebe9704ca9..a41c672727b40 100644
--- a/app/ui/client/views/404/roomNotFound.js
+++ b/app/ui/client/views/404/roomNotFound.js
@@ -20,4 +20,13 @@ Template.roomNotFound.helpers({
 	customErrorMessage() {
 		return this.error.reason;
 	},
+	headerMessage() {
+		const { type } = Template.currentData();
+
+		if (type === 'd') {
+			return 'User_not_found';
+		}
+
+		return 'Room_not_found';
+	},
 });

From 3a2c84d8052b722c204b4837defe793ff251f923 Mon Sep 17 00:00:00 2001
From: Gabriel Henriques <gabriel.henriques@rocket.chat>
Date: Mon, 23 Dec 2019 17:46:48 -0300
Subject: [PATCH 2/2] code style fixes

---
 app/ui/client/views/404/roomNotFound.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/ui/client/views/404/roomNotFound.js b/app/ui/client/views/404/roomNotFound.js
index a41c672727b40..c709d9133b89f 100644
--- a/app/ui/client/views/404/roomNotFound.js
+++ b/app/ui/client/views/404/roomNotFound.js
@@ -23,10 +23,6 @@ Template.roomNotFound.helpers({
 	headerMessage() {
 		const { type } = Template.currentData();
 
-		if (type === 'd') {
-			return 'User_not_found';
-		}
-
-		return 'Room_not_found';
+		return type === 'd' ? 'User_not_found' : 'Room_not_found';
 	},
 });