From e09f37e73b45a58c0a6ebf8ad8b5216c91713f26 Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Mon, 24 May 2021 14:03:32 -0700 Subject: Fix yarn lint issues --- src/screens/profile/MomentCommentsScreen.tsx | 10 ++++------ src/screens/profile/MomentUploadPromptScreen.tsx | 8 ++------ src/screens/profile/SocialMediaTaggs.tsx | 6 +++--- 3 files changed, 9 insertions(+), 15 deletions(-) (limited to 'src/screens/profile') diff --git a/src/screens/profile/MomentCommentsScreen.tsx b/src/screens/profile/MomentCommentsScreen.tsx index 4b332b56..402e5f44 100644 --- a/src/screens/profile/MomentCommentsScreen.tsx +++ b/src/screens/profile/MomentCommentsScreen.tsx @@ -44,14 +44,12 @@ const MomentCommentsScreen: React.FC = ({route}) => { //Receives comment length from child CommentsContainer const [commentsLength, setCommentsLength] = useState(0); - const [shouldUpdateAllComments, setShouldUpdateAllComments] = React.useState( - true, - ); + const [shouldUpdateAllComments, setShouldUpdateAllComments] = + React.useState(true); //Keeps track of the current comments object in focus so that the application knows which comment to post a reply to - const [commentTapped, setCommentTapped] = useState< - CommentType | CommentThreadType | undefined - >(); + const [commentTapped, setCommentTapped] = + useState(); useEffect(() => { navigation.setOptions({ diff --git a/src/screens/profile/MomentUploadPromptScreen.tsx b/src/screens/profile/MomentUploadPromptScreen.tsx index f0aaffc4..7e04063c 100644 --- a/src/screens/profile/MomentUploadPromptScreen.tsx +++ b/src/screens/profile/MomentUploadPromptScreen.tsx @@ -28,12 +28,8 @@ const MomentUploadPromptScreen: React.FC = ({ route, navigation, }) => { - const { - screenType, - momentCategory, - profileBodyHeight, - socialsBarHeight, - } = route.params; + const {screenType, momentCategory, profileBodyHeight, socialsBarHeight} = + route.params; return ( = ({ type={socialMediaType} handle={accountData?.handle} /> - {(accountData?.posts as Array< - SimplePostType | TwitterPostType - >).map((post, index) => + {( + accountData?.posts as Array + ).map((post, index) => socialMediaType === 'Twitter' ? ( Date: Mon, 24 May 2021 14:04:02 -0700 Subject: Fix tag lint issues --- src/components/moments/TagFriendsFoooter.tsx | 35 ++++++++++++++++------------ src/screens/moments/TagFriendsScreen.tsx | 3 ++- src/screens/profile/CaptionScreen.tsx | 35 +++++++++++++--------------- src/screens/profile/IndividualMoment.tsx | 5 +--- 4 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/screens/profile') diff --git a/src/components/moments/TagFriendsFoooter.tsx b/src/components/moments/TagFriendsFoooter.tsx index 6b8fc62a..7b109877 100644 --- a/src/components/moments/TagFriendsFoooter.tsx +++ b/src/components/moments/TagFriendsFoooter.tsx @@ -27,29 +27,23 @@ const TagFriendsFooter: React.FC = ({ selectedUsers: taggedUsers, }) } - style={{ - flexDirection: 'column', - alignItems: 'center', - }}> + style={styles.tagMoreContainer}> - {'Tagg More'} + {'Tagg More'} ); const TaggedUser = (user: ProfilePreviewType) => ( - + handleRemoveTag(user)}> = ({ */ const TagFriendsTitle = () => ( navigation.navigate('TagSelectionScreen', { @@ -112,7 +104,7 @@ const styles = StyleSheet.create({ flexWrap: 'wrap', justifyContent: 'flex-start', }, - taggMoreLabel: { + tagMoreLabel: { fontWeight: '500', fontSize: normalize(9), lineHeight: normalize(10), @@ -127,6 +119,19 @@ const styles = StyleSheet.create({ right: -20, zIndex: 1, }, + tagMoreContainer: { + flexDirection: 'column', + alignItems: 'center', + }, + tagMoreIcon: {width: 38, height: 38, top: -2}, + taggedUserContainer: {flexDirection: 'row-reverse'}, + closeIcon: { + width: 20, + height: 20, + }, + tagFriendsTitleContainer: { + flexDirection: 'row', + }, }); export default TagFriendsFooter; diff --git a/src/screens/moments/TagFriendsScreen.tsx b/src/screens/moments/TagFriendsScreen.tsx index e6a9f5fb..b0722efc 100644 --- a/src/screens/moments/TagFriendsScreen.tsx +++ b/src/screens/moments/TagFriendsScreen.tsx @@ -99,7 +99,7 @@ const TagFriendsScreen: React.FC = ({route}) => { } /> )} - + = ({route, navigation}) => { selectedUsers: taggedUsers, }) } - style={{ - marginHorizontal: '5%', - marginTop: '3%', - flexDirection: 'row', - justifyContent: 'space-between', - alignItems: 'center', - }}> + style={styles.tagFriendsContainer}> Tag Friends - + {taggedList} {taggedList.length > 21 ? '. . .' : ''} @@ -255,9 +240,21 @@ const styles = StyleSheet.create({ fontWeight: '600', }, tagFriendsContainer: { - flexDirection: 'row', + marginHorizontal: '5%', marginTop: '3%', + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'center', + }, + taggedListContainer: { + color: 'white', + width: 150, + fontSize: normalize(10), + lineHeight: normalize(11), + letterSpacing: normalize(0.3), + textAlign: 'right', }, + tagIcon: {width: 20, height: 20}, }); export default CaptionScreen; diff --git a/src/screens/profile/IndividualMoment.tsx b/src/screens/profile/IndividualMoment.tsx index 4baca5b2..515cbacf 100644 --- a/src/screens/profile/IndividualMoment.tsx +++ b/src/screens/profile/IndividualMoment.tsx @@ -1,17 +1,14 @@ -import AsyncStorage from '@react-native-community/async-storage'; import {BlurView} from '@react-native-community/blur'; import {RouteProp} from '@react-navigation/native'; import {StackNavigationProp} from '@react-navigation/stack'; import React from 'react'; -import {Alert, FlatList, StyleSheet, View} from 'react-native'; +import {FlatList, StyleSheet, View} from 'react-native'; import {useSelector} from 'react-redux'; import { IndividualMomentTitleBar, MomentPostContent, MomentPostHeader, } from '../../components'; -import {MOMENT_TAGS_ENDPOINT} from '../../constants'; -import {ERROR_SOMETHING_WENT_WRONG_REFRESH} from '../../constants/strings'; import {MainStackParams} from '../../routes'; import {RootState} from '../../store/rootreducer'; import {MomentType} from '../../types'; -- cgit v1.2.3-70-g09d2