diff --git a/src/components/User-info.jsx b/src/components/User-info.jsx
index 83f381a3..12d16ef1 100644
--- a/src/components/User-info.jsx
+++ b/src/components/User-info.jsx
@@ -31,6 +31,7 @@ import { getAuditorRating } from '../redux/actions/auditorAction.js';
import RatingDetails from './RatingDetails.jsx';
import UserFeedbacks from './UserFeedbacks.jsx';
import ArrowBackIcon from '@mui/icons-material/ArrowBack.js';
+import dayjs from 'dayjs';
const UserInfo = ({ role, linkId }) => {
const dispatch = useDispatch();
@@ -209,6 +210,14 @@ const UserInfo = ({ role, linkId }) => {
E-mail
{data.contacts?.email}
+ {data.free_at && role === AUDITOR && (
+
+ Free at
+
+ {data.free_at ? dayjs(data.free_at).format('MM.DD.YYYY') : ''}
+
+
+ )}
About
diff --git a/src/components/forms/edit-profile-form/edit-profile-form.jsx b/src/components/forms/edit-profile-form/edit-profile-form.jsx
index fbe0b986..098b104a 100644
--- a/src/components/forms/edit-profile-form/edit-profile-form.jsx
+++ b/src/components/forms/edit-profile-form/edit-profile-form.jsx
@@ -33,6 +33,10 @@ import ArrowBackIcon from '@mui/icons-material/ArrowBack';
import { history } from '../../../services/history.js';
import { ASSET_URL } from '../../../services/urls.js';
import CustomSnackbar from '../../custom/CustomSnackbar.jsx';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
+import { DatePicker } from '@mui/x-date-pickers/DatePicker';
+import { LocalizationProvider } from '@mui/x-date-pickers';
+import dayjs from 'dayjs';
const GoBack = ({ role, newLinkId }) => {
const navigate = useNavigate();
@@ -151,7 +155,7 @@ const EditProfileForm = ({ role, newLinkId }) => {
initialValues={{
userId: data.user_id || '',
avatar: data.avatar || '',
- free_at: '',
+ free_at: data?.free_at || dayjs(),
first_name: data?.first_name || user?.name?.split(' ')[0] || '',
last_name: data?.last_name || getPrefilledLastName(),
contacts: {
@@ -356,9 +360,29 @@ const EditProfileForm = ({ role, newLinkId }) => {
/>
)}
+ {role === AUDITOR && (
+
+ Free at
+
+ {
+ const value = new Date(e);
+ setFieldValue('free_at', value.toString());
+ }}
+ disablePast
+ />
+
+
+ )}
{matchSm && (
diff --git a/src/pages/Public-profile.jsx b/src/pages/Public-profile.jsx
index c72a23be..d33ffe7e 100644
--- a/src/pages/Public-profile.jsx
+++ b/src/pages/Public-profile.jsx
@@ -48,6 +48,7 @@ import UserFeedbacks from '../components/UserFeedbacks.jsx';
import WalletConnectIcon from '../components/icons/WalletConnectIcon.jsx';
import { getPublicAuditsAuditor } from '../redux/actions/auditAction.js';
import ProjectCardList from '../components/Project-card-list.jsx';
+import dayjs from 'dayjs';
const PublicProfile = ({ notFoundRedirect = true }) => {
const navigate = useNavigate();
@@ -211,6 +212,7 @@ const PublicProfile = ({ notFoundRedirect = true }) => {
}
}, [data, user]);
+
if (!data) {
return (
@@ -384,6 +386,14 @@ const PublicProfile = ({ notFoundRedirect = true }) => {
: 'Hidden'}
+ {data.free_at && data?.kind?.toLowerCase() === AUDITOR?.toLowerCase() && (
+
+ Free at
+
+ {data.free_at ? dayjs(data.free_at).format('MM.DD.YYYY') : ''}
+
+
+ )}