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

Fix users list not showing on split confirm #20277

Closed
wants to merge 2 commits into from
Closed

Fix users list not showing on split confirm #20277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b93da68
Fix users list not showing on split confirm
kowczarz Jun 6, 2023
9ac063c
Fix lint issues
kowczarz Jun 9, 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
8 changes: 8 additions & 0 deletions src/pages/iou/MoneyRequestModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ const MoneyRequestModal = (props) => {
);
const [amount, setAmount] = useState(0);

useEffect(() => {
setSelectedOptions(
Comment on lines +114 to +115
Copy link
Contributor

Choose a reason for hiding this comment

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

Also, it doesn't make sense to pre-fill participants list from FAB. Only from report screen.

Suggested change
useEffect(() => {
setSelectedOptions(
useEffect(() => {
if (!props.report.reportID) return;
setSelectedOptions(

ReportUtils.isPolicyExpenseChat(props.report)
? OptionsListUtils.getPolicyExpenseReportOptions(props.report)
: OptionsListUtils.getParticipantsOptions(props.report, props.personalDetails),
);
}, [props.report, props.personalDetails]);

Comment on lines +114 to +121
Copy link
Contributor

Choose a reason for hiding this comment

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

personalDetails is replaced with allPersonalDetails in https://github.com/Expensify/App/pull/21113/files#diff-93b9622394e69d864cda6653a30240e791f97ce4cb4a1e0c2a0de679b2557fe9R111

This is what I suggest:
As withCurrentUserPersonalDetails HOC already includes personalDetails in props, allPersonalDetails is redundant in MoneyRequestModal component.

  • So remove:
-       allPersonalDetails: {
-           key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-       },

  • replace all allPersonalDetails occurrences with personalDetails

  • And update default state value: (this is redundant because it's set again on component mount)

-    const [selectedOptions, setSelectedOptions] = useState(
-        ReportUtils.isPolicyExpenseChat(props.report)
-            ? OptionsListUtils.getPolicyExpenseReportOptions(props.report)
-            : OptionsListUtils.getParticipantsOptions(props.report, props.allPersonalDetails),
-    );
+    const [selectedOptions, setSelectedOptions] = useState([]);

useEffect(() => {
PersonalDetails.openMoneyRequestModalPage();
IOU.setMoneyRequestDescription('');
Expand Down