Merge pull request #23310 from Nikhil-Vats/21683_show_new_tooltip_for…

…_mentions Fix tooltip for mentions
Expensify · Jul 21, 2023 · 2c5dd69 · 2c5dd69
2 parents d3a13d6 + 642f346
commit 2c5dd69
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
@@ -4,11 +4,12 @@ import {TNodeChildrenRenderer} from 'react-native-render-html';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
 import Text from '../../Text';
-import Tooltip from '../../Tooltip';
+import UserDetailsTooltip from '../../UserDetailsTooltip';
 import htmlRendererPropTypes from './htmlRendererPropTypes';
 import withCurrentUserPersonalDetails from '../../withCurrentUserPersonalDetails';
 import personalDetailsPropType from '../../../pages/personalDetailsPropType';
 import * as StyleUtils from '../../../styles/StyleUtils';
+import * as PersonalDetailsUtils from '../../../libs/PersonalDetailsUtils';
 import TextLink from '../../TextLink';
 
 const propTypes = {
@@ -33,11 +34,18 @@ function MentionUserRenderer(props) {
     // We need to remove the leading @ from data as it is not part of the login
     const loginWithoutLeadingAt = props.tnode.data.slice(1);
 
+    const accountID = _.first(PersonalDetailsUtils.getAccountIDsByLogins([loginWithoutLeadingAt]));
+
     const isOurMention = loginWithoutLeadingAt === props.currentUserPersonalDetails.login;
 
     return (
         <Text>
-            <Tooltip text={loginWithoutLeadingAt}>
+            <UserDetailsTooltip
+                accountID={accountID}
+                fallbackUserDetails={{
+                    displayName: loginWithoutLeadingAt,
+                }}
+            >
                 <TextLink
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...defaultRendererProps}
@@ -49,7 +57,7 @@ function MentionUserRenderer(props) {
                 >
                     <TNodeChildrenRenderer tnode={props.tnode} />
                 </TextLink>
-            </Tooltip>
+            </UserDetailsTooltip>
         </Text>
     );
 }