fix(endorsement-system): Text fixes (#6174)

* template text adjustments * lock list text for admin * format * messageId Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Jan 7, 2022 · 50f5d0f · 50f5d0f
1 parent 70083b6
commit 50f5d0f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 29 deletions.
diff --git a/libs/application/templates/general-petition/src/fields/ListSubmitted/index.tsx b/libs/application/templates/general-petition/src/fields/ListSubmitted/index.tsx
@@ -1,6 +1,6 @@
 import React, { FC } from 'react'
 import { FieldBaseProps } from '@island.is/application/core'
-import { Box, Text, Bullet, BulletList, Link } from '@island.is/island-ui/core'
+import { Box, Text } from '@island.is/island-ui/core'
 import { useLocale } from '@island.is/localization'
 import { Approved } from '@island.is/application/ui-components'
 import { CopyLink } from '@island.is/application/ui-components'
@@ -34,28 +34,6 @@ const ListSubmited: FC<FieldBaseProps> = ({ application }) => {
       <Text marginBottom={2} variant="h3">
         {formatMessage(m.listSubmitted.bulletListTitle)}
       </Text>
-      <BulletList type="ul">
-        <Bullet>
-          <Link
-            href={formatMessage(m.listSubmitted.bulletLink1)}
-            color="blue400"
-            underline="small"
-            underlineVisibility="always"
-          >
-            {formatMessage(m.listSubmitted.bulletLink1Title)}
-          </Link>
-        </Bullet>
-        <Bullet>
-          <Link
-            href={formatMessage(m.listSubmitted.bulletLink2)}
-            color="blue400"
-            underline="small"
-            underlineVisibility="always"
-          >
-            {formatMessage(m.listSubmitted.bulletLink2Title)}
-          </Link>
-        </Bullet>
-      </BulletList>
       <Box height="full" marginTop={8} marginBottom={10}>
         <School />
       </Box>

diff --git a/libs/application/templates/general-petition/src/lib/messages.ts b/libs/application/templates/general-petition/src/lib/messages.ts
@@ -302,7 +302,7 @@ export const m: MessageDir = {
     agreeTermsLabel: {
       id: 'gpt.application:endorsement.form.agree.label',
       defaultMessage:
-        'Ég hef kynnt mér ofangreint málefni og samþykki uppflettingu úr Þjóðskrá',
+        'Ég hef kynnt mér ofangreint málefni og samþykki uppflettingu í Þjóðskrá',
       description: 'Label for terms and conditions',
     },
     allowNameLabel: {

diff --git a/libs/service-portal/endorsements/src/lib/messages.ts b/libs/service-portal/endorsements/src/lib/messages.ts
@@ -157,6 +157,11 @@ export const m: MessageDir = {
       defaultMessage: 'Ertu viss um að vilja loka lista?',
       description: 'Dialog prompt title',
     },
+    dialogPromptLockListTitle: {
+      id: 'sp.petitions:dialog-prompt-lock',
+      defaultMessage: 'Ertu viss um að vilja læsa lista?',
+      description: 'Dialog prompt title',
+    },
     dialogPromptOpenListTitle: {
       id: 'sp.petitions:dialog-prompt-open',
       defaultMessage: 'Ertu viss um að vilja opna lista?',
@@ -172,6 +177,11 @@ export const m: MessageDir = {
       defaultMessage: 'Loka lista',
       description: 'Button label',
     },
+    lockListButton: {
+      id: 'sp.petitions:lock-list',
+      defaultMessage: 'Læsa lista',
+      description: 'Button label',
+    },
     updateListButton: {
       id: 'sp.petitions:update-list',
       defaultMessage: 'Uppfæra lista',
@@ -207,6 +217,11 @@ export const m: MessageDir = {
       defaultMessage: 'Ekki tókst að loka lista',
       description: 'Toast error message',
     },
+    toastErrorLockList: {
+      id: 'sp.petitions:toast-error-message-lock',
+      defaultMessage: 'Ekki tókst að læsa lista',
+      description: 'Toast error message',
+    },
     toastErrorSendList: {
       id: 'sp.petitions:toast-error-send-list',
       defaultMessage: 'Ekki tókst að senda lista á netfang',
@@ -222,6 +237,11 @@ export const m: MessageDir = {
       defaultMessage: 'Tókst að loka lista',
       description: 'Toast success message',
     },
+    toastSuccessLockList: {
+      id: 'sp.petitions:toast-success-message-lock-list',
+      defaultMessage: 'Tókst að læsa lista',
+      description: 'Toast success message',
+    },
     toastSuccessOpenList: {
       id: 'sp.petitions:toast-success-message-open-list',
       defaultMessage: 'Tókst að opna/uppfæra lista',

diff --git a/libs/service-portal/endorsements/src/screens/ViewPetitionAdmin/ViewPetitionAdmin.tsx b/libs/service-portal/endorsements/src/screens/ViewPetitionAdmin/ViewPetitionAdmin.tsx
@@ -73,11 +73,11 @@ const ViewPetitionAdmin = () => {
         },
       },
     }).catch(() => {
-      toast.error(formatMessage(m.viewPetition.toastErrorCloseList))
+      toast.error(formatMessage(m.viewPetition.toastErrorLockList))
     })
 
     if (success) {
-      toast.success(formatMessage(m.viewPetition.toastSuccessCloseList))
+      toast.success(formatMessage(m.viewPetition.toastSuccessLockList))
     }
   }
 
@@ -188,17 +188,17 @@ const ViewPetitionAdmin = () => {
             {!petition.adminLock ? (
               <DialogPrompt
                 baseId="demo_dialog"
-                title={formatMessage(m.viewPetition.dialogPromptCloseListTitle)}
+                title={formatMessage(m.viewPetition.dialogPromptLockListTitle)}
                 ariaLabel={formatMessage(
-                  m.viewPetition.dialogPromptCloseListTitle,
+                  m.viewPetition.dialogPromptLockListTitle,
                 )}
                 disclosureElement={
                   <Button
                     icon="lockClosed"
                     iconType="outline"
                     colorScheme="destructive"
                   >
-                    {formatMessage(m.viewPetition.closeListButton)}
+                    {formatMessage(m.viewPetition.LockListButton)}
                   </Button>
                 }
                 onConfirm={() => onLockList()}