diff --git a/frontend/benefit/handler/public/locales/en/common.json b/frontend/benefit/handler/public/locales/en/common.json index 251faf3513..cbabf87258 100644 --- a/frontend/benefit/handler/public/locales/en/common.json +++ b/frontend/benefit/handler/public/locales/en/common.json @@ -667,7 +667,7 @@ "review": { "actions": { "handle": "Ota käsittelyyn", - "edit": "Muokkaa hakemusta", + "edit": "Muokkaa", "close": "Sulje", "done": "Tee päätösehdotus", "saveAndContinue": "Tallenna ja sulje", diff --git a/frontend/benefit/handler/public/locales/fi/common.json b/frontend/benefit/handler/public/locales/fi/common.json index ee8a62e0d7..a81a91f7ae 100644 --- a/frontend/benefit/handler/public/locales/fi/common.json +++ b/frontend/benefit/handler/public/locales/fi/common.json @@ -667,7 +667,7 @@ "review": { "actions": { "handle": "Ota käsittelyyn", - "edit": "Muokkaa hakemusta", + "edit": "Muokkaa", "close": "Sulje", "done": "Tee päätösehdotus", "saveAndContinue": "Tallenna ja sulje", diff --git a/frontend/benefit/handler/public/locales/sv/common.json b/frontend/benefit/handler/public/locales/sv/common.json index 251faf3513..cbabf87258 100644 --- a/frontend/benefit/handler/public/locales/sv/common.json +++ b/frontend/benefit/handler/public/locales/sv/common.json @@ -667,7 +667,7 @@ "review": { "actions": { "handle": "Ota käsittelyyn", - "edit": "Muokkaa hakemusta", + "edit": "Muokkaa", "close": "Sulje", "done": "Tee päätösehdotus", "saveAndContinue": "Tallenna ja sulje", diff --git a/frontend/benefit/handler/src/components/applicationReview/employeeView/EmployeeView.tsx b/frontend/benefit/handler/src/components/applicationReview/employeeView/EmployeeView.tsx index cc4c5e9ab5..27537dd4d2 100644 --- a/frontend/benefit/handler/src/components/applicationReview/employeeView/EmployeeView.tsx +++ b/frontend/benefit/handler/src/components/applicationReview/employeeView/EmployeeView.tsx @@ -12,13 +12,8 @@ import { $GridCell } from 'shared/components/forms/section/FormSection.sc'; import { getFullName } from 'shared/utils/application.utils'; import AttachmentsListView from '../../attachmentsListView/AttachmentsListView'; -import EmployeeActions from './EmployeeActions/EmployeeActions'; -const EmployeeView: React.FC = ({ - data, - handleUpload, - isUploading, -}) => { +const EmployeeView: React.FC = ({ data }) => { const translationsBase = 'common:review'; const { t } = useTranslation(); return ( @@ -26,14 +21,7 @@ const EmployeeView: React.FC = ({ id={data.id} header={t(`${translationsBase}.headings.heading5`)} section="employee" - action={ - !ACTIONLESS_STATUSES.includes(data.status) ? ( - - ) : null - } + action={!ACTIONLESS_STATUSES.includes(data.status) ? true : null} > <$GridCell $colSpan={6}> <$ViewFieldBold large> diff --git a/frontend/benefit/handler/src/components/applicationReview/employmentView/EmpoymentView.tsx b/frontend/benefit/handler/src/components/applicationReview/employmentView/EmpoymentView.tsx index a2b05c58a3..1411d11ba8 100644 --- a/frontend/benefit/handler/src/components/applicationReview/employmentView/EmpoymentView.tsx +++ b/frontend/benefit/handler/src/components/applicationReview/employmentView/EmpoymentView.tsx @@ -14,13 +14,8 @@ import { $GridCell } from 'shared/components/forms/section/FormSection.sc'; import { formatFloatToCurrency } from 'shared/utils/string.utils'; import AttachmentsListView from '../../attachmentsListView/AttachmentsListView'; -import EmploymentActions from './employmentActions/EmploymentActions'; -const EmploymentView: React.FC = ({ - data, - isUploading, - handleUpload, -}) => { +const EmploymentView: React.FC = ({ data }) => { const translationsBase = 'common:review'; const { t } = useTranslation(); return ( @@ -28,14 +23,7 @@ const EmploymentView: React.FC = ({ id={data.id} header={t(`${translationsBase}.headings.heading8`)} section="employment" - action={ - !ACTIONLESS_STATUSES.includes(data.status) ? ( - - ) : null - } + action={!ACTIONLESS_STATUSES.includes(data.status) ? true : null} > <$GridCell $colSpan={6} $colStart={1}> <$ViewFieldBold> diff --git a/frontend/benefit/handler/src/components/reviewSection/ReviewSection.sc.ts b/frontend/benefit/handler/src/components/reviewSection/ReviewSection.sc.ts index 23c3408165..e4d02efced 100644 --- a/frontend/benefit/handler/src/components/reviewSection/ReviewSection.sc.ts +++ b/frontend/benefit/handler/src/components/reviewSection/ReviewSection.sc.ts @@ -28,7 +28,7 @@ export const $CheckIconFill = styled(IconCheckCircleFill)` export const $EditButtonContainer = styled.div` position: absolute; - top: 0; - right: 0; + top: 18px; + right: 18px; z-index: 99; `;