3 files changed, 12 insertions, 51 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;
   };
diff --git a/src/routes/onboarding/OnboardingStackNavigator.tsx b/src/routes/onboarding/OnboardingStackNavigator.tsx
index a51a6c86..7d8a751a 100644
--- a/src/routes/onboarding/OnboardingStackNavigator.tsx
+++ b/src/routes/onboarding/OnboardingStackNavigator.tsx
@@ -1,41 +1,17 @@
 import {createStackNavigator} from '@react-navigation/stack';
-import {TaggPopupType, VerificationScreenType} from '../../types';
+import {VerificationScreenType} from '../../types';
 
 export type OnboardingStackParams = {
+  InvitationCodeVerification: {userId: string; username: string};
   Login: undefined;
-  WelcomeScreen: undefined;
-  PasswordResetRequest: undefined;
-  PasswordReset: {value: string};
-  Verification: {id: string; screenType: VerificationScreenType};
-  // RegistrationOne: undefined;
-  // RegistrationTwo: {phone: string};
-  // RegistrationThree: {
-  //   firstName: string;
-  //   lastName: string;
-  //   phone: string;
-  //   email: string;
-  // };
-  // Checkpoint: {username: string; userId: string};
-  // ProfileOnboarding: {username: string; userId: string};
-  // SocialMedia: {username: string; userId: string};
-  // CategorySelection: {
-  //   screenType: CategorySelectionScreenType;
-  //   user: UserType;
-  //   newCustomCategory: string | undefined;
-  // };
-  // CreateCustomCategory: {
-  //   screenType: CategorySelectionScreenType;
-  //   user: UserType;
-  //   existingCategories: string[];
-  // };
-  TaggPopup: {
-    popupProps: TaggPopupType;
-  };
   OnboardingStepOne: undefined;
-  PhoneVerification: {firstName: string; lastName: string; phone: string};
-  OnboardingStepTwo: {firstName: string; lastName: string; phone: string};
   OnboardingStepThree: {userId: string; username: string};
-  InvitationCodeVerification: {userId: string; username: string};
+  OnboardingStepTwo: {firstName: string; lastName: string; phone: string};
+  PasswordReset: {value: string};
+  PasswordResetRequest: undefined;
+  PhoneVerification: {firstName: string; lastName: string; phone: string};
+  Verification: {id: string; screenType: VerificationScreenType};
+  WelcomeScreen: undefined;
 };
 
 export const OnboardingStack = createStackNavigator<OnboardingStackParams>();
diff --git a/src/routes/onboarding/OnboardingStackScreen.tsx b/src/routes/onboarding/OnboardingStackScreen.tsx
index 79171efd..5e1de2dd 100644
--- a/src/routes/onboarding/OnboardingStackScreen.tsx
+++ b/src/routes/onboarding/OnboardingStackScreen.tsx
@@ -1,6 +1,5 @@
 import {StackCardInterpolationProps} from '@react-navigation/stack';
 import React from 'react';
-import TaggPopup from '../../components/common/TaggPopup';
 import {
   InvitationCodeVerification,
   Login,
@@ -45,14 +44,6 @@ const Onboarding: React.FC = () => {
       />
       <OnboardingStack.Screen name="WelcomeScreen" component={WelcomeScreen} />
       <OnboardingStack.Screen
-        name="TaggPopup"
-        component={TaggPopup}
-        options={{
-          gestureEnabled: false,
-          ...modalStyle,
-        }}
-      />
-      <OnboardingStack.Screen
         name="PasswordReset"
         component={PasswordReset}
         options={{