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

1 files changed, 4 insertions, 10 deletions

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index 64ad9198..1f173569 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -3,13 +3,7 @@
  */
 import {createStackNavigator} from '@react-navigation/stack';
 import {Image} from 'react-native-image-crop-picker';
-import {
-  CategorySelectionScreenType,
-  MomentType,
-  ScreenType,
-  SearchCategoryType,
-  UserType,
-} from '../../types';
+import {MomentType, ScreenType, SearchCategoryType} from '../../types';
 
 export type MainStackParams = {
   SuggestedPeople: {
@@ -61,11 +55,11 @@ export type MainStackParams = {
     username: string;
   };
   CategorySelection: {
-    screenType: CategorySelectionScreenType;
-    user: UserType;
     newCustomCategory: string | undefined;
   };
-  CreateCustomCategory: {};
+  CreateCustomCategory: {
+    existingCategories: string[];
+  };
   Notifications: {
     screenType: ScreenType;
   };