Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/components/ImageWithLoading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ function ImageWithLoading({
>
{isLoading &&
!!previewUri && (
// Preview is a placeholder; parent onLoad should fire only when the full image is ready.
// eslint-disable-next-line react-native-a11y/has-valid-accessibility-ignores-invert-colors -- Custom Image wrapper does not support this prop.
<Image
{...rest}
source={{uri: previewUri}}
style={[styles.pAbsolute, styles.w100, styles.h100, styles.opacitySemiTransparent, style]}
resizeMode={resizeMode}
onLoad={onLoad}
loadingIconSize={loadingIconSize}
loadingIndicatorStyles={loadingIndicatorStyles}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import ActivityIndicator from '@components/ActivityIndicator';
import Badge from '@components/Badge';
import PDFThumbnail from '@components/PDFThumbnail';
import PressableWithoutFocus from '@components/Pressable/PressableWithoutFocus';
import ReceiptImage from '@components/ReceiptImage';
Expand All @@ -16,7 +17,7 @@ import type {ReceiptSource} from '@src/types/onyx/Transaction';
import type {LayoutChangeEvent, StyleProp, ViewStyle} from 'react-native';

import {Str} from 'expensify-common';
import React from 'react';
import React, {useState} from 'react';
import {View} from 'react-native';

type ConfirmationReceiptThumbnailProps = {
Expand Down Expand Up @@ -65,6 +66,9 @@ type ConfirmationReceiptThumbnailProps = {
/** Stable image source captured for non-flashing display (from useReceiptThumbnailSource) */
effectiveReceiptSource: ReceiptSource;

/** Page count of the receipt, used to show a "Page 1 of N" badge on multi-page PDFs */
receiptPageCount: number;

/** Whether the active transaction is an odometer-driven distance request */
isOdometerDistanceRequest: boolean;

Expand Down Expand Up @@ -105,6 +109,7 @@ function ConfirmationReceiptThumbnail({
receiptThumbnail,
resolvedReceiptImage,
effectiveReceiptSource,
receiptPageCount,
isOdometerDistanceRequest,
isDistanceRequest,
compactReceiptContainerStyle,
Expand All @@ -116,10 +121,17 @@ function ConfirmationReceiptThumbnail({
}: ConfirmationReceiptThumbnailProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
const [isReceiptLoaded, setIsReceiptLoaded] = useState(false);

// Stitching replaces the receipt, so drop the loaded flag or the badge sits on the spinner.
if (isLoadingReceipt && isReceiptLoaded) {
setIsReceiptLoaded(false);
}

const receiptContainerStyle = isCompactMode && compactReceiptContainerStyle ? compactReceiptContainerStyle : styles.expenseViewImageSmall;
const receiptThumbnailStyle = [styles.h100, styles.flex1];
const isPDF = isLocalFile && Str.isPDF(receiptFilename);
const shouldShowReceiptPageCount = receiptPageCount > 1 && Str.isPDF(receiptFilename) && !isLoadingReceipt && isReceiptLoaded;

const navigateToReceipt = () => {
if (!transactionID) {
Expand Down Expand Up @@ -153,7 +165,10 @@ function ConfirmationReceiptThumbnail({
style={styles.h100}
onLoadError={onPDFLoadError}
onPassword={onPDFPassword}
onLoadSuccess={onPDFLoadSuccess}
onLoadSuccess={() => {
setIsReceiptLoaded(true);
onPDFLoadSuccess?.();
}}
/>
</PressableWithoutFocus>
) : (
Expand All @@ -174,11 +189,20 @@ function ConfirmationReceiptThumbnail({
shouldUseThumbnailImage
shouldUseInitialObjectPosition={isDistanceRequest}
shouldUseFullHeight={isCompactMode}
onLoad={onReceiptLoad}
onLoad={(event) => {
setIsReceiptLoaded(true);
onReceiptLoad(event);
}}
resizeMode={isOdometerDistanceRequest ? 'contain' : undefined}
/>
</PressableWithoutFocus>
))}
{shouldShowReceiptPageCount && (
<Badge
text={translate('receipt.pageCount', {pageCount: receiptPageCount})}
badgeStyles={[styles.receiptPageCountBadge, styles.pointerEventsNone]}
/>
)}
</View>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ function ReceiptSection({
receiptThumbnail={receiptSource.receiptThumbnail}
resolvedReceiptImage={receiptSource.resolvedReceiptImage as string | undefined}
effectiveReceiptSource={receiptSource.effectiveReceiptSource}
receiptPageCount={transaction?.receipt?.pageCount ?? 0}
isOdometerDistanceRequest={isOdometerDistanceRequest}
isDistanceRequest={isDistanceRequest}
compactReceiptContainerStyle={compact.compactReceiptContainerStyle}
Expand Down
4 changes: 2 additions & 2 deletions src/libs/TransactionUtils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,7 @@ function isScanningTransaction(transaction: OnyxEntry<Transaction>): boolean {
* Optimistically generate a transaction.
*
* @param amount – in cents
* @param [existingTransactionID] When creating a distance expense, an empty transaction has already been created with a transactionID. In that case, the transaction here needs to have
* it's transactionID match what was already generated.
* @param [existingTransactionID] Reuse this ID when a distance expense already created an empty transaction.
*/
function buildOptimisticTransaction(params: BuildOptimisticTransactionParams): Transaction {
const {originalTransactionID = '', existingTransactionID, existingTransaction, policy, transactionParams, isDemoTransactionParam} = params;
Expand Down Expand Up @@ -597,6 +596,7 @@ function buildOptimisticTransaction(params: BuildOptimisticTransactionParams): T
filename: receipt?.name ?? filename,
state: receiptState ?? receipt.state ?? CONST.IOU.RECEIPT_STATE.SCAN_READY,
isTestDriveReceipt: receipt.isTestDriveReceipt,
pageCount: receipt.pageCount,
}
: undefined,
hasEReceipt: existingTransaction?.hasEReceipt,
Expand Down
23 changes: 23 additions & 0 deletions tests/ui/components/MoneyRequestReceiptViewTest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,15 @@ jest.mock(
},
);

const mockReceiptImage = {shouldCompleteLoad: true};

jest.mock('@components/ReportActionItem/ReportActionItemImage', () => {
const {useEffect} = jest.requireActual<typeof React>('react');
function MockReportActionItemImage({onLoad}: {onLoad?: () => void}) {
useEffect(() => {
if (!mockReceiptImage.shouldCompleteLoad) {
return;
}
onLoad?.();
}, [onLoad]);
return null;
Expand Down Expand Up @@ -260,6 +265,7 @@ describe('MoneyRequestReceiptView', () => {
});

beforeEach(async () => {
mockReceiptImage.shouldCompleteLoad = true;
jest.clearAllMocks();
await act(async () => {
await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${TEST_PARENT_REPORT_ID}`, {
Expand Down Expand Up @@ -307,6 +313,23 @@ describe('MoneyRequestReceiptView', () => {
});

describe('receipt page count badge', () => {
it('does not show the page count while the receipt is still loading', async () => {
mockReceiptImage.shouldCompleteLoad = false;
await act(async () => {
await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${TEST_TRANSACTION_ID}`, transactionWithMultiPagePDFReceipt);
});
await waitForBatchedUpdatesWithAct();

render(
<Wrapper>
<MoneyRequestReceiptView report={testReport} />
</Wrapper>,
);
await waitForBatchedUpdatesWithAct();

expect(screen.queryByText(translateLocal('receipt.pageCount', {pageCount: 3}))).toBeNull();
});

it('shows the page count for a multi-page PDF receipt', async () => {
await act(async () => {
await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${TEST_TRANSACTION_ID}`, transactionWithMultiPagePDFReceipt);
Expand Down
Loading