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

Fix pressing the arrow up key doesn't open edit composer for the hold reason message in a combined report #47133

Merged
merged 3 commits into from
Aug 12, 2024
Merged

Fix pressing the arrow up key doesn't open edit composer for the hold reason message in a combined report #47133

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7aafe5
include transaction thread actions when calculating last report action
bernhardoj Aug 9, 2024
b88c863
let react compiler memoize the value
bernhardoj Aug 9, 2024
92df581
remove unnecessary selector
bernhardoj Aug 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
16 changes: 4 additions & 12 deletions src/pages/home/ReportScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,10 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
const hasHelpfulErrors = Object.keys(report?.errorFields ?? {}).some((key) => key !== 'notFound');
const shouldHideReport = !hasHelpfulErrors && !ReportUtils.canAccessReport(report, policies, betas);

const lastReportAction: OnyxEntry<OnyxTypes.ReportAction> = useMemo(
() =>
reportActions.length
? [...reportActions, parentReportAction].find((action) => ReportUtils.canEditReportAction(action) && !ReportActionsUtils.isMoneyRequestAction(action))
: undefined,
[reportActions, parentReportAction],
);
const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions ?? [], isOffline);
const [transactionThreadReportActions = {}] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`);
const combinedReportActions = ReportActionsUtils.getCombinedReportActions(reportActions, transactionThreadReportID ?? null, Object.values(transactionThreadReportActions));
const lastReportAction = [...combinedReportActions, parentReportAction].find((action) => ReportUtils.canEditReportAction(action) && !ReportActionsUtils.isMoneyRequestAction(action));
const isSingleTransactionView = ReportUtils.isMoneyRequest(report) || ReportUtils.isTrackExpenseReport(report);
const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
const isTopMostReportId = currentReportID === reportIDFromRoute;
Expand Down Expand Up @@ -339,11 +336,6 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
/>
);

const transactionThreadReportID = useMemo(
() => ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions ?? [], isOffline),
[report.reportID, reportActions, isOffline],
);

if (isSingleTransactionView) {
headerView = (
<MoneyRequestHeader
Expand Down
Loading