1 files changed, 90 insertions, 67 deletions

diff --git a/src/components/moments/MomentPostContent.tsx b/src/components/moments/MomentPostContent.tsx
index 4a1f3894..aca2999c 100644
--- a/src/components/moments/MomentPostContent.tsx
+++ b/src/components/moments/MomentPostContent.tsx
@@ -1,77 +1,81 @@
 import {useNavigation} from '@react-navigation/native';
-import React, {useEffect, useRef, useState} from 'react';
+import React, {useContext, useEffect, useRef, useState} from 'react';
 import {Image, StyleSheet, Text, View, ViewProps} from 'react-native';
 import {TouchableWithoutFeedback} from 'react-native-gesture-handler';
-import Animated, {Easing} from 'react-native-reanimated';
+import Animated, {EasingNode} from 'react-native-reanimated';
 import {useDispatch, useStore} from 'react-redux';
-import {getCommentsCount} from '../../services';
+import {MomentContext} from '../../screens/profile/IndividualMoment';
 import {RootState} from '../../store/rootReducer';
-import {MomentTagType, ScreenType, UserType} from '../../types';
 import {
+  MomentCommentPreviewType,
+  MomentPostType,
+  MomentTagType,
+  ScreenType,
+  UserType,
+} from '../../types';
+import {
+  getLoggedInUserAsProfilePreview,
   getTimePosted,
   navigateToProfile,
   normalize,
-  SCREEN_HEIGHT,
   SCREEN_WIDTH,
 } from '../../utils';
 import {mentionPartTypes, renderTextWithMentions} from '../../utils/comments';
-import {CommentsCount} from '../comments';
+import {AddComment} from '../comments';
 import {MomentTags} from '../common';
+import MomentCommentPreview from './MomentCommentPreview';
 
 interface MomentPostContentProps extends ViewProps {
   screenType: ScreenType;
-  momentId: string;
-  caption: string;
-  pathHash: string;
-  dateTime: string;
+  moment: MomentPostType;
   momentTags: MomentTagType[];
+  index: number;
 }
 const MomentPostContent: React.FC<MomentPostContentProps> = ({
   screenType,
-  momentId,
-  caption,
-  pathHash,
-  dateTime,
+  moment,
   style,
   momentTags,
+  index,
 }) => {
+  const [tags, setTags] = useState<MomentTagType[]>(momentTags);
   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 [visible, setVisible] = useState(false);
-
   const [fadeValue, setFadeValue] = useState<Animated.Value<number>>(
     new Animated.Value(0),
   );
+  const [commentCount, setCommentCount] = useState<number>(
+    moment.comments_count,
+  );
+  const [commentPreview, setCommentPreview] =
+    useState<MomentCommentPreviewType | null>(moment.comment_preview);
+  const {keyboardVisible, scrollTo} = useContext(MomentContext);
+  const [hideText, setHideText] = useState(false);
 
   useEffect(() => {
     setTags(momentTags);
   }, [momentTags]);
 
   useEffect(() => {
-    const fetchCommentsCount = async () => {
-      const count = await getCommentsCount(momentId, false);
-      setCommentsCount(count);
-    };
-    setElapsedTime(getTimePosted(dateTime));
-    fetchCommentsCount();
-  }, [dateTime, momentId]);
-
-  useEffect(() => {
     const fade = async () => {
       Animated.timing(fadeValue, {
         toValue: 1,
         duration: 250,
-        easing: Easing.linear,
+        easing: EasingNode.linear,
       }).start();
     };
     fade();
   }, [fadeValue]);
 
+  useEffect(() => {
+    if (!keyboardVisible && hideText) {
+      setHideText(false);
+    }
+  }, [keyboardVisible, hideText]);
+
   return (
     <View style={[styles.container, style]}>
       <TouchableWithoutFeedback
@@ -82,76 +86,95 @@ const MomentPostContent: React.FC<MomentPostContentProps> = ({
         <Image
           ref={imageRef}
           style={styles.image}
-          source={{uri: pathHash}}
+          source={{uri: moment.moment_url}}
           resizeMode={'cover'}
         />
         {tags.length > 0 && (
           <Image
             source={require('../../assets/icons/tag_indicate.png')}
-            style={[styles.tagIcon]}
+            style={styles.tagIcon}
           />
         )}
       </TouchableWithoutFeedback>
       {visible && (
         <Animated.View style={[styles.tapTag, {opacity: fadeValue}]}>
-          <MomentTags editing={false} tags={tags} imageRef={imageRef} />
+          <MomentTags
+            editing={false}
+            tags={tags}
+            setTags={() => null}
+            imageRef={imageRef}
+          />
         </Animated.View>
       )}
-      <View style={styles.footerContainer}>
-        <CommentsCount
-          commentsCount={comments_count}
-          momentId={momentId}
-          screenType={screenType}
-        />
-        <Text style={styles.text}>{elapsedTime}</Text>
-      </View>
-      {renderTextWithMentions({
-        value: caption,
-        styles: styles.captionText,
-        partTypes: mentionPartTypes('white'),
-        onPress: (user: UserType) =>
-          navigateToProfile(state, dispatch, navigation, screenType, user),
-      })}
+      {!hideText && (
+        <>
+          {moment.caption !== '' &&
+            renderTextWithMentions({
+              value: moment.caption,
+              styles: styles.captionText,
+              partTypes: mentionPartTypes('white'),
+              onPress: (user: UserType) =>
+                navigateToProfile(
+                  state,
+                  dispatch,
+                  navigation,
+                  screenType,
+                  user,
+                ),
+            })}
+          <MomentCommentPreview
+            momentId={moment.moment_id}
+            commentsCount={commentCount}
+            commentPreview={commentPreview}
+            screenType={screenType}
+          />
+        </>
+      )}
+      <AddComment
+        placeholderText={'Add a comment here!'}
+        momentId={moment.moment_id}
+        callback={(message) => {
+          setCommentPreview({
+            commenter: getLoggedInUserAsProfilePreview(state),
+            comment: message,
+          });
+          setCommentCount(commentCount + 1);
+        }}
+        onFocus={() => {
+          setHideText(true);
+          scrollTo(index);
+        }}
+        isKeyboardAvoiding={false}
+        theme={'dark'}
+      />
+      <Text style={styles.text}>{getTimePosted(moment.date_created)}</Text>
     </View>
   );
 };
 
 const styles = StyleSheet.create({
-  container: {
-    height: SCREEN_HEIGHT,
-  },
+  container: {},
   image: {
     width: SCREEN_WIDTH,
     aspectRatio: 1,
     marginBottom: '3%',
   },
-  footerContainer: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    marginLeft: '7%',
-    marginRight: '5%',
-    marginBottom: '2%',
-  },
   text: {
-    position: 'relative',
-    paddingBottom: '1%',
-    paddingTop: '1%',
-    marginLeft: '7%',
-    marginRight: '2%',
-    color: '#ffffff',
-    fontWeight: 'bold',
+    marginHorizontal: '5%',
+    color: 'white',
+    fontWeight: '500',
+    textAlign: 'right',
+    marginTop: 5,
   },
   captionText: {
     position: 'relative',
-    paddingBottom: '34%',
-    paddingTop: '1%',
-    marginLeft: '5%',
-    marginRight: '5%',
+    marginHorizontal: '5%',
     color: '#ffffff',
     fontWeight: '500',
     fontSize: normalize(13),
     lineHeight: normalize(15.51),
     letterSpacing: normalize(0.6),
+    marginBottom: normalize(18),
   },
   tapTag: {
     position: 'absolute',