diff options
| author | Ivan Chen <ivan@thetaggid.com> | 2021-02-06 21:23:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-06 21:23:07 -0500 |
| commit | 34919450687d47b27b4858ed5bef26f8636d3d99 (patch) | |
| tree | 6b8de9733fbbaa794cdeea4cd16c377a1912dcd0 /src | |
| parent | 09ed0b7c02a0848ea970c096b9c9007af35f1d0b (diff) | |
| parent | beefe8db13c026811c8beae7c05b49538c9afc4c (diff) | |
Merge pull request #226 from ashmgarv/friends-bug-fix
issues fixed
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/profile/Friends.tsx | 9 | ||||
| -rw-r--r-- | src/screens/profile/FriendsListScreen.tsx | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/components/profile/Friends.tsx b/src/components/profile/Friends.tsx index 9b9e5302..da289e8a 100644 --- a/src/components/profile/Friends.tsx +++ b/src/components/profile/Friends.tsx @@ -26,11 +26,10 @@ const Friends: React.FC<FriendsProps> = ({result, screenType, userId}) => { return ( <> <View style={styles.subheader}> - <Text style={styles.subheaderText}>Friends</Text> + {/* <Text style={styles.subheaderText}>Friends</Text> */} </View> <ScrollView keyboardShouldPersistTaps={'always'} - stickyHeaderIndices={[4]} style={styles.scrollView} contentContainerStyle={styles.scrollViewContent} showsVerticalScrollIndicator={false}> @@ -64,20 +63,18 @@ const styles = StyleSheet.create({ flexDirection: 'column', alignSelf: 'center', width: SCREEN_WIDTH * 0.85, - height: SCREEN_HEIGHT, }, scrollViewContent: { alignSelf: 'center', - paddingBottom: SCREEN_HEIGHT / 15, + paddingBottom: SCREEN_HEIGHT / 7, width: SCREEN_WIDTH * 0.85, - height: SCREEN_HEIGHT * 0.75, marginTop: '1%', }, header: {flexDirection: 'row'}, subheader: { alignSelf: 'center', width: SCREEN_WIDTH * 0.85, - marginVertical: '3%', + marginVertical: '1%', }, subheaderText: { color: '#828282', diff --git a/src/screens/profile/FriendsListScreen.tsx b/src/screens/profile/FriendsListScreen.tsx index 26d19e60..b2123f44 100644 --- a/src/screens/profile/FriendsListScreen.tsx +++ b/src/screens/profile/FriendsListScreen.tsx @@ -31,7 +31,7 @@ const FriendsListScreen: React.FC<FriendsListScreenProps> = ({route}) => { : useSelector((state: RootState) => state.friends); return ( - <View style={styles.background}> + <> <SafeAreaView> <View style={styles.header}> <TouchableOpacity @@ -43,12 +43,10 @@ const FriendsListScreen: React.FC<FriendsListScreenProps> = ({route}) => { </TouchableOpacity> <Text style={styles.headerText}>Friends</Text> </View> - <View style={styles.body}> - <Friends result={friends} screenType={screenType} userId={userXId} /> - </View> + <Friends result={friends} screenType={screenType} userId={userXId} /> </SafeAreaView> <TabsGradient /> - </View> + </> ); }; |