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
5 changes: 3 additions & 2 deletions src/components/EReceipt.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {getCardName} from '@libs/TransactionUtils';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type Transaction from '@src/types/onyx/Transaction';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
import ImageSVG from './ImageSVG';
Expand All @@ -24,7 +25,7 @@ type EReceiptProps = {
transactionID: string | undefined;

/** The transaction data in search */
transactionItem?: TransactionListItemType;
transactionItem?: TransactionListItemType | Transaction;

/** Where it is the preview */
isThumbnail?: boolean;
Expand All @@ -38,7 +39,7 @@ function EReceipt({transactionID, transactionItem, isThumbnail = false}: EReceip
const {translate} = useLocalize();
const theme = useTheme();

const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: false});
Comment thread
nkdengineer marked this conversation as resolved.

const {primaryColor, secondaryColor, titleColor, MCCIcon, tripIcon, backgroundImage} = useEReceipt(transactionItem ?? transaction);

Expand Down
3 changes: 2 additions & 1 deletion src/components/EReceiptWithSizeCalculation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import {View} from 'react-native';
import type {LayoutChangeEvent} from 'react-native';
import useThemeStyles from '@hooks/useThemeStyles';
import variables from '@styles/variables';
import type {Transaction} from '@src/types/onyx';
import EReceipt from './EReceipt';
import type {TransactionListItemType} from './SelectionList/types';

type EReceiptWithSizeCalculationProps = {
transactionID: string | undefined;

transactionItem?: TransactionListItemType;
transactionItem?: TransactionListItemType | Transaction;
};

function EReceiptWithSizeCalculation(props: EReceiptWithSizeCalculationProps) {
Expand Down
3 changes: 2 additions & 1 deletion src/components/ReceiptImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import {View} from 'react-native';
import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import type {Transaction} from '@src/types/onyx';
import type IconAsset from '@src/types/utils/IconAsset';
import EReceiptThumbnail from './EReceiptThumbnail';
import type {IconSize} from './EReceiptThumbnail';
Expand Down Expand Up @@ -92,7 +93,7 @@ type ReceiptImageProps = (
isPerDiemRequest?: boolean;

/** The transaction data in search */
transactionItem?: TransactionListItemType;
transactionItem?: TransactionListItemType | Transaction;

/** Whether the receipt empty state should extend to the full height of the container. */
shouldUseFullHeight?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
getCurrency as getTransactionCurrency,
getDescription as getTransactionDescription,
hasReceipt,
hasReceiptSource,
isExpensifyCardTransaction,
isPending,
isReceiptBeingScanned,
Expand Down Expand Up @@ -113,7 +114,7 @@ function ReceiptCell({transactionItem}: TransactionCellProps) {
>
<ReceiptImage
source={source}
isEReceipt={transactionItem.hasEReceipt}
isEReceipt={transactionItem.hasEReceipt && !hasReceiptSource(transactionItem)}
transactionID={transactionItem.transactionID}
shouldUseThumbnailImage={!transactionItem?.receipt?.source}
isAuthTokenRequired
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import {getFileName} from '@libs/fileDownload/FileUtils';
import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
import {hasReceiptSource} from '@libs/TransactionUtils';
import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
import variables from '@styles/variables';
import type {Transaction} from '@src/types/onyx';
Expand Down Expand Up @@ -38,7 +39,7 @@ function ReceiptCell({transactionItem, isSelected}: {transactionItem: Transactio
>
<ReceiptImage
source={source}
isEReceipt={transactionItem.hasEReceipt}
isEReceipt={transactionItem.hasEReceipt && !hasReceiptSource(transactionItem)}
transactionID={transactionItem.transactionID}
shouldUseThumbnailImage={!transactionItem?.receipt?.source}
isAuthTokenRequired
Expand All @@ -47,6 +48,7 @@ function ReceiptCell({transactionItem, isSelected}: {transactionItem: Transactio
fallbackIconColor={theme.icon}
fallbackIconBackground={isSelected ? theme.buttonHoveredBG : undefined}
iconSize="x-small"
transactionItem={transactionItem}
Comment thread
nkdengineer marked this conversation as resolved.
/>
</View>
);
Expand Down