Merge pull request RocketChat#173 from shubhsherl/fix_room_header

fix room header
Shailesh351 · Mar 19, 2020 · 91a2780 · 91a2780
2 parents ffe0b5c + 821c55a
commit 91a2780
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
@@ -9,7 +9,7 @@
 					{{> burger}}
 				</div>
 
-				{{#if isDiscussion}}
+				{{#if $and isDiscussion isNotMobile}}
 					<div class="rc-header__block rc-header__block--action js-open-parent-channel rc-tooltip rc-tooltip--down rc-tooltip--start" aria-label={{_ "Back_to_room"}}>
 						<span class="rc-header__first-icon">{{> icon block="rc-header__icon rc-header__icon" icon="back"}}</span>
 					</div>
@@ -29,14 +29,12 @@
 				{{/if}}
 
 				<div class="rc-header__content rc-header__block">
-					{{#if isDirect}}
-						{{#if isNotMobile}}
+					{{#if $and isDirect isNotMobile}}
 						<div class="rc-header__block">
 							<div class="rc-header__image">
 								{{> avatar username=avatarBackground}}
 							</div>
 						</div>
-						{{/if}}
 					{{/if}}
 
 					<div class="rc-header__data">
@@ -52,7 +50,7 @@
 							<div class="rc-header__visual-status">{{userStatusText}}</div>
 						</span>
 						{{else}}
-						{{#if roomTopic}}<span class="rc-header__topic">{{{roomTopic}}}</span>{{/if}}
+						{{#if $and roomTopic isNotMobile}}<span class="rc-header__topic">{{{roomTopic}}}</span>{{/if}}
 						{{/if}}
 					</div>