Cloudpresser/user details tooltip #20276
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import React, {useCallback} from 'react'; | ||
| import {View, Text} from 'react-native'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import Str from 'expensify-common/lib/str'; | ||
| import lodashGet from 'lodash/get'; | ||
| import _ from 'underscore'; | ||
| import Avatar from '../Avatar'; | ||
| import Tooltip from '../Tooltip'; | ||
| import {propTypes, defaultProps} from './userDetailsTooltipPropTypes'; | ||
| import styles from '../../styles/styles'; | ||
| import ONYXKEYS from '../../ONYXKEYS'; | ||
|
|
||
| function UserDetailsTooltip(props) { | ||
| const userDetails = lodashGet(props.personalDetailsList, props.accountID, props.fallbackUserDetails); | ||
| const renderTooltipContent = useCallback( | ||
| () => ( | ||
| <View style={[styles.alignItemsCenter, styles.ph2, styles.pv2]}> | ||
| <View style={styles.emptyAvatar}> | ||
| <Avatar | ||
| containerStyles={[styles.actionAvatar]} | ||
| source={userDetails.avatar} | ||
| /> | ||
| </View> | ||
|
|
||
| <Text style={[styles.mt2, styles.textMicroBold, styles.textReactionSenders, styles.textAlignCenter]}> | ||
| {String(userDetails.displayName).trim() ? userDetails.displayName : ''} | ||
| </Text> | ||
|
|
||
| <Text style={[styles.textMicro, styles.fontColorReactionLabel]}> | ||
| {String(userDetails.login).trim() && !_.isEqual(userDetails.login, userDetails.displayName) ? Str.removeSMSDomain(userDetails.login) : ''} | ||
| </Text> | ||
|
Comment on lines
+29
to
+31
There was a problem hiding this comment. The user with mobile number login case was handled incorrectly resulting in the regression showing the phone number twice with different formatting. Handled it by improving the checks! There was a problem hiding this comment. We added the login handling here, but we didn't account for overflowing content on the tooltip with a very long email. This caused a regression here. |
||
| </View> | ||
| ), | ||
| [userDetails.avatar, userDetails.displayName, userDetails.login], | ||
| ); | ||
|
|
||
| if (!userDetails.displayName && !userDetails.login) { | ||
| return props.children; | ||
| } | ||
|
|
||
| return <Tooltip renderTooltipContent={renderTooltipContent}>{props.children}</Tooltip>; | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| UserDetailsTooltip.propTypes = propTypes; | ||
| UserDetailsTooltip.defaultProps = defaultProps; | ||
| UserDetailsTooltip.displayName = 'UserDetailsTooltip'; | ||
|
|
||
| export default withOnyx({ | ||
| personalDetailsList: { | ||
| key: ONYXKEYS.PERSONAL_DETAILS_LIST, | ||
| }, | ||
| })(UserDetailsTooltip); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import PropTypes from 'prop-types'; | ||
| import personalDetailsPropType from '../../pages/personalDetailsPropType'; | ||
|
|
||
| const propTypes = { | ||
| /** User's Account ID */ | ||
| accountID: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired, | ||
| /** Fallback User Details object used if no accountID */ | ||
| fallbackUserDetails: PropTypes.shape({ | ||
| /** Avatar URL */ | ||
| avatar: PropTypes.oneOfType([PropTypes.string, PropTypes.func]), | ||
| /** Display Name */ | ||
| displayName: PropTypes.string, | ||
| /** Login */ | ||
| login: PropTypes.string, | ||
| }), | ||
| /** Component that displays the tooltip */ | ||
| children: PropTypes.node.isRequired, | ||
| /** List of personalDetails (keyed by accountID) */ | ||
| personalDetailsList: PropTypes.objectOf(personalDetailsPropType), | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| accountID: '', | ||
| fallbackUserDetails: {displayName: '', login: '', avatar: ''}, | ||
| personalDetailsList: {}, | ||
| }; | ||
|
|
||
| export {propTypes, defaultProps}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -749,6 +749,7 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false) | |
| } | ||
| if (isConciergeChatReport(report)) { | ||
| result.source = CONST.CONCIERGE_ICON_URL; | ||
| result.name = CONST.EMAIL.CONCIERGE; | ||
| return [result]; | ||
| } | ||
| if (isArchivedRoom(report)) { | ||
|
|
@@ -845,6 +846,16 @@ function getPersonalDetailsForLogin(login) { | |
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the accountID for a login by looking in the ONYXKEYS.PERSONAL_DETAILS Onyx key (stored in the local variable, allPersonalDetails). If it doesn't exist in Onyx, | ||
| * then an empty string is returned. | ||
| * @param {String} login | ||
| * @returns {String} | ||
| */ | ||
| function getAccountIDForLogin(login) { | ||
|
There was a problem hiding this comment. @cloudpresser @puneetlath There was a problem hiding this comment. @esh-g If the the method no longer works after So it's not a regression from this PR. |
||
| return lodashGet(allPersonalDetails, [login, 'accountID'], ''); | ||
| } | ||
|
|
||
| /** | ||
| * Get the displayName for a single report participant. | ||
| * | ||
|
|
@@ -873,7 +884,8 @@ function getDisplayNameForParticipant(login, shouldUseShortForm = false) { | |
| function getDisplayNamesWithTooltips(participants, isMultipleParticipantReport) { | ||
| return _.map(participants, (participant) => { | ||
| const displayName = getDisplayNameForParticipant(participant.login, isMultipleParticipantReport); | ||
cloudpresser marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const avatar = UserUtils.getDefaultAvatar(participant.login); | ||
|
There was a problem hiding this comment. I think this caused a regression where we are unable to load a user's uploaded/custom avatar in some cases as identified on #20683 I believe I've got a fix so will push it up and request reviews from ya'll. There was a problem hiding this comment. @bondydaa The root cause of that issue is that we are not passing the |
||
| const accountID = participant.accountID; | ||
|
|
||
| let pronouns = participant.pronouns; | ||
| if (pronouns && pronouns.startsWith(CONST.PRONOUNS.PREFIX)) { | ||
|
|
@@ -883,7 +895,9 @@ function getDisplayNamesWithTooltips(participants, isMultipleParticipantReport) | |
|
|
||
| return { | ||
| displayName, | ||
| avatar, | ||
| login: participant.login, | ||
| accountID, | ||
| pronouns, | ||
| }; | ||
| }); | ||
|
|
@@ -2153,7 +2167,9 @@ function getParentReport(report) { | |
| } | ||
|
|
||
| export { | ||
| getAccountIDForLogin, | ||
| getReportParticipantsTitle, | ||
| getPersonalDetailsForLogin, | ||
cloudpresser marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| isReportMessageAttachment, | ||
| findLastAccessedReport, | ||
| canEditReportAction, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We didn't properly migrate the
shouldShowTooltipprop toUserDetailsTooltipwhich was being applied indirectly to the oldTooltipvia tooltipTexts at line 72.