diff --git a/libs/portals/admin/signature-collection/src/lib/messages.ts b/libs/portals/admin/signature-collection/src/lib/messages.ts
index 04147e17217e..f0e2a7744eb6 100644
--- a/libs/portals/admin/signature-collection/src/lib/messages.ts
+++ b/libs/portals/admin/signature-collection/src/lib/messages.ts
@@ -501,6 +501,11 @@ export const m = defineMessages({
defaultMessage: 'Úrvinnslu lokið',
description: '',
},
+ toggleReviewSuccessToggleBack: {
+ id: 'admin-portal.signature-collection:toggleReviewSuccessToggleBack',
+ defaultMessage: 'Tókst að opna fyrir úrvinnslu',
+ description: '',
+ },
lockList: {
id: 'admin-portal.signature-collection:lockList',
defaultMessage: 'Læsa söfnun',
@@ -754,6 +759,11 @@ export const m = defineMessages({
defaultMessage: 'Ekki tókst að skrá meðmæli',
description: '',
},
+ paperSigneeErrorAlreadySigned: {
+ id: 'admin-portal.signature-collection:paperSigneeErrorAlreadySigned',
+ defaultMessage: 'Kennitala er þegar á lista',
+ description: '',
+ },
})
export const createCollectionErrorMessages = defineMessages({
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 239ecbc8a5e1..419a9c6bd199 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
@@ -131,13 +131,10 @@ export const Constituency = ({
': ' +
constituencyLists.length}
- {allowedToProcess &&
- collectionStatus === CollectionStatus.InInitialReview && (
-
- )}
+
{constituencyLists.map((list) => (
diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/paperSignees/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/paperSignees/index.tsx
index 38d624aeec34..e8d3b39e0392 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/paperSignees/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/paperSignees/index.tsx
@@ -75,7 +75,13 @@ export const PaperSignees = ({ listId }: { listId: string }) => {
if (res.signatureCollectionAdminUploadPaperSignature?.success) {
toast.success(formatMessage(m.paperSigneeSuccess))
} else {
- toast.error(formatMessage(m.paperSigneeError))
+ if (
+ res.signatureCollectionAdminUploadPaperSignature?.reasons?.includes(
+ 'alreadySigned',
+ )
+ ) {
+ toast.error(formatMessage(m.paperSigneeErrorAlreadySigned))
+ }
}
reset()
revalidate()
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 7da91a5a0a37..bf67334a38fe 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
@@ -35,7 +35,11 @@ const ActionReviewComplete = ({
onCompleted: () => {
setModalSubmitReviewIsOpen(false)
revalidate()
- toast.success(formatMessage(m.toggleReviewSuccess))
+ toast.success(
+ listReviewed
+ ? formatMessage(m.toggleReviewSuccessToggleBack)
+ : formatMessage(m.toggleReviewSuccess),
+ )
},
onError: () => {
toast.error(formatMessage(m.toggleReviewError))