Merge branch 'master' into tma904-moment-comment-revamp

# Conflicts:
#	src/components/moments/MomentPost.tsx
#	src/components/moments/MomentPostContent.tsx
#	src/services/MomentService.ts

1 files changed, 3 insertions, 2 deletions

diff --git a/src/components/moments/MomentPost.tsx b/src/components/moments/MomentPost.tsx
index 3b2721a0..d87028e3 100644
--- a/src/components/moments/MomentPost.tsx
+++ b/src/components/moments/MomentPost.tsx
@@ -74,13 +74,14 @@ const MomentPost: React.FC<MomentPostProps> = ({
   return (
     <>
       <MomentPostHeader
+        style={styles.postHeader}
         userXId={userXId}
         screenType={screenType}
         username={isOwnProfile ? loggedInUsername : username}
-        momentId={moment.moment_id}
-        style={styles.postHeader}
         momentTagId={momentTagId}
         removeTag={removeTag}
+        moment={moment}
+        tags={tags}
       />
       <MomentPostContent
         style={styles.postContent}