From a3e242854f32597eb046cf40edd5a39d448c7434 Mon Sep 17 00:00:00 2001 From: yksolanki9 Date: Fri, 13 Jan 2023 21:37:21 +0530 Subject: [PATCH] Set time to 00:00:00 when getting current timestamp --- .../src/app/portfolio/portfolio.service.ts | 20 +++++++++++++++---- .../investment-chart.component.ts | 5 ++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 02b95ab54..ecb03ca3d 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -1415,16 +1415,28 @@ export class PortfolioService { private getStartDate(aDateRange: DateRange, portfolioStart: Date) { switch (aDateRange) { case '1d': - portfolioStart = max([portfolioStart, subDays(new Date(), 1)]); + portfolioStart = max([ + portfolioStart, + subDays(new Date().setHours(0, 0, 0, 0), 1) + ]); break; case 'ytd': - portfolioStart = max([portfolioStart, setDayOfYear(new Date(), 1)]); + portfolioStart = max([ + portfolioStart, + setDayOfYear(new Date().setHours(0, 0, 0, 0), 1) + ]); break; case '1y': - portfolioStart = max([portfolioStart, subYears(new Date(), 1)]); + portfolioStart = max([ + portfolioStart, + subYears(new Date().setHours(0, 0, 0, 0), 1) + ]); break; case '5y': - portfolioStart = max([portfolioStart, subYears(new Date(), 5)]); + portfolioStart = max([ + portfolioStart, + subYears(new Date().setHours(0, 0, 0, 0), 5) + ]); break; } return portfolioStart; diff --git a/apps/client/src/app/components/investment-chart/investment-chart.component.ts b/apps/client/src/app/components/investment-chart/investment-chart.component.ts index bfce434e8..734fe704f 100644 --- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts +++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts @@ -196,7 +196,10 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy { this.getTooltipPluginConfiguration() ); this.chart.options.scales.x.min = this.daysInMarket - ? subDays(new Date(), this.daysInMarket).toISOString() + ? subDays( + new Date().setHours(0, 0, 0, 0), + this.daysInMarket + ).toISOString() : undefined; if (