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
14 changes: 13 additions & 1 deletion src/components/ReportActionItem/MoneyRequestPreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ function MoneyRequestPreview(props) {
const isDistanceRequest = TransactionUtils.isDistanceRequest(props.transaction);
const isExpensifyCardTransaction = TransactionUtils.isExpensifyCardTransaction(props.transaction);
const isSettled = ReportUtils.isSettled(props.iouReport.reportID);
const isDeleted = lodashGet(props.action, 'pendingAction', null) === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;

// Show the merchant for IOUs and expenses only if they are custom or not related to scanning smartscan
const shouldShowMerchant =
Expand Down Expand Up @@ -232,6 +233,16 @@ function MoneyRequestPreview(props) {
return CurrencyUtils.convertToDisplayString(requestAmount, requestCurrency);
};

const getDisplayDeleteAmountText = () => {
const {amount, currency} = ReportUtils.getTransactionDetails(props.action.originalMessage);

if (isDistanceRequest) {
return CurrencyUtils.convertToDisplayString(TransactionUtils.getAmount(props.action.originalMessage), currency);
}

return CurrencyUtils.convertToDisplayString(amount, currency);
};

const childContainer = (
<View>
<OfflineWithFeedback
Expand Down Expand Up @@ -277,10 +288,11 @@ function MoneyRequestPreview(props) {
style={[
styles.moneyRequestPreviewAmount,
StyleUtils.getAmountFontSizeAndLineHeight(variables.fontSizeXLarge, variables.lineHeightXXLarge, isSmallScreenWidth, windowWidth),
isDeleted && styles.lineThrough,
]}
numberOfLines={1}
>
{getDisplayAmountText()}
{isDeleted ? getDisplayDeleteAmountText() : getDisplayAmountText()}
</Text>
{ReportUtils.isSettled(props.iouReport.reportID) && !props.isBillSplit && (
<View style={styles.defaultCheckmarkWrapper}>
Expand Down
2 changes: 2 additions & 0 deletions src/styles/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import writingDirection from './utilities/writingDirection';
import variables from './variables';
import colors from './colors';
import objectFit from './utilities/objectFit';
import textDecorationLine from './utilities/textDecorationLine';

type AnchorPosition = {
horizontal: number;
Expand Down Expand Up @@ -227,6 +228,7 @@ const styles = (theme: ThemeDefault) =>
...userSelect,
...textUnderline,
...objectFit,
...textDecorationLine,

autoCompleteSuggestionsContainer: {
backgroundColor: theme.appBG,
Expand Down
8 changes: 8 additions & 0 deletions src/styles/utilities/textDecorationLine.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import {TextStyle} from 'react-native';

export default {
lineThrough: {
textDecorationLine: 'line-through',
textDecorationStyle: 'solid',
},
} satisfies Record<string, TextStyle>;