From dbad97da47b8e6fecb1a75ce7d8466929036ab94 Mon Sep 17 00:00:00 2001 From: Kamran Ahmed Date: Wed, 29 Aug 2018 22:19:16 +0500 Subject: Date filter fix --- src/components/group-heading/index.js | 4 ++-- src/containers/feed/index.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/components/group-heading/index.js b/src/components/group-heading/index.js index b9f5006..d4adea8 100644 --- a/src/components/group-heading/index.js +++ b/src/components/group-heading/index.js @@ -25,9 +25,9 @@ class GroupHeading extends React.Component { const formattedDate = startMoment.fromNow(); if (formattedDate === 'a year ago') { return 'Last year'; - } else if (formattedDate === '6 days ago') { + } else if (formattedDate === '7 days ago') { return 'This week'; - } else if (formattedDate === '13 days ago') { + } else if (formattedDate === '14 days ago') { return 'Last week'; } diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js index e1b112b..14f9b7f 100644 --- a/src/containers/feed/index.js +++ b/src/containers/feed/index.js @@ -67,7 +67,7 @@ class FeedContainer extends React.Component { dateRange.start = moment(lastRecords.start).subtract(1, dateJump); dateRange.end = lastRecords.start; } else { - dateRange.start = moment().add(1, 'day').subtract(1, dateJump); + dateRange.start = moment().subtract(1, dateJump); dateRange.end = moment(); } -- cgit v1.3