diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-06-09 15:40:08 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-06-09 15:40:08 -0400 |
| commit | cd6e9ba609cfdbcad1365c8589e2c98d755752ad (patch) | |
| tree | 98b1e947f4ae4e306f8289e26354fb783c5ee5b5 /src/components/profile/ProfileBody.tsx | |
| parent | 9d7e900a89f343f7752457956f8e1d205774b910 (diff) | |
| parent | 946b1be53189487e860f37e1b422c69bb44cf0c8 (diff) | |
Merge branch 'master' into tma872-purple-indicator
# Conflicts:
# src/constants/constants.ts
# src/utils/common.ts
Diffstat (limited to 'src/components/profile/ProfileBody.tsx')
| -rw-r--r-- | src/components/profile/ProfileBody.tsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/profile/ProfileBody.tsx b/src/components/profile/ProfileBody.tsx index 8743acfb..c0ee508a 100644 --- a/src/components/profile/ProfileBody.tsx +++ b/src/components/profile/ProfileBody.tsx @@ -20,6 +20,7 @@ import { import {canViewProfile} from '../../utils/users'; import {FriendsButton} from '../common'; import {MessageButton} from '../messages'; +import ProfileBadges from './ProfileBadges'; import ToggleButton from './ToggleButton'; interface ProfileBodyProps { @@ -65,6 +66,7 @@ const ProfileBody: React.FC<ProfileBodyProps> = ({ return ( <View onLayout={onLayout} style={styles.container}> + <ProfileBadges {...{userXId, screenType}} /> <Text style={styles.username}>{`@${username}`}</Text> {biography.length > 0 && ( <Text style={styles.biography}>{`${biography}`}</Text> @@ -137,7 +139,6 @@ const styles = StyleSheet.create({ justifyContent: 'space-between', }, container: { - paddingVertical: '1%', paddingHorizontal: 18, backgroundColor: 'white', }, |