Skip to content

Expense - Report preview shows loader when created offline and still shows loader when online #67137

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
aldo-expensify merged 3 commits into from
Jul 28, 2025
Merged

Expense - Report preview shows loader when created offline and still shows loader when online #67137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68bd57e
fix: loader issue
thelullabyy Jul 25, 2025
07678e7
fix: loader issue
thelullabyy Jul 25, 2025
a5efc60
Merge branch 'main' of https://github.com/Expensify/App into fix/6619…
thelullabyy Jul 28, 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 ...omponents/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function MoneyRequestReportPreviewContent({
onPress,
}: MoneyRequestReportPreviewContentProps) {
const [chatReportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${chatReportID}`, {canBeMissing: true, allowStaleData: true});
const shouldShowLoading = !chatReportMetadata?.hasOnceLoadedReportActions && transactions.length === 0;
const shouldShowLoading = !chatReportMetadata?.hasOnceLoadedReportActions && transactions.length === 0 && !chatReportMetadata?.isOptimisticReport;
// `hasOnceLoadedReportActions` becomes true before transactions populate fully,
// so we defer the loading state update to ensure transactions are loaded
const shouldShowLoadingDeferred = useDeferredValue(shouldShowLoading);
Expand Down
5 changes: 2 additions & 3 deletions src/pages/home/ReportScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
);

const fetchReport = useCallback(() => {
if (reportMetadata.isOptimisticReport && report?.type === CONST.REPORT.TYPE.CHAT) {
if (reportMetadata.isOptimisticReport && report?.type === CONST.REPORT.TYPE.CHAT && !isPolicyExpenseChat(report)) {
return;
}

Expand All @@ -487,8 +487,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
openReport(reportIDFromRoute, reportActionIDFromRoute);
}, [
reportMetadata.isOptimisticReport,
report?.type,
report?.errorFields?.notFound,
report,
isOffline,
route.params?.moneyRequestReportActionID,
route.params?.transactionID,
Expand Down
Loading