Merge branch 'master' of https://github.com/TaggiD-Inc/Frontend

1 files changed, 10 insertions, 5 deletions

diff --git a/src/components/moments/MomentPostHeader.tsx b/src/components/moments/MomentPostHeader.tsx
index dc6a3cd9..5f26951a 100644
--- a/src/components/moments/MomentPostHeader.tsx
+++ b/src/components/moments/MomentPostHeader.tsx
@@ -10,7 +10,7 @@ import {
 import {useDispatch, useSelector, useStore} from 'react-redux';
 import {loadUserMoments} from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
-import {ScreenType} from '../../types';
+import {MomentTagType, MomentType, ScreenType} from '../../types';
 import {fetchUserX, userXInStore} from '../../utils';
 import {MomentMoreInfoDrawer} from '../profile';
 import TaggAvatar from '../profile/TaggAvatar';
@@ -19,19 +19,21 @@ interface MomentPostHeaderProps extends ViewProps {
   userXId?: string;
   screenType: ScreenType;
   username: string;
-  momentId: string;
   momentTagId: string;
   removeTag: () => Promise<void>;
+  moment: MomentType;
+  tags: MomentTagType[];
 }
 
 const MomentPostHeader: React.FC<MomentPostHeaderProps> = ({
   userXId,
   screenType,
   username,
-  momentId,
   style,
   momentTagId,
   removeTag,
+  moment,
+  tags,
 }) => {
   const [drawerVisible, setDrawerVisible] = useState(false);
   const dispatch = useDispatch();
@@ -62,20 +64,23 @@ const MomentPostHeader: React.FC<MomentPostHeaderProps> = ({
           style={styles.avatar}
           userXId={userXId}
           screenType={screenType}
+          editable={false}
         />
         <Text style={styles.headerText}>{username}</Text>
       </TouchableOpacity>
       <MomentMoreInfoDrawer
         isOpen={drawerVisible}
         setIsOpen={setDrawerVisible}
-        momentId={momentId}
         isOwnProfile={isOwnProfile}
         momentTagId={momentTagId}
         removeTag={removeTag}
         dismissScreenAndUpdate={() => {
           dispatch(loadUserMoments(loggedInUserId));
-          navigation.pop();
+          navigation.goBack();
         }}
+        screenType={screenType}
+        moment={moment}
+        tags={tags}
       />
     </View>
   );