Skip to content

Show displayName in IOU if the primary actor is a workspace #30862

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

Merged
merged 3 commits into from
Nov 3, 2023
Merged

Show displayName in IOU if the primary actor is a workspace #30862

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
166a98b
show displayName if primary is workspace
dangrous Nov 3, 2023
600a8d3
simplify, account for copilot
dangrous Nov 3, 2023
8e588ba
Merge branch 'main' into dangrous-fixworkspaceious
dangrous Nov 3, 2023
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
2 changes: 1 addition & 1 deletion src/pages/home/report/ReportActionItemSingle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function ReportActionItemSingle(props) {

// If this is a report preview, display names and avatars of both people involved
let secondaryAvatar = {};
const primaryDisplayName = ReportUtils.getDisplayNameForParticipant(actorAccountID);
const primaryDisplayName = isWorkspaceActor ? displayName : ReportUtils.getDisplayNameForParticipant(actorAccountID);
Copy link
Contributor

@dummy-1111 dummy-1111 Nov 3, 2023

Choose a reason for hiding this comment

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

I think this should be const primaryDisplayName = displayName;

Copy link
Contributor

@dummy-1111 dummy-1111 Nov 3, 2023

Choose a reason for hiding this comment

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

#30342 (comment)

Copy link
Contributor Author

@dangrous dangrous Nov 3, 2023

Choose a reason for hiding this comment

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

Ah, yeah, so just a full revert of that line. Linking your conversation here for convenience

if (displayAllActors) {
// The ownerAccountID and actorAccountID can be the same if the a user requests money back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
const secondaryAccountId = props.iouReport.ownerAccountID === actorAccountID ? props.iouReport.managerID : props.iouReport.ownerAccountID;
Expand Down