Skip to content

[CP Staging] Fix blinking old type of report #62562

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
merged 3 commits into from
May 22, 2025
Merged

[CP Staging] Fix blinking old type of report #62562

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
5e51e30
fix: blinking old type of expense reports
martasudol May 21, 2025
eb287ae
fix: blinking old type of expense reports
martasudol May 22, 2025
04a8f6d
fix: blinking old type of expense reports - prettier & eslint
martasudol May 22, 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
17 changes: 14 additions & 3 deletions src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,16 @@ type MoneyRequestReportListProps = {
reportActions?: OnyxTypes.ReportAction[];

/** List of transactions belonging to this report */
transactions: OnyxTypes.Transaction[];
transactions?: OnyxTypes.Transaction[];

/** If the report has newer actions to load */
hasNewerActions: boolean;

/** If the report has older actions to load */
hasOlderActions: boolean;

/** Whether report actions are still loading */
isLoadingInitialReportActions?: boolean;
};

function getParentReportAction(parentReportActions: OnyxEntry<OnyxTypes.ReportActions>, parentReportActionID: string | undefined): OnyxEntry<OnyxTypes.ReportAction> {
Expand All @@ -91,7 +94,15 @@ function getParentReportAction(parentReportActions: OnyxEntry<OnyxTypes.ReportAc
return parentReportActions[parentReportActionID];
}

function MoneyRequestReportActionsList({report, policy, reportActions = [], transactions = [], hasNewerActions, hasOlderActions}: MoneyRequestReportListProps) {
function MoneyRequestReportActionsList({
report,
policy,
reportActions = [],
transactions = [],
hasNewerActions,
hasOlderActions,
isLoadingInitialReportActions,
}: MoneyRequestReportListProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
const {preferredLocale} = useLocalize();
Expand Down Expand Up @@ -484,7 +495,7 @@ function MoneyRequestReportActionsList({report, policy, reportActions = [], tran
isActive={isFloatingMessageCounterVisible}
onClick={scrollToBottomAndMarkReportAsRead}
/>
{isEmpty(visibleReportActions) && isEmpty(transactions) ? (
{isEmpty(visibleReportActions) && isEmpty(transactions) && !isLoadingInitialReportActions ? (
<>
<MoneyRequestViewReportFields
report={report}
Expand Down
15 changes: 11 additions & 4 deletions src/components/MoneyRequestReportView/MoneyRequestReportView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe

const transactionThreadReportID = getOneTransactionThreadReportID(reportID, reportActions ?? [], isOffline);

const [transactions = undefined] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
selector: (allTransactions: OnyxCollection<OnyxTypes.Transaction>) => selectAllTransactionsForReport(allTransactions, reportID, reportActions),
canBeMissing: true,
});
Expand All @@ -123,8 +123,14 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe
// If true we will use standard `ReportActionsView` to display report data and a special header, anything else is handled via `MoneyRequestReportActionsList`
const isTransactionThreadView = isReportTransactionThread(report);

const isEmptyTransactionReport = transactions && transactionThreadReportID === undefined && !isLoadingInitialReportActions;
const shouldDisplayMoneyRequestActionsList = !!isEmptyTransactionReport && shouldDisplayReportTableView(report, transactions);
// Prevent flash by ensuring transaction data is fully loaded before deciding which view to render
// We need to wait for both the selector to finish AND ensure we're not in a loading state where transactions could still populate
const isTransactionDataReady = transactions !== undefined;
const isStillLoadingData = !!isLoadingInitialReportActions || !!reportMetadata?.isLoadingOlderReportActions || !!reportMetadata?.isLoadingNewerReportActions;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we check for reportMetadata?.isLoadingOlderReportActions and reportMetadata?.isLoadingNewerReportActions?
I've found one case(it was really hard to reproduce it 😄 ) when:

  1. We are already on empty report which is loaded
  2. for some reason loadNewerChats from MoneyRequestReportActionsList fires and makes reportMetadata?.isLoadingNewerReportActions true
  3. because of that InitialLoadingSkeleton flashes for a moment

const shouldWaitForData = (!isTransactionDataReady || (isStillLoadingData && transactions?.length === 0)) && !isTransactionThreadView;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we check for transactions?.length === 0? It's possible to have an empty report

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Initially, when transactions come from Onyx, they are an empty array - not undefined. So the check for transactions?.length === 0 helps us distinguish between "data is ready but empty" vs "data is still loading".


const isEmptyTransactionReport = transactions && transactions.length === 0 && transactionThreadReportID === undefined;
const shouldDisplayMoneyRequestActionsList = !!isEmptyTransactionReport || shouldDisplayReportTableView(report, transactions ?? []);

const reportHeaderView = useMemo(
() =>
Expand Down Expand Up @@ -160,7 +166,7 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe
[activeWorkspaceID, backToRoute, isTransactionThreadView, parentReportAction, policy, report, reportActions, transactionThreadReportID],
);

if (!!(isLoadingInitialReportActions && reportActions.length === 0 && !isOffline) || !transactions) {
if (!!(isLoadingInitialReportActions && reportActions.length === 0 && !isOffline) || shouldWaitForData) {
return <InitialLoadingSkeleton styles={styles} />;
}

Expand Down Expand Up @@ -214,6 +220,7 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe
reportActions={reportActions}
hasOlderActions={hasOlderActions}
hasNewerActions={hasNewerActions}
isLoadingInitialReportActions={isLoadingInitialReportActions}
/>
) : (
<ReportActionsView
Expand Down