1 files changed, 42 insertions, 7 deletions
diff --git a/src/components/notifications/Notification.tsx b/src/components/notifications/Notification.tsx
index a74480b4..ae884b42 100644
--- a/src/components/notifications/Notification.tsx
+++ b/src/components/notifications/Notification.tsx
@@ -26,6 +26,8 @@ import {
 } from '../../types';
 import {
   fetchUserX,
+  getTimeInShorthand,
+  normalize,
   SCREEN_HEIGHT,
   SCREEN_WIDTH,
   userXInStore,
@@ -47,6 +49,7 @@ const Notification: React.FC<NotificationProps> = (props) => {
       notification_type,
       notification_object,
       unread,
+      timestamp,
     },
     screenType,
     loggedInUser,
@@ -231,7 +234,12 @@ const Notification: React.FC<NotificationProps> = (props) => {
       {notification_type === 'SYSTEM_MSG' ? (
         // Only verbage
         <View style={styles.contentContainer}>
-          <Text style={styles.actorName}>{verbage}</Text>
+          <View style={styles.textContainerStyles}>
+            <Text style={styles.actorName}>{verbage}</Text>
+            <Text style={styles.timeStampStyles}>
+              {getTimeInShorthand(timestamp)}
+            </Text>
+          </View>
         </View>
       ) : (
         <>
@@ -242,8 +250,17 @@ const Notification: React.FC<NotificationProps> = (props) => {
                 {first_name} {last_name}
               </Text>
             </TouchableWithoutFeedback>
-            <TouchableWithoutFeedback onPress={onNotificationTap}>
-              <Text>{verbage}</Text>
+            <TouchableWithoutFeedback
+              style={styles.textContainerStyles}
+              onPress={onNotificationTap}>
+              <Text style={styles.verbageStyles}>
+                {verbage}
+                <Text style={styles.timeStampStyles}>
+                  {' '}
+                  {getTimeInShorthand(timestamp)}
+                </Text>
+              </Text>
+              {/* <Text style={styles.verbageStyles}>{verbage}</Text> */}
             </TouchableWithoutFeedback>
           </View>
           {/* Friend request accept/decline button */}
@@ -304,22 +321,40 @@ const styles = StyleSheet.create({
   contentContainer: {
     flex: 5,
     marginLeft: '5%',
+    marginRight: '3%',
     height: '80%',
     flexDirection: 'column',
     justifyContent: 'space-around',
   },
   actorName: {
-    fontSize: 15,
+    fontSize: normalize(12),
     fontWeight: '700',
+    lineHeight: normalize(14.32),
   },
   moment: {
-    height: 42,
-    width: 42,
-    right: '5%',
+    height: normalize(42),
+    width: normalize(42),
   },
   buttonsContainer: {
     height: '80%',
   },
+  textContainerStyles: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+  },
+  verbageStyles: {
+    fontWeight: '500',
+    fontSize: normalize(11),
+    lineHeight: normalize(13.13),
+  },
+  timeStampStyles: {
+    fontWeight: '700',
+    fontSize: normalize(12),
+    lineHeight: normalize(14.32),
+    marginHorizontal: 2,
+    color: '#828282',
+    textAlignVertical: 'center',
+  },
   imageFlex: {
     flex: 1,
   },