diff --git a/src/libs/MoneyRequestReportUtils.ts b/src/libs/MoneyRequestReportUtils.ts index e9542adc085c..0d920f2fc3d6 100644 --- a/src/libs/MoneyRequestReportUtils.ts +++ b/src/libs/MoneyRequestReportUtils.ts @@ -108,13 +108,13 @@ function shouldDisplayReportTableView(report: OnyxEntry, transactions: T function shouldWaitForTransactions(report: OnyxEntry, transactions: Transaction[] | undefined, reportMetadata: OnyxEntry) { const isTransactionDataReady = transactions !== undefined; const isTransactionThreadView = isReportTransactionThread(report); - const isStillLoadingData = transactions?.length === 0 && (!!reportMetadata?.isLoadingInitialReportActions || report?.total !== 0); - + const isStillLoadingData = !!reportMetadata?.isLoadingInitialReportActions || !!reportMetadata?.isLoadingOlderReportActions || !!reportMetadata?.isLoadingNewerReportActions; return ( (isMoneyRequestReport(report) || isInvoiceReport(report)) && - (!isTransactionDataReady || isStillLoadingData) && + (!isTransactionDataReady || (isStillLoadingData && transactions?.length === 0)) && !isTransactionThreadView && - report?.pendingFields?.createReport !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD + report?.pendingFields?.createReport !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && + !reportMetadata?.hasOnceLoadedReportActions ); }