Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/components/DotIndicatorMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ import {View} from 'react-native';
import useConfirmModal from '@hooks/useConfirmModal';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useStyleUtils from '@hooks/useStyleUtils';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
import {isReceiptError, isTranslationKeyError} from '@libs/ErrorUtils';
import fileDownload from '@libs/fileDownload';
import handleRetryPress from '@libs/ReceiptUploadRetryHandler';
Expand Down Expand Up @@ -49,6 +51,7 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissErr
const StyleUtils = useStyleUtils();
const {translate} = useLocalize();
const expensifyIcons = useMemoizedLazyExpensifyIcons(['DotIndicator']);
const {shouldUseNarrowLayout} = useResponsiveLayout();
const {showConfirmModal} = useConfirmModal();

if (Object.keys(messages).length === 0) {
Expand Down Expand Up @@ -83,6 +86,8 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissErr
}
};

const isTextSelectable = !canUseTouchScreen() || !shouldUseNarrowLayout;

const renderMessage = (message: string | ReceiptError | ReactElement, index: number) => {
if (isReceiptError(message)) {
return (
Expand All @@ -102,7 +107,7 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles, dismissErr
<Text
// eslint-disable-next-line react/no-array-index-key
key={index}
style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), textStyles]}
style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), textStyles, isTextSelectable ? styles.userSelectText : styles.userSelectNone]}
accessibilityRole={isErrorMessage ? CONST.ROLE.ALERT : undefined}
accessibilityLiveRegion={isErrorMessage ? 'assertive' : undefined}
>
Expand Down
Loading