From 765a715fcef22bac511f4151042c9ad87988955a Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Fri, 6 May 2022 17:26:32 -0400
Subject: [PATCH] Remove duplicate tooltip from user pills (#8512)

* Remove duplicate tooltip from user pills

* Fix test
---
 src/components/views/elements/Pill.tsx                     | 2 +-
 src/utils/WidgetUtils.ts                                   | 1 -
 test/components/views/messages/TextualBody-test.tsx        | 7 +------
 .../views/messages/__snapshots__/TextualBody-test.tsx.snap | 2 ++
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/views/elements/Pill.tsx b/src/components/views/elements/Pill.tsx
index eb88a2cd46..f344f89456 100644
--- a/src/components/views/elements/Pill.tsx
+++ b/src/components/views/elements/Pill.tsx
@@ -225,7 +225,7 @@ export default class Pill extends React.Component<IProps, IState> {
                     member.rawDisplayName = member.rawDisplayName || '';
                     linkText = member.rawDisplayName;
                     if (this.props.shouldShowPillAvatar) {
-                        avatar = <MemberAvatar member={member} width={16} height={16} aria-hidden="true" />;
+                        avatar = <MemberAvatar member={member} width={16} height={16} aria-hidden="true" hideTitle />;
                     }
                     pillClass = 'mx_UserPill';
                     href = null;
diff --git a/src/utils/WidgetUtils.ts b/src/utils/WidgetUtils.ts
index a81a018144..b2f33b2225 100644
--- a/src/utils/WidgetUtils.ts
+++ b/src/utils/WidgetUtils.ts
@@ -29,7 +29,6 @@ import { MatrixClientPeg } from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
 import dis from '../dispatcher/dispatcher';
 import WidgetEchoStore from '../stores/WidgetEchoStore';
-import SettingsStore from "../settings/SettingsStore";
 import { IntegrationManagers } from "../integrations/IntegrationManagers";
 import { WidgetType } from "../widgets/WidgetType";
 import { Jitsi } from "../widgets/Jitsi";
diff --git a/test/components/views/messages/TextualBody-test.tsx b/test/components/views/messages/TextualBody-test.tsx
index fe4dbf9946..ecb597695b 100644
--- a/test/components/views/messages/TextualBody-test.tsx
+++ b/test/components/views/messages/TextualBody-test.tsx
@@ -254,12 +254,7 @@ describe("<TextualBody />", () => {
             const wrapper = getComponent({ mxEvent: ev }, matrixClient);
             expect(wrapper.text()).toBe("Hey Member");
             const content = wrapper.find(".mx_EventTile_body");
-            expect(content.html()).toBe('<span class="mx_EventTile_body markdown-body" dir="auto">' +
-                'Hey <span>' +
-                '<a class="mx_Pill mx_UserPill">' +
-                '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
-                'style="width: 16px; height: 16px;" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
-                '</span></span>');
+            expect(content.html()).toMatchSnapshot();
         });
 
         it("pills do not appear in code blocks", () => {
diff --git a/test/components/views/messages/__snapshots__/TextualBody-test.tsx.snap b/test/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
index 15d3b7e208..2b6ba33cbc 100644
--- a/test/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
+++ b/test/components/views/messages/__snapshots__/TextualBody-test.tsx.snap
@@ -13,3 +13,5 @@ exports[`<TextualBody /> renders formatted m.text correctly pills do not appear
 </code><span></span></pre><span class=\\"mx_EventTile_button mx_EventTile_copyButton \\"></span></div>
 </span>"
 `;
+
+exports[`<TextualBody /> renders formatted m.text correctly pills get injected correctly into the DOM 1`] = `"<span class=\\"mx_EventTile_body markdown-body\\" dir=\\"auto\\">Hey <span><a class=\\"mx_Pill mx_UserPill\\"><img class=\\"mx_BaseAvatar mx_BaseAvatar_image\\" src=\\"mxc://avatar.url/image.png\\" style=\\"width: 16px; height: 16px;\\" alt=\\"\\" aria-hidden=\\"true\\">Member</a></span></span>"`;