fix: small tweaks to application review

City-of-Helsinki · Mar 1, 2024 · a596999 · a596999
1 parent 2241549
commit a596999
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -12,28 +12,16 @@ 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<ApplicationReviewViewProps> = ({
-  data,
-  handleUpload,
-  isUploading,
-}) => {
+const EmployeeView: React.FC<ApplicationReviewViewProps> = ({ data }) => {
   const translationsBase = 'common:review';
   const { t } = useTranslation();
   return (
     <ReviewSection
       id={data.id}
       header={t(`${translationsBase}.headings.heading5`)}
       section="employee"
-      action={
-        !ACTIONLESS_STATUSES.includes(data.status) ? (
-          <EmployeeActions
-            handleUpload={handleUpload}
-            isUploading={isUploading}
-          />
-        ) : 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
@@ -14,28 +14,16 @@ 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<ApplicationReviewViewProps> = ({
-  data,
-  isUploading,
-  handleUpload,
-}) => {
+const EmploymentView: React.FC<ApplicationReviewViewProps> = ({ data }) => {
   const translationsBase = 'common:review';
   const { t } = useTranslation();
   return (
     <ReviewSection
       id={data.id}
       header={t(`${translationsBase}.headings.heading8`)}
       section="employment"
-      action={
-        !ACTIONLESS_STATUSES.includes(data.status) ? (
-          <EmploymentActions
-            handleUpload={handleUpload}
-            isUploading={isUploading}
-          />
-        ) : 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
@@ -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;
 `;