4 files changed, 8 insertions, 10 deletions
diff --git a/src/components/moments/MomentPostContent.tsx b/src/components/moments/MomentPostContent.tsx
index f485396f..4a1f3894 100644
--- a/src/components/moments/MomentPostContent.tsx
+++ b/src/components/moments/MomentPostContent.tsx
@@ -35,15 +35,13 @@ const MomentPostContent: React.FC<MomentPostContentProps> = ({
   style,
   momentTags,
 }) => {
-  const [elapsedTime, setElapsedTime] = useState('');
-  const [comments_count, setCommentsCount] = useState('');
-  const [tags, setTags] = useState<MomentTagType[]>(momentTags);
-  const [visible, setVisible] = useState(false);
   const state: RootState = useStore().getState();
   const navigation = useNavigation();
   const dispatch = useDispatch();
+  const [elapsedTime, setElapsedTime] = useState('');
+  const [comments_count, setCommentsCount] = useState('');
+  const [tags, setTags] = useState<MomentTagType[]>(momentTags);
   const imageRef = useRef(null);
-  const [fadeValue, setFadeValue] = useState(new Animated.Value(0));
   const [visible, setVisible] = useState(false);
 
   const [fadeValue, setFadeValue] = useState<Animated.Value<number>>(
diff --git a/src/components/moments/TagFriendsFoooter.tsx b/src/components/moments/TagFriendsFoooter.tsx
index 365d709d..753b4486 100644
--- a/src/components/moments/TagFriendsFoooter.tsx
+++ b/src/components/moments/TagFriendsFoooter.tsx
@@ -38,7 +38,7 @@ const TagFriendsFooter: React.FC<TagFriendsFooterProps> = ({tags, setTags}) => {
           source={require('../../assets/icons/tagging/white-plus-icon.png')}
           style={styles.tagMoreIcon}
         />
-        <Text style={styles.tagMoreLabel}>{'Tagg More'}</Text>
+        <Text style={styles.tagMoreLabel}>{'Tag More'}</Text>
       </TouchableOpacity>
     ),
     [tags],
diff --git a/src/screens/moments/TagFriendsScreen.tsx b/src/screens/moments/TagFriendsScreen.tsx
index d960f3b9..c8bca9f4 100644
--- a/src/screens/moments/TagFriendsScreen.tsx
+++ b/src/screens/moments/TagFriendsScreen.tsx
@@ -74,13 +74,12 @@ const TagFriendsScreen: React.FC<TagFriendsScreenProps> = ({route}) => {
             </View>
             <CaptionScreenHeader
               style={styles.header}
-              title={'Tap on photo to Tag friends!'}
+              title={'Tap on photo to tag friends!'}
             />
             <TouchableWithoutFeedback
-              disabled={tags.length > 0}
               onPress={() =>
                 navigation.navigate('TagSelectionScreen', {
-                  selectedUsers: [],
+                  selectedTags: tags,
                 })
               }>
               <Image
diff --git a/src/screens/moments/TagSelectionScreen.tsx b/src/screens/moments/TagSelectionScreen.tsx
index 3177b638..ea2c0871 100644
--- a/src/screens/moments/TagSelectionScreen.tsx
+++ b/src/screens/moments/TagSelectionScreen.tsx
@@ -29,8 +29,9 @@ interface TagSelectionScreenProps {
 
 const TagSelectionScreen: React.FC<TagSelectionScreenProps> = ({route}) => {
   const navigation = useNavigation();
+  const {selectedTags} = route.params;
   const [users, setUsers] = useState<ProfilePreviewType[]>([]);
-  const [tags, setTags] = useState<MomentTagType[]>(route.params.selectedTags);
+  const [tags, setTags] = useState<MomentTagType[]>(selectedTags);
   const [searching, setSearching] = useState(false);
   const [query, setQuery] = useState<string>('');
   const [label, setLabel] = useState<string>('Recent');