From 41d388cdcd0d7e943663feb723d9ecd8d4856195 Mon Sep 17 00:00:00 2001 From: Sampo Tawast Date: Mon, 14 Oct 2024 11:29:56 +0300 Subject: [PATCH] feat: use a different color for applicant change set --- frontend/benefit/handler/public/locales/en/common.json | 3 ++- frontend/benefit/handler/public/locales/fi/common.json | 3 ++- frontend/benefit/handler/public/locales/sv/common.json | 3 ++- .../reviewChanges/ReviewEditChanges.sc.ts | 10 ++++++++-- .../handler/src/components/sidebar/ChangeSet.tsx | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/frontend/benefit/handler/public/locales/en/common.json b/frontend/benefit/handler/public/locales/en/common.json index 6c56699577..f23620e7eb 100644 --- a/frontend/benefit/handler/public/locales/en/common.json +++ b/frontend/benefit/handler/public/locales/en/common.json @@ -637,7 +637,8 @@ }, "changeReason": { "label": "Selvitys", - "placeholder": "Syy muokkaukseen" + "placeholder": "Syy muokkaukseen", + "additionalInformationRequired": "Lisätietoja vaadittu" } }, "salaryExpensesExplanation": "Ilmoita bruttopalkka, sivukulut ja lomaraha euroina kuukaudessa.", diff --git a/frontend/benefit/handler/public/locales/fi/common.json b/frontend/benefit/handler/public/locales/fi/common.json index ad05d1cead..38b5f3b77c 100644 --- a/frontend/benefit/handler/public/locales/fi/common.json +++ b/frontend/benefit/handler/public/locales/fi/common.json @@ -637,7 +637,8 @@ }, "changeReason": { "label": "Selvitys", - "placeholder": "Syy muokkaukseen" + "placeholder": "Syy muokkaukseen", + "additionalInformationRequired": "Lisätietoja vaadittu" } }, "salaryExpensesExplanation": "Ilmoita bruttopalkka, sivukulut ja lomaraha euroina kuukaudessa.", diff --git a/frontend/benefit/handler/public/locales/sv/common.json b/frontend/benefit/handler/public/locales/sv/common.json index 6c56699577..f23620e7eb 100644 --- a/frontend/benefit/handler/public/locales/sv/common.json +++ b/frontend/benefit/handler/public/locales/sv/common.json @@ -637,7 +637,8 @@ }, "changeReason": { "label": "Selvitys", - "placeholder": "Syy muokkaukseen" + "placeholder": "Syy muokkaukseen", + "additionalInformationRequired": "Lisätietoja vaadittu" } }, "salaryExpensesExplanation": "Ilmoita bruttopalkka, sivukulut ja lomaraha euroina kuukaudessa.", diff --git a/frontend/benefit/handler/src/components/applicationForm/reviewChanges/ReviewEditChanges.sc.ts b/frontend/benefit/handler/src/components/applicationForm/reviewChanges/ReviewEditChanges.sc.ts index 1dd7977918..4c650fc09d 100644 --- a/frontend/benefit/handler/src/components/applicationForm/reviewChanges/ReviewEditChanges.sc.ts +++ b/frontend/benefit/handler/src/components/applicationForm/reviewChanges/ReviewEditChanges.sc.ts @@ -28,8 +28,14 @@ export const $ChangeRowLabel = styled.dt` margin: 0; `; -export const $ChangeSet = styled.div` - background: ${(props) => props.theme.colors.silverLight}; +type $ChangeSetProps = { + isChangeByStaff: boolean; +}; +export const $ChangeSet = styled.div<$ChangeSetProps>` + background: ${(props) => + props.isChangeByStaff + ? props.theme.colors.silverLight + : props.theme.colors.fogLight}; padding: ${(props) => props.theme.spacing.s}; font-size: 0.99em; margin-bottom: ${(props) => props.theme.spacing.xs}; diff --git a/frontend/benefit/handler/src/components/sidebar/ChangeSet.tsx b/frontend/benefit/handler/src/components/sidebar/ChangeSet.tsx index e761a735dd..acd883617e 100644 --- a/frontend/benefit/handler/src/components/sidebar/ChangeSet.tsx +++ b/frontend/benefit/handler/src/components/sidebar/ChangeSet.tsx @@ -45,7 +45,7 @@ const ChangeSet: React.FC = ({ data }: ChangeSetProps) => { ); return ( - <$ChangeSet> + <$ChangeSet isChangeByStaff={user.staff}> <$ChangeSetHeader> {user.name} {convertToUIDateAndTimeFormat(date)}