Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Expense - Title tooltip shows user email below workspace name. #35214

Merged
merged 7 commits into from
Jan 31, 2024
Merged

fix: Expense - Title tooltip shows user email below workspace name. #35214

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8f1125
fix: Expense - Title tooltip shows user email below workspace name.
Krishna2323 Jan 26, 2024
c06f621
Merge branch 'Expensify:main' into krishna2323/issue/34835
Krishna2323 Jan 26, 2024
44edf1d
added extra check.
Krishna2323 Jan 29, 2024
9c6dae0
Merge branch 'krishna2323/issue/34835' of https://github.com/Krishna2…
Krishna2323 Jan 29, 2024
7611dae
added comment.
Krishna2323 Jan 29, 2024
e118db5
comment udpated.
Krishna2323 Jan 29, 2024
30c2a90
update comment.
Krishna2323 Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/components/UserDetailsTooltip/BaseUserDetailsTooltip/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,14 @@ function BaseUserDetailsTooltip({accountID, fallbackUserDetails, icon, delegateA
}

let title = String(userDisplayName).trim() ? userDisplayName : '';
const subtitle = userLogin.trim() && LocalePhoneNumber.formatPhoneNumber(userLogin) !== userDisplayName ? Str.removeSMSDomain(userLogin) : '';
let subtitle = userLogin.trim() && LocalePhoneNumber.formatPhoneNumber(userLogin) !== userDisplayName ? Str.removeSMSDomain(userLogin) : '';
if (icon && (icon.type === CONST.ICON_TYPE_WORKSPACE || !title)) {
title = icon.name ?? '';

// We need to clear the subtitle for workspaces so that we don't display any user details under the workspace name
if (icon.type === CONST.ICON_TYPE_WORKSPACE) {
Beamanator marked this conversation as resolved.
Show resolved Hide resolved
subtitle = '';
}
}
const renderTooltipContent = useCallback(
() => (
Expand Down
Loading