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

[ReportPreview / Text] When showing two avatars, also show both display names with tooltip #50341

Merged
merged 5 commits into from
Oct 9, 2024
Merged

[ReportPreview / Text] When showing two avatars, also show both display names with tooltip #50341

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58d2ae2
When showing two avatars, also show both names with tooltip
grgia Oct 7, 2024
2ff15ab
typescript null check
grgia Oct 7, 2024
73f0200
useCallback() for function
grgia Oct 8, 2024
57108d8
Merge branch 'main' into georgia-heading
grgia Oct 9, 2024
3880862
fix indexing
grgia Oct 9, 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
124 changes: 98 additions & 26 deletions src/pages/home/report/ReportActionItemSingle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,24 +150,40 @@ function ReportActionItemSingle({
} else {
secondaryAvatar = {name: '', source: '', type: 'avatar'};
}
const icon = {
source: avatarSource ?? FallbackAvatar,
type: isWorkspaceActor ? CONST.ICON_TYPE_WORKSPACE : CONST.ICON_TYPE_AVATAR,
name: primaryDisplayName ?? '',
id: avatarId,
};
const icon = useMemo(
() => ({
source: avatarSource ?? FallbackAvatar,
type: isWorkspaceActor ? CONST.ICON_TYPE_WORKSPACE : CONST.ICON_TYPE_AVATAR,
name: primaryDisplayName ?? '',
id: avatarId,
}),
[avatarSource, isWorkspaceActor, primaryDisplayName, avatarId],
);

// Since the display name for a report action message is delivered with the report history as an array of fragments
// we'll need to take the displayName from personal details and have it be in the same format for now. Eventually,
// we should stop referring to the report history items entirely for this information.
const personArray = displayName
? [
{
type: 'TEXT',
text: displayName,
},
]
: action?.person;
const personArray = useMemo(() => {
const baseArray = displayName
? [
{
type: 'TEXT',
text: displayName,
},
]
: [action?.person?.at(0)] ?? [];

if (displayAllActors && secondaryAvatar?.name) {
return [
...baseArray,
{
type: 'TEXT',
text: secondaryAvatar?.name ?? '',
},
];
}
return baseArray;
}, [displayName, action?.person, displayAllActors, secondaryAvatar?.name]);

const reportID = report?.reportID;
const iouReportID = iouReport?.reportID;
Expand Down Expand Up @@ -231,6 +247,73 @@ function ReportActionItemSingle({
</UserDetailsTooltip>
);
};

const getHeading = useCallback(() => {
return () => {
if (displayAllActors && personArray.length === 2 && isReportPreviewAction) {
return (
<View style={[styles.flexRow]}>
<ReportActionItemFragment
style={[styles.flex1]}
key={`person-${action?.reportActionID}-${0}`}
accountID={actorAccountID ?? -1}
fragment={{...personArray.at(0), type: 'TEXT', text: displayName ?? ''}}
delegateAccountID={action?.delegateAccountID}
isSingleLine
actorIcon={icon}
moderationDecision={getReportActionMessage(action)?.moderationDecision?.decision}
/>
<Text
numberOfLines={1}
style={[styles.chatItemMessageHeaderSender, styles.pre]}
>
{` & `}
</Text>
<ReportActionItemFragment
style={[styles.flex1]}
key={`person-${action?.reportActionID}-${1}`}
accountID={parseInt(`${secondaryAvatar?.id ?? -1}`, 10)}
fragment={{...personArray.at(1), type: 'TEXT', text: secondaryAvatar.name ?? ''}}
delegateAccountID={action?.delegateAccountID}
isSingleLine
actorIcon={secondaryAvatar}
moderationDecision={getReportActionMessage(action)?.moderationDecision?.decision}
/>
</View>
);
}
return (
<View>
{personArray.map((fragment) => (
<ReportActionItemFragment
style={[styles.flex1]}
key={`person-${action?.reportActionID}-${actorAccountID}`}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to use index suffix like before. Because it's possible that
personArray.length === 2 and isReportPreviewAction is false right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did it because of this eslint error-

Screenshot 2024-10-09 at 1 45 01 PM

I think we might be able to use this pattern for all multiple avatar cases, but we'd need to confirm with design and it's an easy fix so I'll do that in a separate PR if so

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify the above comment, we may be able to remove the isReportPreviewAction check entirely

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. For the lint error, maybe we can just disable the lint by adding

// eslint-disable-next-line react/no-array-index-key

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I see what you mean, updating now.

accountID={actorAccountID ?? -1}
fragment={{...fragment, type: fragment?.type ?? '', text: fragment?.text ?? ''}}
delegateAccountID={action?.delegateAccountID}
isSingleLine
actorIcon={icon}
moderationDecision={getReportActionMessage(action)?.moderationDecision?.decision}
/>
))}
</View>
);
};
}, [
displayAllActors,
secondaryAvatar,
isReportPreviewAction,
personArray,
styles.flexRow,
styles.flex1,
styles.chatItemMessageHeaderSender,
styles.pre,
action,
actorAccountID,
displayName,
icon,
]);

const hasEmojiStatus = !displayAllActors && status?.emojiCode;
const formattedDate = DateUtils.getStatusUntilDate(status?.clearAfter ?? '');
const statusText = status?.text ?? '';
Expand Down Expand Up @@ -261,18 +344,7 @@ function ReportActionItemSingle({
accessibilityLabel={actorHint}
role={CONST.ROLE.BUTTON}
>
{personArray?.map((fragment, index) => (
<ReportActionItemFragment
// eslint-disable-next-line react/no-array-index-key
key={`person-${action?.reportActionID}-${index}`}
accountID={actorAccountID ?? -1}
fragment={{...fragment, type: fragment.type ?? '', text: fragment.text ?? ''}}
delegateAccountID={action?.delegateAccountID}
isSingleLine
actorIcon={icon}
moderationDecision={getReportActionMessage(action)?.moderationDecision?.decision}
/>
))}
{getHeading()}
</PressableWithoutFeedback>
{!!hasEmojiStatus && (
<Tooltip text={statusTooltipText}>
Expand Down
Loading