diff options
Diffstat (limited to 'src/view/com/composer')
-rw-r--r-- | src/view/com/composer/ComposePost.tsx | 11 | ||||
-rw-r--r-- | src/view/com/composer/PhotoCarouselPicker.tsx | 17 |
2 files changed, 23 insertions, 5 deletions
diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index a414a7562..64e75328a 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -16,7 +16,10 @@ import PasteInput, { PasteInputRef, } from '@mattermost/react-native-paste-input' import LinearGradient from 'react-native-linear-gradient' -import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' +import { + FontAwesomeIcon, + FontAwesomeIconStyle, +} from '@fortawesome/react-native-fontawesome' import {useAnalytics} from '@segment/analytics-react-native' import {UserAutocompleteViewModel} from '../../../state/models/user-autocomplete-view' import {Autocomplete} from './Autocomplete' @@ -438,7 +441,11 @@ export const ComposePost = observer(function ComposePost({ hitSlop={HITSLOP}> <FontAwesomeIcon icon={['far', 'image']} - style={selectedPhotos.length < 4 ? pal.link : pal.textLight} + style={ + (selectedPhotos.length < 4 + ? pal.link + : pal.textLight) as FontAwesomeIconStyle + } size={24} /> </TouchableOpacity> diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index 5a5b1cc3b..383027de3 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -1,6 +1,9 @@ import React, {useCallback} from 'react' import {Image, StyleSheet, TouchableOpacity, ScrollView} from 'react-native' -import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' +import { + FontAwesomeIcon, + FontAwesomeIconStyle, +} from '@fortawesome/react-native-fontawesome' import { openPicker, openCamera, @@ -131,13 +134,21 @@ export const PhotoCarouselPicker = ({ testID="openCameraButton" style={[styles.galleryButton, pal.border, styles.photo]} onPress={handleOpenCamera}> - <FontAwesomeIcon icon="camera" size={24} style={pal.link} /> + <FontAwesomeIcon + icon="camera" + size={24} + style={pal.link as FontAwesomeIconStyle} + /> </TouchableOpacity> <TouchableOpacity testID="openGalleryButton" style={[styles.galleryButton, pal.border, styles.photo]} onPress={handleOpenGallery}> - <FontAwesomeIcon icon="image" style={pal.link} size={24} /> + <FontAwesomeIcon + icon="image" + style={pal.link as FontAwesomeIconStyle} + size={24} + /> </TouchableOpacity> {localPhotos.photos.map((item: PhotoIdentifier, index: number) => ( <TouchableOpacity |