Skip to content

[CP Staging] Fix: Not here page opens when admin clicks Move expense in member's report #62611

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 2 commits into from
May 22, 2025
Merged

[CP Staging] Fix: Not here page opens when admin clicks Move expense in member's report #62611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a20dd2a
fix wrong reports shown on details page
twilight2294 May 22, 2025
0fc7900
only make report field editible when the reports are more than 1
twilight2294 May 22, 2025
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/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3943,7 +3943,7 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxInputOrEntry<ReportAction>
}

if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.REPORT) {
return getOutstandingReportsForUser(moneyRequestReport?.policyID, moneyRequestReport?.ownerAccountID, allReports ?? {}).length > 0;
return getOutstandingReportsForUser(moneyRequestReport?.policyID, moneyRequestReport?.ownerAccountID, allReports ?? {}).length > 1;
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 this is ok for now since we'll CP this PR, but ultimately we also want to handle the case where the user has 1 available report and the available reportID is not the same as the transaction.reportID. Basically this flow:

  1. Track an expense
  2. Create a workspace
  3. Create a report
  4. Go to the tracked expense
  5. Notice that you can see the Report field, but not edit it even though the user has an available report

}

return true;
Expand Down
9 changes: 4 additions & 5 deletions src/pages/iou/request/step/IOURequestEditReportCommon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,20 @@ type Props = {
function IOURequestEditReportCommon({backTo, transactionsReports, selectReport}: Props) {
const {translate} = useLocalize();
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: (reports) => mapOnyxCollectionItems(reports, reportSelector), canBeMissing: true});
const [allPoliciesID] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: (policies) => mapOnyxCollectionItems(policies, (policy) => policy?.id), canBeMissing: false});

const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');

const expenseReports = useMemo(
() =>
Object.values(allPoliciesID ?? {}).flatMap((policyID) => {
if (!policyID) {
Object.values(transactionsReports ?? {}).flatMap((transactionsReport) => {
if (!transactionsReport.policyID) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here. This is fine for this PR since we're CPing it, but unreported transactions won't have a policyID, so this will return nothing.

return [];
}
const reports = getOutstandingReportsForUser(policyID, currentUserPersonalDetails.accountID, allReports ?? {});
const reports = getOutstandingReportsForUser(transactionsReport.policyID, transactionsReport?.ownerAccountID ?? currentUserPersonalDetails.accountID, allReports ?? {});
return reports;
}),
[allPoliciesID, allReports, currentUserPersonalDetails.accountID],
[allReports, currentUserPersonalDetails.accountID, transactionsReports],
);

const reportOptions: ReportListItem[] = useMemo(() => {
Expand Down
Loading