From 46b58a6e1b9c2ab1c1f38558ae47d69b9bb999e3 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Tue, 9 Jan 2024 17:14:30 -0500 Subject: [PATCH] Fix IO-1828 Signed-off-by: Dave Richer --- .../courtesy-cars-list/courtesy-cars-list.component.jsx | 2 +- .../courtesy-car-detail/courtesy-car-detail.page.container.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx index 7b5cc8ec2..6f4d2a4a2 100644 --- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx +++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx @@ -76,7 +76,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) { const mileageOver = nextservicekm ? nextservicekm <= mileage : false; const dueForService = - nextservicedate && dayjs(nextservicedate).end('day').isSameOrBefore(dayjs()); + nextservicedate && dayjs(nextservicedate).endOf('day').isSameOrBefore(dayjs()); return ( diff --git a/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx b/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx index 80d357616..66e39e47a 100644 --- a/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx +++ b/client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx @@ -1,6 +1,6 @@ import { useMutation, useQuery } from "@apollo/client"; import { Form, notification } from "antd"; -import dayjs from "dayjs"; +import dayjs from "../../utils/day"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux";