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

Align offline receipt view for one-transaction and multi-transaction views #39465

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Align offline receipt view for one-transaction and multi-transaction views #39465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 17 additions & 12 deletions src/pages/home/report/ReportActionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,15 +752,18 @@ function ReportActionItem({
}
if (ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report)) {
return (
<OfflineWithFeedback pendingAction={action.pendingAction}>
// eslint-disable-next-line react/jsx-no-useless-fragment
<>
{transactionThreadReport && !isEmptyObject(transactionThreadReport) ? (
<>
{transactionCurrency !== report.currency && (
<MoneyReportView
report={report}
policy={policy}
shouldShowHorizontalRule={!shouldHideThreadDividerLine}
/>
<OfflineWithFeedback pendingAction={action.pendingAction}>
Copy link
Contributor

Choose a reason for hiding this comment

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

Moving the OfflineWithFeedback component here caused a bug: #39824 I am going to have a contributor fix this and another bug related to it that also exists on prod with the pending action appearing and disappearing.

<MoneyReportView
report={report}
policy={policy}
shouldShowHorizontalRule={!shouldHideThreadDividerLine}
/>
</OfflineWithFeedback>
)}
<ShowContextMenuContext.Provider value={contextValue}>
<MoneyRequestView
Expand All @@ -771,13 +774,15 @@ function ReportActionItem({
</ShowContextMenuContext.Provider>
</>
) : (
<MoneyReportView
report={report}
policy={policy}
shouldShowHorizontalRule={!shouldHideThreadDividerLine}
/>
<OfflineWithFeedback pendingAction={action.pendingAction}>
<MoneyReportView
report={report}
policy={policy}
shouldShowHorizontalRule={!shouldHideThreadDividerLine}
/>
</OfflineWithFeedback>
)}
</OfflineWithFeedback>
</>
);
}

Expand Down
Loading