Merge branch 'main' into fix/web-pension-calculator-translations

island-is · Sep 17, 2024 · 04cbddc · 04cbddc
2 parents 38c10a7 + 66d0463
commit 04cbddc
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 491 deletions.
diff --git a/apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx b/apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx
@@ -317,7 +317,15 @@ export const OrganizationHeader: React.FC<
         />
       )
     case 'hsn':
-      return (
+      return n('usingDefaultHeader', false) ? (
+        <DefaultHeader
+          {...defaultProps}
+          image={n(
+            'hsnHeaderImage',
+            'https://images.ctfassets.net/8k0h54kbe6bj/4v20729OMrRYkktuaCTWRi/675807c8c848895833c4a6a162f2813a/hsn-header-icon.svg',
+          )}
+        />
+      ) : (
         <HeilbrigdisstofnunNordurlandsHeader
           organizationPage={organizationPage}
           logoAltText={logoAltText}

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts b/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
@@ -622,6 +622,11 @@ export const translationStrings = defineMessages({
     defaultMessage: 'Samtals frá TR fyrir skatt',
     description: 'Niðurstöðuskjár, Samtals frá TR fyrir skatt',
   },
+  'REIKNH.FRADRSKATTUR': {
+    id: 'web.pensionCalculator:REIKNH.FRADRSKATTUR',
+    defaultMessage: 'Frádreginn skattur af öðrum greiðslum',
+    description: 'Niðurstöðuskjár, Frádreginn skattur af öðrum greiðslum',
+  },
   'REIKNH.FRADRSKATTURTR1': {
     id: 'web.pensionCalculator:REIKNH.FRADRSKATTURTR1',
     defaultMessage: 'Frádreginn skattur TR (1. og 2. skattþrep)',

diff --git a/libs/service-portal/signature-collection/src/lib/messages.ts b/libs/service-portal/signature-collection/src/lib/messages.ts
@@ -16,7 +16,7 @@ export const m = defineMessages({
   pageDescriptionSignee: {
     id: 'sp.signatureCollection:pageDescriptionSignee',
     defaultMessage:
-      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur imperdiet, dui eget iaculis vehicula, purus nibh lobortis urna, sit amet dignissim lacus metus non arcu.',
+      'Aðeins er hægt að mæla með einu framboði. Hægt er að afturkalla meðmæli þangað til söfnun lokar og mæla með öðrum frambjóðanda ef vill.',
     description: '',
   },
   createListButton: {
@@ -29,6 +29,11 @@ export const m = defineMessages({
     defaultMessage: 'Forsetakosningar 2024',
     description: '',
   },
+  collectionTitleParliamentary: {
+    id: 'sp.signatureCollection:collectionTitleParliamentary',
+    defaultMessage: 'Alþingiskosningar',
+    description: '',
+  },
   myListsDescription: {
     id: 'sp.signatureCollection:myListsDescription',
     defaultMessage: 'Yfirlit safnana sem þú hefur stofnað',

diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx b/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx
@@ -9,17 +9,10 @@ import {
 import { constituencies } from '../../../lib/constants'
 import { useNavigate } from 'react-router-dom'
 import { SignatureCollectionPaths } from '../../../lib/paths'
-import LookupPerson from './modals/LookupPerson'
 import { useLocale } from '@island.is/localization'
 import { m } from '../../../lib/messages'
 import AddConstituency from './modals/AddConstituency'
-import DeletePerson from './modals/DeletePerson'
-import {
-  useGetListsForOwner,
-  useGetListsForUser,
-  useIsOwner,
-} from '../../../hooks'
-import { useAuth } from '@island.is/auth/react'
+import { useGetListsForOwner } from '../../../hooks'
 import { SignatureCollection } from '@island.is/api/schema'
 
 const OwnerView = ({
@@ -29,7 +22,6 @@ const OwnerView = ({
 }) => {
   const navigate = useNavigate()
   const { formatMessage } = useLocale()
-  const { userInfo: user } = useAuth()
   const { listsForOwner, loadingOwnerLists } = useGetListsForOwner(
     currentCollection?.id || '',
   )
@@ -92,28 +84,18 @@ const OwnerView = ({
             {formatMessage(m.supervisors) + ' '}
             <Tooltip placement="right" text="info" color="blue400" />
           </Text>
-          <LookupPerson
-            collectionId={'1'}
-            title={formatMessage(m.addSupervisor)}
-          />
         </Box>
         <T.Table>
           <T.Head>
             <T.Row>
               <T.HeadData>{formatMessage(m.personName)}</T.HeadData>
               <T.HeadData>{formatMessage(m.personNationalId)}</T.HeadData>
-              <T.HeadData></T.HeadData>
             </T.Row>
           </T.Head>
           <T.Body>
             <T.Row>
-              <T.Data width={'30%'}>{'Nafni Nafnason'}</T.Data>
+              <T.Data width={'40%'}>{'Nafni Nafnason'}</T.Data>
               <T.Data>{'010130-3019'}</T.Data>
-              <T.Data>
-                <Box display="flex" justifyContent="flexEnd">
-                  <DeletePerson />
-                </Box>
-              </T.Data>
             </T.Row>
           </T.Body>
         </T.Table>

diff --git a/...al/signature-collection/src/screens/Parliamentary/OwnerView/modals/DeletePerson/index.tsx b/...al/signature-collection/src/screens/Parliamentary/OwnerView/modals/DeletePerson/index.tsx
diff --git a/...al/signature-collection/src/screens/Parliamentary/OwnerView/modals/LookupPerson/index.tsx b/...al/signature-collection/src/screens/Parliamentary/OwnerView/modals/LookupPerson/index.tsx