From bce807d7514c4747336907f93cad50b0f129d741 Mon Sep 17 00:00:00 2001
From: Syed Fazil <84120587+fazil-syed@users.noreply.github.com>
Date: Sun, 29 Oct 2023 00:34:42 +0530
Subject: [PATCH] [MM-55109] Replace usage of LocalizedIcon in
 'group_member_list.tsx' with i/span tags (#25178)

---
 .../user_group_popover.test.tsx.snap          | 75 +++----------------
 .../group_member_list.test.tsx.snap           | 75 +++----------------
 .../group_member_list/group_member_list.tsx   |  5 +-
 3 files changed, 21 insertions(+), 134 deletions(-)

diff --git a/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap b/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
index ac79bde2a3..e7d160fa06 100644
--- a/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
+++ b/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
@@ -1260,20 +1260,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           onMouseOut={[Function]}
                                                           onMouseOver={[Function]}
                                                         >
-                                                          <LocalizedIcon
-                                                            ariaLabel={
-                                                              Object {
-                                                                "defaultMessage": "Close",
-                                                                "id": "user_group_popover.close",
-                                                              }
-                                                            }
+                                                          <i
                                                             className="icon icon-send"
-                                                          >
-                                                            <i
-                                                              aria-label="Close"
-                                                              className="icon icon-send"
-                                                            />
-                                                          </LocalizedIcon>
+                                                          />
                                                         </button>
                                                       </DMButton>
                                                     </OverlayTrigger>
@@ -1479,20 +1468,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           onMouseOut={[Function]}
                                                           onMouseOver={[Function]}
                                                         >
-                                                          <LocalizedIcon
-                                                            ariaLabel={
-                                                              Object {
-                                                                "defaultMessage": "Close",
-                                                                "id": "user_group_popover.close",
-                                                              }
-                                                            }
+                                                          <i
                                                             className="icon icon-send"
-                                                          >
-                                                            <i
-                                                              aria-label="Close"
-                                                              className="icon icon-send"
-                                                            />
-                                                          </LocalizedIcon>
+                                                          />
                                                         </button>
                                                       </DMButton>
                                                     </OverlayTrigger>
@@ -1698,20 +1676,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           onMouseOut={[Function]}
                                                           onMouseOver={[Function]}
                                                         >
-                                                          <LocalizedIcon
-                                                            ariaLabel={
-                                                              Object {
-                                                                "defaultMessage": "Close",
-                                                                "id": "user_group_popover.close",
-                                                              }
-                                                            }
+                                                          <i
                                                             className="icon icon-send"
-                                                          >
-                                                            <i
-                                                              aria-label="Close"
-                                                              className="icon icon-send"
-                                                            />
-                                                          </LocalizedIcon>
+                                                          />
                                                         </button>
                                                       </DMButton>
                                                     </OverlayTrigger>
@@ -1917,20 +1884,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           onMouseOut={[Function]}
                                                           onMouseOver={[Function]}
                                                         >
-                                                          <LocalizedIcon
-                                                            ariaLabel={
-                                                              Object {
-                                                                "defaultMessage": "Close",
-                                                                "id": "user_group_popover.close",
-                                                              }
-                                                            }
+                                                          <i
                                                             className="icon icon-send"
-                                                          >
-                                                            <i
-                                                              aria-label="Close"
-                                                              className="icon icon-send"
-                                                            />
-                                                          </LocalizedIcon>
+                                                          />
                                                         </button>
                                                       </DMButton>
                                                     </OverlayTrigger>
@@ -2136,20 +2092,9 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                                                           onMouseOut={[Function]}
                                                           onMouseOver={[Function]}
                                                         >
-                                                          <LocalizedIcon
-                                                            ariaLabel={
-                                                              Object {
-                                                                "defaultMessage": "Close",
-                                                                "id": "user_group_popover.close",
-                                                              }
-                                                            }
+                                                          <i
                                                             className="icon icon-send"
-                                                          >
-                                                            <i
-                                                              aria-label="Close"
-                                                              className="icon icon-send"
-                                                            />
-                                                          </LocalizedIcon>
+                                                          />
                                                         </button>
                                                       </DMButton>
                                                     </OverlayTrigger>
diff --git a/webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap b/webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap
index fb1dba914a..60b65bee46 100644
--- a/webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap
+++ b/webapp/channels/src/components/user_group_popover/group_member_list/__snapshots__/group_member_list.test.tsx.snap
@@ -530,20 +530,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           onMouseOut={[Function]}
                                           onMouseOver={[Function]}
                                         >
-                                          <LocalizedIcon
-                                            ariaLabel={
-                                              Object {
-                                                "defaultMessage": "Close",
-                                                "id": "user_group_popover.close",
-                                              }
-                                            }
+                                          <i
                                             className="icon icon-send"
-                                          >
-                                            <i
-                                              aria-label="Close"
-                                              className="icon icon-send"
-                                            />
-                                          </LocalizedIcon>
+                                          />
                                         </button>
                                       </DMButton>
                                     </OverlayTrigger>
@@ -749,20 +738,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           onMouseOut={[Function]}
                                           onMouseOver={[Function]}
                                         >
-                                          <LocalizedIcon
-                                            ariaLabel={
-                                              Object {
-                                                "defaultMessage": "Close",
-                                                "id": "user_group_popover.close",
-                                              }
-                                            }
+                                          <i
                                             className="icon icon-send"
-                                          >
-                                            <i
-                                              aria-label="Close"
-                                              className="icon icon-send"
-                                            />
-                                          </LocalizedIcon>
+                                          />
                                         </button>
                                       </DMButton>
                                     </OverlayTrigger>
@@ -968,20 +946,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           onMouseOut={[Function]}
                                           onMouseOver={[Function]}
                                         >
-                                          <LocalizedIcon
-                                            ariaLabel={
-                                              Object {
-                                                "defaultMessage": "Close",
-                                                "id": "user_group_popover.close",
-                                              }
-                                            }
+                                          <i
                                             className="icon icon-send"
-                                          >
-                                            <i
-                                              aria-label="Close"
-                                              className="icon icon-send"
-                                            />
-                                          </LocalizedIcon>
+                                          />
                                         </button>
                                       </DMButton>
                                     </OverlayTrigger>
@@ -1187,20 +1154,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           onMouseOut={[Function]}
                                           onMouseOver={[Function]}
                                         >
-                                          <LocalizedIcon
-                                            ariaLabel={
-                                              Object {
-                                                "defaultMessage": "Close",
-                                                "id": "user_group_popover.close",
-                                              }
-                                            }
+                                          <i
                                             className="icon icon-send"
-                                          >
-                                            <i
-                                              aria-label="Close"
-                                              className="icon icon-send"
-                                            />
-                                          </LocalizedIcon>
+                                          />
                                         </button>
                                       </DMButton>
                                     </OverlayTrigger>
@@ -1406,20 +1362,9 @@ exports[`component/user_group_popover/group_member_list should match snapshot 1`
                                           onMouseOut={[Function]}
                                           onMouseOver={[Function]}
                                         >
-                                          <LocalizedIcon
-                                            ariaLabel={
-                                              Object {
-                                                "defaultMessage": "Close",
-                                                "id": "user_group_popover.close",
-                                              }
-                                            }
+                                          <i
                                             className="icon icon-send"
-                                          >
-                                            <i
-                                              aria-label="Close"
-                                              className="icon icon-send"
-                                            />
-                                          </LocalizedIcon>
+                                          />
                                         </button>
                                       </DMButton>
                                     </OverlayTrigger>
diff --git a/webapp/channels/src/components/user_group_popover/group_member_list/group_member_list.tsx b/webapp/channels/src/components/user_group_popover/group_member_list/group_member_list.tsx
index eaa65d6354..aaa44fce3a 100644
--- a/webapp/channels/src/components/user_group_popover/group_member_list/group_member_list.tsx
+++ b/webapp/channels/src/components/user_group_popover/group_member_list/group_member_list.tsx
@@ -14,14 +14,12 @@ import type {ServerError} from '@mattermost/types/errors';
 import type {Group} from '@mattermost/types/groups';
 import type {UserProfile} from '@mattermost/types/users';
 
-import LocalizedIcon from 'components/localized_icon';
 import NoResultsIndicator from 'components/no_results_indicator';
 import {NoResultsVariant} from 'components/no_results_indicator/types';
 import LoadingSpinner from 'components/widgets/loading/loading_spinner';
 import SimpleTooltip from 'components/widgets/simple_tooltip';
 import Avatar from 'components/widgets/users/avatar';
 
-import {t} from 'utils/i18n';
 import * as Utils from 'utils/utils';
 
 import {Load} from '../constants';
@@ -197,9 +195,8 @@ const GroupMemberList = (props: Props) => {
                                     {user: name})}
                                 onClick={() => showDirectChannel(user)}
                             >
-                                <LocalizedIcon
+                                <i
                                     className='icon icon-send'
-                                    ariaLabel={{id: t('user_group_popover.close'), defaultMessage: 'Close'}}
                                 />
                             </DMButton>
                         </SimpleTooltip>