From c242c18cc139479ea5d239e6609a4936e959ae46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 13:03:36 +0000
Subject: [PATCH 01/21] Fix locale updates. Add cleanstring

---
 .../Notifications/NotificationButton.tsx           |  9 +++++++--
 .../api/domains/notifications/src/utils/helpers.ts | 14 ++++++++++----
 .../screens/Notifications/Notifications.graphql    | 11 +++++++----
 .../src/screens/Notifications/Notifications.tsx    | 10 ++++++++--
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/apps/service-portal/src/components/Notifications/NotificationButton.tsx b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
index 95bd7a20d4f1..82583f47e539 100644
--- a/apps/service-portal/src/components/Notifications/NotificationButton.tsx
+++ b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
@@ -24,21 +24,26 @@ const NotificationButton = ({
   showMenu = false,
   disabled,
 }: Props) => {
-  const { formatMessage } = useLocale()
+  const { formatMessage, lang } = useLocale()
   const [hasMarkedLocally, setHasMarkedLocally] = useState(false)
   const [markAllAsSeen] = useMarkAllNotificationsAsSeenMutation()
   const { width } = useWindowSize()
   const isMobile = width < theme.breakpoints.md
   const ref = useRef<HTMLButtonElement>(null)
 
-  const { data } = useGetUserNotificationsOverviewQuery({
+  const { data, refetch } = useGetUserNotificationsOverviewQuery({
     variables: {
       input: {
         limit: 5,
       },
+      locale: lang,
     },
   })
 
+  useEffect(() => {
+    refetch()
+  }, [lang, refetch])
+
   const showBadge =
     !!data?.userNotificationsOverview?.unseenCount && !hasMarkedLocally
 
diff --git a/libs/api/domains/notifications/src/utils/helpers.ts b/libs/api/domains/notifications/src/utils/helpers.ts
index 2e45833e1afe..918804210289 100644
--- a/libs/api/domains/notifications/src/utils/helpers.ts
+++ b/libs/api/domains/notifications/src/utils/helpers.ts
@@ -1,6 +1,10 @@
 import { RenderedNotificationDto } from '@island.is/clients/user-notification'
 import { Notification } from '../lib/notifications.model'
 
+const cleanString = (str: string) => {
+  return str.replace(/\s+/g, ' ').trim()
+}
+
 export const notificationMapper = (
   notification: RenderedNotificationDto,
 ): Notification => ({
@@ -20,10 +24,12 @@ export const notificationMapper = (
     nationalId: undefined,
   },
   message: {
-    title: notification.title,
-    body: notification.body,
-    dataCopy: notification.dataCopy,
-    displayBody: notification.dataCopy ?? notification.body,
+    title: cleanString(notification.title ?? ''),
+    body: cleanString(notification.body ?? ''),
+    dataCopy: notification.dataCopy
+      ? cleanString(notification.dataCopy)
+      : undefined,
+    displayBody: cleanString(notification.dataCopy ?? notification.body),
     link: {
       url: notification.clickActionUrl,
     },
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
index b370a1d97a3d..8aec19cda7e5 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
@@ -32,8 +32,8 @@ fragment NotificationDataFields on Notification {
   }
 }
 
-query GetUserNotifications($input: NotificationsInput!) {
-  userNotifications(input: $input) {
+query GetUserNotifications($input: NotificationsInput!, $locale: String!) {
+  userNotifications(input: $input, locale: $locale) {
     data {
       ...NotificationDataFields
       recipient {
@@ -52,8 +52,11 @@ query GetUserNotifications($input: NotificationsInput!) {
   }
 }
 
-query GetUserNotificationsOverview($input: NotificationsInput!) {
-  userNotificationsOverview: userNotifications(input: $input) {
+query GetUserNotificationsOverview(
+  $input: NotificationsInput!
+  $locale: String!
+) {
+  userNotificationsOverview: userNotifications(input: $input, locale: $locale) {
     data {
       ...NotificationDataFields
     }
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
index 294bec5bc6cf..96dea2401617 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import {
   Box,
   Button,
@@ -32,7 +32,7 @@ const DEFAULT_PAGE_SIZE = 5
 
 const UserNotifications = () => {
   useNamespaces('sp.information-notifications')
-  const { formatMessage } = useLocale()
+  const { formatMessage, lang } = useLocale()
   const [loadingMore, setLoadingMore] = useState(false)
 
   const [postMarkAsRead] = useMarkUserNotificationAsReadMutation()
@@ -54,9 +54,14 @@ const UserNotifications = () => {
           before: '',
           after: '',
         },
+        locale: lang,
       },
     })
 
+  useEffect(() => {
+    refetch()
+  }, [refetch, lang])
+
   const loadMore = (cursor: string) => {
     if (loadingMore) return
     setLoadingMore(true)
@@ -67,6 +72,7 @@ const UserNotifications = () => {
           before: '',
           after: cursor,
         },
+        locale: lang,
       },
       updateQuery: (prevResult, { fetchMoreResult }) => {
         if (

From 5a25e302fc22c9841c9b2a73a2e6987b7933bff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 13:16:33 +0000
Subject: [PATCH 02/21] update string clean

---
 libs/api/domains/notifications/src/utils/helpers.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libs/api/domains/notifications/src/utils/helpers.ts b/libs/api/domains/notifications/src/utils/helpers.ts
index 918804210289..f8c68345fd92 100644
--- a/libs/api/domains/notifications/src/utils/helpers.ts
+++ b/libs/api/domains/notifications/src/utils/helpers.ts
@@ -1,7 +1,10 @@
 import { RenderedNotificationDto } from '@island.is/clients/user-notification'
 import { Notification } from '../lib/notifications.model'
 
-const cleanString = (str: string) => {
+const cleanString = (str?: string) => {
+  if (!str) {
+    return ''
+  }
   return str.replace(/\s+/g, ' ').trim()
 }
 
@@ -24,8 +27,8 @@ export const notificationMapper = (
     nationalId: undefined,
   },
   message: {
-    title: cleanString(notification.title ?? ''),
-    body: cleanString(notification.body ?? ''),
+    title: cleanString(notification.title),
+    body: cleanString(notification.body),
     dataCopy: notification.dataCopy
       ? cleanString(notification.dataCopy)
       : undefined,

From 6f1509f83e78fd9f33a626b8f669f5239a2ef608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 13:34:17 +0000
Subject: [PATCH 03/21] Update packagejson

---
 libs/service-portal/information/project.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/service-portal/information/project.json b/libs/service-portal/information/project.json
index c7d097c4d436..967f733f0c68 100644
--- a/libs/service-portal/information/project.json
+++ b/libs/service-portal/information/project.json
@@ -29,6 +29,7 @@
     "codegen/frontend-client": {
       "executor": "nx:run-commands",
       "options": {
+        "parallel": false,
         "output": "libs/service-portal/information/src/**/*.generated.ts",
         "command": "graphql-codegen --config libs/service-portal/information/codegen.yml"
       }

From b72757734da3b8047772dcfcf690b1418880cc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 14:37:27 +0000
Subject: [PATCH 04/21] Update query

---
 .../information/src/screens/Notifications/Notifications.graphql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
index 8aec19cda7e5..63fe15c7f240 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
@@ -32,7 +32,7 @@ fragment NotificationDataFields on Notification {
   }
 }
 
-query GetUserNotifications($input: NotificationsInput!, $locale: String!) {
+query GetUserNotifications($input: NotificationsInput!, $locale: String) {
   userNotifications(input: $input, locale: $locale) {
     data {
       ...NotificationDataFields

From ae5d56a8d400dde018a01c5c7df1ab12d94b8773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 14:43:33 +0000
Subject: [PATCH 05/21] Update query

---
 .../src/components/Notifications/NotificationButton.tsx         | 1 -
 .../information/src/screens/Notifications/Notifications.graphql | 2 +-
 .../information/src/screens/Notifications/Notifications.tsx     | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/service-portal/src/components/Notifications/NotificationButton.tsx b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
index 82583f47e539..9461de07f11b 100644
--- a/apps/service-portal/src/components/Notifications/NotificationButton.tsx
+++ b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
@@ -36,7 +36,6 @@ const NotificationButton = ({
       input: {
         limit: 5,
       },
-      locale: lang,
     },
   })
 
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
index 63fe15c7f240..c92e90e288f3 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
@@ -54,7 +54,7 @@ query GetUserNotifications($input: NotificationsInput!, $locale: String) {
 
 query GetUserNotificationsOverview(
   $input: NotificationsInput!
-  $locale: String!
+  $locale: String
 ) {
   userNotificationsOverview: userNotifications(input: $input, locale: $locale) {
     data {
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
index 96dea2401617..0b0b809f0d0d 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -54,7 +54,6 @@ const UserNotifications = () => {
           before: '',
           after: '',
         },
-        locale: lang,
       },
     })
 
@@ -72,7 +71,6 @@ const UserNotifications = () => {
           before: '',
           after: cursor,
         },
-        locale: lang,
       },
       updateQuery: (prevResult, { fetchMoreResult }) => {
         if (

From 1a60cbb02786d1101c33684357c1844b69641281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 15:02:44 +0000
Subject: [PATCH 06/21] Add lang option

---
 .../src/components/Notifications/NotificationButton.tsx         | 1 +
 .../information/src/screens/Notifications/Notifications.tsx     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/apps/service-portal/src/components/Notifications/NotificationButton.tsx b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
index 9461de07f11b..82583f47e539 100644
--- a/apps/service-portal/src/components/Notifications/NotificationButton.tsx
+++ b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
@@ -36,6 +36,7 @@ const NotificationButton = ({
       input: {
         limit: 5,
       },
+      locale: lang,
     },
   })
 
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
index 0b0b809f0d0d..96dea2401617 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -54,6 +54,7 @@ const UserNotifications = () => {
           before: '',
           after: '',
         },
+        locale: lang,
       },
     })
 
@@ -71,6 +72,7 @@ const UserNotifications = () => {
           before: '',
           after: cursor,
         },
+        locale: lang,
       },
       updateQuery: (prevResult, { fetchMoreResult }) => {
         if (

From 76f5cf009eeeaa9f164ff819ef616a89c52df56d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 15:14:18 +0000
Subject: [PATCH 07/21] Test

---
 .../src/components/Notifications/NotificationButton.tsx          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/service-portal/src/components/Notifications/NotificationButton.tsx b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
index 82583f47e539..9461de07f11b 100644
--- a/apps/service-portal/src/components/Notifications/NotificationButton.tsx
+++ b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
@@ -36,7 +36,6 @@ const NotificationButton = ({
       input: {
         limit: 5,
       },
-      locale: lang,
     },
   })
 

From 895b2187cd27ae629eedc6bbbb74fd5b24244df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 15:34:23 +0000
Subject: [PATCH 08/21] Fix

---
 .../src/components/Notifications/NotificationButton.tsx       | 1 +
 libs/service-portal/information/project.json                  | 1 -
 .../src/screens/Notifications/Notifications.graphql           | 2 +-
 .../information/src/screens/Notifications/Notifications.tsx   | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/service-portal/src/components/Notifications/NotificationButton.tsx b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
index 9461de07f11b..82583f47e539 100644
--- a/apps/service-portal/src/components/Notifications/NotificationButton.tsx
+++ b/apps/service-portal/src/components/Notifications/NotificationButton.tsx
@@ -36,6 +36,7 @@ const NotificationButton = ({
       input: {
         limit: 5,
       },
+      locale: lang,
     },
   })
 
diff --git a/libs/service-portal/information/project.json b/libs/service-portal/information/project.json
index 967f733f0c68..c7d097c4d436 100644
--- a/libs/service-portal/information/project.json
+++ b/libs/service-portal/information/project.json
@@ -29,7 +29,6 @@
     "codegen/frontend-client": {
       "executor": "nx:run-commands",
       "options": {
-        "parallel": false,
         "output": "libs/service-portal/information/src/**/*.generated.ts",
         "command": "graphql-codegen --config libs/service-portal/information/codegen.yml"
       }
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
index c92e90e288f3..b3dbcdbf1c08 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
@@ -32,7 +32,7 @@ fragment NotificationDataFields on Notification {
   }
 }
 
-query GetUserNotifications($input: NotificationsInput!, $locale: String) {
+query GetUserNotificationsList($input: NotificationsInput!, $locale: String) {
   userNotifications(input: $input, locale: $locale) {
     data {
       ...NotificationDataFields
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
index 96dea2401617..7914eaf6defa 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -17,7 +17,7 @@ import {
 } from '@island.is/service-portal/core'
 
 import {
-  useGetUserNotificationsQuery,
+  useGetUserNotificationsListQuery,
   useMarkAllNotificationsAsReadMutation,
   useMarkUserNotificationAsReadMutation,
 } from './Notifications.generated'
@@ -47,7 +47,7 @@ const UserNotifications = () => {
   })
 
   const { data, loading, error, refetch, fetchMore } =
-    useGetUserNotificationsQuery({
+    useGetUserNotificationsListQuery({
       variables: {
         input: {
           limit: DEFAULT_PAGE_SIZE,

From f6bda61fd436a8fe4f9dd66949f4cecd7d7b23e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 16:22:41 +0000
Subject: [PATCH 09/21] Add locale

---
 .../Notifications/Notifications.graphql       |  2 +-
 .../screens/Notifications/Notifications.tsx   | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
index b3dbcdbf1c08..127f773a3515 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
@@ -33,7 +33,7 @@ fragment NotificationDataFields on Notification {
 }
 
 query GetUserNotificationsList($input: NotificationsInput!, $locale: String) {
-  userNotifications(input: $input, locale: $locale) {
+  userNotificationsList: userNotifications(input: $input, locale: $locale) {
     data {
       ...NotificationDataFields
       recipient {
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
index 7914eaf6defa..7851c5b3050b 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -76,12 +76,12 @@ const UserNotifications = () => {
       },
       updateQuery: (prevResult, { fetchMoreResult }) => {
         if (
-          fetchMoreResult?.userNotifications?.data.length &&
-          prevResult?.userNotifications?.data.length
+          fetchMoreResult?.userNotificationsList?.data.length &&
+          prevResult?.userNotificationsList?.data.length
         ) {
-          fetchMoreResult.userNotifications.data = [
-            ...prevResult.userNotifications.data,
-            ...fetchMoreResult.userNotifications.data,
+          fetchMoreResult.userNotificationsList.data = [
+            ...prevResult.userNotificationsList.data,
+            ...fetchMoreResult.userNotificationsList.data,
           ]
           return fetchMoreResult
         }
@@ -90,7 +90,8 @@ const UserNotifications = () => {
     }).finally(() => setLoadingMore(false))
   }
 
-  const noData = !data?.userNotifications?.data?.length && !loading && !error
+  const noData =
+    !data?.userNotificationsList?.data?.length && !loading && !error
   return (
     <>
       <IntroHeader
@@ -144,7 +145,7 @@ const UserNotifications = () => {
         )}
 
         {!loading &&
-          data?.userNotifications?.data.map((item) => (
+          data?.userNotificationsList?.data.map((item) => (
             <ActionCard
               heading={item.message.title}
               text={item.message.displayBody}
@@ -174,7 +175,7 @@ const UserNotifications = () => {
             />
           ))}
         {loadingMore && <CardLoader />}
-        {data?.userNotifications?.pageInfo.hasNextPage ? (
+        {data?.userNotificationsList?.pageInfo.hasNextPage ? (
           <Box
             display="flex"
             alignItems="center"
@@ -183,14 +184,14 @@ const UserNotifications = () => {
           >
             <Button
               onClick={() =>
-                loadMore(data?.userNotifications?.pageInfo.endCursor ?? '')
+                loadMore(data?.userNotificationsList?.pageInfo.endCursor ?? '')
               }
               variant="ghost"
               size="small"
             >
               {`${formatMessage(m.fetchMore)} ${
-                data?.userNotifications?.data?.length ?? 0
-              }/${data?.userNotifications?.totalCount ?? 1}`}
+                data?.userNotificationsList?.data?.length ?? 0
+              }/${data?.userNotificationsList?.totalCount ?? 1}`}
             </Button>
           </Box>
         ) : undefined}

From 332484d3ab5cba69c3ceb1a6d52615177da0ef76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Fri, 14 Jun 2024 16:32:13 +0000
Subject: [PATCH 10/21] Test name update

---
 libs/service-portal/information/src/index.ts                    | 2 +-
 .../{Notifications.graphql => NotificationInfo.graphql}         | 0
 .../information/src/screens/Notifications/Notifications.tsx     | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename libs/service-portal/information/src/screens/Notifications/{Notifications.graphql => NotificationInfo.graphql} (100%)

diff --git a/libs/service-portal/information/src/index.ts b/libs/service-portal/information/src/index.ts
index 2a9e5fd8c20c..0461ff590ce8 100644
--- a/libs/service-portal/information/src/index.ts
+++ b/libs/service-portal/information/src/index.ts
@@ -4,7 +4,7 @@ export * from './module'
 export * from './lib/navigation'
 export * from './lib/paths'
 export * from './components/FamilyMemberCard/FamilyMemberCard'
-export * from './screens/Notifications/Notifications.generated'
+export * from './screens/Notifications/NotificationInfo.generated'
 export * from './utils/notificationLinkResolver'
 
 /**
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql b/libs/service-portal/information/src/screens/Notifications/NotificationInfo.graphql
similarity index 100%
rename from libs/service-portal/information/src/screens/Notifications/Notifications.graphql
rename to libs/service-portal/information/src/screens/Notifications/NotificationInfo.graphql
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
index 7851c5b3050b..2ba20eb98864 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -20,7 +20,7 @@ import {
   useGetUserNotificationsListQuery,
   useMarkAllNotificationsAsReadMutation,
   useMarkUserNotificationAsReadMutation,
-} from './Notifications.generated'
+} from './NotificationInfo.generated'
 
 import { mInformationNotifications } from '../../lib/messages'
 import { ActionCard, CardLoader } from '@island.is/service-portal/core'

From 825347cec0b37d52a8042daa12d7b901d479988c Mon Sep 17 00:00:00 2001
From: lommi <jonorn@gmail.com>
Date: Fri, 14 Jun 2024 16:54:39 +0000
Subject: [PATCH 11/21] fix: force generated files

---
 scripts/ci/cache/__config.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/cache/__config.mjs b/scripts/ci/cache/__config.mjs
index eb31e5e661c4..d16f0851dcd3 100644
--- a/scripts/ci/cache/__config.mjs
+++ b/scripts/ci/cache/__config.mjs
@@ -23,6 +23,7 @@ import { keyStorage } from './_key_storage.mjs'
 
 // When testing this is good to manipulate
 const HASH_VERSION = `newcache-${6}`
+const GENERATED_FILES_VERSION = '2024061401-notifications-locale-cleanstring';
 
 export const ENABLED_MODULES = (process.env[ENV_ENABLED_CACHE] || '')
   .split(',')
@@ -85,7 +86,7 @@ export const caches = [
     enabled: ENABLED_MODULES['generated-files'],
     hash: async () =>
       keyStorage.getKey('generated-files') ??
-      `generated-files-${HASH_VERSION}-${getPlatformString()}-${await getYarnLockHash()}-${await getPackageHash()}-${await getGeneratedFileHash()}`,
+      `generated-files-${GENERATED_FILES_VERSION}-${HASH_VERSION}-${getPlatformString()}-${await getYarnLockHash()}-${await getPackageHash()}-${await getGeneratedFileHash()}`,
     name: 'Cache Generated Files',
     id: 'generated-files',
     path: 'generated_files.tar.gz',

From bf4e3b10fdf5df542532a282948b9074f1d291b2 Mon Sep 17 00:00:00 2001
From: andes-it <builders@andes.is>
Date: Fri, 14 Jun 2024 17:06:09 +0000
Subject: [PATCH 12/21] chore: nx format:write update dirty files

---
 scripts/ci/cache/__config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/cache/__config.mjs b/scripts/ci/cache/__config.mjs
index d16f0851dcd3..1d2a84f7788d 100644
--- a/scripts/ci/cache/__config.mjs
+++ b/scripts/ci/cache/__config.mjs
@@ -23,7 +23,7 @@ import { keyStorage } from './_key_storage.mjs'
 
 // When testing this is good to manipulate
 const HASH_VERSION = `newcache-${6}`
-const GENERATED_FILES_VERSION = '2024061401-notifications-locale-cleanstring';
+const GENERATED_FILES_VERSION = '2024061401-notifications-locale-cleanstring'
 
 export const ENABLED_MODULES = (process.env[ENV_ENABLED_CACHE] || '')
   .split(',')

From 17e56731695005a04a69330071348d2198cebf16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Mon, 17 Jun 2024 23:53:24 +0000
Subject: [PATCH 13/21] Revert test

---
 libs/service-portal/information/src/index.ts  |  2 +-
 ...tionInfo.graphql => Notifications.graphql} |  2 +-
 .../screens/Notifications/Notifications.tsx   | 25 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)
 rename libs/service-portal/information/src/screens/Notifications/{NotificationInfo.graphql => Notifications.graphql} (94%)

diff --git a/libs/service-portal/information/src/index.ts b/libs/service-portal/information/src/index.ts
index 0461ff590ce8..2a9e5fd8c20c 100644
--- a/libs/service-portal/information/src/index.ts
+++ b/libs/service-portal/information/src/index.ts
@@ -4,7 +4,7 @@ export * from './module'
 export * from './lib/navigation'
 export * from './lib/paths'
 export * from './components/FamilyMemberCard/FamilyMemberCard'
-export * from './screens/Notifications/NotificationInfo.generated'
+export * from './screens/Notifications/Notifications.generated'
 export * from './utils/notificationLinkResolver'
 
 /**
diff --git a/libs/service-portal/information/src/screens/Notifications/NotificationInfo.graphql b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
similarity index 94%
rename from libs/service-portal/information/src/screens/Notifications/NotificationInfo.graphql
rename to libs/service-portal/information/src/screens/Notifications/Notifications.graphql
index 127f773a3515..b3dbcdbf1c08 100644
--- a/libs/service-portal/information/src/screens/Notifications/NotificationInfo.graphql
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.graphql
@@ -33,7 +33,7 @@ fragment NotificationDataFields on Notification {
 }
 
 query GetUserNotificationsList($input: NotificationsInput!, $locale: String) {
-  userNotificationsList: userNotifications(input: $input, locale: $locale) {
+  userNotifications(input: $input, locale: $locale) {
     data {
       ...NotificationDataFields
       recipient {
diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
index 2ba20eb98864..7914eaf6defa 100644
--- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
+++ b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -20,7 +20,7 @@ import {
   useGetUserNotificationsListQuery,
   useMarkAllNotificationsAsReadMutation,
   useMarkUserNotificationAsReadMutation,
-} from './NotificationInfo.generated'
+} from './Notifications.generated'
 
 import { mInformationNotifications } from '../../lib/messages'
 import { ActionCard, CardLoader } from '@island.is/service-portal/core'
@@ -76,12 +76,12 @@ const UserNotifications = () => {
       },
       updateQuery: (prevResult, { fetchMoreResult }) => {
         if (
-          fetchMoreResult?.userNotificationsList?.data.length &&
-          prevResult?.userNotificationsList?.data.length
+          fetchMoreResult?.userNotifications?.data.length &&
+          prevResult?.userNotifications?.data.length
         ) {
-          fetchMoreResult.userNotificationsList.data = [
-            ...prevResult.userNotificationsList.data,
-            ...fetchMoreResult.userNotificationsList.data,
+          fetchMoreResult.userNotifications.data = [
+            ...prevResult.userNotifications.data,
+            ...fetchMoreResult.userNotifications.data,
           ]
           return fetchMoreResult
         }
@@ -90,8 +90,7 @@ const UserNotifications = () => {
     }).finally(() => setLoadingMore(false))
   }
 
-  const noData =
-    !data?.userNotificationsList?.data?.length && !loading && !error
+  const noData = !data?.userNotifications?.data?.length && !loading && !error
   return (
     <>
       <IntroHeader
@@ -145,7 +144,7 @@ const UserNotifications = () => {
         )}
 
         {!loading &&
-          data?.userNotificationsList?.data.map((item) => (
+          data?.userNotifications?.data.map((item) => (
             <ActionCard
               heading={item.message.title}
               text={item.message.displayBody}
@@ -175,7 +174,7 @@ const UserNotifications = () => {
             />
           ))}
         {loadingMore && <CardLoader />}
-        {data?.userNotificationsList?.pageInfo.hasNextPage ? (
+        {data?.userNotifications?.pageInfo.hasNextPage ? (
           <Box
             display="flex"
             alignItems="center"
@@ -184,14 +183,14 @@ const UserNotifications = () => {
           >
             <Button
               onClick={() =>
-                loadMore(data?.userNotificationsList?.pageInfo.endCursor ?? '')
+                loadMore(data?.userNotifications?.pageInfo.endCursor ?? '')
               }
               variant="ghost"
               size="small"
             >
               {`${formatMessage(m.fetchMore)} ${
-                data?.userNotificationsList?.data?.length ?? 0
-              }/${data?.userNotificationsList?.totalCount ?? 1}`}
+                data?.userNotifications?.data?.length ?? 0
+              }/${data?.userNotifications?.totalCount ?? 1}`}
             </Button>
           </Box>
         ) : undefined}

From 2f282245610e67a089451e10da51566846620a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20Hafli=C3=B0ason?=
 <tolleinn@gmail.com>
Date: Tue, 18 Jun 2024 00:27:42 +0000
Subject: [PATCH 14/21] Remove ff

---
 .../api/domains/notifications/src/lib/notifications.resolver.ts | 2 --
 .../domains/notifications/src/lib/notificationsList.resolver.ts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/libs/api/domains/notifications/src/lib/notifications.resolver.ts b/libs/api/domains/notifications/src/lib/notifications.resolver.ts
index 0f4ee313468d..8b9d124e7359 100644
--- a/libs/api/domains/notifications/src/lib/notifications.resolver.ts
+++ b/libs/api/domains/notifications/src/lib/notifications.resolver.ts
@@ -13,7 +13,6 @@ import {
 } from './notifications.model'
 import type { Locale } from '@island.is/shared/types'
 import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
-import { FeatureFlag, Features } from '@island.is/nest/feature-flags'
 
 const LOG_CATEGORY = 'notifications-resolver'
 export const AUDIT_NAMESPACE = 'notifications-resolver'
@@ -22,7 +21,6 @@ export const AUDIT_NAMESPACE = 'notifications-resolver'
 @Resolver()
 @Audit({ namespace: AUDIT_NAMESPACE })
 @Scopes(DocumentsScope.main)
-@FeatureFlag(Features.ServicePortalNotificationsEnabled)
 export class NotificationsResolver {
   constructor(
     private readonly service: NotificationsService,
diff --git a/libs/api/domains/notifications/src/lib/notificationsList.resolver.ts b/libs/api/domains/notifications/src/lib/notificationsList.resolver.ts
index 738fc7d18d58..cd2b81bc5d19 100644
--- a/libs/api/domains/notifications/src/lib/notificationsList.resolver.ts
+++ b/libs/api/domains/notifications/src/lib/notificationsList.resolver.ts
@@ -26,7 +26,6 @@ import type { Locale } from '@island.is/shared/types'
 import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
 import { Loader } from '@island.is/nest/dataloader'
 import { AUDIT_NAMESPACE } from './notifications.resolver'
-import { FeatureFlag, Features } from '@island.is/nest/feature-flags'
 import { DocumentsScope } from '@island.is/auth/scopes'
 
 const LOG_CATEGORY = 'notification-list-resolver'
@@ -35,7 +34,6 @@ const LOG_CATEGORY = 'notification-list-resolver'
 @Resolver(() => NotificationsResponse)
 @Audit({ namespace: AUDIT_NAMESPACE })
 @Scopes(DocumentsScope.main)
-@FeatureFlag(Features.ServicePortalNotificationsEnabled)
 export class NotificationsListResolver {
   constructor(
     private readonly service: NotificationsService,

From b36f87cae4d77d4976c29e33f91e9b52ee89a931 Mon Sep 17 00:00:00 2001
From: lommi <jonorn@gmail.com>
Date: Tue, 18 Jun 2024 10:17:48 +0000
Subject: [PATCH 15/21] fix: hash generated files

---
 scripts/_hash-generated-files.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_hash-generated-files.sh b/scripts/_hash-generated-files.sh
index 87acbd3cd1aa..b45e6576e1d3 100755
--- a/scripts/_hash-generated-files.sh
+++ b/scripts/_hash-generated-files.sh
@@ -33,7 +33,7 @@ patterns=(
 	'apps/**/*.union.ts'
 	'libs/**/*.union.ts'
 	'apps/**/*.graphql.ts'
-	'apps/judicial-system/**/*.graphql'
+	'apps/**/*.graphql'
 	'libs/**/*.graphql.ts'
 	'libs/**/*.graphql'
 	'libs/**/clientConfig.yaml'

From 56f72cc986d78b760cb0da6bfef73ee22f2ba126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gu=C3=B0j=C3=B3n=20Gu=C3=B0j=C3=B3nsson?=
 <gudjon@kolibri.is>
Date: Tue, 18 Jun 2024 09:24:09 +0000
Subject: [PATCH 16/21] fix(j-s): Null Service Reference (#15247)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .../backend/src/app/modules/case/internalCase.service.ts         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts b/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts
index fa2f48a5ab7c..3f1330ed5351 100644
--- a/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts
+++ b/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts
@@ -164,6 +164,7 @@ export class InternalCaseService {
     private readonly defendantService: DefendantService,
     @Inject(forwardRef(() => EventLogService))
     private readonly eventLogService: EventLogService,
+    @Inject(forwardRef(() => PDFService))
     private readonly pdfService: PDFService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
   ) {}

From 3b25846bb5442412759083a2f49768999ddb0a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3rey=20J=C3=B3na?= <thoreyjona@gmail.com>
Date: Tue, 18 Jun 2024 09:55:34 +0000
Subject: [PATCH 17/21] feat(native-app): Notifications final improvements
 (#15240)

* feat: buttons at top should not be sticky

* feat: add empty state for notifications

* fix: make sure to update unreadCount in inbox when fetching next page

* feat: add fallback icon for notifications

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 apps/native/app/src/messages/en.ts            |   3 +
 apps/native/app/src/messages/is.ts            |   3 +
 apps/native/app/src/screens/inbox/inbox.tsx   |   1 +
 .../screens/notifications/notifications.tsx   | 125 ++++++++++++------
 .../app/src/ui/lib/empty-state/empty-list.tsx |  20 +--
 5 files changed, 97 insertions(+), 55 deletions(-)

diff --git a/apps/native/app/src/messages/en.ts b/apps/native/app/src/messages/en.ts
index 2490a8017358..6792e2614ac4 100644
--- a/apps/native/app/src/messages/en.ts
+++ b/apps/native/app/src/messages/en.ts
@@ -281,6 +281,9 @@ export const en: TranslatedMessages = {
   'notifications.markAllAsRead': 'Mark all as read',
   'notifications.settings': 'My settings',
   'notifications.errorUnknown': 'Error occurred while loading notifications',
+  'notifications.emptyListTitle': 'No notifications',
+  'notifications.emptyListDescription':
+    'When you receive notifications, they will appear here.',
 
   // profile
   'profile.screenTitle': 'More',
diff --git a/apps/native/app/src/messages/is.ts b/apps/native/app/src/messages/is.ts
index f6754c762e4c..c3bcdb5d8bf4 100644
--- a/apps/native/app/src/messages/is.ts
+++ b/apps/native/app/src/messages/is.ts
@@ -415,6 +415,9 @@ export const is = {
   'notifications.markAllAsRead': 'Merkja allt lesið',
   'notifications.settings': 'Mínar stillingar',
   'notifications.errorUnknown': 'Villa kom upp við að sækja tilkynningar',
+  'notifications.emptyListTitle': 'Engar tilkynningar',
+  'notifications.emptyListDescription':
+    'Þegar þú færð sendar tilkynningar þá birtast þær hér.',
 
   // applications screen
   'applications.title': 'Umsóknir',
diff --git a/apps/native/app/src/screens/inbox/inbox.tsx b/apps/native/app/src/screens/inbox/inbox.tsx
index 334c2ae70252..308966c19068 100644
--- a/apps/native/app/src/screens/inbox/inbox.tsx
+++ b/apps/native/app/src/screens/inbox/inbox.tsx
@@ -217,6 +217,7 @@ function useInboxQuery(incomingFilters?: Filters) {
                 ...(data.documentsV2?.data ?? []),
               ],
               totalCount: data.documentsV2?.totalCount ?? 0,
+              unreadCount: data.documentsV2?.unreadCount ?? 0,
             }))
           } else {
             setData(data.documentsV2)
diff --git a/apps/native/app/src/screens/notifications/notifications.tsx b/apps/native/app/src/screens/notifications/notifications.tsx
index 548498d79e15..aa54c3fe624a 100644
--- a/apps/native/app/src/screens/notifications/notifications.tsx
+++ b/apps/native/app/src/screens/notifications/notifications.tsx
@@ -4,13 +4,20 @@ import {
   NotificationCard,
   Problem,
   ListItemSkeleton,
+  EmptyList,
 } from '@ui'
 import { useApolloClient } from '@apollo/client'
 
 import { dismissAllNotificationsAsync } from 'expo-notifications'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useIntl } from 'react-intl'
-import { ActivityIndicator, FlatList, SafeAreaView } from 'react-native'
+import {
+  ActivityIndicator,
+  FlatList,
+  SafeAreaView,
+  View,
+  Image,
+} from 'react-native'
 import {
   Navigation,
   NavigationFunctionComponent,
@@ -37,6 +44,7 @@ import { isAndroid } from '../../utils/devices'
 import { testIDs } from '../../utils/test-ids'
 import settings from '../../assets/icons/settings.png'
 import inboxRead from '../../assets/icons/inbox-read.png'
+import emptyIllustrationSrc from '../../assets/illustrations/le-company-s3.png'
 
 const LoadingWrapper = styled.View`
   padding-vertical: ${({ theme }) => theme.spacing[3]}px;
@@ -47,10 +55,14 @@ const ButtonWrapper = styled.View`
   flex-direction: row;
   margin-horizontal: ${({ theme }) => theme.spacing[2]}px;
   margin-top: ${({ theme }) => theme.spacing[2]}px;
+  margin-bottom: ${({ theme }) => theme.spacing[2]}px;
 `
 
 const DEFAULT_PAGE_SIZE = 50
 
+const FALLBACK_ICON_URL =
+  'https://images.ctfassets.net/8k0h54kbe6bj/6XhCz5Ss17OVLxpXNVDxAO/d3d6716bdb9ecdc5041e6baf68b92ba6/coat_of_arms.svg'
+
 const { getNavigationOptions, useNavigationOptions } =
   createNavigationOptionHooks(() => ({
     topBar: {
@@ -62,7 +74,12 @@ type NotificationItem = NonNullable<
   NonNullable<GetUserNotificationsQuery['userNotifications']>['data']
 >[0]
 
-type ListItem = SkeletonItem | NotificationItem
+export type EmptyItem = {
+  id: string
+  __typename: 'Empty'
+}
+
+type ListItem = SkeletonItem | NotificationItem | EmptyItem
 
 export const NotificationsScreen: NavigationFunctionComponent = ({
   componentId,
@@ -123,6 +140,10 @@ export const NotificationsScreen: NavigationFunctionComponent = ({
       return createSkeletonArr(9)
     }
 
+    if (data?.userNotifications?.data?.length === 0) {
+      return [{ id: '0', __typename: 'Empty' }]
+    }
+
     return data?.userNotifications?.data || []
   }, [data, loading])
 
@@ -185,6 +206,26 @@ export const NotificationsScreen: NavigationFunctionComponent = ({
       return <ListItemSkeleton multilineMessage />
     }
 
+    if (item.__typename === 'Empty') {
+      return (
+        <View style={{ marginTop: 80 }}>
+          <EmptyList
+            title={intl.formatMessage({ id: 'notifications.emptyListTitle' })}
+            description={intl.formatMessage({
+              id: 'notifications.emptyListDescription',
+            })}
+            image={
+              <Image
+                source={emptyIllustrationSrc}
+                style={{ width: 134, height: 176 }}
+                resizeMode="contain"
+              />
+            }
+          />
+        </View>
+      )
+    }
+
     return (
       <NotificationCard
         key={item.id}
@@ -192,11 +233,11 @@ export const NotificationsScreen: NavigationFunctionComponent = ({
         title={item.message.title}
         message={item.message.displayBody}
         date={new Date(item.metadata.sent)}
-        icon={
-          item.sender?.logoUrl && {
-            uri: `${item.sender.logoUrl}?w=64&h=64&fit=pad&fm=png`,
-          }
-        }
+        icon={{
+          uri: `${
+            item.sender.logoUrl ?? FALLBACK_ICON_URL
+          }?w=64&h=64&fit=pad&fm=png`,
+        }}
         unread={!item.metadata.read}
         onPress={() => onNotificationPress(item)}
         testID={testIDs.NOTIFICATION_CARD_BUTTON}
@@ -219,40 +260,6 @@ export const NotificationsScreen: NavigationFunctionComponent = ({
         showLoading={loading && !!data}
       />
       <SafeAreaView style={{ flex: 1 }} testID={testIDs.SCREEN_NOTIFICATIONS}>
-        <ButtonWrapper>
-          <Button
-            isOutlined
-            isUtilityButton
-            title={intl.formatMessage({
-              id: 'notifications.markAllAsRead',
-              defaultMessage: 'Merkja allt lesið',
-            })}
-            style={{
-              marginRight: theme.spacing[2],
-              maxWidth: 145,
-            }}
-            icon={inboxRead}
-            iconStyle={{ tintColor: theme.color.blue400 }}
-            onPress={() => markAllUserNotificationsAsRead()}
-          />
-          <Button
-            isOutlined
-            isUtilityButton
-            title={intl.formatMessage({
-              id: 'notifications.settings',
-              defaultMessage: 'Mínar stillingar',
-            })}
-            onPress={() => navigateTo('/settings', componentId)}
-            icon={settings}
-            style={{
-              maxWidth: 145,
-            }}
-            iconStyle={{
-              tintColor: theme.color.blue400,
-              resizeMode: 'contain',
-            }}
-          />
-        </ButtonWrapper>
         {showError ? (
           <Problem type="error" withContainer />
         ) : (
@@ -265,6 +272,42 @@ export const NotificationsScreen: NavigationFunctionComponent = ({
             onEndReached={handleEndReached}
             scrollEventThrottle={16}
             scrollToOverflowEnabled
+            ListHeaderComponent={
+              <ButtonWrapper>
+                <Button
+                  isOutlined
+                  isUtilityButton
+                  title={intl.formatMessage({
+                    id: 'notifications.markAllAsRead',
+                    defaultMessage: 'Merkja allt lesið',
+                  })}
+                  style={{
+                    marginRight: theme.spacing[2],
+                    maxWidth: 145,
+                  }}
+                  icon={inboxRead}
+                  iconStyle={{ tintColor: theme.color.blue400 }}
+                  onPress={() => markAllUserNotificationsAsRead()}
+                />
+                <Button
+                  isOutlined
+                  isUtilityButton
+                  title={intl.formatMessage({
+                    id: 'notifications.settings',
+                    defaultMessage: 'Mínar stillingar',
+                  })}
+                  onPress={() => navigateTo('/settings', componentId)}
+                  icon={settings}
+                  style={{
+                    maxWidth: 145,
+                  }}
+                  iconStyle={{
+                    tintColor: theme.color.blue400,
+                    resizeMode: 'contain',
+                  }}
+                />
+              </ButtonWrapper>
+            }
             ListFooterComponent={
               loadingMore && !error ? (
                 <LoadingWrapper>
diff --git a/apps/native/app/src/ui/lib/empty-state/empty-list.tsx b/apps/native/app/src/ui/lib/empty-state/empty-list.tsx
index 90f950d57ce4..f55706c3abf9 100644
--- a/apps/native/app/src/ui/lib/empty-state/empty-list.tsx
+++ b/apps/native/app/src/ui/lib/empty-state/empty-list.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { View } from 'react-native'
 import styled from 'styled-components/native'
 
-import { font } from '../../utils/font'
 import { dynamicColor } from '@ui/utils'
+import { Typography } from '../typography/typography'
 
 const Host = styled.View`
   display: flex;
@@ -12,6 +12,7 @@ const Host = styled.View`
   justify-content: center;
   align-items: center;
   padding: 0 53px;
+  margin-top: ${({ theme }) => theme.spacing[3]}px;
 `
 
 const HostWithBorder = styled.View`
@@ -36,21 +37,12 @@ const ImageWrap = styled.View`
   margin-bottom: 50px;
 `
 
-const Title = styled.Text`
-  margin-bottom: ${({ theme }) => theme.spacing[2]}px;
-
-  ${font({
-    fontWeight: '600',
-  })}
-
+const Title = styled(Typography)`
+  margin-bottom: ${({ theme }) => theme.spacing[1]}px;
   text-align: center;
 `
 
-const Description = styled.Text`
-  ${font({
-    fontWeight: '300',
-    lineHeight: 24,
-  })}
+const Description = styled(Typography)`
   text-align: center;
 `
 
@@ -74,7 +66,7 @@ export function EmptyList({ title, description, image, small }: HeadingProps) {
   return (
     <Host>
       <ImageWrap>{image}</ImageWrap>
-      <Title>{title}</Title>
+      <Title variant={'heading3'}>{title}</Title>
       <Description>{description}</Description>
     </Host>
   )

From c6dffb84d43877d1bb17af2871d2301e6de42a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Arnar=20=C3=86gisson?= <korsbacka@gmail.com>
Date: Tue, 18 Jun 2024 10:30:34 +0000
Subject: [PATCH 18/21] feat(consultation-portal): KAM-2522: PowerBI report
 added (#15251)

---
 .../components/Layout/Layout.json             |  4 ++
 .../Menu/components/MenuItems/MenuItems.ts    | 10 ++--
 .../components/PowerBI/PowerBI.tsx            | 31 +++++++++++++
 .../components/PowerBI/index.ts               |  5 ++
 apps/consultation-portal/pages/tolfraedi.tsx  | 23 ----------
 .../pages/tolfraedi/index.tsx                 |  5 ++
 .../pages/user/link-expired/index.tsx         |  7 +++
 .../pages/user/not-found/index.tsx            |  7 +++
 .../screens/EmailVerified/EmailVerified.json  | 20 ++++++++
 .../screens/EmailVerified/LinkExpired.tsx     | 46 +++++++++++++++++++
 .../screens/EmailVerified/NotFound.tsx        | 46 +++++++++++++++++++
 .../screens/Statistics/Statistics.json        | 19 ++++++++
 .../screens/Statistics/Statistics.tsx         | 32 +++++++++++++
 13 files changed, 227 insertions(+), 28 deletions(-)
 create mode 100644 apps/consultation-portal/components/PowerBI/PowerBI.tsx
 create mode 100644 apps/consultation-portal/components/PowerBI/index.ts
 delete mode 100644 apps/consultation-portal/pages/tolfraedi.tsx
 create mode 100644 apps/consultation-portal/pages/tolfraedi/index.tsx
 create mode 100644 apps/consultation-portal/pages/user/link-expired/index.tsx
 create mode 100644 apps/consultation-portal/pages/user/not-found/index.tsx
 create mode 100644 apps/consultation-portal/screens/EmailVerified/LinkExpired.tsx
 create mode 100644 apps/consultation-portal/screens/EmailVerified/NotFound.tsx
 create mode 100644 apps/consultation-portal/screens/Statistics/Statistics.json
 create mode 100644 apps/consultation-portal/screens/Statistics/Statistics.tsx

diff --git a/apps/consultation-portal/components/Layout/Layout.json b/apps/consultation-portal/components/Layout/Layout.json
index b49cfe4a6045..963248ac7337 100644
--- a/apps/consultation-portal/components/Layout/Layout.json
+++ b/apps/consultation-portal/components/Layout/Layout.json
@@ -16,6 +16,10 @@
         "label": "Áskriftir",
         "href": "/askriftir"
       },
+      {
+        "label": "Tölfræði",
+        "href": "/tolfraedi"
+      },
       {
         "label": "Mínar umsagnir",
         "href": "/umsagnir"
diff --git a/apps/consultation-portal/components/Layout/components/Menu/components/MenuItems/MenuItems.ts b/apps/consultation-portal/components/Layout/components/Menu/components/MenuItems/MenuItems.ts
index 9b2b6c77bcfc..04db232a20fb 100644
--- a/apps/consultation-portal/components/Layout/components/Menu/components/MenuItems/MenuItems.ts
+++ b/apps/consultation-portal/components/Layout/components/Menu/components/MenuItems/MenuItems.ts
@@ -13,14 +13,14 @@ export const menuItems = [
     href: loc[1].href,
     testId: 'subscriptions-btn',
   },
-  // Tölfræði is hidden until PowerBI
-  // {
-  //   label: 'Tölfræði',
-  //   href: '/tolfraedi',
-  // },
   {
     label: loc[2].label,
     href: loc[2].href,
+    testId: 'statistics-btn',
+  },
+  {
+    label: loc[3].label,
+    href: loc[3].href,
     testId: 'advices-btn',
   },
 ]
diff --git a/apps/consultation-portal/components/PowerBI/PowerBI.tsx b/apps/consultation-portal/components/PowerBI/PowerBI.tsx
new file mode 100644
index 000000000000..7abb922eada5
--- /dev/null
+++ b/apps/consultation-portal/components/PowerBI/PowerBI.tsx
@@ -0,0 +1,31 @@
+import { useRef } from 'react'
+import { PowerBIEmbed } from 'powerbi-client-react'
+import { type Embed, models } from 'powerbi-client'
+
+export const PowerBI = () => {
+  const embedRef = useRef<Embed | null>(null)
+
+  const getEmbeddedComponent = (embed: Embed) => {
+    embed.element.style.height = '700px'
+    embed.element.style.width = '100%'
+    embed.iframe.style.border = 'none'
+    embedRef.current = embed
+  }
+
+  return (
+    <PowerBIEmbed
+      embedConfig={{
+        type: 'report',
+        tokenType: models.TokenType.Embed,
+        embedUrl:
+          'https://app.powerbi.com/view?r=eyJrIjoiZjFjOWRlODEtNGFlNS00MDkxLTlhNmYtNGUxY2Y0ZWM0M2E5IiwidCI6ImJjMTRhNDRlLWUwZmItNGUwYi1hNTM1LTEwMDU3OWQ0MWI2NSIsImMiOjh9',
+        settings: {
+          layoutType: models.LayoutType.MobilePortrait,
+        },
+      }}
+      getEmbeddedComponent={getEmbeddedComponent}
+    />
+  )
+}
+
+export default PowerBI
diff --git a/apps/consultation-portal/components/PowerBI/index.ts b/apps/consultation-portal/components/PowerBI/index.ts
new file mode 100644
index 000000000000..a8748281fdc6
--- /dev/null
+++ b/apps/consultation-portal/components/PowerBI/index.ts
@@ -0,0 +1,5 @@
+import dynamic from 'next/dynamic'
+
+export const PowerBIComponent = dynamic(() => import('./PowerBI'), {
+  ssr: false,
+})
diff --git a/apps/consultation-portal/pages/tolfraedi.tsx b/apps/consultation-portal/pages/tolfraedi.tsx
deleted file mode 100644
index 9bb43ab068c4..000000000000
--- a/apps/consultation-portal/pages/tolfraedi.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Layout } from '../components'
-import { Box, GridColumn, GridRow } from '@island.is/island-ui/core'
-const Statistics = () => {
-  return (
-    <Layout seo={{ title: 'Tölfræði', url: 'tolfraedi' }}>
-      <GridRow>
-        <GridColumn span={['12/12', '12/12', '12/12', '12/12']}>
-          <Box style={{ display: 'flex', justifyContent: 'center' }}>
-            {/* <iframe
-              title="Report Section"
-              width="100%"
-              height="700"
-              src="https://app.powerbi.com/view?r=eyJrIjoiOTVmZjE2ZmUtZTMzMS00NDU3LWE3N2EtODE2NTZjMjIwYTlhIiwidCI6Ijk2YWI5NGU3LWY0M2QtNDk5Yi05OTgzLTQ1NGExYWE2MTg2OCIsImMiOjh9"
-              allowFullScreen={true}
-            ></iframe> */}
-          </Box>
-        </GridColumn>
-      </GridRow>
-    </Layout>
-  )
-}
-
-export default Statistics
diff --git a/apps/consultation-portal/pages/tolfraedi/index.tsx b/apps/consultation-portal/pages/tolfraedi/index.tsx
new file mode 100644
index 000000000000..1ec2bae64598
--- /dev/null
+++ b/apps/consultation-portal/pages/tolfraedi/index.tsx
@@ -0,0 +1,5 @@
+import { StatisticsScreen } from '../../screens/Statistics/Statistics'
+
+export const Index = () => <StatisticsScreen />
+
+export default Index
diff --git a/apps/consultation-portal/pages/user/link-expired/index.tsx b/apps/consultation-portal/pages/user/link-expired/index.tsx
new file mode 100644
index 000000000000..43b9a6aeba0d
--- /dev/null
+++ b/apps/consultation-portal/pages/user/link-expired/index.tsx
@@ -0,0 +1,7 @@
+import LinkExpiredScreen from '../../../screens/EmailVerified/LinkExpired'
+
+export const Index = () => {
+  return <LinkExpiredScreen />
+}
+
+export default Index
diff --git a/apps/consultation-portal/pages/user/not-found/index.tsx b/apps/consultation-portal/pages/user/not-found/index.tsx
new file mode 100644
index 000000000000..e8fb87a89a4a
--- /dev/null
+++ b/apps/consultation-portal/pages/user/not-found/index.tsx
@@ -0,0 +1,7 @@
+import NotFoundScreen from '../../../screens/EmailVerified/NotFound'
+
+export const Index = () => {
+  return <NotFoundScreen />
+}
+
+export default Index
diff --git a/apps/consultation-portal/screens/EmailVerified/EmailVerified.json b/apps/consultation-portal/screens/EmailVerified/EmailVerified.json
index bec3b37792d6..d1525f11c973 100644
--- a/apps/consultation-portal/screens/EmailVerified/EmailVerified.json
+++ b/apps/consultation-portal/screens/EmailVerified/EmailVerified.json
@@ -8,5 +8,25 @@
     "emailVerifiedText": "Netfang staðfest",
     "text": "Nú geturðu skráð þig í áskrift að málum, hægt er að velja um nokkrar leiðir.",
     "arrowLinkText": "Aftur á forsíðu"
+  },
+  "linkExpired": {
+    "seo": {
+      "title": "Hlekkur útrunninn",
+      "url": "/user/link-expired"
+    },
+    "failText": "Aðgerð tókst ekki",
+    "linkExpiredText": "Hlekkur útrunninn",
+    "text": "Hlekkur er útrunninn, vinsamlegast athugaðu að hlekkur sé ekki eldri en 24 klukkustundir. Vinsamlegast sláðu inn netfang aftur og fáðu nýjan hlekk.",
+    "arrowLinkText": "Aftur á forsíðu"
+  },
+  "notFound": {
+    "seo": {
+      "title": "Eitthvað fór úrskeiðis",
+      "url": "/user/not-found"
+    },
+    "failText": "Aðgerð tókst ekki",
+    "notFoundText": "Eitthvað fór úrskeiðis",
+    "text": "Reyndu aftur eða hafðu samband.",
+    "arrowLinkText": "Aftur á forsíðu"
   }
 }
diff --git a/apps/consultation-portal/screens/EmailVerified/LinkExpired.tsx b/apps/consultation-portal/screens/EmailVerified/LinkExpired.tsx
new file mode 100644
index 000000000000..f1033d5ee92d
--- /dev/null
+++ b/apps/consultation-portal/screens/EmailVerified/LinkExpired.tsx
@@ -0,0 +1,46 @@
+import {
+  ArrowLink,
+  Box,
+  GridColumn,
+  GridContainer,
+  GridRow,
+  Text,
+} from '@island.is/island-ui/core'
+import { Layout } from '../../components'
+import localization from './EmailVerified.json'
+
+export const LinkExpiredScreen = () => {
+  const loc = localization['linkExpired']
+  return (
+    <Layout seo={{ title: loc.seo.title, url: loc.seo.url }}>
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={'12/12'} paddingBottom={10} paddingTop={8}>
+            <Box
+              display="flex"
+              flexDirection="column"
+              width="full"
+              alignItems="center"
+            >
+              <Text
+                variant="eyebrow"
+                as="div"
+                paddingBottom={2}
+                color="purple400"
+              >
+                {loc.failText}
+              </Text>
+
+              <Text variant="h1" as="h1" paddingBottom={3}>
+                {loc.linkExpiredText}
+              </Text>
+              <Text paddingBottom={3}>{loc.text}</Text>
+              <ArrowLink href="/">{loc.arrowLinkText}</ArrowLink>
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+    </Layout>
+  )
+}
+export default LinkExpiredScreen
diff --git a/apps/consultation-portal/screens/EmailVerified/NotFound.tsx b/apps/consultation-portal/screens/EmailVerified/NotFound.tsx
new file mode 100644
index 000000000000..64682a2edb1b
--- /dev/null
+++ b/apps/consultation-portal/screens/EmailVerified/NotFound.tsx
@@ -0,0 +1,46 @@
+import {
+  ArrowLink,
+  Box,
+  GridColumn,
+  GridContainer,
+  GridRow,
+  Text,
+} from '@island.is/island-ui/core'
+import { Layout } from '../../components'
+import localization from './EmailVerified.json'
+
+export const NotFoundScreen = () => {
+  const loc = localization['notFound']
+  return (
+    <Layout seo={{ title: loc.seo.title, url: loc.seo.url }}>
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={'12/12'} paddingBottom={10} paddingTop={8}>
+            <Box
+              display="flex"
+              flexDirection="column"
+              width="full"
+              alignItems="center"
+            >
+              <Text
+                variant="eyebrow"
+                as="div"
+                paddingBottom={2}
+                color="purple400"
+              >
+                {loc.failText}
+              </Text>
+
+              <Text variant="h1" as="h1" paddingBottom={3}>
+                {loc.notFoundText}
+              </Text>
+              <Text paddingBottom={3}>{loc.text}</Text>
+              <ArrowLink href="/">{loc.arrowLinkText}</ArrowLink>
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+    </Layout>
+  )
+}
+export default NotFoundScreen
diff --git a/apps/consultation-portal/screens/Statistics/Statistics.json b/apps/consultation-portal/screens/Statistics/Statistics.json
new file mode 100644
index 000000000000..d94712e8309b
--- /dev/null
+++ b/apps/consultation-portal/screens/Statistics/Statistics.json
@@ -0,0 +1,19 @@
+{
+  "statistics": {
+    "seo": {
+      "title": "Tölfræði",
+      "url": "/tolfraedi",
+      "description": "Tölfræði um samráðsgátt",
+      "keywords": ""
+    },
+    "breadcrumbs": [
+      {
+        "title": "Samráðsgátt",
+        "href": "/samradsgatt"
+      },
+      {
+        "title": "Tölfræði"
+      }
+    ]
+  }
+}
diff --git a/apps/consultation-portal/screens/Statistics/Statistics.tsx b/apps/consultation-portal/screens/Statistics/Statistics.tsx
new file mode 100644
index 000000000000..7d8468d9c4bc
--- /dev/null
+++ b/apps/consultation-portal/screens/Statistics/Statistics.tsx
@@ -0,0 +1,32 @@
+import { GridContainer } from '@island.is/island-ui/core'
+
+import { Breadcrumbs, Layout } from '../../components'
+import localization from './Statistics.json'
+import { PowerBIComponent } from '../../components/PowerBI'
+
+export const StatisticsScreen = () => {
+  const loc = localization['statistics']
+
+  return (
+    <Layout
+      seo={{
+        title: loc.seo.title,
+        url: loc.seo.url,
+        description: loc.seo.description,
+        keywords: loc.seo.keywords,
+      }}
+    >
+      <Breadcrumbs
+        items={[
+          { title: loc.breadcrumbs[0].title, href: loc.breadcrumbs[0].href },
+          { title: loc.breadcrumbs[1].title },
+        ]}
+      />
+      <GridContainer>
+        <PowerBIComponent />
+      </GridContainer>
+    </Layout>
+  )
+}
+
+export default StatisticsScreen

From fc305bbbf74afa1031955c325bc0e0b30386e0ce Mon Sep 17 00:00:00 2001
From: lommi <jonorn@gmail.com>
Date: Tue, 18 Jun 2024 11:54:41 +0000
Subject: [PATCH 19/21] fix: hash generated files (#15253)

* fix: hash generated files

* chore: nx format:write update dirty files

---------

Co-authored-by: andes-it <builders@andes.is>
---
 scripts/ci/cache/__config.mjs         |   4 +-
 scripts/ci/cache/_const.mjs           |   1 -
 scripts/ci/cache/_generated_files.mjs |  51 +++++
 scripts/ci/cache/_utils.mjs           |  27 +--
 scripts/ci/cache/package.json         |   3 +-
 scripts/ci/cache/yarn.lock            | 297 ++++++++++++++++++++++++++
 6 files changed, 354 insertions(+), 29 deletions(-)
 create mode 100644 scripts/ci/cache/_generated_files.mjs

diff --git a/scripts/ci/cache/__config.mjs b/scripts/ci/cache/__config.mjs
index 1d2a84f7788d..25b9188f7774 100644
--- a/scripts/ci/cache/__config.mjs
+++ b/scripts/ci/cache/__config.mjs
@@ -6,7 +6,6 @@ import {
   getYarnLockHash,
   getPackageHash,
   getNodeVersionString,
-  getGeneratedFileHash,
   folderSizeIsEqualOrGreaterThan,
   runCommand,
   fileSizeIsEqualOrGreaterThan,
@@ -20,6 +19,7 @@ import {
   ENV_CACHE_SUCCESS,
 } from './_const.mjs'
 import { keyStorage } from './_key_storage.mjs'
+import { getGeneratedFilesHash } from './_generated_files.mjs'
 
 // When testing this is good to manipulate
 const HASH_VERSION = `newcache-${6}`
@@ -86,7 +86,7 @@ export const caches = [
     enabled: ENABLED_MODULES['generated-files'],
     hash: async () =>
       keyStorage.getKey('generated-files') ??
-      `generated-files-${GENERATED_FILES_VERSION}-${HASH_VERSION}-${getPlatformString()}-${await getYarnLockHash()}-${await getPackageHash()}-${await getGeneratedFileHash()}`,
+      `generated-files-${HASH_VERSION}-${getPlatformString()}-${await getYarnLockHash()}-${await getPackageHash()}-${await getGeneratedFilesHash()}`,
     name: 'Cache Generated Files',
     id: 'generated-files',
     path: 'generated_files.tar.gz',
diff --git a/scripts/ci/cache/_const.mjs b/scripts/ci/cache/_const.mjs
index 4c3ab53cf83e..e84d77fa89ff 100644
--- a/scripts/ci/cache/_const.mjs
+++ b/scripts/ci/cache/_const.mjs
@@ -5,4 +5,3 @@ export const ENV_YAML_FILE = 'YAML_FILE'
 export const ENV_CACHE_SUCCESS = '_CACHE_SUCCESS'
 export const ENV_ENABLED_CACHE = 'ENABLE_CACHE'
 export const ENV_JOB_STATUS = 'JOB_STATUS'
-export const HASH_GENERATE_FILES_SCRIPT = 'scripts/_hash-generated-files.sh'
diff --git a/scripts/ci/cache/_generated_files.mjs b/scripts/ci/cache/_generated_files.mjs
new file mode 100644
index 000000000000..58c534db8187
--- /dev/null
+++ b/scripts/ci/cache/_generated_files.mjs
@@ -0,0 +1,51 @@
+// @ts-check
+import { createHash } from 'node:crypto'
+import { readFile } from 'node:fs/promises'
+import { glob } from 'glob'
+import { ROOT } from './_common.mjs'
+import { resolve } from 'node:path'
+
+const patterns = [
+  'scripts/codegen.js',
+  'libs/cms/src/lib/generated/contentfulTypes.d.ts',
+  'apps/air-discount-scheme/web/i18n/withLocale.tsx',
+  'apps/air-discount-scheme/web/components/AppLayout/AppLayout.tsx',
+  'apps/air-discount-scheme/web/components/Header/Header.tsx',
+  'apps/air-discount-scheme/web/screens/**/*.tsx',
+  'libs/application/types/src/lib/ApplicationTypes.ts',
+  '**/codegen.yml',
+  '**/*.model.ts',
+  '**/*.enum.ts',
+  '**/queries/**/*',
+  '**/mutations/**/*',
+  '**/fragments/**/*',
+  '**/*.resolver.ts',
+  '**/*.service.ts',
+  '**/*.dto.ts',
+  '**/*.input.ts',
+  '**/*.module.ts',
+  '**/*.controller.ts',
+  '**/*.union.ts',
+  '**/*.graphql.tsx?',
+  '**/*.graphql',
+  '**/clientConfig.*',
+  'libs/judicial-system/**',
+]
+
+export async function getGeneratedFilesHash() {
+  const hash = createHash('sha1')
+  const files = await glob(patterns, {
+    cwd: ROOT,
+    nodir: true,
+  })
+  console.log(`Files to hash:`)
+  for (const _file of files) {
+    console.log(_file)
+    const file = resolve(ROOT, _file)
+    const content = await readFile(file, 'utf8')
+    hash.update(content)
+  }
+
+  const finalHash = hash.digest('hex')
+  return finalHash
+}
diff --git a/scripts/ci/cache/_utils.mjs b/scripts/ci/cache/_utils.mjs
index a9731642bc89..82eedce63726 100644
--- a/scripts/ci/cache/_utils.mjs
+++ b/scripts/ci/cache/_utils.mjs
@@ -2,33 +2,10 @@
 import { arch, platform } from 'node:os'
 import crypto from 'node:crypto'
 import { ROOT } from './_common.mjs'
-import { spawn, exec } from 'node:child_process'
+import { spawn } from 'node:child_process'
 import { resolve, join } from 'node:path'
 import { readFile, readdir, stat } from 'node:fs/promises'
-import { HASH_GENERATE_FILES_SCRIPT } from './_const.mjs'
-
-const GENERATE_HASH_GENERATED_FILES_SCRIPT = resolve(
-  ROOT,
-  ...HASH_GENERATE_FILES_SCRIPT.split('/'),
-)
-export async function getGeneratedFileHash(
-  scriptPath = GENERATE_HASH_GENERATED_FILES_SCRIPT,
-) {
-  return new Promise((resolve, reject) => {
-    exec(`bash "${scriptPath}"`, (error, stdout, stderr) => {
-      if (error) {
-        reject(`Error: ${error.message}`)
-        return
-      }
-      if (stderr) {
-        reject(`Stderr: ${stderr}`)
-        return
-      }
-      console.log(stdout)
-      resolve(stdout)
-    })
-  })
-}
+
 export async function getNodeVersionString() {
   const content = await getPackageJSON()
   const nodeVersion = content?.engines?.node
diff --git a/scripts/ci/cache/package.json b/scripts/ci/cache/package.json
index ae05f9115e38..d829160273f8 100644
--- a/scripts/ci/cache/package.json
+++ b/scripts/ci/cache/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
-    "@actions/cache": "3.2.4"
+    "@actions/cache": "3.2.4",
+    "glob": "10.4.1"
   }
 }
diff --git a/scripts/ci/cache/yarn.lock b/scripts/ci/cache/yarn.lock
index 1ac282c37cfa..c599e140db02 100644
--- a/scripts/ci/cache/yarn.lock
+++ b/scripts/ci/cache/yarn.lock
@@ -243,6 +243,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@isaacs/cliui@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@isaacs/cliui@npm:8.0.2"
+  dependencies:
+    string-width: ^5.1.2
+    string-width-cjs: "npm:string-width@^4.2.0"
+    strip-ansi: ^7.0.1
+    strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
+    wrap-ansi: ^8.1.0
+    wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
+  checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb
+  languageName: node
+  linkType: hard
+
+"@pkgjs/parseargs@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@pkgjs/parseargs@npm:0.11.0"
+  checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f
+  languageName: node
+  linkType: hard
+
 "abort-controller@npm:^3.0.0":
   version: 3.0.0
   resolution: "abort-controller@npm:3.0.0"
@@ -261,6 +282,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-regex@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "ansi-regex@npm:5.0.1"
+  checksum: 2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "ansi-regex@npm:6.0.1"
+  checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^4.0.0":
+  version: 4.3.0
+  resolution: "ansi-styles@npm:4.3.0"
+  dependencies:
+    color-convert: ^2.0.1
+  checksum: 513b44c3b2105dd14cc42a19271e80f386466c4be574bccf60b627432f9198571ebf4ab1e4c3ba17347658f4ee1711c163d574248c0c1cdc2d5917a0ad582ec4
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^6.1.0":
+  version: 6.2.1
+  resolution: "ansi-styles@npm:6.2.1"
+  checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9
+  languageName: node
+  linkType: hard
+
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -285,6 +336,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"brace-expansion@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "brace-expansion@npm:2.0.1"
+  dependencies:
+    balanced-match: ^1.0.0
+  checksum: a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1
+  languageName: node
+  linkType: hard
+
+"color-convert@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "color-convert@npm:2.0.1"
+  dependencies:
+    color-name: ~1.1.4
+  checksum: 79e6bdb9fd479a205c71d89574fccfb22bd9053bd98c6c4d870d65c132e5e904e6034978e55b43d69fcaa7433af2016ee203ce76eeba9cfa554b373e7f7db336
+  languageName: node
+  linkType: hard
+
+"color-name@npm:~1.1.4":
+  version: 1.1.4
+  resolution: "color-name@npm:1.1.4"
+  checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
+  languageName: node
+  linkType: hard
+
 "combined-stream@npm:^1.0.6":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
@@ -301,6 +377,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cross-spawn@npm:^7.0.0":
+  version: 7.0.3
+  resolution: "cross-spawn@npm:7.0.3"
+  dependencies:
+    path-key: ^3.1.0
+    shebang-command: ^2.0.0
+    which: ^2.0.1
+  checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52
+  languageName: node
+  linkType: hard
+
 "debug@npm:4, debug@npm:^4.3.4":
   version: 4.3.5
   resolution: "debug@npm:4.3.5"
@@ -320,6 +407,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eastasianwidth@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "eastasianwidth@npm:0.2.0"
+  checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "emoji-regex@npm:8.0.0"
+  checksum: d4c5c39d5a9868b5fa152f00cada8a936868fd3367f33f71be515ecee4c803132d11b31a6222b2571b1e5f7e13890156a94880345594d0ce7e3c9895f560f192
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^9.2.2":
+  version: 9.2.2
+  resolution: "emoji-regex@npm:9.2.2"
+  checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601
+  languageName: node
+  linkType: hard
+
 "event-target-shim@npm:^5.0.0":
   version: 5.0.1
   resolution: "event-target-shim@npm:5.0.1"
@@ -345,6 +453,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"foreground-child@npm:^3.1.0":
+  version: 3.2.1
+  resolution: "foreground-child@npm:3.2.1"
+  dependencies:
+    cross-spawn: ^7.0.0
+    signal-exit: ^4.0.1
+  checksum: 3e2e844d6003c96d70affe8ae98d7eaaba269a868c14d997620c088340a8775cd5d2d9043e6ceebae1928d8d9a874911c4d664b9a267e8995945df20337aebc0
+  languageName: node
+  linkType: hard
+
 "form-data@npm:^2.5.0":
   version: 2.5.1
   resolution: "form-data@npm:2.5.1"
@@ -356,6 +474,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:10.4.1":
+  version: 10.4.1
+  resolution: "glob@npm:10.4.1"
+  dependencies:
+    foreground-child: ^3.1.0
+    jackspeak: ^3.1.2
+    minimatch: ^9.0.4
+    minipass: ^7.1.2
+    path-scurry: ^1.11.1
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 5d33c686c80bf6877f4284adf99a8c3cbb2a6eccbc92342943fe5d4b42c01d78c1881f2223d950c92a938d0f857e12e37b86a8e5483ab2141822e053b67d0dde
+  languageName: node
+  linkType: hard
+
 "http-proxy-agent@npm:^7.0.0":
   version: 7.0.2
   resolution: "http-proxy-agent@npm:7.0.2"
@@ -376,6 +509,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-fullwidth-code-point@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-fullwidth-code-point@npm:3.0.0"
+  checksum: 44a30c29457c7fb8f00297bce733f0a64cd22eca270f83e58c105e0d015e45c019491a4ab2faef91ab51d4738c670daff901c799f6a700e27f7314029e99e348
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "isexe@npm:2.0.0"
+  checksum: 26bf6c5480dda5161c820c5b5c751ae1e766c587b1f951ea3fcfc973bafb7831ae5b54a31a69bd670220e42e99ec154475025a468eae58ea262f813fdc8d1c62
+  languageName: node
+  linkType: hard
+
+"jackspeak@npm:^3.1.2":
+  version: 3.4.0
+  resolution: "jackspeak@npm:3.4.0"
+  dependencies:
+    "@isaacs/cliui": ^8.0.2
+    "@pkgjs/parseargs": ^0.11.0
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: 350f6f311018bb175ffbe736b19c26ac0b134bb5a17a638169e89594eb0c24ab1c658ab3a2fda24ff63b3b19292e1a5ec19d2255bc526df704e8168d392bef85
+  languageName: node
+  linkType: hard
+
+"lru-cache@npm:^10.2.0":
+  version: 10.2.2
+  resolution: "lru-cache@npm:10.2.2"
+  checksum: 98e8fc93691c546f719a76103ef2bee5a3ac823955c755a47641ec41f8c7fafa1baeaba466937cc1cbfa9cfd47e03536d10e2db3158a64ad91ff3a58a32c893e
+  languageName: node
+  linkType: hard
+
 "mime-db@npm:1.52.0":
   version: 1.52.0
   resolution: "mime-db@npm:1.52.0"
@@ -401,6 +568,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^9.0.4":
+  version: 9.0.4
+  resolution: "minimatch@npm:9.0.4"
+  dependencies:
+    brace-expansion: ^2.0.1
+  checksum: cf717f597ec3eed7dabc33153482a2e8d49f4fd3c26e58fd9c71a94c5029a0838728841b93f46bf1263b65a8010e2ee800d0dc9b004ab8ba8b6d1ec07cc115b5
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "minipass@npm:7.1.2"
+  checksum: 2bfd325b95c555f2b4d2814d49325691c7bee937d753814861b0b49d5edcda55cbbf22b6b6a60bb91eddac8668771f03c5ff647dcd9d0f798e9548b9cdc46ee3
+  languageName: node
+  linkType: hard
+
 "ms@npm:2.1.2":
   version: 2.1.2
   resolution: "ms@npm:2.1.2"
@@ -422,11 +605,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-key@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "path-key@npm:3.1.1"
+  checksum: 55cd7a9dd4b343412a8386a743f9c746ef196e57c823d90ca3ab917f90ab9f13dd0ded27252ba49dbdfcab2b091d998bc446f6220cd3cea65db407502a740020
+  languageName: node
+  linkType: hard
+
+"path-scurry@npm:^1.11.1":
+  version: 1.11.1
+  resolution: "path-scurry@npm:1.11.1"
+  dependencies:
+    lru-cache: ^10.2.0
+    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
+  checksum: 890d5abcd593a7912dcce7cf7c6bf7a0b5648e3dee6caf0712c126ca0a65c7f3d7b9d769072a4d1baf370f61ce493ab5b038d59988688e0c5f3f646ee3c69023
+  languageName: node
+  linkType: hard
+
 "root-workspace-0b6124@workspace:.":
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
     "@actions/cache": 3.2.4
+    glob: 10.4.1
   languageName: unknown
   linkType: soft
 
@@ -446,6 +647,69 @@ __metadata:
   languageName: node
   linkType: hard
 
+"shebang-command@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "shebang-command@npm:2.0.0"
+  dependencies:
+    shebang-regex: ^3.0.0
+  checksum: 6b52fe87271c12968f6a054e60f6bde5f0f3d2db483a1e5c3e12d657c488a15474121a1d55cd958f6df026a54374ec38a4a963988c213b7570e1d51575cea7fa
+  languageName: node
+  linkType: hard
+
+"shebang-regex@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "shebang-regex@npm:3.0.0"
+  checksum: 1a2bcae50de99034fcd92ad4212d8e01eedf52c7ec7830eedcf886622804fe36884278f2be8be0ea5fde3fd1c23911643a4e0f726c8685b61871c8908af01222
+  languageName: node
+  linkType: hard
+
+"signal-exit@npm:^4.0.1":
+  version: 4.1.0
+  resolution: "signal-exit@npm:4.1.0"
+  checksum: 64c757b498cb8629ffa5f75485340594d2f8189e9b08700e69199069c8e3070fb3e255f7ab873c05dc0b3cec412aea7402e10a5990cb6a050bd33ba062a6c549
+  languageName: node
+  linkType: hard
+
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0":
+  version: 4.2.3
+  resolution: "string-width@npm:4.2.3"
+  dependencies:
+    emoji-regex: ^8.0.0
+    is-fullwidth-code-point: ^3.0.0
+    strip-ansi: ^6.0.1
+  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
+  languageName: node
+  linkType: hard
+
+"string-width@npm:^5.0.1, string-width@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "string-width@npm:5.1.2"
+  dependencies:
+    eastasianwidth: ^0.2.0
+    emoji-regex: ^9.2.2
+    strip-ansi: ^7.0.1
+  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
+  languageName: node
+  linkType: hard
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "strip-ansi@npm:6.0.1"
+  dependencies:
+    ansi-regex: ^5.0.1
+  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
+  languageName: node
+  linkType: hard
+
+"strip-ansi@npm:^7.0.1":
+  version: 7.1.0
+  resolution: "strip-ansi@npm:7.1.0"
+  dependencies:
+    ansi-regex: ^6.0.1
+  checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d
+  languageName: node
+  linkType: hard
+
 "strnum@npm:^1.0.5":
   version: 1.0.5
   resolution: "strnum@npm:1.0.5"
@@ -525,6 +789,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "which@npm:2.0.2"
+  dependencies:
+    isexe: ^2.0.0
+  bin:
+    node-which: ./bin/node-which
+  checksum: 1a5c563d3c1b52d5f893c8b61afe11abc3bab4afac492e8da5bde69d550de701cf9806235f20a47b5c8fa8a1d6a9135841de2596535e998027a54589000e66d1
+  languageName: node
+  linkType: hard
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version: 7.0.0
+  resolution: "wrap-ansi@npm:7.0.0"
+  dependencies:
+    ansi-styles: ^4.0.0
+    string-width: ^4.1.0
+    strip-ansi: ^6.0.0
+  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
+  languageName: node
+  linkType: hard
+
+"wrap-ansi@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "wrap-ansi@npm:8.1.0"
+  dependencies:
+    ansi-styles: ^6.1.0
+    string-width: ^5.0.1
+    strip-ansi: ^7.0.1
+  checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238
+  languageName: node
+  linkType: hard
+
 "xml2js@npm:^0.5.0":
   version: 0.5.0
   resolution: "xml2js@npm:0.5.0"

From 266fdd9c9a826687c1bd65b50c3bc1df2b9c75c1 Mon Sep 17 00:00:00 2001
From: lommi <jonorn@gmail.com>
Date: Tue, 18 Jun 2024 12:14:14 +0000
Subject: [PATCH 20/21] fix: remove file

---
 scripts/_hash-generated-files.sh | 45 --------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100755 scripts/_hash-generated-files.sh

diff --git a/scripts/_hash-generated-files.sh b/scripts/_hash-generated-files.sh
deleted file mode 100755
index b45e6576e1d3..000000000000
--- a/scripts/_hash-generated-files.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-patterns=(
-	'scripts/codegen.js'
-	'libs/cms/src/lib/generated/contentfulTypes.d.ts'
-	'apps/air-discount-scheme/web/i18n/withLocale.tsx'
-	'apps/air-discount-scheme/web/components/AppLayout/AppLayout.tsx'
-	'apps/air-discount-scheme/web/components/Header/Header.tsx'
-	'apps/air-discount-scheme/web/screens/**.tsx'
-	'libs/application/types/src/lib/ApplicationTypes.ts'
-	'apps/**/codegen.yml'
-	'libs/**/codegen.yml'
-	'apps/**/*.model.ts'
-	'libs/**/*.model.ts'
-	'apps/**/*.enum.ts'
-	'libs/**/*.enum.ts'
-	'apps/**/queries/**/*.tsx?'
-	'libs/**/queries/**/*.tsx?'
-	'libs/**/mutations/**/*.tsx?'
-	'libs/**/fragments/**/*.tsx?'
-	'apps/**/*.resolver.ts'
-	'libs/**/*.resolver.ts'
-	'apps/**/*.service.ts'
-	'libs/**/*.service.ts'
-	'apps/**/*.dto.ts'
-	'libs/**/*.dto.ts'
-	'apps/**/*.input.ts'
-	'libs/**/*.input.ts'
-	'apps/**/*.module.ts'
-	'libs/**/*.module.ts'
-	'apps/**/*.controller.ts'
-	'libs/**/*.controller.ts'
-	'apps/**/*.union.ts'
-	'libs/**/*.union.ts'
-	'apps/**/*.graphql.ts'
-	'apps/**/*.graphql'
-	'libs/**/*.graphql.ts'
-	'libs/**/*.graphql'
-	'libs/**/clientConfig.yaml'
-	'libs/**/clientConfig.json'
-	'libs/judicial-system/**'
-)
-HASH="$(for pattern in "${patterns[@]}"; do git ls-files "$pattern"; done | xargs cat | git hash-object --stdin)" 
-echo -n "$HASH"
-

From e9efa7c69e5888e766fac824a8ad9c3382f10c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9E=C3=B3r=C3=B0ur=20H?= <thordur@hugsmidjan.is>
Date: Tue, 18 Jun 2024 13:07:49 +0000
Subject: [PATCH 21/21] Update __config.mjs

---
 scripts/ci/cache/__config.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/ci/cache/__config.mjs b/scripts/ci/cache/__config.mjs
index 25b9188f7774..6552ec71b40f 100644
--- a/scripts/ci/cache/__config.mjs
+++ b/scripts/ci/cache/__config.mjs
@@ -23,7 +23,6 @@ import { getGeneratedFilesHash } from './_generated_files.mjs'
 
 // When testing this is good to manipulate
 const HASH_VERSION = `newcache-${6}`
-const GENERATED_FILES_VERSION = '2024061401-notifications-locale-cleanstring'
 
 export const ENABLED_MODULES = (process.env[ENV_ENABLED_CACHE] || '')
   .split(',')