Merge pull request #18228 from Victor-Nyagudi/fix/17838-new-word-copi…

…ed-with-messages-when-unread Fix: Copying the messages and marking a message in between as unread generates 'new' in the text
Expensify · May 2, 2023 · 4d4d484 · 4d4d484
2 parents 081e45c + 2652e7d
commit 4d4d484
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/components/UnreadActionIndicator.js b/src/components/UnreadActionIndicator.js
@@ -5,7 +5,11 @@ import Text from './Text';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 
 const UnreadActionIndicator = props => (
-    <View accessibilityLabel={props.translate('accessibilityHints.newMessageLineIndicator')} data-action-id={props.reportActionID} style={styles.unreadIndicatorContainer}>
+    <View
+        accessibilityLabel={props.translate('accessibilityHints.newMessageLineIndicator')}
+        data-action-id={props.reportActionID}
+        style={[styles.unreadIndicatorContainer, styles.userSelectNone]}
+    >
         <View style={styles.unreadIndicatorLine} />
         <Text style={styles.unreadIndicatorText}>
             {props.translate('common.new')}

diff --git a/src/libs/SelectionScraper/index.js b/src/libs/SelectionScraper/index.js
@@ -2,6 +2,7 @@ import render from 'dom-serializer';
 import {parseDocument} from 'htmlparser2';
 import _ from 'underscore';
 import Str from 'expensify-common/lib/str';
+import styles from '../../styles/styles';
 
 const elementsWillBeSkipped = ['html', 'body'];
 const tagAttribute = 'data-testid';
@@ -80,6 +81,9 @@ const getHTMLOfSelection = () => {
         }
     }
 
+    // Remove any element that isn't selectable to prevent copying unnecessary text/items
+    div.querySelectorAll(`div[style*="user-select: ${styles.userSelectNone.WebkitUserSelect}"]`).forEach(item => item.remove());
+
     return div.innerHTML;
 };