Skip to content

Show loading spinner instead of not-found page for draft transaction receipt preview #84291

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

Draft
MelvinBot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Show loading spinner instead of not-found page for draft transaction receipt preview #84291

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03b4f58
Show loading spinner instead of not-found page during Onyx pending me…
MelvinBot Mar 5, 2026
d02ed8c
Fix: Use nullish coalescing operator instead of logical or
MelvinBot Mar 5, 2026
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
7 changes: 5 additions & 2 deletions src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {ReceiptSource} from '@src/types/onyx/Transaction';
import type {FileObject} from '@src/types/utils/Attachment';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
import useDownloadAttachment from './hooks/useDownloadAttachment';

function TransactionReceiptModalContent({navigation, route}: AttachmentModalScreenProps<typeof SCREENS.TRANSACTION_RECEIPT>) {
Expand All @@ -45,7 +46,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
const allTransactions = useAllTransactions();
const transactionMain = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`];
const [transactionDraft] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${getNonEmptyStringOnyxID(transactionID)}`);
const [transactionDraft, transactionDraftResult] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${getNonEmptyStringOnyxID(transactionID)}`);
const [reportMetadata = CONST.DEFAULT_REPORT_METADATA] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`);
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
const [session] = useOnyx(ONYXKEYS.SESSION);
Expand Down Expand Up @@ -595,7 +596,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
threeDotsMenuItems,
isAuthTokenRequired,
isTrackExpenseAction: isTrackExpenseActionValue,
isLoading: !transaction && reportMetadata?.isLoadingInitialReportActions,
isLoading: !transaction && (reportMetadata?.isLoadingInitialReportActions ?? (isDraftTransaction && isLoadingOnyxValue(transactionDraftResult))),
shouldShowNotFoundPage,
shouldShowCarousel: false,
shouldShowRotateButton: false,
Expand All @@ -616,6 +617,8 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
isTrackExpenseActionValue,
transaction,
reportMetadata?.isLoadingInitialReportActions,
isDraftTransaction,
transactionDraftResult,
shouldShowNotFoundPage,
allowDownload,
onDownloadAttachment,
Expand Down
Loading