From faeb6f52accef994076c87c9fffbca7d053ad831 Mon Sep 17 00:00:00 2001
From: ayush-chauhan233 <ayush.chauhan@brightscout.com>
Date: Wed, 22 Jan 2025 04:30:33 +0530
Subject: [PATCH] [MM-55284]: Fixed adding aria-label logic in team sidebar
 (#29562)

* [MA-6]: Fixed adding aria-label logic in team sidebar

* [MA-6]: Updated en.json, added create team button id

* [MA-6]: Fix: Added logic to add aria-label to users type

* [MA-6]: Fix typo

* [MA-6]: Added translation function to team button

* [MA-6]: Added translation function to team button

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../components/team_sidebar/components/team_button.tsx   | 2 +-
 .../src/components/team_sidebar/team_sidebar.tsx         | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/webapp/channels/src/components/team_sidebar/components/team_button.tsx b/webapp/channels/src/components/team_sidebar/components/team_button.tsx
index 5cc4468c63..cbd774fc5e 100644
--- a/webapp/channels/src/components/team_sidebar/components/team_button.tsx
+++ b/webapp/channels/src/components/team_sidebar/components/team_button.tsx
@@ -164,7 +164,7 @@ export default function TeamButton({
     const teamButton = (
         <Link
             id={`${url.slice(1)}TeamButton`}
-            aria-label={ariaLabel}
+            aria-label={isNotCreateTeamButton ? ariaLabel : displayName}
             to={url}
             onClick={handleSwitch}
         >
diff --git a/webapp/channels/src/components/team_sidebar/team_sidebar.tsx b/webapp/channels/src/components/team_sidebar/team_sidebar.tsx
index fab3dcacb2..d17ab5234a 100644
--- a/webapp/channels/src/components/team_sidebar/team_sidebar.tsx
+++ b/webapp/channels/src/components/team_sidebar/team_sidebar.tsx
@@ -204,7 +204,6 @@ export class TeamSidebar extends React.PureComponent<Props, State> {
 
     render() {
         const {intl} = this.props;
-
         const root: Element | null = document.querySelector('#root');
         if (this.props.myTeams.length <= 1) {
             root!.classList.remove('multi-teams');
@@ -267,6 +266,10 @@ export class TeamSidebar extends React.PureComponent<Props, State> {
                     }
                     content={plusIcon}
                     switchTeam={this.props.actions.switchTeam}
+                    displayName={intl.formatMessage({
+                        id: 'team_sidebar.join',
+                        defaultMessage: 'Other teams you can join',
+                    })}
                 />,
             );
         } else {
@@ -286,6 +289,10 @@ export class TeamSidebar extends React.PureComponent<Props, State> {
                         }
                         content={plusIcon}
                         switchTeam={this.props.actions.switchTeam}
+                        displayName={intl.formatMessage({
+                            id: 'navbar_dropdown.create',
+                            defaultMessage: 'Create a Team',
+                        })}
                     />
                 </SystemPermissionGate>,
             );