From 7695e36491fdd076cd4f388c7258f3bf52cf0a10 Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Fri, 19 Feb 2021 11:31:48 -0800 Subject: fixed --- src/components/profile/Content.tsx | 12 +++----- src/components/taggs/Tagg.tsx | 6 ++-- src/routes/Routes.tsx | 2 +- .../suggestedPeople/SuggestedPeopleScreen.tsx | 32 ++++++++++++---------- 4 files changed, 27 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/components/profile/Content.tsx b/src/components/profile/Content.tsx index 86d40f1b..d047cc2f 100644 --- a/src/components/profile/Content.tsx +++ b/src/components/profile/Content.tsx @@ -109,10 +109,9 @@ const Content: React.FC = ({y, userXId, screenType}) => { const [isStageOnePromptClosed, setIsStageOnePromptClosed] = useState( false, ); - const [ - isStageThreePromptClosed, - setIsStageThreePromptClosed, - ] = useState(false); + const [isStageThreePromptClosed, setIsStageThreePromptClosed] = useState< + boolean + >(false); const onRefresh = useCallback(() => { const refrestState = async () => { @@ -309,9 +308,7 @@ const Content: React.FC = ({y, userXId, screenType}) => { isBlocked, }} /> - - - + {userXId && moments.length === 0 && ( @@ -418,7 +415,6 @@ const styles = StyleSheet.create({ color: 'gray', marginVertical: '8%', }, - taggsbarContainer: {paddingHorizontal: 15}, }); export default Content; diff --git a/src/components/taggs/Tagg.tsx b/src/components/taggs/Tagg.tsx index 66694132..1ab09055 100644 --- a/src/components/taggs/Tagg.tsx +++ b/src/components/taggs/Tagg.tsx @@ -182,13 +182,15 @@ const styles = StyleSheet.create({ spcontainer: { justifyContent: 'space-between', alignItems: 'center', - marginRight: 34, + marginRight: 15, + marginLeft: 19, height: normalize(60), }, container: { justifyContent: 'space-between', alignItems: 'center', - marginRight: 34, + marginRight: 15, + marginLeft: 15, height: normalize(90), }, iconTap: { diff --git a/src/routes/Routes.tsx b/src/routes/Routes.tsx index 1cbc9bc5..bf137445 100644 --- a/src/routes/Routes.tsx +++ b/src/routes/Routes.tsx @@ -39,7 +39,7 @@ const Routes: React.FC = () => { }); if (!userId) { - userLogin(dispatch, {userId: '', username: ''}); + // userLogin(dispatch, {userId: '', username: ''}); } else { SplashScreen.hide(); } diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx index 3437cd85..129ea1e8 100644 --- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx +++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx @@ -59,18 +59,20 @@ const SuggestedPeopleScreen: React.FC = () => { Suggested People - - - {firstName} - {username} - - console.log('Call add friend function')}> - - {'Add Friend'} + + + + {firstName} + {username} - + console.log('Call add friend function')}> + + {'Add Friend'} + + + { profileBodyHeight={0} screenType={ScreenType.SuggestedPeople} /> - + + + @@ -95,12 +99,12 @@ const SuggestedPeopleScreen: React.FC = () => { const styles = StyleSheet.create({ mainContainer: { flexDirection: 'column', - width: SCREEN_WIDTH * 0.9, + width: SCREEN_WIDTH, height: isIPhoneX() ? SCREEN_HEIGHT * 0.85 : SCREEN_HEIGHT * 0.88, justifyContent: 'space-between', alignSelf: 'center', - marginHorizontal: '5%', }, + marginManager: {marginHorizontal: '5%'}, image: { position: 'absolute', width: SCREEN_WIDTH, -- cgit v1.2.3-70-g09d2