Merge pull request #350 from IvanIFChen/tma682-to-date-after-3-days

[TMA-682] Display date after 3 days

2 files changed, 20 insertions, 14 deletions

diff --git a/src/screens/profile/IndividualMoment.tsx b/src/screens/profile/IndividualMoment.tsx
index 8c1dc327..871d62bf 100644
--- a/src/screens/profile/IndividualMoment.tsx
+++ b/src/screens/profile/IndividualMoment.tsx
@@ -27,7 +27,7 @@ interface IndividualMomentProps {
   navigation: IndividualMomentNavigationProp;
 }
 
-const ITEM_HEIGHT = SCREEN_HEIGHT * (9 / 10);
+const ITEM_HEIGHT = SCREEN_HEIGHT * 0.9;
 
 const IndividualMoment: React.FC<IndividualMomentProps> = ({
   route,
@@ -40,13 +40,13 @@ const IndividualMoment: React.FC<IndividualMomentProps> = ({
   );
   const {
     user: {username},
-  } = userXId
-    ? useSelector((state: RootState) => state.userX[screenType][userXId])
-    : useSelector((state: RootState) => state.user);
+  } = useSelector((state: RootState) =>
+    userXId ? state.userX[screenType][userXId] : state.user,
+  );
 
-  const {moments} = userXId
-    ? useSelector((state: RootState) => state.userX[screenType][userXId])
-    : useSelector((state: RootState) => state.moments);
+  const {moments} = useSelector((state: RootState) =>
+    userXId ? state.userX[screenType][userXId] : state.moments,
+  );
 
   const isOwnProfile = username === loggedInUsername;
   const momentData = moments.filter(
diff --git a/src/utils/moments.ts b/src/utils/moments.ts
index 7428b1ac..87f062af 100644
--- a/src/utils/moments.ts
+++ b/src/utils/moments.ts
@@ -1,15 +1,17 @@
 import moment from 'moment';
 
-//A util that calculates the difference between a given time and current time
-//Returns the difference in the largest possible unit of time (days > hours > minutes > seconds)
-
+/**
+ * Formats elapsed time from a given time.
+ * @param date_time given time
+ * @returns difference in the largest possible unit of time (days > hours > minutes > seconds)
+ */
 export const getTimePosted = (date_time: string) => {
   const datePosted = moment(date_time);
   const now = moment();
   var time = date_time;
   var difference = now.diff(datePosted, 'seconds');
 
-  //Creating elapsedTime string to display to user
+  // Creating elapsedTime string to display to user
   // 0 to less than 1 minute
   if (difference < 60) {
     time = difference + ' seconds';
@@ -19,15 +21,19 @@ export const getTimePosted = (date_time: string) => {
     difference = now.diff(datePosted, 'minutes');
     time = difference + (difference === 1 ? ' minute' : ' minutes');
   }
-  //1 hour to less than 1 day
+  // 1 hour to less than 1 day
   else if (difference >= 60 * 60 && difference < 24 * 60 * 60) {
     difference = now.diff(datePosted, 'hours');
     time = difference + (difference === 1 ? ' hour' : ' hours');
   }
-  //Any number of days
-  else if (difference >= 24 * 60 * 60) {
+  // Any number of days
+  else if (difference >= 24 * 60 * 60 && difference < 24 * 60 * 60 * 3) {
     difference = now.diff(datePosted, 'days');
     time = difference + (difference === 1 ? ' day' : ' days');
   }
+  // More than 3 days
+  else if (difference >= 24 * 60 * 60 * 3) {
+    time = datePosted.format('MMMM D, YYYY');
+  }
   return time;
 };