Merge pull request #35557 from tienifr/fix/34437

Expensify · Feb 5, 2024 · 6a30950 · 6a30950
2 parents 5398ee3 + 99a9c36
commit 6a30950
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/NextStepEmailRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/NextStepEmailRenderer.tsx
@@ -11,7 +11,14 @@ type NextStepEmailRendererProps = {
 function NextStepEmailRenderer({tnode}: NextStepEmailRendererProps) {
     const styles = useThemeStyles();
 
-    return <Text style={[styles.breakWord, styles.textLabelSupporting, styles.textStrong]}>{tnode.data}</Text>;
+    return (
+        <Text
+            nativeID="email-with-break-opportunities"
+            style={[styles.breakWord, styles.textLabelSupporting, styles.textStrong]}
+        >
+            {tnode.data}
+        </Text>
+    );
 }
 
 NextStepEmailRenderer.displayName = 'NextStepEmailRenderer';

diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
@@ -112,6 +112,9 @@ const replaceNodes = (dom: Node, isChildOfEditorElement: boolean): Node => {
     // Encoding HTML chars '< >' in the text, because any HTML will be removed in stripHTML method.
     if (dom.type.toString() === 'text' && dom instanceof DataNode) {
         data = Str.htmlEncode(dom.data);
+        if (dom.parent instanceof Element && dom.parent?.attribs?.id === 'email-with-break-opportunities') {
+            data = data.replaceAll('\u200b', '');
+        }
     } else if (dom instanceof Element) {
         domName = dom.name;
         if (dom.attribs?.[tagAttribute]) {