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

Allow split bill for hidden user #32166

Merged
merged 10 commits into from
Nov 30, 2023
Merged

Allow split bill for hidden user #32166

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a0f592
Allow split bill for hidden user
dukenv0307 Nov 29, 2023
cd5fa9c
remove un-use function
dukenv0307 Nov 29, 2023
f109a3c
update hidden for native
dukenv0307 Nov 29, 2023
52efc96
Merge branch 'main' into fix/31792
dukenv0307 Nov 30, 2023
2aafb7a
add hidden for display name native component
dukenv0307 Nov 30, 2023
bab320b
add title for display name web component
dukenv0307 Nov 30, 2023
4ecea54
fix lint
dukenv0307 Nov 30, 2023
61bc06b
Merge branch 'main' into fix/31792
dukenv0307 Nov 30, 2023
e875e3c
merge main
dukenv0307 Nov 30, 2023
0a457f4
fix lint
dukenv0307 Nov 30, 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
1 change: 1 addition & 0 deletions src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1453,6 +1453,7 @@ function getIOUConfirmationOptionsFromPayeePersonalDetail(personalDetail, amount
function getIOUConfirmationOptionsFromParticipants(participants, amountText) {
return _.map(participants, (participant) => ({
...participant,
text: participant.text || Localize.translateLocal('common.hidden'),
Copy link
Contributor

Choose a reason for hiding this comment

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

Why this seems to be only needed for Native?

Copy link
Contributor Author

@dukenv0307 dukenv0307 Nov 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

@s77rt Because in native DisplayNames component render the text which is fullTitle here. On other platforms, we use displayNamesWithTooltips props which already set Hidden for displayName field in getDisplayNameForParticipant function

App/src/components/OptionRow.js

Line 115 in a0b2197

const fullTitle = props.isMultilineSupported ? text.trimStart() : text;

App/src/components/OptionRow.js

Line 221 in a0b2197

<DisplayNames

App/src/components/DisplayNames/index.native.tsx

Line 13 in a0b2197

{fullTitle}

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah I see. But the suggested solution does not fix the bug. I think the DisplayNames component on itself is inconsistent as the shouldUseFullTitle prop is only available on non-native.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you have any suggestions? I think we only have the bug for the participant case so we can fix this in getIOUConfirmationOptionsFromParticipants function.

What do you think about add Hidden as default value here.

App/src/components/OptionRow.js

Line 114 in a0b2197

const text = lodashGet(props.option, 'text', '');

Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add the Hidden as a default in DisplayNames instead? I think that would make more sense

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So we will add Hidden as default in native DisplayNames right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, that seems safer as OptionRow is a generic component where Hidden may not be wanted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@s77rt Updated.

descriptiveText: amountText,
}));
}
Expand Down
11 changes: 4 additions & 7 deletions src/pages/iou/steps/MoneyRequestConfirmPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,10 @@ function MoneyRequestConfirmPage(props) {
const [receiptFile, setReceiptFile] = useState();
const participants = useMemo(
() =>
_.chain(props.iou.participants)
.map((participant) => {
const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false);
return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, props.personalDetails);
})
.filter((participant) => !!participant.login || !!participant.text)
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove the _.chain and _.value. We only need _.map here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@s77rt I updated.

.value(),
_.map(props.iou.participants, (participant) => {
const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false);
return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, props.personalDetails);
}),
[props.iou.participants, props.personalDetails],
);
const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(props.report)), [props.report]);
Expand Down
Loading