From b17daf79b16d35d564192dcdc3b22167d0cd973e Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 1 Sep 2023 12:20:45 -0400
Subject: [PATCH] MM-49393 Remove Utils.isMobile (#24271)

* Switch Utils.isMobile to getIsMobileView in most places

* Copy Utils.isMobile into menu widgets

* Actually remove Utils.isMobile

* Remove pointless checkAndSetMobileView action

* Fix incorrect import of UserProfile

* Fix unit test
---
 .../components/actions_menu/actions_menu.tsx  |  2 -
 .../admin_console/admin_sidebar/index.ts      |  7 +-
 .../channel_info_rhs/about_area_gm.test.tsx   |  5 ++
 .../linking_landing_page.tsx                  |  4 +-
 .../components/search_bar/search_bar.test.tsx |  8 ---
 .../components/sidebar_right_menu/index.ts    |  2 +
 .../sidebar_right_menu/sidebar_right_menu.tsx |  6 +-
 .../src/components/team_general_tab/index.ts  |  3 +
 .../team_general_tab.test.tsx                 |  1 +
 .../team_general_tab/team_general_tab.tsx     |  8 +--
 .../virtualized_thread_viewer/index.ts        |  4 +-
 .../virtualized_thread_viewer.test.tsx        |  2 +-
 .../virtualized_thread_viewer.tsx             | 23 ++-----
 .../src/components/user_profile/index.ts      |  4 +-
 .../user_profile/user_profile.test.tsx        |  1 +
 .../components/user_profile/user_profile.tsx  |  6 +-
 .../components/user_settings/general/index.ts |  6 +-
 .../general/user_settings_general.test.tsx    |  1 +
 .../general/user_settings_general.tsx         | 15 +++--
 .../widgets/menu/is_mobile_view_hack.ts       | 15 +++++
 .../src/components/widgets/menu/menu.scss     | 14 ++++
 .../src/components/widgets/menu/menu.test.tsx | 66 ++-----------------
 .../src/components/widgets/menu/menu.tsx      | 20 +++---
 .../menu/menu_items/submenu_item.test.tsx     |  4 ++
 .../widgets/menu/menu_items/submenu_item.tsx  |  7 +-
 .../submenu_modal/submenu_modal.test.tsx      |  6 +-
 .../widgets/menu/menu_wrapper_animation.tsx   |  2 +-
 .../channels/src/selectors/onboarding.test.ts | 25 +++++++
 webapp/channels/src/selectors/onboarding.ts   |  9 ++-
 webapp/channels/src/utils/utils.tsx           | 10 +--
 30 files changed, 143 insertions(+), 143 deletions(-)
 create mode 100644 webapp/channels/src/components/widgets/menu/is_mobile_view_hack.ts

diff --git a/webapp/channels/src/components/actions_menu/actions_menu.tsx b/webapp/channels/src/components/actions_menu/actions_menu.tsx
index ec540a994a..cbd8ba2281 100644
--- a/webapp/channels/src/components/actions_menu/actions_menu.tsx
+++ b/webapp/channels/src/components/actions_menu/actions_menu.tsx
@@ -273,8 +273,6 @@ export class ActionMenuClass extends React.PureComponent<Props, State> {
             return null;
         }
 
-        // const isMobile = this.props.isMobileView TODO;
-
         const pluginItems = this.props.pluginMenuItems?.
             filter((item) => {
                 return item.filter ? item.filter(this.props.post.id) : item;
diff --git a/webapp/channels/src/components/admin_console/admin_sidebar/index.ts b/webapp/channels/src/components/admin_console/admin_sidebar/index.ts
index 5873ce4e61..dd3c2997da 100644
--- a/webapp/channels/src/components/admin_console/admin_sidebar/index.ts
+++ b/webapp/channels/src/components/admin_console/admin_sidebar/index.ts
@@ -15,10 +15,9 @@ import {ActionFunc} from 'mattermost-redux/types/actions';
 
 import {GlobalState} from 'types/store';
 
-import {isMobile} from 'utils/utils';
-
-import {getNavigationBlocked} from 'selectors/views/admin';
 import {getAdminDefinition, getConsoleAccess} from 'selectors/admin_console';
+import {getNavigationBlocked} from 'selectors/views/admin';
+import {getIsMobileView} from 'selectors/views/browser';
 
 import {OnboardingTaskCategory, OnboardingTaskList} from 'components/onboarding_tasks';
 
@@ -33,7 +32,7 @@ function mapStateToProps(state: GlobalState) {
     const consoleAccess = getConsoleAccess(state);
     const taskListStatus = getBool(state, OnboardingTaskCategory, OnboardingTaskList.ONBOARDING_TASK_LIST_SHOW);
     const isUserFirstAdmin = isFirstAdmin(state);
-    const isMobileView = isMobile();
+    const isMobileView = getIsMobileView(state);
     const showTaskList = isUserFirstAdmin && taskListStatus && !isMobileView;
     const subscriptionProduct = getSubscriptionProduct(state);
 
diff --git a/webapp/channels/src/components/channel_info_rhs/about_area_gm.test.tsx b/webapp/channels/src/components/channel_info_rhs/about_area_gm.test.tsx
index 02664431c0..ce9e03dfe8 100644
--- a/webapp/channels/src/components/channel_info_rhs/about_area_gm.test.tsx
+++ b/webapp/channels/src/components/channel_info_rhs/about_area_gm.test.tsx
@@ -107,6 +107,11 @@ const initialState = {
             config: {PostEditTimeLimit: -1},
         },
     },
+    views: {
+        browser: {
+            windowSize: '',
+        },
+    },
 };
 
 describe('channel_info_rhs/about_area_gm', () => {
diff --git a/webapp/channels/src/components/linking_landing_page/linking_landing_page.tsx b/webapp/channels/src/components/linking_landing_page/linking_landing_page.tsx
index 9e63dd0ad3..f86e22eab1 100644
--- a/webapp/channels/src/components/linking_landing_page/linking_landing_page.tsx
+++ b/webapp/channels/src/components/linking_landing_page/linking_landing_page.tsx
@@ -160,14 +160,14 @@ export default class LinkingLandingPage extends PureComponent<Props, State> {
     renderGoNativeAppMessage = () => {
         return (
             <a
-                href={Utils.isMobile() ? '#' : this.state.nativeLocation}
+                href={UserAgent.isMobile() ? '#' : this.state.nativeLocation}
                 onMouseDown={() => {
                     this.setPreference(LandingPreferenceTypes.MATTERMOSTAPP, true);
                 }}
                 onClick={() => {
                     this.setPreference(LandingPreferenceTypes.MATTERMOSTAPP, true);
                     this.setState({redirectPage: true, navigating: true});
-                    if (Utils.isMobile()) {
+                    if (UserAgent.isMobile()) {
                         if (UserAgent.isAndroidWeb()) {
                             const timeout = setTimeout(() => {
                                 window.location.replace(this.getDownloadLink()!);
diff --git a/webapp/channels/src/components/search_bar/search_bar.test.tsx b/webapp/channels/src/components/search_bar/search_bar.test.tsx
index 4e5f308435..2827134e24 100644
--- a/webapp/channels/src/components/search_bar/search_bar.test.tsx
+++ b/webapp/channels/src/components/search_bar/search_bar.test.tsx
@@ -22,14 +22,6 @@ const suggestionProviders = [
     new SearchUserProvider(jest.fn()),
 ];
 
-jest.mock('utils/utils', () => {
-    const original = jest.requireActual('utils/utils');
-    return {
-        ...original,
-        isMobile: jest.fn(() => false),
-    };
-});
-
 const wrapIntl = (component: JSX.Element) => (
     <IntlProvider
         locale={'en'}
diff --git a/webapp/channels/src/components/sidebar_right_menu/index.ts b/webapp/channels/src/components/sidebar_right_menu/index.ts
index 9ef521ccb5..f7607c38de 100644
--- a/webapp/channels/src/components/sidebar_right_menu/index.ts
+++ b/webapp/channels/src/components/sidebar_right_menu/index.ts
@@ -8,6 +8,7 @@ import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
 import {openMenu as openRhsMenu} from 'actions/views/rhs';
 import {getIsRhsMenuOpen} from 'selectors/rhs';
+import {getIsMobileView} from 'selectors/views/browser';
 
 import {GlobalState} from 'types/store';
 
@@ -23,6 +24,7 @@ function mapStateToProps(state: GlobalState) {
 
     return {
         teamDisplayName: currentTeam && currentTeam.display_name,
+        isMobileView: getIsMobileView(state),
         isOpen: getIsRhsMenuOpen(state),
         siteName,
     };
diff --git a/webapp/channels/src/components/sidebar_right_menu/sidebar_right_menu.tsx b/webapp/channels/src/components/sidebar_right_menu/sidebar_right_menu.tsx
index 1081403663..6a9f7efcaa 100644
--- a/webapp/channels/src/components/sidebar_right_menu/sidebar_right_menu.tsx
+++ b/webapp/channels/src/components/sidebar_right_menu/sidebar_right_menu.tsx
@@ -8,7 +8,6 @@ import {CSSTransition} from 'react-transition-group';
 
 import * as GlobalActions from 'actions/global_actions';
 import {Constants} from 'utils/constants';
-import * as Utils from 'utils/utils';
 
 import MainMenu from 'components/main_menu';
 
@@ -17,6 +16,7 @@ type Action = {
 }
 
 type Props = {
+    isMobileView: boolean;
     isOpen: boolean;
     teamDisplayName?: string;
     siteName?: string;
@@ -42,7 +42,7 @@ export default class SidebarRightMenu extends React.PureComponent<Props> {
 
         return (
             <div
-                className={classNames('sidebar--menu', {'move--left': this.props.isOpen && Utils.isMobile()})}
+                className={classNames('sidebar--menu', {'move--left': this.props.isOpen && this.props.isMobileView})}
                 id='sidebar-menu'
             >
                 <div className='team__header theme'>
@@ -56,7 +56,7 @@ export default class SidebarRightMenu extends React.PureComponent<Props> {
 
                 <div className='nav-pills__container mobile-main-menu'>
                     <CSSTransition
-                        in={this.props.isOpen && Utils.isMobile()}
+                        in={this.props.isOpen && this.props.isMobileView}
                         classNames='MobileRightSidebarMenu'
                         enter={true}
                         exit={true}
diff --git a/webapp/channels/src/components/team_general_tab/index.ts b/webapp/channels/src/components/team_general_tab/index.ts
index ac1fb585f8..c7faa3f6a2 100644
--- a/webapp/channels/src/components/team_general_tab/index.ts
+++ b/webapp/channels/src/components/team_general_tab/index.ts
@@ -10,6 +10,8 @@ import {Permissions} from 'mattermost-redux/constants';
 import {haveITeamPermission} from 'mattermost-redux/selectors/entities/roles';
 import {ActionResult, GenericAction} from 'mattermost-redux/types/actions';
 
+import {getIsMobileView} from 'selectors/views/browser';
+
 import {GlobalState} from 'types/store/index';
 
 import {Team} from '@mattermost/types/teams';
@@ -33,6 +35,7 @@ function mapStateToProps(state: GlobalState, ownProps: OwnProps) {
     return {
         maxFileSize,
         canInviteTeamMembers,
+        isMobileView: getIsMobileView(state),
     };
 }
 
diff --git a/webapp/channels/src/components/team_general_tab/team_general_tab.test.tsx b/webapp/channels/src/components/team_general_tab/team_general_tab.test.tsx
index 43b17931f2..8869cbf00b 100644
--- a/webapp/channels/src/components/team_general_tab/team_general_tab.test.tsx
+++ b/webapp/channels/src/components/team_general_tab/team_general_tab.test.tsx
@@ -30,6 +30,7 @@ describe('components/TeamSettings', () => {
         collapseModal: jest.fn(),
         actions: baseActions,
         canInviteTeamMembers: true,
+        isMobileView: false,
     };
 
     test('should handle bad updateTeamIcon function call', () => {
diff --git a/webapp/channels/src/components/team_general_tab/team_general_tab.tsx b/webapp/channels/src/components/team_general_tab/team_general_tab.tsx
index 8a72f36f45..6095d2d594 100644
--- a/webapp/channels/src/components/team_general_tab/team_general_tab.tsx
+++ b/webapp/channels/src/components/team_general_tab/team_general_tab.tsx
@@ -5,7 +5,7 @@ import React, {ChangeEvent, MouseEvent, ReactNode} from 'react';
 import {FormattedMessage, FormattedDate} from 'react-intl';
 
 import Constants from 'utils/constants';
-import {imageURLForTeam, isMobile, localizeMessage, moveCursorToEnd} from 'utils/utils';
+import {imageURLForTeam, localizeMessage, moveCursorToEnd} from 'utils/utils';
 import {t} from 'utils/i18n';
 
 import SettingItemMax from 'components/setting_item_max';
@@ -390,7 +390,7 @@ export default class GeneralTab extends React.PureComponent<Props, State> {
         if (this.props.activeSection === 'name') {
             const inputs = [];
 
-            const teamNameLabel = isMobile() ? '' : (
+            const teamNameLabel = this.props.isMobileView ? '' : (
                 <FormattedMessage
                     id='general_tab.teamName'
                     defaultMessage='Team Name'
@@ -449,7 +449,7 @@ export default class GeneralTab extends React.PureComponent<Props, State> {
         if (this.props.activeSection === 'description') {
             const inputs = [];
 
-            const teamDescriptionLabel = isMobile() ? '' : (
+            const teamDescriptionLabel = this.props.isMobileView ? '' : (
                 <FormattedMessage
                     id='general_tab.teamDescription'
                     defaultMessage='Team Description'
@@ -557,7 +557,7 @@ export default class GeneralTab extends React.PureComponent<Props, State> {
                     />
                 );
             } else {
-                minMessage = isMobile() ? localizeMessage('general_tab.teamIconEditHintMobile', 'Click to upload an image') : localizeMessage('general_tab.teamIconEditHint', 'Click \'Edit\' to upload an image.');
+                minMessage = this.props.isMobileView ? localizeMessage('general_tab.teamIconEditHintMobile', 'Click to upload an image') : localizeMessage('general_tab.teamIconEditHint', 'Click \'Edit\' to upload an image.');
             }
 
             teamIconSection = (
diff --git a/webapp/channels/src/components/threading/virtualized_thread_viewer/index.ts b/webapp/channels/src/components/threading/virtualized_thread_viewer/index.ts
index 97ee36a111..5210154e29 100644
--- a/webapp/channels/src/components/threading/virtualized_thread_viewer/index.ts
+++ b/webapp/channels/src/components/threading/virtualized_thread_viewer/index.ts
@@ -13,9 +13,10 @@ import {Post} from '@mattermost/types/posts';
 
 import {FakePost} from 'types/store/rhs';
 
+import {getIsMobileView} from 'selectors/views/browser';
 import {makePrepareReplyIdsForThreadViewer, makeGetThreadLastViewedAt} from 'selectors/views/threads';
 
-import {GlobalState} from 'types/store';
+import type {GlobalState} from 'types/store';
 
 import ThreadViewerVirtualized from './virtualized_thread_viewer';
 
@@ -51,6 +52,7 @@ function makeMapStateToProps() {
         return {
             currentUserId,
             directTeammate,
+            isMobileView: getIsMobileView(state),
             lastPost,
             replyListIds,
             lastViewedAt,
diff --git a/webapp/channels/src/components/threading/virtualized_thread_viewer/virtualized_thread_viewer.test.tsx b/webapp/channels/src/components/threading/virtualized_thread_viewer/virtualized_thread_viewer.test.tsx
index aea2a803c8..410494aa95 100644
--- a/webapp/channels/src/components/threading/virtualized_thread_viewer/virtualized_thread_viewer.test.tsx
+++ b/webapp/channels/src/components/threading/virtualized_thread_viewer/virtualized_thread_viewer.test.tsx
@@ -54,7 +54,6 @@ describe('components/threading/VirtualizedThreadViewer', () => {
         socketConnectionStatus: true,
         actions,
         directTeammate,
-        isCollapsedThreadsEnabled: false,
         posts: [post],
         lastPost: post,
         onCardClick: () => {},
@@ -62,6 +61,7 @@ describe('components/threading/VirtualizedThreadViewer', () => {
         replyListIds: [],
         teamId: '',
         useRelativeTimestamp: true,
+        isMobileView: false,
         isThreadView: true,
         lastViewedAt: 0,
         newMessagesSeparatorActions: [],
diff --git a/webapp/channels/src/components/threading/virtualized_thread_viewer/virtualized_thread_viewer.tsx b/webapp/channels/src/components/threading/virtualized_thread_viewer/virtualized_thread_viewer.tsx
index b0ad23b8af..c30c568ff2 100644
--- a/webapp/channels/src/components/threading/virtualized_thread_viewer/virtualized_thread_viewer.tsx
+++ b/webapp/channels/src/components/threading/virtualized_thread_viewer/virtualized_thread_viewer.tsx
@@ -36,6 +36,7 @@ type Props = {
     replyListIds: string[];
     selected: Post | FakePost;
     useRelativeTimestamp: boolean;
+    isMobileView: boolean;
     isThreadView: boolean;
     lastViewedAt: number;
     newMessagesSeparatorActions: PluginComponent[];
@@ -43,7 +44,6 @@ type Props = {
 
 type State = {
     createCommentHeight: number;
-    isMobile: boolean;
     isScrolling: boolean;
     topRhsPostId?: string;
     userScrolled: boolean;
@@ -96,7 +96,6 @@ class ThreadViewerVirtualized extends PureComponent<Props, State> {
         super(props);
 
         const postIndex = this.getInitialPostIndex();
-        const isMobile = Utils.isMobile();
 
         this.initRangeToRender = [
             Math.max(postIndex - 30, 0),
@@ -110,7 +109,6 @@ class ThreadViewerVirtualized extends PureComponent<Props, State> {
 
         this.state = {
             createCommentHeight: 0,
-            isMobile,
             isScrolling: false,
             userScrolled: false,
             userScrolledToBottom: false,
@@ -125,12 +123,10 @@ class ThreadViewerVirtualized extends PureComponent<Props, State> {
 
     componentDidMount() {
         this.mounted = true;
-        window.addEventListener('resize', this.handleWindowResize);
     }
 
     componentWillUnmount() {
         this.mounted = false;
-        window.removeEventListener('resize', this.handleWindowResize);
     }
 
     componentDidUpdate(prevProps: Props) {
@@ -156,15 +152,6 @@ class ThreadViewerVirtualized extends PureComponent<Props, State> {
         return Promise.resolve();
     }
 
-    handleWindowResize = () => {
-        const isMobile = Utils.isMobile();
-        if (isMobile !== this.state.isMobile) {
-            this.setState({
-                isMobile,
-            });
-        }
-    };
-
     initScrollToIndex = (): {index: number; position: string; offset?: number} => {
         const {highlightedPostId, replyListIds} = this.props;
 
@@ -207,7 +194,7 @@ class ThreadViewerVirtualized extends PureComponent<Props, State> {
             updatedState.userScrolled = true;
             updatedState.userScrolledToBottom = userScrolledToBottom;
 
-            if (this.state.isMobile) {
+            if (this.props.isMobileView) {
                 if (!this.state.isScrolling) {
                     updatedState.isScrolling = true;
                 }
@@ -241,7 +228,7 @@ class ThreadViewerVirtualized extends PureComponent<Props, State> {
         overscanStartIndex,
         overscanStopIndex,
     }: OnItemsRenderedArgs) => {
-        if (this.state.isMobile) {
+        if (this.props.isMobileView) {
             this.updateFloatingTimestamp(visibleStartIndex);
         }
         this.setState({
@@ -434,11 +421,11 @@ class ThreadViewerVirtualized extends PureComponent<Props, State> {
     };
 
     render() {
-        const {isMobile, topRhsPostId} = this.state;
+        const {topRhsPostId} = this.state;
 
         return (
             <>
-                {isMobile && topRhsPostId && !this.props.useRelativeTimestamp && (
+                {this.props.isMobileView && topRhsPostId && !this.props.useRelativeTimestamp && (
                     <FloatingTimestamp
                         isRhsPost={true}
                         isScrolling={this.state.isScrolling}
diff --git a/webapp/channels/src/components/user_profile/index.ts b/webapp/channels/src/components/user_profile/index.ts
index f7b6b2508c..5d14b9dafa 100644
--- a/webapp/channels/src/components/user_profile/index.ts
+++ b/webapp/channels/src/components/user_profile/index.ts
@@ -6,7 +6,8 @@ import {connect} from 'react-redux';
 import {getUser, makeGetDisplayName} from 'mattermost-redux/selectors/entities/users';
 import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
-import {GlobalState} from '@mattermost/types/store';
+import {getIsMobileView} from 'selectors/views/browser';
+import {GlobalState} from 'types/store';
 
 import UserProfile from './user_profile';
 
@@ -25,6 +26,7 @@ function makeMapStateToProps() {
             displayName: getDisplayName(state, ownProps.userId, true),
             user,
             theme,
+            isMobileView: getIsMobileView(state),
             isShared: Boolean(user && user.remote_id),
         };
     };
diff --git a/webapp/channels/src/components/user_profile/user_profile.test.tsx b/webapp/channels/src/components/user_profile/user_profile.test.tsx
index 69f0c985e7..9b847fe53d 100644
--- a/webapp/channels/src/components/user_profile/user_profile.test.tsx
+++ b/webapp/channels/src/components/user_profile/user_profile.test.tsx
@@ -13,6 +13,7 @@ describe('components/UserProfile', () => {
     const baseProps = {
         displayName: 'nickname',
         isBusy: false,
+        isMobileView: false,
         user: {username: 'username'} as UserProfileType,
         userId: 'user_id',
         theme: Preferences.THEMES.onyx,
diff --git a/webapp/channels/src/components/user_profile/user_profile.tsx b/webapp/channels/src/components/user_profile/user_profile.tsx
index 86d006e5a8..916879c2ba 100644
--- a/webapp/channels/src/components/user_profile/user_profile.tsx
+++ b/webapp/channels/src/components/user_profile/user_profile.tsx
@@ -12,7 +12,7 @@ import {UserProfile as UserProfileType} from '@mattermost/types/users';
 import {Theme} from 'mattermost-redux/selectors/entities/preferences';
 import {isGuest} from 'mattermost-redux/utils/user_utils';
 
-import {imageURLForUser, isMobile} from 'utils/utils';
+import {imageURLForUser} from 'utils/utils';
 
 import OverlayTrigger, {BaseOverlayTrigger} from 'components/overlay_trigger';
 import ProfilePopover from 'components/profile_popover';
@@ -34,6 +34,7 @@ export type UserProfileProps = {
     colorize?: boolean;
     hasMention?: boolean;
     hideStatus?: boolean;
+    isMobileView: boolean;
     isRHS?: boolean;
     channelId?: string;
     theme?: Theme;
@@ -68,6 +69,7 @@ export default class UserProfile extends PureComponent<UserProfileProps> {
             displayName,
             displayUsername,
             isBusy,
+            isMobileView,
             isRHS,
             isShared,
             hasMention,
@@ -110,7 +112,7 @@ export default class UserProfile extends PureComponent<UserProfileProps> {
         }
 
         let placement = 'right';
-        if (isRHS && !isMobile()) {
+        if (isRHS && !isMobileView) {
             placement = 'left';
         }
 
diff --git a/webapp/channels/src/components/user_settings/general/index.ts b/webapp/channels/src/components/user_settings/general/index.ts
index 215ad18e59..198371ce51 100644
--- a/webapp/channels/src/components/user_settings/general/index.ts
+++ b/webapp/channels/src/components/user_settings/general/index.ts
@@ -13,9 +13,12 @@ import {
 import {clearErrors, logError} from 'mattermost-redux/actions/errors';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 
-import {GlobalState} from '@mattermost/types/store';
 import {ActionFunc} from 'mattermost-redux/types/actions';
 
+import {getIsMobileView} from 'selectors/views/browser';
+
+import type {GlobalState} from 'types/store';
+
 import UserSettingsGeneralTab, {Props} from './user_settings_general';
 
 function mapStateToProps(state: GlobalState) {
@@ -34,6 +37,7 @@ function mapStateToProps(state: GlobalState) {
     const ldapPictureAttributeSet = config.LdapPictureAttributeSet === 'true';
 
     return {
+        isMobileView: getIsMobileView(state),
         requireEmailVerification,
         maxFileSize,
         ldapFirstNameAttributeSet,
diff --git a/webapp/channels/src/components/user_settings/general/user_settings_general.test.tsx b/webapp/channels/src/components/user_settings/general/user_settings_general.test.tsx
index 77ccd626f1..700f1951b5 100644
--- a/webapp/channels/src/components/user_settings/general/user_settings_general.test.tsx
+++ b/webapp/channels/src/components/user_settings/general/user_settings_general.test.tsx
@@ -34,6 +34,7 @@ describe('components/user_settings/general/UserSettingsGeneral', () => {
         activeSection: '',
         closeModal: jest.fn(),
         collapseModal: jest.fn(),
+        isMobileView: false,
         actions: {
             logError: jest.fn(),
             clearErrors: jest.fn(),
diff --git a/webapp/channels/src/components/user_settings/general/user_settings_general.tsx b/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
index 211d09b19d..5e7596233d 100644
--- a/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
+++ b/webapp/channels/src/components/user_settings/general/user_settings_general.tsx
@@ -101,6 +101,7 @@ export type Props = {
     activeSection?: string;
     closeModal: () => void;
     collapseModal: () => void;
+    isMobileView: boolean;
     maxFileSize: number;
     actions: {
         logError: ({message, type}: {message: any; type: string}, status: boolean) => void;
@@ -934,7 +935,7 @@ export class UserSettingsGeneralTab extends React.Component<Props, State> {
                     defaultMessage="Click 'Edit' to add your full name"
                 />
             );
-            if (Utils.isMobile()) {
+            if (this.props.isMobileView) {
                 describe = (
                     <FormattedMessage
                         id='user.settings.general.mobile.emptyName'
@@ -984,7 +985,7 @@ export class UserSettingsGeneralTab extends React.Component<Props, State> {
                         defaultMessage='Nickname'
                     />
                 );
-                if (Utils.isMobile()) {
+                if (this.props.isMobileView) {
                     nicknameLabel = '';
                 }
 
@@ -1046,7 +1047,7 @@ export class UserSettingsGeneralTab extends React.Component<Props, State> {
                     defaultMessage="Click 'Edit' to add a nickname"
                 />
             );
-            if (Utils.isMobile()) {
+            if (this.props.isMobileView) {
                 describe = (
                     <FormattedMessage
                         id='user.settings.general.mobile.emptyNickname'
@@ -1086,7 +1087,7 @@ export class UserSettingsGeneralTab extends React.Component<Props, State> {
                         defaultMessage='Username'
                     />
                 );
-                if (Utils.isMobile()) {
+                if (this.props.isMobileView) {
                     usernameLabel = '';
                 }
 
@@ -1187,7 +1188,7 @@ export class UserSettingsGeneralTab extends React.Component<Props, State> {
                         defaultMessage='Position'
                     />
                 );
-                if (Utils.isMobile()) {
+                if (this.props.isMobileView) {
                     positionLabel = '';
                 }
 
@@ -1250,7 +1251,7 @@ export class UserSettingsGeneralTab extends React.Component<Props, State> {
                     defaultMessage="Click 'Edit' to add your job title / position"
                 />
             );
-            if (Utils.isMobile()) {
+            if (this.props.isMobileView) {
                 describe = (
                     <FormattedMessage
                         id='user.settings.general.mobile.emptyPosition'
@@ -1332,7 +1333,7 @@ export class UserSettingsGeneralTab extends React.Component<Props, State> {
         }
 
         let minMessage: JSX.Element|string = formatMessage(holders.uploadImage);
-        if (Utils.isMobile()) {
+        if (this.props.isMobileView) {
             minMessage = formatMessage(holders.uploadImageMobile);
         }
         if (user.last_picture_update > 0) {
diff --git a/webapp/channels/src/components/widgets/menu/is_mobile_view_hack.ts b/webapp/channels/src/components/widgets/menu/is_mobile_view_hack.ts
new file mode 100644
index 0000000000..3e48d1571c
--- /dev/null
+++ b/webapp/channels/src/components/widgets/menu/is_mobile_view_hack.ts
@@ -0,0 +1,15 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {getIsMobileView} from 'selectors/views/browser';
+
+import store from 'stores/redux_store';
+
+/**
+ * @deprecated This is a horrible hack that shouldn't used done elsewhere because we shouldn't be accessing the global
+ * store directly, but it's too hard to get this value into these component properly without rewriting everything.
+ * These components will eventually be replaced by the newer components in `components/menu` anyway.
+ */
+export function isMobile() {
+    return getIsMobileView(store.getState());
+}
diff --git a/webapp/channels/src/components/widgets/menu/menu.scss b/webapp/channels/src/components/widgets/menu/menu.scss
index fb30b2abb1..775094540f 100644
--- a/webapp/channels/src/components/widgets/menu/menu.scss
+++ b/webapp/channels/src/components/widgets/menu/menu.scss
@@ -171,3 +171,17 @@
         }
     }
 }
+
+.Menu__content {
+    &.openLeft {
+        right: 0;
+        left: inherit;
+    }
+
+    &.openUp {
+        @media screen and (min-width: 768px) {
+            top: auto;
+            bottom: 100%;
+        }
+    }
+}
diff --git a/webapp/channels/src/components/widgets/menu/menu.test.tsx b/webapp/channels/src/components/widgets/menu/menu.test.tsx
index 362a3861b9..ab0b6e68cc 100644
--- a/webapp/channels/src/components/widgets/menu/menu.test.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu.test.tsx
@@ -6,19 +6,15 @@ import {shallow} from 'enzyme';
 
 import Menu from './menu';
 
+jest.mock('./is_mobile_view_hack', () => ({
+    isMobile: jest.fn(() => false),
+}));
+
 (global as any).MutationObserver = class {
     public disconnect() {}
     public observe() {}
 };
 
-jest.mock('utils/utils', () => {
-    const original = jest.requireActual('utils/utils');
-    return {
-        ...original,
-        isMobile: jest.fn(() => false),
-    };
-});
-
 describe('components/Menu', () => {
     test('should match snapshot', () => {
         const wrapper = shallow(<Menu ariaLabel='test-label'>{'text'}</Menu>);
@@ -68,46 +64,7 @@ describe('components/Menu', () => {
     `);
     });
 
-    test('should match snapshot with openLeft and openUp when is mobile', () => {
-        const utils = require('utils/utils'); //eslint-disable-line global-require
-        utils.isMobile.mockReturnValue(true);
-
-        const wrapper = shallow(
-            <Menu
-                openLeft={true}
-                openUp={true}
-                ariaLabel='test-label'
-            >
-                {'text'}
-            </Menu>,
-        );
-
-        expect(wrapper).toMatchInlineSnapshot(`
-      <div
-        aria-label="test-label"
-        className="a11y__popup Menu"
-        role="menu"
-      >
-        <ul
-          className="Menu__content dropdown-menu"
-          onClick={[Function]}
-          style={
-            Object {
-              "left": "inherit",
-              "right": 0,
-            }
-          }
-        >
-          text
-        </ul>
-      </div>
-    `);
-    });
-
     test('should match snapshot with openLeft and openUp', () => {
-        const utils = require('utils/utils'); //eslint-disable-line global-require
-        utils.isMobile.mockReturnValue(false);
-
         const wrapper = shallow(
             <Menu
                 openLeft={true}
@@ -125,16 +82,9 @@ describe('components/Menu', () => {
         role="menu"
       >
         <ul
-          className="Menu__content dropdown-menu"
+          className="Menu__content dropdown-menu openLeft openUp"
           onClick={[Function]}
-          style={
-            Object {
-              "bottom": "100%",
-              "left": "inherit",
-              "right": 0,
-              "top": "auto",
-            }
-          }
+          style={Object {}}
         >
           text
         </ul>
@@ -143,8 +93,6 @@ describe('components/Menu', () => {
     });
 
     test('should hide the correct dividers', () => {
-        const utils = require('utils/utils'); //eslint-disable-line global-require
-        utils.isMobile.mockReturnValue(false);
         const pseudoMenu = document.createElement('div');
         const listOfItems = [
             'menu-divider',
@@ -255,8 +203,6 @@ describe('components/Menu', () => {
     });
 
     test('should hide the correct dividers on mobile', () => {
-        const utils = require('utils/utils'); //eslint-disable-line global-require
-        utils.isMobile.mockReturnValue(false);
         const pseudoMenu = document.createElement('div');
         const listOfItems = [
             'mobile-menu-divider',
diff --git a/webapp/channels/src/components/widgets/menu/menu.tsx b/webapp/channels/src/components/widgets/menu/menu.tsx
index 3dcb659527..aa1879a703 100644
--- a/webapp/channels/src/components/widgets/menu/menu.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu.tsx
@@ -4,8 +4,6 @@
 import React, {CSSProperties} from 'react';
 import classNames from 'classnames';
 
-import {isMobile} from 'utils/utils';
-
 import SubMenuItem from './menu_items/submenu_item';
 
 import MenuHeader from './menu_header';
@@ -123,15 +121,6 @@ export default class Menu extends React.PureComponent<Props> {
         let styles: CSSProperties = {};
         if (customStyles) {
             styles = customStyles;
-        } else {
-            if (openLeft) {
-                styles.left = 'inherit';
-                styles.right = 0;
-            }
-            if (openUp && !isMobile()) {
-                styles.bottom = '100%';
-                styles.top = 'auto';
-            }
         }
 
         return (
@@ -145,7 +134,14 @@ export default class Menu extends React.PureComponent<Props> {
                     id={listId}
                     ref={this.node}
                     style={styles}
-                    className={classNames('Menu__content dropdown-menu', this.props.className)}
+                    className={classNames(
+                        'Menu__content dropdown-menu',
+                        {
+                            openLeft,
+                            openUp,
+                        },
+                        this.props.className,
+                    )}
                     onClick={this.handleMenuClick}
                 >
                     {children}
diff --git a/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.test.tsx b/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.test.tsx
index e2b0e29177..2189173e51 100644
--- a/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.test.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.test.tsx
@@ -8,6 +8,10 @@ import Constants from 'utils/constants';
 
 import SubMenuItem from './submenu_item';
 
+jest.mock('../is_mobile_view_hack', () => ({
+    isMobile: jest.fn(() => false),
+}));
+
 describe('components/widgets/menu/menu_items/submenu_item', () => {
     test('empty subMenu should match snapshot', () => {
         const wrapper = mount(
diff --git a/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.tsx b/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.tsx
index 3e9b58eef1..da59a078a0 100644
--- a/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu_items/submenu_item.tsx
@@ -6,10 +6,13 @@ import classNames from 'classnames';
 
 import * as Keyboard from 'utils/keyboard';
 import * as Utils from 'utils/utils';
+
 import {showMobileSubMenuModal} from 'actions/global_actions';
 
 import type {Menu} from 'types/store/plugins';
 
+import {isMobile as isMobileViewHack} from '../is_mobile_view_hack';
+
 import './menu_item.scss';
 import Constants from 'utils/constants';
 
@@ -94,7 +97,7 @@ export default class SubMenuItem extends React.PureComponent<Props, State> {
     private onClick = (event: React.SyntheticEvent<HTMLElement>) => {
         event.preventDefault();
         const {id, postId, subMenu, action, root, isHeader} = this.props;
-        const isMobile = Utils.isMobile();
+        const isMobile = isMobileViewHack();
         if (isHeader) {
             event.stopPropagation();
             return;
@@ -141,7 +144,7 @@ export default class SubMenuItem extends React.PureComponent<Props, State> {
 
     public render() {
         const {id, postId, text, selectedValueText, subMenu, icon, filter, ariaLabel, direction, styleSelectableItem, extraText, renderSelected, rightDecorator, tabIndex} = this.props;
-        const isMobile = Utils.isMobile();
+        const isMobile = isMobileViewHack();
 
         if (filter && !filter(id)) {
             return ('');
diff --git a/webapp/channels/src/components/widgets/menu/menu_modals/submenu_modal/submenu_modal.test.tsx b/webapp/channels/src/components/widgets/menu/menu_modals/submenu_modal/submenu_modal.test.tsx
index c06d62aadb..d7e3aa3cf3 100644
--- a/webapp/channels/src/components/widgets/menu/menu_modals/submenu_modal/submenu_modal.test.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu_modals/submenu_modal/submenu_modal.test.tsx
@@ -5,7 +5,11 @@ import React from 'react';
 import {shallow, mount} from 'enzyme';
 import {Modal} from 'react-bootstrap';
 
-import SubMenuModal from 'components/widgets/menu/menu_modals/submenu_modal/submenu_modal';
+import SubMenuModal from './submenu_modal';
+
+jest.mock('../../is_mobile_view_hack', () => ({
+    isMobile: jest.fn(() => false),
+}));
 
 (global as any).MutationObserver = class {
     public disconnect() {}
diff --git a/webapp/channels/src/components/widgets/menu/menu_wrapper_animation.tsx b/webapp/channels/src/components/widgets/menu/menu_wrapper_animation.tsx
index 950103ba00..66d8fb442d 100644
--- a/webapp/channels/src/components/widgets/menu/menu_wrapper_animation.tsx
+++ b/webapp/channels/src/components/widgets/menu/menu_wrapper_animation.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import {CSSTransition} from 'react-transition-group';
 
-import {isMobile} from 'utils/utils';
+import {isMobile} from './is_mobile_view_hack';
 
 const ANIMATION_DURATION = 80;
 
diff --git a/webapp/channels/src/selectors/onboarding.test.ts b/webapp/channels/src/selectors/onboarding.test.ts
index d6d767b208..41617d13c9 100644
--- a/webapp/channels/src/selectors/onboarding.test.ts
+++ b/webapp/channels/src/selectors/onboarding.test.ts
@@ -35,6 +35,11 @@ describe('selectors/onboarding', () => {
                         profiles,
                     },
                 },
+                views: {
+                    browser: {
+                        windowSize: '',
+                    },
+                },
             } as unknown as GlobalState;
 
             const [showTaskList, firstTimeOnboarding] = getShowTaskListBool(state);
@@ -65,6 +70,11 @@ describe('selectors/onboarding', () => {
                         profiles,
                     },
                 },
+                views: {
+                    browser: {
+                        windowSize: '',
+                    },
+                },
             } as unknown as GlobalState;
 
             const [showTaskList, firstTimeOnboarding] = getShowTaskListBool(state);
@@ -95,6 +105,11 @@ describe('selectors/onboarding', () => {
                         profiles,
                     },
                 },
+                views: {
+                    browser: {
+                        windowSize: '',
+                    },
+                },
             } as unknown as GlobalState;
 
             const [showTaskList, firstTimeOnboarding] = getShowTaskListBool(state);
@@ -128,6 +143,11 @@ describe('selectors/onboarding', () => {
                         profiles,
                     },
                 },
+                views: {
+                    browser: {
+                        windowSize: '',
+                    },
+                },
             } as unknown as GlobalState;
 
             const [showTaskList, firstTimeOnboarding] = getShowTaskListBool(state);
@@ -165,6 +185,11 @@ describe('selectors/onboarding', () => {
                         profiles,
                     },
                 },
+                views: {
+                    browser: {
+                        windowSize: '',
+                    },
+                },
             } as unknown as GlobalState;
 
             const [showTaskList, firstTimeOnboarding] = getShowTaskListBool(state);
diff --git a/webapp/channels/src/selectors/onboarding.ts b/webapp/channels/src/selectors/onboarding.ts
index 00c7c63c04..818ccf1f37 100644
--- a/webapp/channels/src/selectors/onboarding.ts
+++ b/webapp/channels/src/selectors/onboarding.ts
@@ -1,14 +1,14 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {isMobile} from 'utils/utils';
-
 import {createSelector} from 'mattermost-redux/selectors/create_selector';
 import {makeGetCategory, getBool} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentUser, isFirstAdmin} from 'mattermost-redux/selectors/entities/users';
 
 import {OnboardingTaskCategory, OnboardingTaskList} from 'components/onboarding_tasks';
 
+import {getIsMobileView} from 'selectors/views/browser';
+
 import {GlobalState} from 'types/store';
 
 import {RecommendedNextStepsLegacy, Preferences} from 'utils/constants';
@@ -125,9 +125,8 @@ export const getShowTaskListBool = createSelector(
     (state: GlobalState) => state,
     (state: GlobalState) => getCategory(state, OnboardingTaskCategory),
     (state: GlobalState) => getCategory(state, Preferences.RECOMMENDED_NEXT_STEPS),
-    (state, onboardingPreferences, legacyStepsPreferences) => {
-        const isMobileView = isMobile();
-
+    getIsMobileView,
+    (state, onboardingPreferences, legacyStepsPreferences, isMobileView) => {
         // conditions to validate scenario where users (initially first_admins) had already set any of the onboarding task list preferences values.
         // We check wether the preference value exists meaning the onboarding tasks list already started no matter what the state of the process is
         const hasUserStartedOnboardingTaskListProcess = onboardingPreferences?.some((pref) =>
diff --git a/webapp/channels/src/utils/utils.tsx b/webapp/channels/src/utils/utils.tsx
index a522e404c2..2c3ebd43bf 100644
--- a/webapp/channels/src/utils/utils.tsx
+++ b/webapp/channels/src/utils/utils.tsx
@@ -47,12 +47,10 @@ import {searchForTerm} from 'actions/post_actions';
 import {getHistory} from 'utils/browser_history';
 import * as Keyboard from 'utils/keyboard';
 import * as UserAgent from 'utils/user_agent';
-import {isDesktopApp} from 'utils/user_agent';
 import {t} from 'utils/i18n';
 import store from 'stores/redux_store.jsx';
 
 import {getCurrentLocale, getTranslations} from 'selectors/i18n';
-import {getIsMobileView} from 'selectors/views/browser';
 
 import {FileInfo} from '@mattermost/types/files';
 import {Team} from '@mattermost/types/teams';
@@ -890,10 +888,6 @@ export function isValidBotUsername(name: string) {
     return error;
 }
 
-export function isMobile() {
-    return getIsMobileView(store.getState());
-}
-
 export function loadImage(
     url: string,
     onLoad: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null,
@@ -1720,9 +1714,9 @@ const TrackFlowSources: Record<string, string> = {
 };
 
 function getTrackFlowSource() {
-    if (isMobile()) {
+    if (UserAgent.isMobile()) {
         return TrackFlowSources.wm;
-    } else if (isDesktopApp()) {
+    } else if (UserAgent.isDesktopApp()) {
         return TrackFlowSources.d;
     }
     return TrackFlowSources.wd;