mattermost · M-ZubairAhmed · Jul 26, 2022 · Jul 27, 2022 · Jul 27, 2022 · Jul 28, 2022
diff --git a/components/__snapshots__/list_modal.test.jsx.snap b/components/__snapshots__/list_modal.test.jsx.snap
@@ -99,7 +99,6 @@ exports[`components/ListModal should match snapshot 1`] = `
               <LoadingScreen
                 key="loading"
                 position="absolute"
-                style={Object {}}
               />
             </div>
           </div>
@@ -212,7 +211,6 @@ exports[`components/ListModal should match snapshot with title bar button 1`] =
               <LoadingScreen
                 key="loading"
                 position="absolute"
-                style={Object {}}
               />
             </div>
           </div>

diff --git a/components/__snapshots__/searchable_channel_list.test.jsx.snap b/components/__snapshots__/searchable_channel_list.test.jsx.snap
@@ -16,7 +16,6 @@ exports[`components/SearchableChannelList should match init snapshot 1`] = `
         inputComponent={
           Object {
             "$$typeof": Symbol(react.forward_ref),
-            "displayName": "LocalizedInput",
             "render": [Function],
           }
         }
@@ -37,10 +36,7 @@ exports[`components/SearchableChannelList should match init snapshot 1`] = `
     <div
       id="moreChannelsList"
     >
-      <LoadingScreen
-        position="relative"
-        style={Object {}}
-      />
+      <LoadingScreen />
     </div>
   </div>
   <div

diff --git a/components/__snapshots__/textbox.test.tsx.snap b/components/__snapshots__/textbox.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`components/TextBox should match snapshot with additional, optional prop
     inputComponent={
       Object {
         "$$typeof": Symbol(react.forward_ref),
-        "displayName": "AutosizeTextarea",
         "render": [Function],
       }
     }
@@ -125,7 +124,6 @@ exports[`components/TextBox should match snapshot with required props 1`] = `
     inputComponent={
       Object {
         "$$typeof": Symbol(react.forward_ref),
-        "displayName": "AutosizeTextarea",
         "render": [Function],
       }
     }
@@ -220,7 +218,6 @@ exports[`components/TextBox should throw error when new property is too long 1`]
     inputComponent={
       Object {
         "$$typeof": Symbol(react.forward_ref),
-        "displayName": "AutosizeTextarea",
         "render": [Function],
       }
     }
@@ -315,7 +312,6 @@ exports[`components/TextBox should throw error when value is too long 1`] = `
     inputComponent={
       Object {
         "$$typeof": Symbol(react.forward_ref),
-        "displayName": "AutosizeTextarea",
         "render": [Function],
       }
     }

diff --git a/components/access_history_modal/__snapshots__/access_history_modal.test.tsx.snap b/components/access_history_modal/__snapshots__/access_history_modal.test.tsx.snap
@@ -132,10 +132,7 @@ exports[`components/AccessHistoryModal should match snapshot when no audits exis
     bsClass="modal-body"
     componentClass="div"
   >
-    <LoadingScreen
-      position="relative"
-      style={Object {}}
-    />
+    <LoadingScreen />
   </ModalBody>
   <ModalFooter
     bsClass="modal-footer"

diff --git a/...om_terms_of_service_settings/__snapshots__/custom_terms_of_service_settings.test.tsx.snap b/...om_terms_of_service_settings/__snapshots__/custom_terms_of_service_settings.test.tsx.snap
@@ -15,10 +15,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
         id="admin.support.termsOfServiceTitle"
       />
     </AdminHeader>
-    <LoadingScreen
-      position="relative"
-      style={Object {}}
-    />
+    <LoadingScreen />
     <div
       className="admin-console-save"
     >
@@ -77,10 +74,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
         id="admin.support.termsOfServiceTitle"
       />
     </AdminHeader>
-    <LoadingScreen
-      position="relative"
-      style={Object {}}
-    />
+    <LoadingScreen />
     <div
       className="admin-console-save"
     >
@@ -139,10 +133,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
         id="admin.support.termsOfServiceTitle"
       />
     </AdminHeader>
-    <LoadingScreen
-      position="relative"
-      style={Object {}}
-    />
+    <LoadingScreen />
     <div
       className="admin-console-save"
     >
@@ -201,10 +192,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
         id="admin.support.termsOfServiceTitle"
       />
     </AdminHeader>
-    <LoadingScreen
-      position="relative"
-      style={Object {}}
-    />
+    <LoadingScreen />
     <div
       className="admin-console-save"
     >

diff --git a/...min_console/data_retention_settings/channel_list/__snapshots__/channel_list.test.tsx.snap b/...min_console/data_retention_settings/channel_list/__snapshots__/channel_list.test.tsx.snap
@@ -81,7 +81,6 @@ exports[`components/admin_console/data_retention_settings/channel_list should ma
               "$$typeof": Symbol(react.memo),
               "WrappedComponent": [Function],
               "compare": null,
-              "displayName": "Connect(TeamFilterDropdown)",
               "type": [Function],
             },
             "values": Object {
@@ -229,7 +228,6 @@ exports[`components/admin_console/data_retention_settings/channel_list should ma
               "$$typeof": Symbol(react.memo),
               "WrappedComponent": [Function],
               "compare": null,
-              "displayName": "Connect(TeamFilterDropdown)",
               "type": [Function],
             },
             "values": Object {

diff --git a/components/admin_console/manage_teams_modal/__snapshots__/manage_teams_modal.test.tsx.snap b/components/admin_console/manage_teams_modal/__snapshots__/manage_teams_modal.test.tsx.snap
@@ -76,10 +76,7 @@ exports[`ManageTeamsModal should match snapshot init 1`] = `
       <div
         className="manage-teams__teams"
       >
-        <LoadingScreen
-          position="relative"
-          style={Object {}}
-        />
+        <LoadingScreen />
       </div>
     </div>
   </ModalBody>

diff --git a/components/admin_console/manage_tokens_modal/__snapshots__/manage_tokens_modal.test.tsx.snap b/components/admin_console/manage_tokens_modal/__snapshots__/manage_tokens_modal.test.tsx.snap
@@ -88,10 +88,7 @@ exports[`components/admin_console/manage_tokens_modal/manage_tokens_modal.tsx sh
       <div
         className="manage-teams__teams"
       >
-        <LoadingScreen
-          position="relative"
-          style={Object {}}
-        />
+        <LoadingScreen />
       </div>
     </div>
   </ModalBody>

diff --git a/...nsole/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap b/...nsole/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap
@@ -1,11 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should match snapshot loading 1`] = `
-<LoadingScreen
-  position="relative"
-  style={Object {}}
-/>
-`;
+exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should match snapshot loading 1`] = `<LoadingScreen />`;
 
 exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should match snapshot with schemes 1`] = `
 <div

diff --git a/...sion_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap b/...sion_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap
@@ -1,11 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings should match snapshot on roles with permissions 1`] = `
-<LoadingScreen
-  position="relative"
-  style={Object {}}
-/>
-`;
+exports[`components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings should match snapshot on roles with permissions 1`] = `<LoadingScreen />`;
 
 exports[`components/admin_console/permission_schemes_settings/permission_system_scheme_settings/permission_system_scheme_settings should match snapshot on roles with permissions 2`] = `
 Object {

diff --git a/...rmission_team_scheme_settings/__snapshots__/permission_team_scheme_settings.test.tsx.snap b/...rmission_team_scheme_settings/__snapshots__/permission_team_scheme_settings.test.tsx.snap
@@ -1,11 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit with permissions 1`] = `
-<LoadingScreen
-  position="relative"
-  style={Object {}}
-/>
-`;
+exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit with permissions 1`] = `<LoadingScreen />`;
 
 exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit with permissions 2`] = `
 Object {
@@ -1069,12 +1064,7 @@ Object {
 }
 `;
 
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on new with default roles with permissions 1`] = `
-<LoadingScreen
-  position="relative"
-  style={Object {}}
-/>
-`;
+exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on new with default roles with permissions 1`] = `<LoadingScreen />`;
 
 exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on new with default roles with permissions 2`] = `
 Object {

diff --git a/.../system_roles/system_role/system_role_users/__snapshots__/system_role_users.test.tsx.snap b/.../system_roles/system_role/system_role_users/__snapshots__/system_role_users.test.tsx.snap
@@ -106,7 +106,6 @@ exports[`admin_console/system_role_users should match snapshot 1`] = `
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(AddUsersToRoleModal)",
           "type": [Function],
         }
       }
@@ -473,7 +472,6 @@ exports[`admin_console/system_role_users should match snapshot with readOnly tru
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(AddUsersToRoleModal)",
           "type": [Function],
         }
       }

diff --git a/components/admin_console/system_users/list/__snapshots__/system_users_list.test.tsx.snap b/components/admin_console/system_users/list/__snapshots__/system_users_list.test.tsx.snap
@@ -22,7 +22,6 @@ exports[`components/admin_console/system_users/list should match default snapsho
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(SystemUsersDropdown)",
           "type": [Function],
         },
       ]
@@ -45,7 +44,6 @@ exports[`components/admin_console/system_users/list should match default snapsho
         "$$typeof": Symbol(react.memo),
         "WrappedComponent": [Function],
         "compare": null,
-        "displayName": "Connect(UserListRowWithError)",
         "type": [Function],
       }
     }
@@ -108,7 +106,6 @@ exports[`components/admin_console/system_users/list should match default snapsho
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(SystemUsersDropdown)",
           "type": [Function],
         },
       ]
@@ -229,7 +226,6 @@ exports[`components/admin_console/system_users/list should match default snapsho
         "$$typeof": Symbol(react.memo),
         "WrappedComponent": [Function],
         "compare": null,
-        "displayName": "Connect(UserListRowWithError)",
         "type": [Function],
       }
     }
@@ -313,7 +309,6 @@ exports[`components/admin_console/system_users/list should match default snapsho
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(SystemUsersDropdown)",
           "type": [Function],
         },
       ]
@@ -459,7 +454,6 @@ exports[`components/admin_console/system_users/list should match default snapsho
         "$$typeof": Symbol(react.memo),
         "WrappedComponent": [Function],
         "compare": null,
-        "displayName": "Connect(UserListRowWithError)",
         "type": [Function],
       }
     }

diff --git a/..._console/team_channel_settings/channel/details/__snapshots__/channel_groups.test.tsx.snap b/..._console/team_channel_settings/channel/details/__snapshots__/channel_groups.test.tsx.snap
@@ -31,7 +31,6 @@ exports[`admin_console/team_channel_settings/channel/ChannelGroups should match
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(AddGroupsToChannelModal)",
           "type": [Function],
         }
       }

diff --git a/...nnel_settings/channel/details/channel_members/__snapshots__/channel_members.test.tsx.snap b/...nnel_settings/channel/details/channel_members/__snapshots__/channel_members.test.tsx.snap
@@ -37,7 +37,6 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(ChannelInviteModal)",
           "type": [Function],
         }
       }
@@ -343,7 +342,6 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(ChannelInviteModal)",
           "type": [Function],
         }
       }

diff --git a/...admin_console/team_channel_settings/channel/list/__snapshots__/channel_list.test.tsx.snap b/...admin_console/team_channel_settings/channel/list/__snapshots__/channel_list.test.tsx.snap
@@ -114,7 +114,6 @@ exports[`admin_console/team_channel_settings/channel/ChannelList should match sn
               "$$typeof": Symbol(react.memo),
               "WrappedComponent": [Function],
               "compare": null,
-              "displayName": "Connect(TeamFilterDropdown)",
               "type": [Function],
             },
             "values": Object {
@@ -317,7 +316,6 @@ exports[`admin_console/team_channel_settings/channel/ChannelList should match sn
               "$$typeof": Symbol(react.memo),
               "WrappedComponent": [Function],
               "compare": null,
-              "displayName": "Connect(TeamFilterDropdown)",
               "type": [Function],
             },
             "values": Object {
@@ -925,7 +923,6 @@ exports[`admin_console/team_channel_settings/channel/ChannelList should match sn
               "$$typeof": Symbol(react.memo),
               "WrappedComponent": [Function],
               "compare": null,
-              "displayName": "Connect(TeamFilterDropdown)",
               "type": [Function],
             },
             "values": Object {

diff --git a/.../admin_console/team_channel_settings/team/details/__snapshots__/team_groups.test.tsx.snap b/.../admin_console/team_channel_settings/team/details/__snapshots__/team_groups.test.tsx.snap
@@ -51,7 +51,6 @@ exports[`admin_console/team_channel_settings/team/TeamGroups should match snapsh
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(AddGroupsToTeamModal)",
           "type": [Function],
         }
       }

diff --git a/.../team_channel_settings/team/details/team_members/__snapshots__/team_members.test.tsx.snap b/.../team_channel_settings/team/details/team_members/__snapshots__/team_members.test.tsx.snap
@@ -36,7 +36,6 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(AddUsersToTeamModal)",
           "type": [Function],
         }
       }
@@ -317,7 +316,6 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
           "$$typeof": Symbol(react.memo),
           "WrappedComponent": [Function],
           "compare": null,
-          "displayName": "Connect(AddUsersToTeamModal)",
           "type": [Function],
         }
       }

diff --git a/components/category_menu_items/index.ts b/components/category_menu_items/index.ts
diff --git a/components/channel_header/channel_info_button.tsx b/components/channel_header/channel_info_button.tsx
@@ -61,6 +61,7 @@ const ChannelInfoButton = ({channel}: Props) => {
             buttonClass={buttonClass}
             buttonId='channel-info-btn'
             onClick={toggleRHS}
+            ariaLabel={true}
             iconComponent={<Icon className='icon-information-outline'/>}
             tooltipKey={tooltipKey}
         />

diff --git a/components/channel_header_dropdown/channel_header_dropdown_items.tsx b/components/channel_header_dropdown/channel_header_dropdown_items.tsx
@@ -11,7 +11,7 @@ import {isGuest} from 'mattermost-redux/utils/user_utils';
 
 import MobileChannelHeaderPlug from 'plugins/mobile_channel_header_plug';
 
-import CategoryMenuItems from 'components/category_menu_items';
+import ChannelMoveToSubmenu from 'components/channel_move_to_submenu';
 import ChannelNotificationsModal from 'components/channel_notifications_modal';
 import ChannelInviteModal from 'components/channel_invite_modal';
 import EditChannelHeaderModal from 'components/edit_channel_header_modal';
@@ -108,11 +108,9 @@ export default class ChannelHeaderDropdown extends React.PureComponent<Props> {
                     show={channel.type !== Constants.DM_CHANNEL && channel.type !== Constants.GM_CHANNEL}
                     channel={channel}
                 />
-                <CategoryMenuItems
+                {/* <ChannelMoveToSubmenu
                     channel={channel}
-                    openUp={false}
-                    location={'channel'}
-                />
+                /> */}
                 <Menu.Group divider={divider}>
                     <MenuItemToggleFavoriteChannel
                         show={isMobile}