Skip to content

Commit 321d985

Browse files
committed
Revert "Merge pull request Expensify#67817 from Expensify/youssef_fix_description_html"
This reverts commit 5f9fba5, reversing changes made to 3333792.
1 parent 877781f commit 321d985

3 files changed

Lines changed: 4 additions & 14 deletions

File tree

src/components/TextWithTooltip/index.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React, {useState} from 'react';
2-
import RenderHTML from '@components/RenderHTML';
32
import Text from '@components/Text';
43
import Tooltip from '@components/Tooltip';
54
import type TextWithTooltipProps from './types';
@@ -8,7 +7,7 @@ type LayoutChangeEvent = {
87
target: HTMLElement;
98
};
109

11-
function TextWithTooltip({text, shouldShowTooltip, style, numberOfLines = 1, shouldRenderAsHTML}: TextWithTooltipProps) {
10+
function TextWithTooltip({text, shouldShowTooltip, style, numberOfLines = 1}: TextWithTooltipProps) {
1211
const [showTooltip, setShowTooltip] = useState(false);
1312

1413
return (
@@ -31,7 +30,7 @@ function TextWithTooltip({text, shouldShowTooltip, style, numberOfLines = 1, sho
3130
setShowTooltip(false);
3231
}}
3332
>
34-
{shouldRenderAsHTML ? <RenderHTML html={text} /> : text}
33+
{text}
3534
</Text>
3635
</Tooltip>
3736
);

src/components/TextWithTooltip/types.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ type TextWithTooltipProps = {
1212

1313
/** Custom number of lines for text wrapping */
1414
numberOfLines?: number;
15-
16-
/** Whether the supplied text can be markdown */
17-
shouldRenderAsHTML?: boolean;
1815
};
1916

2017
export default TextWithTooltipProps;

src/components/TransactionItemRow/DataCells/MerchantCell.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import React, {useMemo} from 'react';
1+
import React from 'react';
22
import TextWithTooltip from '@components/TextWithTooltip';
33
import useThemeStyles from '@hooks/useThemeStyles';
4-
import Parser from '@libs/Parser';
54

65
function MerchantOrDescriptionCell({
76
merchantOrDescription,
@@ -14,16 +13,11 @@ function MerchantOrDescriptionCell({
1413
}) {
1514
const styles = useThemeStyles();
1615

17-
const html = useMemo(() => {
18-
return Parser.replace(merchantOrDescription, {shouldEscapeText: false});
19-
}, [merchantOrDescription]);
20-
2116
return (
2217
<TextWithTooltip
2318
shouldShowTooltip={shouldShowTooltip}
24-
text={html}
19+
text={merchantOrDescription}
2520
style={[!shouldUseNarrowLayout ? styles.lineHeightLarge : styles.lh20, styles.pre, styles.justifyContentCenter, styles.flex1]}
26-
shouldRenderAsHTML
2721
/>
2822
);
2923
}

0 commit comments

Comments
 (0)