Skip to content

Commit e56bcc0

Browse files
authored
Merge pull request #29 from vj-abishek/vj-abishek-patch-1
fix: date undefined issue
2 parents c23f4a4 + dc9f84d commit e56bcc0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Components/Home/Room/Single.jsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
22
import { Link, useParams } from 'react-router-dom';
33
import { Helmet } from 'react-helmet';
44
import { connect } from 'react-redux';
5-
import { format, formatDistanceToNow } from 'date-fns';
5+
import { format, formatDistanceToNow, isDate } from 'date-fns';
66
import E2E from '../../Utils/EndToEnd';
77
import Styles from '../../../Styles/responsive.module.css';
88
import { UpdateChannel } from '../../../Store/Actions/Channel';
@@ -146,6 +146,9 @@ const Single = ({
146146
const message = lastMessage.get(snapShot.channelId);
147147
lastMessagetime = message.message?.time;
148148
}
149+
150+
const checkDate = isDate(lastMessagetime) && (new Date(lastMessagetime) !== 'Invalid Date')
151+
149152
return (
150153
<Link
151154
to={`/r/${snapShot.channelId}/${
@@ -208,7 +211,7 @@ const Single = ({
208211
<span>{snapShot.pro.data().displayName}</span>
209212
</div>
210213
<div className={`${Styles.gray1} text-xs`}>
211-
{(hasLastMessage &&
214+
{(hasLastMessage && checkDate &&
212215
format(new Date(lastMessagetime), 'hh:mm a')) ||
213216
''}
214217
</div>

0 commit comments

Comments
 (0)