3 files changed, 25 insertions, 13 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index bc023da8..c569d2d6 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -35,13 +35,25 @@ export type MainStackParams = {
     userXId: string | undefined;
     screenType: ScreenType;
   };
+  CameraScreen: {
+    screenType: ScreenType;
+    selectedCategory?: string;
+  };
+  ZoomInCropper: {
+    media: {uri: string; isVideo: boolean};
+    screenType: ScreenType;
+    selectedCategory?: string;
+  };
   CaptionScreen: {
-    title?: string;
-    media?: {uri: string; isVideo: boolean};
     screenType: ScreenType;
+    media?: {uri: string; isVideo: boolean};
+    selectedCategory?: string;
     selectedTags?: MomentTagType[];
     moment?: MomentType;
   };
+  ChoosingCategoryScreen: {
+    newCustomCategory?: string;
+  };
   TagFriendsScreen: {
     media: {
       uri: string;
@@ -80,6 +92,7 @@ export type MainStackParams = {
   };
   CreateCustomCategory: {
     existingCategories: string[];
+    fromScreen: 'ChoosingCategoryScreen' | 'CategorySelection';
   };
   Notifications: {
     screenType: ScreenType;
@@ -109,15 +122,6 @@ export type MainStackParams = {
   ChatList: undefined;
   Chat: undefined;
   NewChatModal: undefined;
-  ZoomInCropper: {
-    media: {uri: string; isVideo: boolean};
-    screenType: ScreenType;
-    title: string;
-  };
-  CameraScreen: {
-    title: string;
-    screenType: ScreenType;
-  };
 };
 
 export const MainStack = createStackNavigator<MainStackParams>();
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 948f37b8..15300c0d 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -40,6 +40,7 @@ import {ScreenType} from '../../types';
 import {AvatarHeaderHeight, ChatHeaderHeight, SCREEN_WIDTH} from '../../utils';
 import {MainStack, MainStackParams} from './MainStackNavigator';
 import {ZoomInCropper} from '../../components/comments/ZoomInCropper';
+import ChoosingCategoryScreen from '../../screens/profile/ChoosingCategoryScreen';
 
 /**
  * Profile : To display the logged in user's profile when the userXId passed in to it is (undefined | null | empty string) else displays profile of the user being visited.
@@ -181,6 +182,13 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           }}
         />
         <MainStack.Screen
+          name="ChoosingCategoryScreen"
+          component={ChoosingCategoryScreen}
+          options={{
+            ...headerBarOptions('white', 'Categories'),
+          }}
+        />
+        <MainStack.Screen
           name="SocialMediaTaggs"
           component={SocialMediaTaggs}
           initialParams={{screenType}}
diff --git a/src/routes/tabs/NavigationBar.tsx b/src/routes/tabs/NavigationBar.tsx
index 12f6ab58..c3f0b9f8 100644
--- a/src/routes/tabs/NavigationBar.tsx
+++ b/src/routes/tabs/NavigationBar.tsx
@@ -66,7 +66,7 @@ const NavigationBar: React.FC = () => {
                     disabled={!focused}
                   />
                 );
-              case 'Profile':
+              case 'ProfileTab':
                 return <NavigationIcon tab="Profile" disabled={!focused} />;
               case 'SuggestedPeople':
                 return (
@@ -118,7 +118,7 @@ const NavigationBar: React.FC = () => {
           }}
         />
         <Tabs.Screen
-          name="Profile"
+          name="ProfileTab"
           component={MainStackScreen}
           initialParams={{screenType: ScreenType.Profile}}
         />