diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-21 15:43:03 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-04-21 15:43:03 -0400 |
| commit | 0dd0a4ac4343df036a1f16cbde070c524405bd21 (patch) | |
| tree | 292a30ce0228560720214645805deb4b89f2eeae /src/components/profile/PublicProfile.tsx | |
| parent | 5c438df5f6787cdc6c393873a98590cc827667b9 (diff) | |
| parent | 4e8e1c0d58424e6b63cfb8470fc0a73c0e6b102b (diff) | |
Merge branch 'master' into hotfix-linting-fixup
# Conflicts:
# .eslintrc.js
# src/components/notifications/Notification.tsx
# src/screens/onboarding/legacy/SocialMedia.tsx
# src/screens/onboarding/legacy/WaitlistSuccessScreen.tsx
# src/screens/profile/CategorySelection.tsx
Diffstat (limited to 'src/components/profile/PublicProfile.tsx')
| -rw-r--r-- | src/components/profile/PublicProfile.tsx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/components/profile/PublicProfile.tsx b/src/components/profile/PublicProfile.tsx index 1c49bff5..d2ee8626 100644 --- a/src/components/profile/PublicProfile.tsx +++ b/src/components/profile/PublicProfile.tsx @@ -243,8 +243,7 @@ const PublicProfile: React.FC<ContentProps> = ({ <TouchableOpacity onPress={() => navigation.navigate('CategorySelection', { - screenType: CategorySelectionScreenType.Profile, - user: loggedInUser, + newCustomCategory: undefined, }) } style={styles.createCategoryButton}> @@ -258,10 +257,6 @@ const PublicProfile: React.FC<ContentProps> = ({ }; const styles = StyleSheet.create({ - container: { - flex: 1, - backgroundColor: '#fff', - }, momentsContainer: { backgroundColor: '#f2f2f2', paddingBottom: SCREEN_HEIGHT * 0.15, |