Skip to content

Entire expense report is grayed out after paying expense offline on Reports #76892

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
MarioExpensify merged 5 commits into from
Dec 18, 2025
Merged

Entire expense report is grayed out after paying expense offline on Reports #76892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0217193
Entire expense report is grayed out after paying expense offline on R…
nkdengineer Dec 6, 2025
db6c9c7
resolve conflict
nkdengineer Dec 12, 2025
dc6ddb0
Merge branch 'main' into fix/76323
nkdengineer Dec 15, 2025
f447d78
resolve conflict
nkdengineer Dec 15, 2025
583892b
Merge branch 'main' into fix/76323
nkdengineer Dec 18, 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
11 changes: 9 additions & 2 deletions src/components/MoneyRequestReportView/MoneyRequestReportView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,15 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe

return (
<View style={styles.flex1}>
<OfflineWithFeedback
pendingAction={reportPendingAction ?? report?.pendingFields?.reimbursed}
errors={reportErrors}
needsOffscreenAlphaCompositing
shouldShowErrorMessages={false}
>
<HeaderGap />
{reportHeaderView}
</OfflineWithFeedback>
<OfflineWithFeedback
pendingAction={reportPendingAction}
errors={reportErrors}
Expand All @@ -215,8 +224,6 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe
contentContainerStyle={styles.flex1}
errorRowStyles={[styles.ph5, styles.mv2]}
>
<HeaderGap />
{reportHeaderView}
<View style={[styles.overflowHidden, styles.justifyContentEnd, styles.flex1]}>
{shouldDisplayMoneyRequestActionsList ? (
<MoneyRequestReportActionsList
Expand Down
7 changes: 1 addition & 6 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10239,12 +10239,7 @@ function getOriginalReportID(reportID: string | undefined, reportAction: OnyxInp
*/
function getReportOfflinePendingActionAndErrors(report: OnyxEntry<Report>): ReportOfflinePendingActionAndErrors {
// It shouldn't be possible for all of these actions to be pending (or to have errors) for the same report at the same time, so just take the first that exists
const reportPendingAction =
report?.pendingFields?.addWorkspaceRoom ??
report?.pendingFields?.createChat ??
report?.pendingFields?.reimbursed ??
report?.pendingFields?.createReport ??
report?.pendingFields?.reportName;
const reportPendingAction = report?.pendingFields?.addWorkspaceRoom ?? report?.pendingFields?.createChat ?? report?.pendingFields?.createReport ?? report?.pendingFields?.reportName;
const reportErrors = getCreationReportErrors(report);
return {reportPendingAction, reportErrors};
}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/ReportScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
>
<DragAndDropProvider isDisabled={isEditingDisabled}>
<OfflineWithFeedback
pendingAction={reportPendingAction}
pendingAction={reportPendingAction ?? report?.pendingFields?.reimbursed}
errors={reportErrors}
shouldShowErrorMessages={false}
needsOffscreenAlphaCompositing
Expand Down
Loading