diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx index 1ff34412bea7..3eb141d58f41 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx @@ -1,4 +1,3 @@ -import ExpensiMark from 'expensify-common/lib/ExpensiMark'; import {truncate} from 'lodash'; import lodashSortBy from 'lodash/sortBy'; import React from 'react'; @@ -11,7 +10,6 @@ import MoneyRequestSkeletonView from '@components/MoneyRequestSkeletonView'; import MultipleAvatars from '@components/MultipleAvatars'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback'; -import RenderHTML from '@components/RenderHTML'; import ReportActionItemImages from '@components/ReportActionItem/ReportActionItemImages'; import {showContextMenuForReport} from '@components/ShowContextMenuContext'; import Text from '@components/Text'; @@ -63,7 +61,6 @@ function MoneyRequestPreviewContent({ const StyleUtils = useStyleUtils(); const {translate} = useLocalize(); const {isSmallScreenWidth, windowWidth} = useWindowDimensions(); - const parser = new ExpensiMark(); const sessionAccountID = session?.accountID; const managerID = iouReport?.managerID ?? -1; @@ -298,12 +295,9 @@ function MoneyRequestPreviewContent({ {!isCurrentUserManager && shouldShowPendingConversionMessage && ( {translate('iou.pendingConversionMessage')} )} - {shouldShowDescription && ( - - ${parser.replace(merchantOrDescription)}`} /> - + {(shouldShowMerchant || shouldShowDescription) && ( + {merchantOrDescription} )} - {shouldShowMerchant && {merchantOrDescription}} {isBillSplit && participantAccountIDs.length > 0 && !!requestAmount && requestAmount > 0 && ( diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx index 57563d1ac181..54f9f1aa081f 100644 --- a/src/components/ReportActionItem/ReportPreview.tsx +++ b/src/components/ReportActionItem/ReportPreview.tsx @@ -1,4 +1,3 @@ -import ExpensiMark from 'expensify-common/lib/ExpensiMark'; import React, {useMemo} from 'react'; import type {StyleProp, ViewStyle} from 'react-native'; import {View} from 'react-native'; @@ -9,7 +8,6 @@ import Icon from '@components/Icon'; import * as Expensicons from '@components/Icon/Expensicons'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback'; -import RenderHTML from '@components/RenderHTML'; import SettlementButton from '@components/SettlementButton'; import {showContextMenuForReport} from '@components/ShowContextMenuContext'; import Text from '@components/Text'; @@ -227,16 +225,14 @@ function ReportPreview({ numberOfRequests === 1 && (!!formattedMerchant || !!formattedDescription) && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend); const shouldShowSubtitle = !isScanning && (shouldShowSingleRequestMerchantOrDescription || numberOfRequests > 1); - const {isSupportTextHtml, supportText} = useMemo(() => { + const {supportText} = useMemo(() => { if (formattedMerchant) { - return {isSupportTextHtml: false, supportText: formattedMerchant}; + return {supportText: formattedMerchant}; } if (formattedDescription ?? moneyRequestComment) { - const parsedSubtitle = new ExpensiMark().replace(formattedDescription ?? moneyRequestComment); - return {isSupportTextHtml: !!parsedSubtitle, supportText: parsedSubtitle ? `${parsedSubtitle}` : ''}; + return {supportText: formattedDescription ?? moneyRequestComment}; } return { - isSupportTextHtml: false, supportText: translate('iou.expenseCount', { count: numberOfRequests - numberOfScanningReceipts - numberOfPendingRequests, scanningReceipts: numberOfScanningReceipts, @@ -310,11 +306,7 @@ function ReportPreview({ {shouldShowSubtitle && supportText && ( - {isSupportTextHtml ? ( - - ) : ( - {supportText} - )} + {supportText} )}