diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/notifications/Notification.tsx | 21 | ||||
-rw-r--r-- | src/utils/moments.ts | 4 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/components/notifications/Notification.tsx b/src/components/notifications/Notification.tsx index 0290f9c7..ae884b42 100644 --- a/src/components/notifications/Notification.tsx +++ b/src/components/notifications/Notification.tsx @@ -253,10 +253,14 @@ const Notification: React.FC<NotificationProps> = (props) => { <TouchableWithoutFeedback style={styles.textContainerStyles} onPress={onNotificationTap}> - <Text style={styles.verbageStyles}>{verbage}</Text> - <Text style={styles.timeStampStyles}> - {getTimeInShorthand(timestamp)} + <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 */} @@ -317,6 +321,7 @@ const styles = StyleSheet.create({ contentContainer: { flex: 5, marginLeft: '5%', + marginRight: '3%', height: '80%', flexDirection: 'column', justifyContent: 'space-around', @@ -327,14 +332,16 @@ const styles = StyleSheet.create({ 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'}, + textContainerStyles: { + flexDirection: 'row', + flexWrap: 'wrap', + }, verbageStyles: { fontWeight: '500', fontSize: normalize(11), diff --git a/src/utils/moments.ts b/src/utils/moments.ts index 12323e7b..90d69519 100644 --- a/src/utils/moments.ts +++ b/src/utils/moments.ts @@ -39,10 +39,6 @@ export const getTimePosted = (date_time: string) => { }; export const getTimeInShorthand = (date_time: string) => { - //TODO: Explore this function to get dates in our range and format - // const datePosted = moment(date_time); - // return moment(datePosted).fromNow(); - const datePosted = moment(date_time); const now = moment(); var time = date_time; |