Skip to content

Commit 2d5479e

Browse files
authored
Merge pull request #51459 from bernhardoj/fix/51186-hidden-shows-briefly-when-mention-unknown-user
Fix hidden shows briefly when mentioning unknown user
2 parents 664f826 + f63804f commit 2d5479e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import isEmpty from 'lodash/isEmpty';
44
import React from 'react';
55
import {StyleSheet} from 'react-native';
66
import type {TextStyle} from 'react-native';
7+
import {useOnyx} from 'react-native-onyx';
78
import type {CustomRendererProps, TPhrasing, TText} from 'react-native-render-html';
89
import {TNodeChildrenRenderer} from 'react-native-render-html';
9-
import {usePersonalDetails} from '@components/OnyxProvider';
1010
import {ShowContextMenuContext, showContextMenuForReport} from '@components/ShowContextMenuContext';
1111
import Text from '@components/Text';
1212
import UserDetailsTooltip from '@components/UserDetailsTooltip';
@@ -20,6 +20,7 @@ import Navigation from '@libs/Navigation/Navigation';
2020
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
2121
import * as ReportUtils from '@libs/ReportUtils';
2222
import CONST from '@src/CONST';
23+
import ONYXKEYS from '@src/ONYXKEYS';
2324
import ROUTES from '@src/ROUTES';
2425
import type {Route} from '@src/ROUTES';
2526
import asMutable from '@src/types/utils/asMutable';
@@ -31,7 +32,7 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
3132
const styles = useThemeStyles();
3233
const StyleUtils = useStyleUtils();
3334
const htmlAttribAccountID = tnode.attributes.accountid;
34-
const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
35+
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
3536
const htmlAttributeAccountID = tnode.attributes.accountid;
3637

3738
let accountID: number;
@@ -56,7 +57,7 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
5657
return displayText.split('@').at(0);
5758
};
5859

59-
if (!isEmpty(htmlAttribAccountID)) {
60+
if (!isEmpty(htmlAttribAccountID) && personalDetails?.[htmlAttribAccountID]) {
6061
const user = personalDetails[htmlAttribAccountID];
6162
accountID = parseInt(htmlAttribAccountID, 10);
6263
mentionDisplayText = LocalePhoneNumber.formatPhoneNumber(user?.login ?? '') || PersonalDetailsUtils.getDisplayNameOrDefault(user);

0 commit comments

Comments
 (0)