6 files changed, 20 insertions, 1 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index 3b183cc0..dac60c0c 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -99,6 +99,7 @@ export type MainStackParams = {
   ChatList: undefined;
   Chat: undefined;
   NewChatModal: undefined;
+  TagSelection: undefined;
 };
 
 export const MainStack = createStackNavigator<MainStackParams>();
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index d76f9137..d146190c 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -32,6 +32,7 @@ import {
   SuggestedPeopleScreen,
   SuggestedPeopleUploadPictureScreen,
   SuggestedPeopleWelcomeScreen,
+  TagSelection,
 } from '../../screens';
 import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import {ScreenType} from '../../types';
@@ -310,6 +311,7 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           component={NewChatModal}
           options={{headerShown: false, ...newChatModalStyle}}
         />
+        <MainStack.Screen name="TagSelection" component={TagSelection} />
       </MainStack.Navigator>
     );
   };
diff --git a/src/screens/index.ts b/src/screens/index.ts
index 44ae4b52..0c7d911f 100644
--- a/src/screens/index.ts
+++ b/src/screens/index.ts
@@ -6,3 +6,4 @@ export * from './suggestedPeople';
 export * from './suggestedPeopleOnboarding';
 export * from './badge';
 export * from './chat';
+export * from './moments';
diff --git a/src/screens/moments/TagSelection.tsx b/src/screens/moments/TagSelection.tsx
new file mode 100644
index 00000000..fe88bc90
--- /dev/null
+++ b/src/screens/moments/TagSelection.tsx
@@ -0,0 +1,7 @@
+import React from 'react';
+
+const TagSelection: React.FC = () => {
+  return <></>;
+};
+
+export default TagSelection;
diff --git a/src/screens/moments/index.ts b/src/screens/moments/index.ts
new file mode 100644
index 00000000..f2f4cbc5
--- /dev/null
+++ b/src/screens/moments/index.ts
@@ -0,0 +1 @@
+export {default as TagSelection} from './TagSelection';
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index a41abba6..15abe965 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -10,6 +10,8 @@ import {
   StyleSheet,
   TouchableWithoutFeedback,
   View,
+  TouchableOpacity,
+  Text,
 } from 'react-native';
 import {MentionInput} from 'react-native-controlled-mentions';
 import {Button} from 'react-native-elements';
@@ -26,7 +28,7 @@ import {
   updateProfileCompletionStage,
 } from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
-import {SCREEN_WIDTH, StatusBarHeight} from '../../utils';
+import {normalize, SCREEN_WIDTH, StatusBarHeight} from '../../utils';
 import {mentionPartTypes} from '../../utils/comments';
 
 /**
@@ -118,6 +120,11 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
               onChange={setCaption}
               partTypes={mentionPartTypes('blue')}
             />
+            <TouchableOpacity style={{width: SCREEN_WIDTH}}>
+              <Text style={{color: 'white', fontSize: normalize(14)}}>
+                Tag Friends
+              </Text>
+            </TouchableOpacity>
           </View>
         </KeyboardAvoidingView>
       </TouchableWithoutFeedback>