Skip to content

Commit 05b2085

Browse files
committed
Merge remote-tracking branch 'origin/configurable-deadlines' into configurable-deadlines
2 parents c6fcb10 + 93cfc6f commit 05b2085

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

frontend/src/components/pages/status.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,14 @@ export const Status = () => {
2929
const { user, updateUser } = useLoginContext();
3030

3131
const confirmationDays = Math.floor(settings.application.hoursToConfirm / 24);
32-
const fillProfileFormFrom = settings.application.fillProfileFormFrom;
33-
const fillProfileFormUntil = settings.application.fillProfileFormUntil;
34-
const acceptanceDeadline = settings.application.acceptanceDeadline;
35-
const confirmSpotUntil = settings.application.confirmSpotUntil;
32+
const fillProfileFormFrom = dateToString(
33+
settings.application.fillProfileFormFrom,
34+
);
35+
const fillProfileFormTo = dateToString(settings.application.fillProfileFormTo);
36+
const acceptanceDeadline = dateToString(
37+
settings.application.acceptanceDeadline,
38+
);
39+
const confirmSpotUntil = dateToString(settings.application.confirmSpotUntil);
3640
const isExpired = user == null ? false : isConfirmationExpired(user);
3741
const isNotAttending = isExpired || user?.declined;
3842
const deadline = user?.confirmationExpiresAt;

frontend/src/components/settings/project-rating/rating-criteria-settings.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ export const ProjectProjectSettings = () => {
138138
setSettings((prev) => {
139139
const changedSettings = {
140140
...prev,
141-
rating: {
142-
...prev.rating,
141+
project: {
142+
...prev.project,
143143
allowRatingProjects: value,
144144
},
145145
};

0 commit comments

Comments
 (0)