Skip to content

Commit cde448a

Browse files
authored
Merge pull request Expensify#86271 from Expensify/claude-fixErrorMessageTextSelection
2 parents e3528be + 9d3878f commit cde448a

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

src/components/DotIndicatorMessage.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ import {View} from 'react-native';
77
import useConfirmModal from '@hooks/useConfirmModal';
88
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
99
import useLocalize from '@hooks/useLocalize';
10+
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1011
import useStyleUtils from '@hooks/useStyleUtils';
1112
import useTheme from '@hooks/useTheme';
1213
import useThemeStyles from '@hooks/useThemeStyles';
14+
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
1315
import {isReceiptError, isTranslationKeyError} from '@libs/ErrorUtils';
1416
import fileDownload from '@libs/fileDownload';
1517
import handleRetryPress from '@libs/ReceiptUploadRetryHandler';
@@ -49,6 +51,7 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissErr
4951
const StyleUtils = useStyleUtils();
5052
const {translate} = useLocalize();
5153
const expensifyIcons = useMemoizedLazyExpensifyIcons(['DotIndicator']);
54+
const {shouldUseNarrowLayout} = useResponsiveLayout();
5255
const {showConfirmModal} = useConfirmModal();
5356

5457
if (Object.keys(messages).length === 0) {
@@ -83,6 +86,8 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissErr
8386
}
8487
};
8588

89+
const isTextSelectable = !canUseTouchScreen() || !shouldUseNarrowLayout;
90+
8691
const renderMessage = (message: string | ReceiptError | ReactElement, index: number) => {
8792
if (isReceiptError(message)) {
8893
return (
@@ -102,7 +107,7 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissErr
102107
<Text
103108
// eslint-disable-next-line react/no-array-index-key
104109
key={index}
105-
style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), textStyles]}
110+
style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), textStyles, isTextSelectable ? styles.userSelectText : styles.userSelectNone]}
106111
accessibilityRole={isErrorMessage ? CONST.ROLE.ALERT : undefined}
107112
accessibilityLiveRegion={isErrorMessage ? 'assertive' : undefined}
108113
>

0 commit comments

Comments
 (0)