diff --git a/src/components/rangeUsePlanPage/versionsList/VersionsDropdownList.tsx b/src/components/rangeUsePlanPage/versionsList/VersionsDropdownList.tsx index a5f3cffc..a55d44f1 100644 --- a/src/components/rangeUsePlanPage/versionsList/VersionsDropdownList.tsx +++ b/src/components/rangeUsePlanPage/versionsList/VersionsDropdownList.tsx @@ -7,12 +7,12 @@ import TableCell from '@mui/material/TableCell'; import TableHead from '@mui/material/TableHead'; import TableRow from '@mui/material/TableRow'; import Typography from '@mui/material/Typography'; -import moment from 'moment'; import classnames from 'classnames'; import Status from '../../common/Status'; import { useUser } from '../../../providers/UserProvider'; import { PrimaryButton, MuiIcon } from '../../common/'; import { axios, getAuthHeaderConfig } from '../../../utils'; +import { formatPlanVersionDate } from '../../../utils/format/planVersionDate'; import * as API from '../../../constants/api'; import AttachmentsList from './AttachmentsList'; import { ATTACHMENT_TYPE } from '../../../constants/variables'; @@ -52,13 +52,9 @@ const VersionRow = ({ option, user }: { option: any; user: any }) => { {option.version.amendmentType} {option.version.submittedBy} - - {option.version.createdAt ? moment(option.version.createdAt).format('MMM DD YYYY h:mm a') : ''} - + {formatPlanVersionDate(option.version.createdAt)} {option.version.approvedBy} - - {option.version.approvedAt === null ? '' : moment(option.version.approvedAt).format('MMM DD YYYY h:mm a')} - + {formatPlanVersionDate(option.version.approvedAt)} + date ? dayjs.utc(date).tz(PLAN_TIMEZONE).format('MMM DD YYYY h:mm a') : '';