From 22f98105e9184ae4e25f58cb3c57983ee5fd908a Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 10:35:25 +0000
Subject: [PATCH 1/9] tweaks

---
 .../Constituency/index.tsx                    | 133 +++++++++---------
 .../src/screens-parliamentary/List/index.tsx  |  14 +-
 .../src/screens-parliamentary/index.tsx       |  12 +-
 .../extendDeadline/index.tsx                  |  18 +--
 4 files changed, 96 insertions(+), 81 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
index 0f5fd355a24b..c9b9ca3f7062 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
@@ -127,7 +127,7 @@ export const Constituency = ({
                     ': ' +
                     constituencyLists.length}
                 </Text>
-                {constituencyLists?.length > 0 && (
+                {allowedToProcess && constituencyLists?.length > 0 && (
                   <CreateCollection collectionId={collection?.id} />
                 )}
               </Box>
@@ -156,77 +156,80 @@ export const Constituency = ({
                     }}
                     tag={
                       !list.reviewed
-                        ? {
-                            label: 'Cancel collection',
-                            renderTag: () => (
-                              <DialogPrompt
-                                baseId="cancel_collection_dialog"
-                                title={
-                                  formatMessage(m.cancelCollectionButton) +
-                                  ' - ' +
-                                  list.area?.name
-                                }
-                                description={
-                                  candidatesListCount[list.candidate.id] === 1
-                                    ? formatMessage(
-                                        m.cancelCollectionModalMessageLastList,
-                                      )
-                                    : formatMessage(
-                                        m.cancelCollectionModalMessage,
-                                      )
-                                }
-                                ariaLabel="delete"
-                                disclosureElement={
-                                  <Tag outlined variant="red">
-                                    <Box display="flex" alignItems="center">
-                                      <Icon
-                                        icon="trash"
-                                        size="small"
-                                        type="outline"
-                                      />
-                                    </Box>
-                                  </Tag>
-                                }
-                                onConfirm={() => {
-                                  removeList({
-                                    variables: {
-                                      input: {
-                                        listId: list.id,
-                                      },
-                                    },
-                                  })
-
-                                  if (
+                        ? allowedToProcess
+                          ? {
+                              label: 'Cancel collection',
+                              renderTag: () => (
+                                <DialogPrompt
+                                  baseId="cancel_collection_dialog"
+                                  title={
+                                    formatMessage(m.cancelCollectionButton) +
+                                    ' - ' +
+                                    list.area?.name
+                                  }
+                                  description={
                                     candidatesListCount[list.candidate.id] === 1
-                                  ) {
-                                    removeCandidate({
+                                      ? formatMessage(
+                                          m.cancelCollectionModalMessageLastList,
+                                        )
+                                      : formatMessage(
+                                          m.cancelCollectionModalMessage,
+                                        )
+                                  }
+                                  ariaLabel="delete"
+                                  disclosureElement={
+                                    <Tag outlined variant="red">
+                                      <Box display="flex" alignItems="center">
+                                        <Icon
+                                          icon="trash"
+                                          size="small"
+                                          type="outline"
+                                        />
+                                      </Box>
+                                    </Tag>
+                                  }
+                                  onConfirm={() => {
+                                    removeList({
                                       variables: {
                                         input: {
-                                          candidateId: list.candidate.id,
+                                          listId: list.id,
                                         },
                                       },
                                     })
+
+                                    if (
+                                      candidatesListCount[list.candidate.id] ===
+                                      1
+                                    ) {
+                                      removeCandidate({
+                                        variables: {
+                                          input: {
+                                            candidateId: list.candidate.id,
+                                          },
+                                        },
+                                      })
+                                    }
+                                  }}
+                                  buttonTextConfirm={
+                                    candidatesListCount[list.candidate.id] === 1
+                                      ? formatMessage(
+                                          m.cancelCollectionAndCandidateModalConfirmButton,
+                                        )
+                                      : formatMessage(
+                                          m.cancelCollectionModalConfirmButton,
+                                        )
                                   }
-                                }}
-                                buttonTextConfirm={
-                                  candidatesListCount[list.candidate.id] === 1
-                                    ? formatMessage(
-                                        m.cancelCollectionAndCandidateModalConfirmButton,
-                                      )
-                                    : formatMessage(
-                                        m.cancelCollectionModalConfirmButton,
-                                      )
-                                }
-                                buttonPropsConfirm={{
-                                  variant: 'primary',
-                                  colorScheme: 'destructive',
-                                }}
-                                buttonTextCancel={formatMessage(
-                                  m.cancelCollectionModalCancelButton,
-                                )}
-                              />
-                            ),
-                          }
+                                  buttonPropsConfirm={{
+                                    variant: 'primary',
+                                    colorScheme: 'destructive',
+                                  }}
+                                  buttonTextCancel={formatMessage(
+                                    m.cancelCollectionModalCancelButton,
+                                  )}
+                                />
+                              ),
+                            }
+                          : undefined
                         : {
                             label: m.confirmListReviewed.defaultMessage,
                             variant: 'mint',
diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index b342542ddc29..adb2eeb15c88 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -91,10 +91,18 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
             }
             type={listStatus === ListStatus.Reviewed ? 'success' : undefined}
           />
-          <ActionExtendDeadline listId={list.id} endTime={list.endTime} />
+          <ActionExtendDeadline
+            listId={list.id}
+            endTime={list.endTime}
+            allowedToProcess={allowedToProcess}
+          />
           <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
-          <PaperSignees listId={list.id} />
-          <ActionReviewComplete listId={list.id} listStatus={listStatus} />
+          {allowedToProcess && (
+            <Box>
+              <PaperSignees listId={list.id} />
+              <ActionReviewComplete listId={list.id} listStatus={listStatus} />
+            </Box>
+          )}
         </GridColumn>
       </GridRow>
     </GridContainer>
diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
index 3a0b0b940abf..cc6f244a3984 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
@@ -101,10 +101,12 @@ const ParliamentaryRoot = ({
                 backgroundColor="blue"
               />
             </Box>
-            <DownloadReports
-              areas={collection.areas}
-              collectionId={collection?.id}
-            />
+            {allowedToProcess && (
+              <DownloadReports
+                areas={collection.areas}
+                collectionId={collection?.id}
+              />
+            )}
           </Box>
           {loading && (
             <Box marginBottom={6}>
@@ -202,7 +204,7 @@ const ParliamentaryRoot = ({
               />
             ))}
           </Stack>
-          <CompareLists collectionId={collection?.id} />
+          {allowedToProcess && <CompareLists collectionId={collection?.id} />}
         </GridColumn>
       </GridRow>
     </GridContainer>
diff --git a/libs/portals/admin/signature-collection/src/shared-components/extendDeadline/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/extendDeadline/index.tsx
index c37ee13b4141..871f82f9f927 100644
--- a/libs/portals/admin/signature-collection/src/shared-components/extendDeadline/index.tsx
+++ b/libs/portals/admin/signature-collection/src/shared-components/extendDeadline/index.tsx
@@ -63,14 +63,16 @@ const ActionExtendDeadline = ({
           readOnly
           value={format(new Date(endDate), 'dd.MM.yyyy HH:mm')}
         />
-        <Box marginLeft={3}>
-          <Button
-            icon="calendar"
-            iconType="outline"
-            variant="ghost"
-            onClick={() => setModalChangeDateIsOpen(true)}
-          ></Button>
-        </Box>
+        {allowedToProcess && (
+          <Box marginLeft={3}>
+            <Button
+              icon="calendar"
+              iconType="outline"
+              variant="ghost"
+              onClick={() => setModalChangeDateIsOpen(true)}
+            ></Button>
+          </Box>
+        )}
       </Box>
       <Modal
         id="extendDeadline"

From 8af8d02552c27381f5de4e92826f674f4b939ffb Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 10:43:05 +0000
Subject: [PATCH 2/9] lks - hide signees while active

---
 .../Constituency/index.tsx                    | 28 ++++++++-----------
 .../src/screens-parliamentary/List/index.tsx  |  8 ++++--
 .../completeReview/index.tsx                  |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
index ba8b75cfa3df..c9b9ca3f7062 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
@@ -142,22 +142,18 @@ export const Constituency = ({
                       maxProgress: list.area.min,
                       withLabel: true,
                     }}
-                    cta={
-                      (allowedToProcess && !list.active) || !allowedToProcess
-                        ? {
-                            label: formatMessage(m.viewList),
-                            variant: 'text',
-                            onClick: () => {
-                              navigate(
-                                SignatureCollectionPaths.ParliamentaryConstituencyList.replace(
-                                  ':constituencyName',
-                                  constituencyName,
-                                ).replace(':listId', list.id),
-                              )
-                            },
-                          }
-                        : undefined
-                    }
+                    cta={{
+                      label: formatMessage(m.viewList),
+                      variant: 'text',
+                      onClick: () => {
+                        navigate(
+                          SignatureCollectionPaths.ParliamentaryConstituencyList.replace(
+                            ':constituencyName',
+                            constituencyName,
+                          ).replace(':listId', list.id),
+                        )
+                      },
+                    }}
                     tag={
                       !list.reviewed
                         ? allowedToProcess
diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index adb2eeb15c88..85b6c238d40d 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -96,10 +96,14 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
             endTime={list.endTime}
             allowedToProcess={allowedToProcess}
           />
-          <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
+          {(allowedToProcess && !list.active) || !allowedToProcess && 
+            <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
+          }
           {allowedToProcess && (
             <Box>
-              <PaperSignees listId={list.id} />
+              {!list.active &&
+                <PaperSignees listId={list.id} />
+              }
               <ActionReviewComplete listId={list.id} listStatus={listStatus} />
             </Box>
           )}
diff --git a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
index 96b5b1488381..28c9e1723236 100644
--- a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
+++ b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
@@ -41,7 +41,7 @@ const ActionReviewComplete = ({
   })
 
   return (
-    <Box marginTop={20}>
+    <Box marginTop={12}>
       <Box display="flex" justifyContent="spaceBetween">
         <LockList listId={listId} listStatus={listStatus} />
         <Button

From 696f550fc13fa2d00777b848123ecdaeb133c839 Mon Sep 17 00:00:00 2001
From: andes-it <builders@andes.is>
Date: Mon, 21 Oct 2024 10:46:41 +0000
Subject: [PATCH 3/9] chore: nx format:write update dirty files

---
 .../src/screens-parliamentary/List/index.tsx          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index 85b6c238d40d..1c07b467de6a 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -96,14 +96,13 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
             endTime={list.endTime}
             allowedToProcess={allowedToProcess}
           />
-          {(allowedToProcess && !list.active) || !allowedToProcess && 
-            <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
-          }
+          {(allowedToProcess && !list.active) ||
+            (!allowedToProcess && (
+              <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
+            ))}
           {allowedToProcess && (
             <Box>
-              {!list.active &&
-                <PaperSignees listId={list.id} />
-              }
+              {!list.active && <PaperSignees listId={list.id} />}
               <ActionReviewComplete listId={list.id} listStatus={listStatus} />
             </Box>
           )}

From e383a3471097198fc64bef1f40c3bfef2bf13422 Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 10:54:18 +0000
Subject: [PATCH 4/9] disable buttons according to status

---
 .../src/screens-parliamentary/List/index.tsx  | 15 ++++++++-------
 .../completeReview/index.tsx                  |  1 +
 .../extendDeadline/index.tsx                  | 19 +++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index 85b6c238d40d..7366efc15e9f 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -94,16 +94,17 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
           <ActionExtendDeadline
             listId={list.id}
             endTime={list.endTime}
-            allowedToProcess={allowedToProcess}
+            allowedToProcess={
+              allowedToProcess && listStatus === ListStatus.Extendable
+            }
           />
-          {(allowedToProcess && !list.active) || !allowedToProcess && 
-            <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
-          }
+          {(allowedToProcess && !list.active) ||
+            (!allowedToProcess && (
+              <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
+            ))}
           {allowedToProcess && (
             <Box>
-              {!list.active &&
-                <PaperSignees listId={list.id} />
-              }
+              {!list.active && <PaperSignees listId={list.id} />}
               <ActionReviewComplete listId={list.id} listStatus={listStatus} />
             </Box>
           )}
diff --git a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
index 28c9e1723236..b931adb3e942 100644
--- a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
+++ b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
@@ -49,6 +49,7 @@ const ActionReviewComplete = ({
           variant="ghost"
           icon={listReviewed ? 'reload' : 'checkmark'}
           onClick={() => setModalSubmitReviewIsOpen(true)}
+          disabled={listStatus === ListStatus.Active}
         >
           {modalText}
         </Button>
diff --git a/libs/portals/admin/signature-collection/src/shared-components/extendDeadline/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/extendDeadline/index.tsx
index 871f82f9f927..b49d827c5f7e 100644
--- a/libs/portals/admin/signature-collection/src/shared-components/extendDeadline/index.tsx
+++ b/libs/portals/admin/signature-collection/src/shared-components/extendDeadline/index.tsx
@@ -63,16 +63,15 @@ const ActionExtendDeadline = ({
           readOnly
           value={format(new Date(endDate), 'dd.MM.yyyy HH:mm')}
         />
-        {allowedToProcess && (
-          <Box marginLeft={3}>
-            <Button
-              icon="calendar"
-              iconType="outline"
-              variant="ghost"
-              onClick={() => setModalChangeDateIsOpen(true)}
-            ></Button>
-          </Box>
-        )}
+        <Box marginLeft={3}>
+          <Button
+            icon="calendar"
+            iconType="outline"
+            variant="ghost"
+            disabled={!allowedToProcess}
+            onClick={() => setModalChangeDateIsOpen(true)}
+          ></Button>
+        </Box>
       </Box>
       <Modal
         id="extendDeadline"

From ed3daea75fbe0d21ce53c54d5d2826d574603a9f Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 11:07:23 +0000
Subject: [PATCH 5/9] action disabled

---
 .../src/shared-components/completeReview/index.tsx            | 4 ++--
 .../src/shared-components/completeReview/lockList/index.tsx   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
index b931adb3e942..5240b0db9dfc 100644
--- a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
+++ b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
@@ -6,7 +6,7 @@ import { useToggleListReviewMutation } from './toggleListReview.generated'
 import { useRevalidator } from 'react-router-dom'
 import { m } from '../../lib/messages'
 import { ListStatus } from '../../lib/utils'
-import LockList from './lockList'
+import ActionLockList from './lockList'
 
 const ActionReviewComplete = ({
   listId,
@@ -43,7 +43,7 @@ const ActionReviewComplete = ({
   return (
     <Box marginTop={12}>
       <Box display="flex" justifyContent="spaceBetween">
-        <LockList listId={listId} listStatus={listStatus} />
+        <ActionLockList listId={listId} listStatus={listStatus} />
         <Button
           iconType="outline"
           variant="ghost"
diff --git a/libs/portals/admin/signature-collection/src/shared-components/completeReview/lockList/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/completeReview/lockList/index.tsx
index 5a95d7203aee..f8886457f401 100644
--- a/libs/portals/admin/signature-collection/src/shared-components/completeReview/lockList/index.tsx
+++ b/libs/portals/admin/signature-collection/src/shared-components/completeReview/lockList/index.tsx
@@ -4,7 +4,7 @@ import { useState } from 'react'
 import { Modal } from '@island.is/react/components'
 import { useRevalidator } from 'react-router-dom'
 import { m } from '../../../lib/messages'
-import { ListStatus } from '../../../lib/utils'
+import { ListStatus } from '@island.is/api/schema'
 import { useSignatureCollectionLockListMutation } from './lockList.generated'
 
 const ActionLockList = ({
@@ -44,6 +44,7 @@ const ActionLockList = ({
         icon="lockClosed"
         colorScheme="destructive"
         onClick={() => setModalLockListIsOpen(true)}
+        disabled={listStatus !== ListStatus.Active}
       >
         {formatMessage(m.lockList)}
       </Button>

From b65ad5da5450cfb752676112725a7f572fba62d9 Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 11:31:41 +0000
Subject: [PATCH 6/9] messages cleanup

---
 .../signature-collection/src/lib/messages.ts  | 52 ++++++-------------
 .../src/lib/navigation.ts                     |  4 +-
 .../Constituency/index.tsx                    |  8 +--
 .../src/screens-parliamentary/index.tsx       |  8 +--
 .../screens-presidential/AllLists/index.tsx   |  2 +-
 .../createCollection/index.tsx                |  3 +-
 6 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/lib/messages.ts b/libs/portals/admin/signature-collection/src/lib/messages.ts
index 624895b9f682..704860b4443f 100644
--- a/libs/portals/admin/signature-collection/src/lib/messages.ts
+++ b/libs/portals/admin/signature-collection/src/lib/messages.ts
@@ -13,7 +13,7 @@ export const m = defineMessages({
     description: '',
   },
   signatureListsTitlePresidential: {
-    id: 'admin-portal.signature-collection-parliamentary:signatureLists',
+    id: 'admin-portal.signature-collection:signatureListsTitlePresidential',
     defaultMessage: 'Forsetakosningar',
     description: '',
   },
@@ -166,6 +166,22 @@ export const m = defineMessages({
     defaultMessage: 'Forsetakosningar 2024',
     description: '',
   },
+  parliamentaryCollectionTitle: {
+    id: 'admin-portal.signature-collection:parliamentaryCollectionTitle',
+    defaultMessage: 'Alþingiskosningar',
+    description: '',
+  },
+  parliamentaryCollectionIntro: {
+    id: 'admin-portal.signature-collection:parliamentaryCollectionIntro',
+    defaultMessage: 'Hér er yfirlit yfir kjördæmin sex. Ýttu á viðeigandi kjördæmi til að sjá meðmælendalista í því kjördæmi.',
+    description: '',
+  },
+  parliamentaryConstituencyIntro: {
+    id: 'admin-portal.signature-collection:parliamentaryConstituencyIntro',
+    defaultMessage:
+      'Hér er yfirlit yfir allar meðmælasafnanir sem stofnaðar hafa verið í',
+    description: '',
+  },
   viewList: {
     id: 'admin-portal.signature-collection:viewList',
     defaultMessage: 'Skoða söfnun',
@@ -713,40 +729,6 @@ export const m = defineMessages({
   },
 })
 
-export const parliamentaryMessages = defineMessages({
-  signatureListsTitle: {
-    id: 'admin-portal.signature-collection-parliamentary:signatureLists',
-    defaultMessage: 'Alþingiskosningar',
-    description: '',
-  },
-  signatureListsDescription: {
-    id: 'admin-portal.signature-collection-parliamentary:signatureListsDescription',
-    defaultMessage: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
-    description: '',
-  },
-  signatureListsIntro: {
-    id: 'admin-portal.signature-collection-parliamentary:signatureListsIntro',
-    defaultMessage:
-      'Hér er yfirlit yfir kjördæmin sex. Ýttu á viðeigandi kjördæmi til að sjá meðmælendalista í því kjördæmi.',
-    description: '',
-  },
-  compareListsButton: {
-    id: 'admin-portal.signature-collection-parliamentary:compareListsButton',
-    defaultMessage: 'Bera saman',
-    description: '',
-  },
-  compareListsDescription: {
-    id: 'admin-portal.signature-collection-parliamentary:compareListsDescription',
-    defaultMessage: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit',
-    description: '',
-  },
-  singleConstituencyIntro: {
-    id: 'admin-portal.signature-collection-parliamentary:singleConstituencyIntro',
-    defaultMessage:
-      'Hér er yfirlit yfir allar meðmælasafnanir sem stofnaðar hafa verið í',
-    description: '',
-  },
-})
 
 export const createCollectionErrorMessages = defineMessages({
   age: {
diff --git a/libs/portals/admin/signature-collection/src/lib/navigation.ts b/libs/portals/admin/signature-collection/src/lib/navigation.ts
index c48d371f7453..419e13dc59d7 100644
--- a/libs/portals/admin/signature-collection/src/lib/navigation.ts
+++ b/libs/portals/admin/signature-collection/src/lib/navigation.ts
@@ -1,6 +1,6 @@
 import { PortalNavigationItem } from '@island.is/portals/core'
 import { SignatureCollectionPaths } from './paths'
-import { m, parliamentaryMessages } from './messages'
+import { m } from './messages'
 
 export const signatureCollectionNavigation: PortalNavigationItem = {
   name: m.signatureListsTitle,
@@ -11,7 +11,7 @@ export const signatureCollectionNavigation: PortalNavigationItem = {
   path: SignatureCollectionPaths.ParliamentaryRoot,
   children: [
     {
-      name: parliamentaryMessages.signatureListsTitle,
+      name: m.parliamentaryCollectionTitle,
       path: SignatureCollectionPaths.ParliamentaryRoot,
       activeIfExact: true,
     },
diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
index c9b9ca3f7062..6e2f196eb529 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
@@ -1,7 +1,7 @@
 import { IntroHeader, PortalNavigation } from '@island.is/portals/core'
 import { signatureCollectionNavigation } from '../../lib/navigation'
 import { useLocale } from '@island.is/localization'
-import { m, parliamentaryMessages } from '../../lib/messages'
+import { m } from '../../lib/messages'
 import {
   ActionCard,
   Box,
@@ -91,7 +91,7 @@ export const Constituency = ({
               items={[
                 {
                   title: formatMessage(
-                    parliamentaryMessages.signatureListsTitle,
+                    m.parliamentaryCollectionTitle,
                   ),
                   href: `/stjornbord${SignatureCollectionPaths.ParliamentaryRoot}`,
                 },
@@ -104,7 +104,7 @@ export const Constituency = ({
           <IntroHeader
             title={constituencyName}
             intro={
-              formatMessage(parliamentaryMessages.singleConstituencyIntro) +
+              formatMessage(m.parliamentaryConstituencyIntro) +
               ' ' +
               constituencyName
             }
@@ -231,7 +231,7 @@ export const Constituency = ({
                             }
                           : undefined
                         : {
-                            label: m.confirmListReviewed.defaultMessage,
+                            label: formatMessage(m.confirmListReviewed),
                             variant: 'mint',
                             outlined: false,
                           }
diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
index cc6f244a3984..1acba2b1efeb 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
@@ -13,7 +13,7 @@ import {
 import { useLocale } from '@island.is/localization'
 import { IntroHeader, PortalNavigation } from '@island.is/portals/core'
 import { signatureCollectionNavigation } from '../lib/navigation'
-import { m, parliamentaryMessages } from '../lib/messages'
+import { m } from '../lib/messages'
 import { useLoaderData, useNavigate } from 'react-router-dom'
 import { SignatureCollectionPaths } from '../lib/paths'
 import CompareLists from '../shared-components/compareLists'
@@ -69,15 +69,15 @@ const ParliamentaryRoot = ({
               items={[
                 {
                   title: formatMessage(
-                    parliamentaryMessages.signatureListsTitle,
+                    m.parliamentaryCollectionTitle,
                   ),
                 },
               ]}
             />
           </Box>
           <IntroHeader
-            title={formatMessage(parliamentaryMessages.signatureListsTitle)}
-            intro={formatMessage(parliamentaryMessages.signatureListsIntro)}
+            title={formatMessage(m.parliamentaryCollectionTitle)}
+            intro={formatMessage(m.parliamentaryCollectionIntro)}
             imgPosition="right"
             imgHiddenBelow="sm"
             img={
diff --git a/libs/portals/admin/signature-collection/src/screens-presidential/AllLists/index.tsx b/libs/portals/admin/signature-collection/src/screens-presidential/AllLists/index.tsx
index eca58fdf7704..37dc264b12f2 100644
--- a/libs/portals/admin/signature-collection/src/screens-presidential/AllLists/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-presidential/AllLists/index.tsx
@@ -265,7 +265,7 @@ const Lists = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
                         tag={
                           list.reviewed
                             ? {
-                                label: m.confirmListReviewed.defaultMessage,
+                                label: formatMessage(m.confirmListReviewed),
                                 variant: 'mint',
                                 outlined: false,
                               }
diff --git a/libs/portals/admin/signature-collection/src/shared-components/createCollection/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/createCollection/index.tsx
index 73cb544d1093..12c03e5c9596 100644
--- a/libs/portals/admin/signature-collection/src/shared-components/createCollection/index.tsx
+++ b/libs/portals/admin/signature-collection/src/shared-components/createCollection/index.tsx
@@ -153,7 +153,6 @@ const CreateCollection = ({ collectionId }: { collectionId: string }) => {
                 label={formatMessage(m.candidateName)}
                 readOnly
                 value={name}
-                placeholder={loadingCandidate ? 'Sæki nafn...' : ''}
               />
             </Stack>
             {!canCreate && (
@@ -170,7 +169,7 @@ const CreateCollection = ({ collectionId }: { collectionId: string }) => {
                 onClick={() => {
                   createNewCollection()
                 }}
-                disabled={!canCreate}
+                disabled={!canCreate || !name}
                 loading={loading}
               >
                 {formatMessage(m.createCollection)}

From e560fbd91a3bce99c82deee4f091e0b8e1a735bc Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 11:36:52 +0000
Subject: [PATCH 7/9] fixes

---
 libs/portals/admin/signature-collection/src/lib/messages.ts   | 4 ++--
 .../src/screens-parliamentary/Constituency/index.tsx          | 4 +---
 .../signature-collection/src/screens-parliamentary/index.tsx  | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/lib/messages.ts b/libs/portals/admin/signature-collection/src/lib/messages.ts
index 704860b4443f..f5ba0db59386 100644
--- a/libs/portals/admin/signature-collection/src/lib/messages.ts
+++ b/libs/portals/admin/signature-collection/src/lib/messages.ts
@@ -173,7 +173,8 @@ export const m = defineMessages({
   },
   parliamentaryCollectionIntro: {
     id: 'admin-portal.signature-collection:parliamentaryCollectionIntro',
-    defaultMessage: 'Hér er yfirlit yfir kjördæmin sex. Ýttu á viðeigandi kjördæmi til að sjá meðmælendalista í því kjördæmi.',
+    defaultMessage:
+      'Hér er yfirlit yfir kjördæmin sex. Ýttu á viðeigandi kjördæmi til að sjá meðmælendalista í því kjördæmi.',
     description: '',
   },
   parliamentaryConstituencyIntro: {
@@ -729,7 +730,6 @@ export const m = defineMessages({
   },
 })
 
-
 export const createCollectionErrorMessages = defineMessages({
   age: {
     id: 'admin-portal.signature-collection:error.age',
diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
index 6e2f196eb529..cc7ae4cd8152 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
@@ -90,9 +90,7 @@ export const Constituency = ({
             <Breadcrumbs
               items={[
                 {
-                  title: formatMessage(
-                    m.parliamentaryCollectionTitle,
-                  ),
+                  title: formatMessage(m.parliamentaryCollectionTitle),
                   href: `/stjornbord${SignatureCollectionPaths.ParliamentaryRoot}`,
                 },
                 {
diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
index 1acba2b1efeb..1c1e155ad4c3 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
@@ -68,9 +68,7 @@ const ParliamentaryRoot = ({
             <Breadcrumbs
               items={[
                 {
-                  title: formatMessage(
-                    m.parliamentaryCollectionTitle,
-                  ),
+                  title: formatMessage(m.parliamentaryCollectionTitle),
                 },
               ]}
             />

From 3177163c1309920ca5b84def22ce5d49dad6f3d4 Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 12:00:47 +0000
Subject: [PATCH 8/9] build fix

---
 .../src/screens-parliamentary/List/index.tsx                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index 7366efc15e9f..08e322264228 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -8,7 +8,7 @@ import {
 import { useLocale } from '@island.is/localization'
 import { IntroHeader, PortalNavigation } from '@island.is/portals/core'
 import { signatureCollectionNavigation } from '../../lib/navigation'
-import { m, parliamentaryMessages } from '../../lib/messages'
+import { m } from '../../lib/messages'
 import { useLoaderData } from 'react-router-dom'
 import { ListStatus, SignatureCollectionList } from '@island.is/api/schema'
 import { PaperSignees } from './paperSignees'
@@ -49,7 +49,7 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
               items={[
                 {
                   title: formatMessage(
-                    parliamentaryMessages.signatureListsTitle,
+                    m.parliamentaryCollectionTitle,
                   ),
                   href: `/stjornbord${SignatureCollectionPaths.ParliamentaryRoot}`,
                 },

From 5aa69672b25b4c42998f9cf2dcb2422543ea0dbe Mon Sep 17 00:00:00 2001
From: andes-it <builders@andes.is>
Date: Mon, 21 Oct 2024 12:14:50 +0000
Subject: [PATCH 9/9] chore: nx format:write update dirty files

---
 .../src/screens-parliamentary/List/index.tsx                  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index 08e322264228..48c8d6d1969e 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -48,9 +48,7 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
             <Breadcrumbs
               items={[
                 {
-                  title: formatMessage(
-                    m.parliamentaryCollectionTitle,
-                  ),
+                  title: formatMessage(m.parliamentaryCollectionTitle),
                   href: `/stjornbord${SignatureCollectionPaths.ParliamentaryRoot}`,
                 },
                 {