Merge pull request RocketChat#291 from Shailesh351/sb_fix_demo

[Upstream Demo] Some Fixes
shubhsherl · May 22, 2020 · d78d685 · d78d685
2 parents f361cc5 + 270ba9c
commit d78d685
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/ui-sidenav/client/SortList.js b/app/ui-sidenav/client/SortList.js
@@ -5,6 +5,7 @@ import { Icon, ToggleSwitch, RadioButton, Box, Flex, Margins } from '@rocket.cha
 import { useTranslation } from '../../../client/contexts/TranslationContext';
 import { useUserPreference } from '../../../client/contexts/UserContext';
 import { useMethod } from '../../../client/contexts/ServerContext';
+import { isMobile } from '../../utils';
 
 function SortListItem({ text, icon, input }) {
 	return <Flex.Container>
@@ -34,7 +35,7 @@ export function SortList() {
 	return <>
 		<div className='rc-popover__column'>
 			<SortModeList/>
-			<ViewModeList/>
+			{isMobile() ? null : <ViewModeList/>}
 			<GroupingList/>
 		</div>
 	</>;

diff --git a/app/ui-utils/client/lib/SideNav.js b/app/ui-utils/client/lib/SideNav.js
@@ -2,7 +2,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 
 import { AccountBox } from './AccountBox';
-import { roomTypes } from '../../../utils/client/lib/roomTypes';
+import { roomTypes, isMobile } from '../../../utils';
 import { Subscriptions } from '../../../models';
 
 export const SideNav = new class {
@@ -46,7 +46,7 @@ export const SideNav = new class {
 		const routesNamesForRooms = roomTypes.getTypes().filter((i) => i.route).map((i) => i.route.name);
 		if (!routesNamesForRooms.includes(FlowRouter.current().route.name)) {
 			const subscription = Subscriptions.findOne({ rid: Session.get('openedRoom') });
-			if (subscription) {
+			if (subscription && !isMobile()) {
 				roomTypes.openRouteLink(subscription.t, subscription, FlowRouter.current().queryParams);
 			} else {
 				FlowRouter.go('home');