[MM-55277] Team's menu doesn't follow standard accessible keyboard behavior (#29917)

2025-04-18 19:18:54 +05:30
--- a/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_dropdowns_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/accessibility/accessibility_dropdowns_spec.js
@@ -105,9 +105,9 @@ describe('Verify Accessibility Support in Dropdown Menus', () => {
            {id: 'invitePeople', label: 'Invite People dialog'},
            {id: 'teamSettings', label: 'Team Settings dialog'},
            {id: 'manageMembers', label: 'Manage Members dialog'},
-            {id: 'joinTeam', text: 'Join Another Team'},
+            {id: 'joinTeam', text: 'Join another team'},
            {id: 'leaveTeam', label: 'Leave Team dialog'},
-            {id: 'createTeam', text: 'Create a Team'},
+            {id: 'createTeam', text: 'Create a team'},
        ];

        menuItems.forEach((item) => {
--- a/e2e-tests/cypress/tests/integration/channels/account_settings/profile/fullname_truncate_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/account_settings/profile/fullname_truncate_spec.ts
@@ -70,7 +70,7 @@ describe('Profile > Profile Settings> Full Name', () => {

    it('MM-T2048 Empty full name: @ still displays before username', () => {
        // # Open any user list ("View Members", "Add Members", "Manage Members", ..)
-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');

        // # Find a user who hasn't set their full name
        cy.get('.modal-title').should('be.visible');
--- a/e2e-tests/cypress/tests/integration/channels/account_settings/profile/nickname_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/account_settings/profile/nickname_spec.ts
@@ -39,7 +39,7 @@ describe('Settings > Sidebar > General', () => {
        });

        // # Open team menu and click "View Members"
-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');

        // # Search for username and check that no nickname is present
        cy.get('.modal-title').should('be.visible');
@@ -68,7 +68,7 @@ describe('Settings > Sidebar > General', () => {
        });

        // # Open team menu and click "View Members"
-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');

        // # Search for username and check that expected nickname is present
        cy.get('.modal-title').should('be.visible');
--- a/e2e-tests/cypress/tests/integration/channels/archived_channel/archived_leave_channel_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/archived_channel/archived_leave_channel_spec.ts
@@ -67,7 +67,7 @@ describe('Leave an archived channel', () => {
            cy.uiArchiveChannel();

            // # Open channel menu and click View Members
-            cy.uiOpenChannelMenu('View Members');
+            cy.uiOpenChannelMenu('View members');

            // * Channel Members modal opens
            cy.get('div#channelMembersModal').should('be.visible');
--- a/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_4_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/auth_sso/authentication_4_spec.ts
@@ -267,7 +267,7 @@ describe('Authentication', () => {
        cy.postMessage('hello');

        // # Open team menu and click on "Invite People"
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Click invite members if needed
        cy.findByText('Copy invite link').click();
--- a/e2e-tests/cypress/tests/integration/channels/bot_accounts/in_lists_2_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/bot_accounts/in_lists_2_spec.ts
@@ -72,7 +72,7 @@ describe('Bots in lists', () => {

            // # Open channel members
            cy.get('.channel-header__trigger').click();
-            cy.findByText('Manage Members').click();
+            cy.findByText('Manage members').click();

            cy.get('.more-modal__row .more-modal__name').then(async ($query) => {
                // # Extract usernames from jQuery collection
--- a/e2e-tests/cypress/tests/integration/channels/bot_accounts/promote_demote_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/bot_accounts/promote_demote_spec.ts
@@ -37,7 +37,7 @@ describe('Managing bots in Teams and Channels', () => {
            await client.addToTeam(team.id, bot.user_id);

            // # Open team menu and click 'Manage Members'
-            cy.uiOpenTeamMenu('Manage Members');
+            cy.uiOpenTeamMenu('Manage members');

            // # Find bot
            cy.get('.more-modal__list').find('.more-modal__row').its('length').should('be.gt', 0);
--- a/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_5_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_5_spec.ts
@@ -105,7 +105,7 @@ describe('Custom Status - Verifying Where Custom Status Appears', () => {

    it('MM-T3850_8 should show custom status emoji next to username in the team members modal', () => {
        // # Open team menu and click on "View Members"
-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');
        cy.get('#teamMembersModal').should('exist');

        // # Search the current user's username in the search input
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_input_fields_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_input_fields_spec.ts
@@ -36,7 +36,7 @@ describe('Verify Accessibility Support in different input fields', () => {

    it('MM-T1456 Verify Accessibility Support in Input fields in Invite People Flow', () => {
        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Click invite members if needed
        cy.get('.InviteAs').findByTestId('inviteMembersLink').click();
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_modals_dialogs_1_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_modals_dialogs_1_spec.ts
@@ -47,7 +47,7 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {
        verifyUserMenuModal('Profile');

        // * Verify the accessibility support in Team Settings Dialog
-        verifyMainMenuModal('Team Settings');
+        verifyMainMenuModal('Team settings');

        // * Verify the accessibility support in Manage Members Dialog
        verifyMainMenuModal('Manage Members', `${testTeam.display_name} Members`);
@@ -72,7 +72,7 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {

        // # Open Channel Members Dialog
        cy.get('#channelHeaderTitle').click();
-        cy.findByText('Manage Members').click().wait(TIMEOUTS.FIVE_SEC);
+        cy.findByText('Manage members').click().wait(TIMEOUTS.FIVE_SEC);

        // * Verify the accessibility support in Manage Members Dialog
        cy.findByRole('dialog', {name: 'Off-Topic Members'}).within(() => {
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_modals_dialogs_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/accessibility/accessibility_modals_dialogs_spec.ts
@@ -44,7 +44,7 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);
    });

-    it.skip('MM-T1466 Accessibility Support in Direct Messages Dialog screen', () => {
+    it('MM-T1466 Accessibility Support in Direct Messages Dialog screen', () => {
        // * Verify the aria-label in create direct message button
        cy.uiAddDirectMessage().click();

@@ -53,11 +53,11 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {
            cy.findByRole('heading', {name: 'Direct Messages'});

            // * Verify the accessibility support in search input
-            cy.findByRole('textbox', {name: 'Search for people'}).
+            cy.findByLabelText('Search for people').
                should('have.attr', 'aria-autocomplete', 'list');

            // # Search for a text and then check up and down arrow
-            cy.findByRole('textbox', {name: 'Search for people'}).
+            cy.findByLabelText('Search for people').
                typeWithForce('s').
                wait(TIMEOUTS.HALF_SEC).
                typeWithForce('{downarrow}{downarrow}{downarrow}{uparrow}');
@@ -80,7 +80,7 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {

            // # Search for an invalid text
            const additionalSearchTerm = 'somethingwhichdoesnotexist';
-            cy.findByRole('textbox', {name: 'Search for people'}).clear().
+            cy.findByLabelText('Search for people').clear().
                typeWithForce(additionalSearchTerm).
                wait(TIMEOUTS.HALF_SEC);

@@ -137,7 +137,7 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {
        });
    });

-    it.skip('MM-T1468 Accessibility Support in Add people to Channel Dialog screen', () => {
+    it('MM-T1468 Accessibility Support in Add people to Channel Dialog screen', () => {
        // # Add atleast 5 users
        for (let i = 0; i < 5; i++) {
            cy.apiCreateUser().then(({user}) => { // eslint-disable-line
@@ -159,11 +159,11 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {
            cy.wait(TIMEOUTS.ONE_SEC);

            // * Verify the accessibility support in search input
-            cy.findByRole('textbox', {name: 'Search for people or groups'}).
+            cy.findByLabelText('Search for people or groups').
                should('have.attr', 'aria-autocomplete', 'list');

            // # Search for a text and then check up and down arrow
-            cy.findByRole('textbox', {name: 'Search for people or groups'}).
+            cy.findByLabelText('Search for people or groups').
                wait(TIMEOUTS.HALF_SEC).
                typeWithForce('u').
                wait(TIMEOUTS.HALF_SEC).
@@ -189,7 +189,7 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {
                });

            // # Search for an invalid text and check if reader can read no results
-            cy.findByRole('textbox', {name: 'Search for people or groups'}).
+            cy.findByLabelText('Search for people or groups').
                typeWithForce('somethingwhichdoesnotexist').
                wait(TIMEOUTS.HALF_SEC);

@@ -203,7 +203,7 @@ describe('Verify Accessibility Support in Modals & Dialogs', () => {
    it('MM-T1515 Verify Accessibility Support in Invite People Flow', () => {
        // # Open Invite People
        cy.uiGetLHSHeader().click();
-        cy.get('#invitePeople').should('be.visible').click();
+        cy.get("#sidebarTeamMenu li:contains('Invite people')").should('be.visible').click();

        // * Verify accessibility support in Invite People Dialog
        cy.findByTestId('invitationModal').should('have.attr', 'aria-modal', 'true').and('have.attr', 'aria-labelledby', 'invitation_modal_title').and('have.attr', 'role', 'dialog');
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/cloud/billing/notify_admin_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/cloud/billing/notify_admin_spec.ts
@@ -111,9 +111,14 @@ function userGroupsNotification() {
 }

 function creatNewTeamNotification() {
-    cy.get('.test-team-header').click().then(() => {
+    // # Click on the team menu button
+    cy.get('#sidebarTeamMenuButton').click();
+
+    // # Click on the lock button on Create a team menu item
+    cy.get('#sidebarTeamMenu').within(() => {
        cy.get('#mattermost_feature_create_multiple_teams-restricted-indicator').click();
    });
+
    cy.get('#FeatureRestrictedModal').should('exist');
    cy.get('#button-plans').as('notifyButton').should('have.text', 'Notify admin').click();
    cy.get('@notifyButton').should('have.text', 'Admin notified!');
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_experience_ui_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_experience_ui_spec.ts
@@ -64,24 +64,27 @@ describe('Guest Account - Guest User Experience', () => {

        // * Verify reduced options in Team Menu
        const missingMainOptions = [
-            'Invite People',
-            'Team Settings',
-            'Manage Members',
-            'Join Another Team',
-            'Create a Team',
+            'Invite people',
+            'Team settings',
+            'Manage members',
+            'Join another team',
+            'Create a team',
        ];
        missingMainOptions.forEach((missingOption) => {
            cy.uiGetLHSTeamMenu().should('not.contain', missingOption);
        });

        const includeMainOptions = [
-            'View Members',
-            'Leave Team',
+            'View members',
+            'Leave team',
        ];
        includeMainOptions.forEach((includeOption) => {
            cy.uiGetLHSTeamMenu().findByText(includeOption);
        });

+        // # Close the main menu
+        cy.get('body').type('{esc}');
+
        // * Verify Reduced Options in LHS
        cy.uiGetLHSAddChannelButton().should('not.exist');

@@ -120,7 +123,7 @@ describe('Guest Account - Guest User Experience', () => {
        cy.uiGetLhsSection('CHANNELS').find('.SidebarChannel').should('have.length', 3);

        // * Verify list of Users a Guest User can see in Team Members dialog
-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');
        cy.get('#searchableUserListTotal').should('be.visible').and('have.text', '1 - 2 members of 2 total');
    });

@@ -136,17 +139,18 @@ describe('Guest Account - Guest User Experience', () => {
        // * Verify options in team menu are changed
        cy.uiOpenTeamMenu();
        const includeOptions = [
-            'Invite People',
-            'View Members',
-            'Leave Team',
-            'Create a Team',
+            'Invite people',
+            'View members',
+            'Leave team',
+            'Create a team',
        ];
        includeOptions.forEach((option) => {
            cy.uiGetLHSTeamMenu().findByText(option);
        });

-        // # Close the main menu
-        cy.uiGetLHSHeader().click();
+        // Close the main menu with Escape key
+        cy.get('body').type('{esc}');
+        cy.uiGetLHSTeamMenu().should('not.exist');

        // * Verify Options in LHS are changed
        cy.uiGetLHSAddChannelButton();
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_identification_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_identification_spec.ts
@@ -101,7 +101,7 @@ describe('Guest Accounts', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu, click Invite People, then invite guest
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');
        cy.findByTestId('inviteGuestLink').click();

        // # Type guest user e-mail address.
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_identification_ui_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_identification_ui_spec.ts
@@ -68,7 +68,7 @@ describe('Verify Guest User Identification in different screens', () => {

    it('Verify Guest Badge in Team Members dialog', () => {
        // # Open team menu and click 'View Members'
-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');

        cy.get('#teamMembersModal').should('be.visible').within(($el) => {
            cy.wrap($el).findAllByTestId('userListItemDetails').each(($elChild) => {
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_invitation_ui_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/guest_invitation_ui_spec.ts
@@ -53,7 +53,7 @@ describe('Guest Account - Guest User Invitation Flow', () => {

    it('MM-T4451 Verify UI Elements of Guest User Invitation Flow', () => {
        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // * Verify Invite Guest link
        cy.findByTestId('inviteGuestLink').should('be.visible').click();
@@ -117,7 +117,7 @@ describe('Guest Account - Guest User Invitation Flow', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // * Verify if Invite Members modal is displayed when guest account feature is disabled
        cy.findByTestId('invitationModal').find('h1').should('have.text', `Invite people to ${testTeam.display_name}`);
@@ -164,7 +164,7 @@ describe('Guest Account - Guest User Invitation Flow', () => {
        cy.apiDemoteUserToGuest(newUser.id);

        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Click invite members if needed
        cy.get('.InviteAs').findByTestId('inviteMembersLink').click();
@@ -226,7 +226,7 @@ describe('Guest Account - Guest User Invitation Flow', () => {

    it('hides the copy link button when inviting guests', () => {
        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Select Guest
        cy.findByTestId('inviteGuestLink').should('be.visible').click();
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/helpers.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/helpers.ts
@@ -16,7 +16,7 @@ export function changeGuestFeatureSettings(featureFlag = true, emailInvitation =

 export function invitePeople(typeText: string, resultsCount: number, verifyText: string, channelName = 'Town Square', clickInvite = true) {
    // # Open team menu and click 'Invite People'
-    cy.uiOpenTeamMenu('Invite People');
+    cy.uiOpenTeamMenu('Invite people');

    // # Click on the next icon to invite guest
    cy.findByTestId('inviteGuestLink').click();
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/member_invitation_ui_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/member_invitation_ui_spec.ts
@@ -52,7 +52,7 @@ describe('Guest Account - Member Invitation Flow', () => {
        const email = `temp-${getRandomId()}@mattermost.com`;

        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // * Verify UI Elements in initial step
        cy.findByTestId('invitationModal').within(() => {
@@ -251,7 +251,7 @@ describe('Guest Account - Member Invitation Flow', () => {

 function invitePeople(typeText, resultsCount, verifyText, clickInvite = true) {
    // # Open team menu and click 'Invite People'
-    cy.uiOpenTeamMenu('Invite People');
+    cy.uiOpenTeamMenu('Invite people');

    // # Search and add a member
    cy.get('.users-emails-input__control').should('be.visible').within(() => {
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/system_console_guest_access_ui_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/guest_accounts/system_console_guest_access_ui_spec.ts
@@ -103,7 +103,7 @@ describe('Guest Account - Verify Guest Access UI', () => {
        });

        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // * Verify that an option to Invite via Guest should not be available
        cy.findByTestId('inviteGuestLink').should('not.exist');
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_guest_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/ldap/ldap_guest_spec.ts
@@ -219,7 +219,7 @@ describe('LDAP guest', () => {
                    cy.visit(`/${team.name}/channels/town-square`);

                    // # Open team menu and click 'Invite People'
-                    cy.uiOpenTeamMenu('Invite People');
+                    cy.uiOpenTeamMenu('Invite people');

                    cy.wait(TIMEOUTS.TWO_SEC);

--- a/e2e-tests/cypress/tests/integration/channels/enterprise/ldap_group/invite_bot_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/ldap_group/invite_bot_spec.ts
@@ -54,7 +54,7 @@ describe('Group Synced Team - Bot invitation flow', () => {
        cy.visit(`/${groupConstrainedTeam.name}`);

        // # Click 'Invite People' at team menu
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Type the first letters of a bot
        cy.get('.users-emails-input__control input').typeWithForce(bot.username);
@@ -75,7 +75,7 @@ describe('Group Synced Team - Bot invitation flow', () => {
        cy.visit(`/${groupConstrainedTeam.name}`);

        // # Click 'Manage Members' at team menu
-        cy.uiOpenTeamMenu('Manage Members');
+        cy.uiOpenTeamMenu('Manage members');

        // # Search for the bot that we want to remove
        cy.get('#searchUsersInput').should('be.visible').type(bot.username);
--- a/e2e-tests/cypress/tests/integration/channels/enterprise/permissions/team_permissions_spec.ts
+++ b/e2e-tests/cypress/tests/integration/channels/enterprise/permissions/team_permissions_spec.ts
@@ -95,10 +95,10 @@ describe('Team Permissions', () => {
        cy.uiOpenTeamMenu().wait(TIMEOUTS.HALF_SEC);

        // * Verify `Invite People` menu item is not present
-        cy.get('#invitePeople').should('not.exist');
+        cy.get("#sidebarTeamMenu li:contains('Invite people')").should('not.exist');

        // # Click `View Members` menu item
-        cy.get('#viewMembers').should('be.visible').click().wait(TIMEOUTS.HALF_SEC);
+        cy.get("#sidebarTeamMenu li:contains('View members')").should('be.visible').click().wait(TIMEOUTS.HALF_SEC);

        // * Verify team members modal opens
        cy.get('#teamMembersModal').should('be.visible');
--- a/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/ctrl_cmd_shift_slash/not_open_emoji_picker_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/keyboard_shortcuts/ctrl_cmd_shift_slash/not_open_emoji_picker_spec.js
@@ -108,7 +108,7 @@ describe('Keyboard shortcut CTRL/CMD+Shift+\\ for adding reaction to last messag
        cy.uiOpenProductMenu('About Mattermost');
        verifyEmojiPickerNotOpen();

-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');
        verifyEmojiPickerNotOpen();

        cy.uiOpenProfileModal('Profile Settings');
@@ -167,9 +167,6 @@ describe('Keyboard shortcut CTRL/CMD+Shift+\\ for adding reaction to last messag
        // # Close the expanded RHS
        cy.findByLabelText('Collapse Sidebar Icon').click();

-        // # Open the pinned posts
-        cy.uiGetChannelPinButton().click();
-
        // # Expand RHS
        cy.findByLabelText('Expand Sidebar Icon').click();

--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_spec.js
@@ -21,6 +21,7 @@ describe('Message Reply', () => {
            newChannel = channel;
            cy.visit(`/${team.name}/channels/${channel.name}`);

+            // HERE WE NEED TO UPDATE THE AREA SINCE WE REMOVED THIS ID
            // # Wait for the page to fully load before continuing
            cy.get('#sidebar-header-container').should('be.visible').and('have.text', team.display_name);
        });
--- a/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/send_dm_user_no_team_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/send_dm_user_no_team_spec.js
@@ -38,7 +38,7 @@ describe('Send a DM', () => {
        cy.visit(testChannelUrl);
        cy.get('#postListContent', {timeout: TIMEOUTS.HALF_MIN}).should('be.visible');
        cy.uiGetLHSHeader().click();
-        cy.findByText('Leave Team').click();
+        cy.findByText('Leave team').click();
        cy.findByText('Yes').click();
        cy.url().should('include', '/select_team');

--- a/e2e-tests/cypress/tests/integration/channels/notifications/browser_tab_notification_2_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/notifications/browser_tab_notification_2_spec.js
@@ -108,7 +108,7 @@ describe('Notifications', () => {

        // # Invites User 1
        cy.get('#member_popover').should('be.visible').click();
-        cy.contains('Manage Members').click();
+        cy.contains('Manage members').click();
        cy.contains('Add Members').click();
        cy.get('.channel-invite__content').
            should('be.visible').
--- a/e2e-tests/cypress/tests/integration/channels/onboarding/invalidate_pending_email_invitations_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/onboarding/invalidate_pending_email_invitations_spec.js
@@ -64,7 +64,7 @@ describe('Onboarding', () => {
        cy.reload();

        // # Open the 'Invite People' modal
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Wait half a second to ensure that the modal has been fully loaded
        cy.wait(TIMEOUTS.HALF_SEC);
--- a/e2e-tests/cypress/tests/integration/channels/onboarding/login_page_link_account_creation_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/onboarding/login_page_link_account_creation_spec.js
@@ -44,7 +44,7 @@ describe('Onboarding', () => {

    it('MM-T400 Create account from login page link using email-password', () => {
        // # Open team menu and click on "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Check that the 'Team Settings' modal was opened
        cy.get('#teamSettingsModal').should('exist').within(() => {
--- a/e2e-tests/cypress/tests/integration/channels/onboarding/use_team_invite_link_to_sign_up_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/onboarding/use_team_invite_link_to_sign_up_spec.js
@@ -47,7 +47,7 @@ describe('Onboarding', () => {
        stubClipboard().as('clipboard');

        // # Open the 'Invite People' full screen modal and get the invite url
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Copy invite link to clipboard
        cy.findByTestId('InviteView__copyInviteLink').click();
--- a/e2e-tests/cypress/tests/integration/channels/system_console/environment_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/environment_spec.js
@@ -35,7 +35,7 @@ describe('Environment', () => {
        cy.visit(townsquareLink);

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Check that the 'Team Settings' modal was opened
        cy.get('#teamSettingsModal').should('exist').within(() => {
@@ -79,7 +79,7 @@ describe('Environment', () => {
        cy.visit(townsquareLink);

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Check that the 'Team Settings' modal was opened
        cy.get('#teamSettingsModal').should('exist').within(() => {
@@ -123,7 +123,7 @@ describe('Environment', () => {
        cy.visit(townsquareLink);

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Check that the 'Team Settings' modal was opened
        cy.get('#teamSettingsModal').should('exist').within(() => {
--- a/e2e-tests/cypress/tests/integration/channels/system_console/user_management_not_cloud_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/user_management_not_cloud_spec.js
@@ -66,7 +66,7 @@ describe('User Management', () => {
        cy.visit(`/${testTeam.name}/channels/${testChannel.name}`);

        // # Open team menu and click View Members
-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');

        // * Check View Members modal dialog
        cy.get('#teamMembersModal').should('be.visible').within(() => {
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js
@@ -55,7 +55,7 @@ describe('Team Settings', () => {

    it('MM-T385 Invite new user to closed team using email invite', () => {
        // # Open 'Team Settings' modal
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Check that the 'Team Settings' modal was opened
        cy.get('#teamSettingsModal').should('exist').within(() => {
@@ -75,7 +75,7 @@ describe('Team Settings', () => {
        });

        // # Open the 'Invite People' full screen modal
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Wait half a second to ensure that the modal has been fully loaded
        cy.wait(TIMEOUTS.HALF_SEC);
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/create_a_team_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/create_a_team_spec.js
@@ -23,7 +23,7 @@ describe('Teams Suite', () => {

    it('MM-T383 Create a new team', () => {
        // # Open team menu and click "Create a Team"
-        cy.uiOpenTeamMenu('Create a Team');
+        cy.uiOpenTeamMenu('Create a team');

        // # Input team name as Team Test
        const teamName = 'Team Test';
@@ -69,7 +69,7 @@ describe('Teams Suite', () => {

 function tryReservedTeamURLAndVerifyError(teamURL) {
    // # Open team menu and click "Create a Team"
-    cy.uiOpenTeamMenu('Create a Team');
+    cy.uiOpenTeamMenu('Create a team');

    // # Input passed in team name
    cy.get('#teamNameInput').should('be.visible').type(teamURL);
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/helpers.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/helpers.js
@@ -10,7 +10,7 @@ import {

 export const allowOnlyUserFromSpecificDomain = (domain) => {
    // # Open 'Team Settings' modal
-    cy.uiOpenTeamMenu('Team Settings');
+    cy.uiOpenTeamMenu('Team settings');

    // * Check that the 'Team Settings' modal was opened
    cy.get('#teamSettingsModal').should('exist').within(() => {
@@ -31,7 +31,7 @@ export const allowOnlyUserFromSpecificDomain = (domain) => {

 export const inviteUserByEmail = (email) => {
    // # Open team menu and click 'Invite People'
-    cy.uiOpenTeamMenu('Invite People');
+    cy.uiOpenTeamMenu('Invite people');

    // # Wait half a second to ensure that the modal has been fully loaded
    cy.wait(TIMEOUTS.HALF_SEC);
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/invite_members_backdrop_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/invite_members_backdrop_spec.js
@@ -32,7 +32,7 @@ describe('Invite Members', () => {
            cy.visit('/');

            // # Open and select invite menu item
-            cy.uiOpenTeamMenu('Invite People');
+            cy.uiOpenTeamMenu('Invite people');
        });

        it('allows user to exit when there are no inputs', () => {
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/invite_members_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/invite_members_spec.js
@@ -111,7 +111,7 @@ describe('Invite Members', () => {
            cy.visit(`/${testTeam.name}/channels/town-square`);

            // # Open and select invite menu item
-            cy.uiOpenTeamMenu('Invite People');
+            cy.uiOpenTeamMenu('Invite people');

            // * Users emails input is focused by default
            cy.get('.users-emails-input__control--is-focused').should('be.visible');
@@ -181,7 +181,7 @@ function inviteUserToTeamAsMember(testUser, testTeam, user) {
    cy.visit(`/${testTeam.name}/channels/town-square`);

    // # Open and select invite menu item
-    cy.uiOpenTeamMenu('Invite People');
+    cy.uiOpenTeamMenu('Invite people');

    // * Verify Invite Members
    verifyInviteMembersModal(testTeam);
@@ -196,7 +196,7 @@ function inviteUserToTeamAsSysadmin(testTeam, user) {
    cy.visit(`/${testTeam.name}/channels/off-topic`);

    // # Open and select invite menu item
-    cy.uiOpenTeamMenu('Invite People');
+    cy.uiOpenTeamMenu('Invite people');

    // * Verify Invite Members
    verifyInviteMembersModal(testTeam);
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/invite_user_to_closed_team_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/invite_user_to_closed_team_spec.js
@@ -34,7 +34,7 @@ describe('Team Settings', () => {
        const inviteFailedMessage = `The following email addresses do not belong to an accepted domain: ${invalidEmail}. Please contact your System Administrator for details.`;

        // # Open team menu and click 'Team Settings'
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Check that the 'Team Settings' modal was opened
        cy.get('#teamSettingsModal').should('exist').within(() => {
@@ -55,7 +55,7 @@ describe('Team Settings', () => {
        });

        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Invite user with valid email domain that is not in the team
        inviteNewMemberToTeam(newUser.email);
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/join_closed_team_with_not_allowed_email_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/join_closed_team_with_not_allowed_email_spec.js
@@ -42,7 +42,7 @@ describe('Team Settings', () => {
        stubClipboard().as('clipboard');

        // # Open team menu and click 'Team Settings'
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Check that the 'Team Settings' modal was opened
        cy.get('#teamSettingsModal').should('exist').within(() => {
@@ -63,7 +63,7 @@ describe('Team Settings', () => {
        cy.uiClose();

        // # Open team menu and click 'Invite People'
-        cy.uiOpenTeamMenu('Invite People');
+        cy.uiOpenTeamMenu('Invite people');

        // # Get the invite URL
        cy.findByTestId('InviteView__copyInviteLink').should('be.visible').click();
@@ -94,7 +94,7 @@ describe('Team Settings', () => {

    it('MM-T2341 Cannot add a user to a team if the user\'s email is not from the correct domain', () => {
        // # Open team menu and click 'Team Settings'
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Check that the 'Team Settings' modal was opened
        cy.get('#teamSettingsModal').should('exist').within(() => {
@@ -136,7 +136,7 @@ describe('Team Settings', () => {
                    cy.visit(`/${otherTeam.name}/channels/town-square`);

                    // # Open team menu and click 'Join Another Team'
-                    cy.uiOpenTeamMenu('Join Another Team');
+                    cy.uiOpenTeamMenu('Join another team');

                    // # Try to join the existing team
                    cy.get('.signup-team-dir').find(`#${testTeam.display_name.replace(' ', '_')}`).scrollIntoView().click();
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/manage_members_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/manage_members_spec.js
@@ -34,7 +34,7 @@ describe('Manage Members', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click 'Manage Members'
-        cy.uiOpenTeamMenu('Manage Members');
+        cy.uiOpenTeamMenu('Manage members');

        // # Open member dropdown
        cy.get(`#teamMembersDropdown_${testUser.username}`).should('be.visible').click();
@@ -61,7 +61,7 @@ describe('Manage Members', () => {
                cy.visit(`/${testTeam.name}/channels/town-square`);

                // # Open team menu and click 'Manage Members'
-                cy.uiOpenTeamMenu('Manage Members');
+                cy.uiOpenTeamMenu('Manage members');

                // # Open member dropdown
                cy.get(`#teamMembersDropdown_${user.username}`).should('be.visible').click();
@@ -94,7 +94,7 @@ describe('Manage Members', () => {
                        cy.visit(`/${testTeam.name}/channels/town-square`);

                        // # Open team menu and click 'Manage Members'
-                        cy.uiOpenTeamMenu('Manage Members');
+                        cy.uiOpenTeamMenu('Manage members');

                        // # Open member dropdown
                        cy.get(`#teamMembersDropdown_${user.username}`).should('be.visible').click();
@@ -139,7 +139,7 @@ describe('Manage Members', () => {
                cy.visit(`/${testTeam.name}/channels/town-square`);

                // # Open team menu and click 'Manage Members'
-                cy.uiOpenTeamMenu('Manage Members');
+                cy.uiOpenTeamMenu('Manage members');

                // # Open member dropdown
                cy.get(`#teamMembersDropdown_${user.username}`).should('be.visible').click();
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/remove_team_icon_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/remove_team_icon_spec.js
@@ -61,7 +61,7 @@ describe('Teams Settings', () => {

 function openTeamSettingsDialog() {
    // # Open team menu and click 'Team Settings'
-    cy.uiOpenTeamMenu('Team Settings');
+    cy.uiOpenTeamMenu('Team settings');

    // * Verify the team settings dialog is open
    cy.get('#teamSettingsModalLabel').should('be.visible').and('contain', 'Team Settings');
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/teammates_pagination_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/teammates_pagination_spec.js
@@ -50,7 +50,7 @@ describe('Teams Suite', () => {

    it('MM-T384 Team Admin can use Next button to page through list in Manage Members', () => {
        // # Open team menu and click "Manage Members"
-        cy.uiOpenTeamMenu('Manage Members');
+        cy.uiOpenTeamMenu('Manage members');

        // * Check Manage Members modal dialog
        cy.get('#teamMemberModalLabel').should('be.visible');
--- a/e2e-tests/cypress/tests/integration/channels/team_settings/teams_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/team_settings/teams_spec.js
@@ -41,7 +41,7 @@ describe('Teams Suite', () => {
        cy.url().should('include', `/${testTeam.name}/channels/town-square`);

        // # Open team menu and click "Manage Members"
-        cy.uiOpenTeamMenu('Leave Team');
+        cy.uiOpenTeamMenu('Leave team');

        // * Check that the "leave team modal" opened up
        cy.get('#leaveTeamModal').should('be.visible');
@@ -75,8 +75,8 @@ describe('Teams Suite', () => {

            // # Open team menu and click "Invite People"
            cy.uiOpenTeamMenu();
-            cy.uiGetLHSTeamMenu().findByText('Add people to the team');
-            cy.uiGetLHSTeamMenu().findByText('Invite People').click().wait(TIMEOUTS.HALF_SEC);
+            cy.uiGetLHSTeamMenu().find('div.label-elements > span:nth-child(2)').should('have.text', 'Add or invite people to the team');
+            cy.uiGetLHSTeamMenu().find("li span:contains('Invite people')").should('have.text', 'Invite people').click().wait(TIMEOUTS.HALF_SEC);

            // * Check that the Invitation Modal opened up
            cy.findByTestId('invitationModal', {timeout: TIMEOUTS.HALF_SEC}).should('be.visible');
@@ -184,7 +184,7 @@ describe('Teams Suite', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // # Go to Access section
        cy.get('#accessButton').click();
@@ -208,7 +208,7 @@ describe('Teams Suite', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // # Click on the team name menu item
        cy.findByText('Team Name').should('be.visible').click();
@@ -236,7 +236,7 @@ describe('Teams Suite', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // # Change team description in the input
        cy.get('#teamDescription').should('be.visible').clear().type(teamDescription);
@@ -246,7 +246,7 @@ describe('Teams Suite', () => {
        cy.uiSaveAndClose();

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // * Verify team description is updated
        cy.get('#teamDescription').should('have.text', teamDescription);
@@ -257,7 +257,7 @@ describe('Teams Suite', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // # Go to Access section
        cy.get('#accessButton').click();
@@ -296,7 +296,7 @@ describe('Teams Suite', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click "Team Settings"
-        cy.uiOpenTeamMenu('Team Settings');
+        cy.uiOpenTeamMenu('Team settings');

        // # Go to Access section
        cy.get('#accessButton').click();
@@ -314,7 +314,7 @@ describe('Teams Suite', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click "Join Another Team"
-        cy.uiOpenTeamMenu('Join Another Team');
+        cy.uiOpenTeamMenu('Join another team');

        // # Verify the original test team isn't on the list
        cy.get('.signup-team-dir').children().should('not.contain', `#${testTeam.name.charAt(0).toUpperCase() + testTeam.name.slice(1)}`);
@@ -329,7 +329,7 @@ describe('Teams Suite', () => {
        cy.visit(`/${testTeam.name}/channels/town-square`);

        // # Open team menu and click "View Members"
-        cy.uiOpenTeamMenu('View Members');
+        cy.uiOpenTeamMenu('View members');
        cy.wait(TIMEOUTS.HALF_SEC);
        cy.get('#searchUsersInput').should('be.visible').type('sysadmin');
        cy.get('.more-modal__list').should('be.visible').children().should('have.length', 1);
@@ -341,7 +341,7 @@ function removeTeamMember(teamName, username) {
    cy.visit(`/${teamName}`);

    // # Open team menu and click "Manage Members"
-    cy.uiOpenTeamMenu('Manage Members');
+    cy.uiOpenTeamMenu('Manage members');

    cy.get(`#teamMembersDropdown_${username}`).should('be.visible').click();
    cy.get('#removeFromTeam').should('be.visible').click();
--- a/e2e-tests/cypress/tests/support/saml_commands.ts
+++ b/e2e-tests/cypress/tests/support/saml_commands.ts
@@ -79,7 +79,7 @@ function getInvitePeopleLink(settings: TestSettings): ChainableT<any> {
    cy.checkLeftSideBar(settings);

    // # Open team menu and click 'Invite People'
-    cy.uiOpenTeamMenu('Invite People');
+    cy.uiOpenTeamMenu('Invite people');

    stubClipboard().as('clipboard');
    cy.checkInvitePeoplePage();
--- a/e2e-tests/cypress/tests/support/ui/sidebar_left.ts
+++ b/e2e-tests/cypress/tests/support/ui/sidebar_left.ts
@@ -9,7 +9,7 @@ Cypress.Commands.add('uiGetLHS', () => {

 Cypress.Commands.add('uiGetLHSHeader', () => {
    return cy.uiGetLHS().
-        find('.SidebarHeaderMenuWrapper').
+        find('#sidebarTeamMenuButton').
        should('be.visible');
 });

@@ -35,7 +35,7 @@ Cypress.Commands.add('uiGetLHSAddChannelButton', () => {
 });

 Cypress.Commands.add('uiGetLHSTeamMenu', () => {
-    return cy.uiGetLHS().find('#sidebarDropdownMenu');
+    return cy.get('#sidebarTeamMenu');
 });

 function uiOpenSystemConsoleMenu(item = ''): ChainableT<JQuery> {
--- a/e2e-tests/cypress/tests/support/ui/team.ts
+++ b/e2e-tests/cypress/tests/support/ui/team.ts
@@ -7,7 +7,7 @@
 */
 function uiInviteMemberToCurrentTeam(username: string) {
    // # Open member invite screen
-    cy.uiOpenTeamMenu('Invite People');
+    cy.uiOpenTeamMenu('Invite people');

    // # Open members section if licensed for guest accounts
    cy.findByTestId('invitationModal').
--- a/e2e-tests/cypress/tests/support/ui_commands.ts
+++ b/e2e-tests/cypress/tests/support/ui_commands.ts
@@ -393,8 +393,8 @@ function getCurrentTeamURL(siteURL: string): ChainableT<string> {
 Cypress.Commands.add('getCurrentTeamURL', getCurrentTeamURL);

 function leaveTeam() {
-    // # Open team menu and click "Leave Team"
-    cy.uiOpenTeamMenu('Leave Team');
+    // # Open team menu and click "Leave team"
+    cy.uiOpenTeamMenu('Leave team');

    // * Check that the "leave team modal" opened up
    cy.get('#leaveTeamModal').should('be.visible');
--- a/e2e-tests/playwright/lib/src/test_action.ts
+++ b/e2e-tests/playwright/lib/src/test_action.ts
@@ -5,7 +5,7 @@ import {Locator, Page} from '@playwright/test';
 export {waitUntil} from 'async-wait-until';

 const visibilityHidden = 'visibility: hidden !important;';
-const hideTeamHeader = `.test-team-header {${visibilityHidden}} `;
+const hideTeamHeader = `#sidebarTeamMenuButton {${visibilityHidden}} `;
 const hidePostHeaderTime = `.post__time {${visibilityHidden}} `;
 const hidePostProfileIcon = `.profile-icon {${visibilityHidden}} `;