From 58a28d4a04b9914c705afceacc4ec111fe634c29 Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Tue, 3 Dec 2024 16:20:32 +0000
Subject: [PATCH 1/8] Add new options to base pension type

---
 .../src/lib/dtos/pensionCalculation.input.ts                 | 3 +++
 libs/api/domains/social-insurance/src/lib/utils.ts           | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/api/domains/social-insurance/src/lib/dtos/pensionCalculation.input.ts b/libs/api/domains/social-insurance/src/lib/dtos/pensionCalculation.input.ts
index e6f73046d462..79b0efda8b55 100644
--- a/libs/api/domains/social-insurance/src/lib/dtos/pensionCalculation.input.ts
+++ b/libs/api/domains/social-insurance/src/lib/dtos/pensionCalculation.input.ts
@@ -7,6 +7,9 @@ export enum BasePensionType {
   Rehabilitation = 'Rehabilitation',
   HalfRetirement = 'HalfRetirement',
   NewSystem = 'NewSystem',
+  NewSystemDisability = 'NewSystemDisability',
+  NewSystemPartialDisability = 'NewSystemPartialDisability',
+  NewSystemMedicalAndRehabilitation = 'NewSystemMedicalAndRehabilitation',
 }
 
 registerEnumType(BasePensionType, {
diff --git a/libs/api/domains/social-insurance/src/lib/utils.ts b/libs/api/domains/social-insurance/src/lib/utils.ts
index 6341bbcd7ed0..8bd2d340f4b4 100644
--- a/libs/api/domains/social-insurance/src/lib/utils.ts
+++ b/libs/api/domains/social-insurance/src/lib/utils.ts
@@ -21,7 +21,10 @@ const basePensionTypeMapping: Record<BasePensionType, number> = {
   [BasePensionType.Disability]: 3, // Örorkulífeyrir
   [BasePensionType.Rehabilitation]: 4, // Endurhæfingarlífeyrir
   [BasePensionType.HalfRetirement]: 5, // Hálfur Ellilífeyrir
-  [BasePensionType.NewSystem]: 6, // Nýtt kerfi sem tekur gildi 1. september 2025
+  [BasePensionType.NewSystem]: 6, // Örorkulífeyrir - Nýtt kerfi sem tekur gildi 1. september 2025
+  [BasePensionType.NewSystemDisability]: 6, // Örorkulífeyrir - Nýtt kerfi sem tekur gildi 1. september 2025
+  [BasePensionType.NewSystemPartialDisability]: 7, // Hlutaörorka - Nýtt kerfi sem tekur gildi 1. september 2025
+  [BasePensionType.NewSystemMedicalAndRehabilitation]: 8, // Sjúkra- og endurhæfingargreiðslur - Nýtt kerfi sem tekur gildi 1. september 2025
 }
 
 const livingConditionMapping: Record<LivingCondition, number> = {

From 37c337ffafcf30f81f1ae9e5fabdba912fd5287c Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Wed, 4 Dec 2024 15:19:06 +0000
Subject: [PATCH 2/8] Update logic

---
 .../PensionCalculator.tsx                     | 130 +++++++++++++++---
 .../PensionCalculatorResults.tsx              |  25 +++-
 .../translationStrings.ts                     |  24 ++++
 .../SocialInsuranceAdministration/utils.ts    |   6 +
 4 files changed, 163 insertions(+), 22 deletions(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
index af85afcd89db..bed091fc0ebe 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
@@ -1,4 +1,4 @@
-import { PropsWithChildren, useMemo, useState } from 'react'
+import { PropsWithChildren, useEffect, useMemo, useState } from 'react'
 import { Controller, FormProvider, useForm } from 'react-hook-form'
 import { useIntl } from 'react-intl'
 import add from 'date-fns/add'
@@ -57,6 +57,8 @@ import {
   convertToQueryParams,
   extractSlug,
   getDateOfCalculationsOptions,
+  is2025FormPreviewActive,
+  NEW_SYSTEM_TAKES_PLACE_DATE,
 } from './utils'
 import * as styles from './PensionCalculator.css'
 
@@ -70,7 +72,11 @@ const hasDisabilityAssessment = (
 ) => {
   return (
     typeOfBasePension === BasePensionType.Disability ||
-    typeOfBasePension === BasePensionType.Rehabilitation
+    typeOfBasePension === BasePensionType.Rehabilitation ||
+    // TODO: verify
+    typeOfBasePension === BasePensionType.NewSystemDisability ||
+    typeOfBasePension === BasePensionType.NewSystemPartialDisability ||
+    typeOfBasePension === BasePensionType.NewSystemMedicalAndRehabilitation
   )
 }
 
@@ -131,6 +137,15 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
     defaultValues,
   })
 
+  const [dateOfCalculations, setDateOfCalculations] = useQueryState(
+    'dateOfCalculations',
+    {
+      defaultValue:
+        methods.formState.defaultValues?.dateOfCalculations ??
+        dateOfCalculationsOptions[0].value,
+    },
+  )
+
   const currencyInputMaxLength =
     customPageData?.configJson?.currencyInputMaxLength ?? 14
 
@@ -165,7 +180,47 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
       ? maxMonthPensionDelayIfBorn1951OrEarlier
       : maxMonthPensionDelayIfBornAfter1951
 
+  const allCalculatorsOptions = useMemo(() => {
+    const options = [...dateOfCalculationsOptions]
+
+    if (is2025FormPreviewActive(customPageData)) {
+      options.unshift({
+        label: formatMessage(translationStrings.form2025PreviewLabel),
+        value: NEW_SYSTEM_TAKES_PLACE_DATE.toISOString(),
+      })
+    }
+
+    return options
+  }, [customPageData, dateOfCalculationsOptions, formatMessage])
+
+  const isNewSystemActive =
+    is2025FormPreviewActive(customPageData) &&
+    dateOfCalculations === NEW_SYSTEM_TAKES_PLACE_DATE.toISOString()
+
   const basePensionTypeOptions = useMemo<Option<BasePensionType>[]>(() => {
+    if (isNewSystemActive) {
+      const options = [
+        {
+          label: formatMessage(
+            translationStrings.basePensionNewSystemDisabilityLabel,
+          ),
+          value: BasePensionType.NewSystemDisability,
+        },
+        {
+          label: formatMessage(
+            translationStrings.basePensionNewSystemPartialDisabilityLabel,
+          ),
+          value: BasePensionType.NewSystemPartialDisability,
+        },
+        {
+          label: formatMessage(
+            translationStrings.basePensionNewSystemMedicalAndRehabilitation,
+          ),
+          value: BasePensionType.NewSystemMedicalAndRehabilitation,
+        },
+      ]
+      return options
+    }
     const options = [
       {
         label: formatMessage(translationStrings.basePensionRetirementLabel),
@@ -190,9 +245,10 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
         value: BasePensionType.HalfRetirement,
       },
     ]
+
     options.sort(sortAlpha('label'))
     return options
-  }, [formatMessage])
+  }, [formatMessage, isNewSystemActive])
 
   const hasSpouseOptions = useMemo<Option<boolean>[]>(() => {
     return [
@@ -265,15 +321,6 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
     ]
   }, [formatMessage])
 
-  const [dateOfCalculations, setDateOfCalculations] = useQueryState(
-    'dateOfCalculations',
-    {
-      defaultValue:
-        methods.formState.defaultValues?.dateOfCalculations ??
-        dateOfCalculationsOptions[0].value,
-    },
-  )
-
   const { linkResolver } = useLinkResolver()
 
   const router = useRouter()
@@ -355,6 +402,30 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
     ]
   }, [formatMessage])
 
+  // Make sure we never enter an invalid state
+  useEffect(() => {
+    if (isNewSystemActive) {
+      if (
+        typeOfBasePension !== BasePensionType.NewSystemDisability &&
+        typeOfBasePension !== BasePensionType.NewSystemPartialDisability &&
+        typeOfBasePension !== BasePensionType.NewSystemMedicalAndRehabilitation
+      ) {
+        methods.setValue(
+          'typeOfBasePension',
+          BasePensionType.NewSystemDisability,
+        )
+      }
+    } else {
+      if (
+        typeOfBasePension === BasePensionType.NewSystemDisability ||
+        typeOfBasePension === BasePensionType.NewSystemPartialDisability ||
+        typeOfBasePension === BasePensionType.NewSystemMedicalAndRehabilitation
+      ) {
+        methods.setValue('typeOfBasePension', BasePensionType.Retirement)
+      }
+    }
+  }, [isNewSystemActive, methods, typeOfBasePension])
+
   const birthYearOptions = useMemo<Option<number>[]>(() => {
     const today = new Date()
     const options: Option<number>[] = []
@@ -411,10 +482,10 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
     return options
   }, [defaultPensionDate, maxMonthPensionDelay, maxMonthPensionHurry])
 
-  const title = `${formatMessage(translationStrings.mainTitle)} ${
-    dateOfCalculationsOptions.find((o) => o.value === dateOfCalculations)
-      ?.label ?? dateOfCalculationsOptions[0].label
-  }`
+  const title = `${formatMessage(translationStrings.mainTitle)} ${(
+    allCalculatorsOptions.find((o) => o.value === dateOfCalculations)?.label ??
+    dateOfCalculationsOptions[0].label
+  ).toLowerCase()}`
 
   const startMonthOptions = useMemo(() => {
     if (!defaultPensionDate) {
@@ -533,10 +604,31 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
                               translationStrings.dateOfCalculationsPlaceholder,
                             )}
                             size="sm"
-                            options={dateOfCalculationsOptions}
+                            options={allCalculatorsOptions}
                             onSelect={(option) => {
                               if (option) {
                                 setDateOfCalculations(option.value)
+                                if (isNewSystemActive) {
+                                  if (
+                                    option.value ===
+                                    NEW_SYSTEM_TAKES_PLACE_DATE.toISOString()
+                                  ) {
+                                    // Date is being moved to the new system date
+                                    methods.setValue(
+                                      'typeOfBasePension',
+                                      BasePensionType.NewSystemDisability,
+                                    )
+                                  } else if (
+                                    dateOfCalculations ===
+                                    NEW_SYSTEM_TAKES_PLACE_DATE.toISOString()
+                                  ) {
+                                    // Date is being moved from new system date
+                                    methods.setValue(
+                                      'typeOfBasePension',
+                                      BasePensionType.Retirement,
+                                    )
+                                  }
+                                }
                               }
                             }}
                           />
@@ -827,6 +919,10 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
 
                             {(typeOfBasePension ===
                               BasePensionType.Disability ||
+                              typeOfBasePension ===
+                                BasePensionType.NewSystemDisability ||
+                              typeOfBasePension ===
+                                BasePensionType.NewSystemPartialDisability ||
                               typeOfBasePension ===
                                 BasePensionType.Rehabilitation) && (
                               <Box className={styles.inputContainer}>
diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
index 8d0d36910b4a..9b0e7470d093 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
@@ -1,4 +1,4 @@
-import { Fragment, useState } from 'react'
+import { Fragment, useMemo, useState } from 'react'
 import { useIntl } from 'react-intl'
 
 import {
@@ -58,7 +58,9 @@ import {
   convertToQueryParams,
   extractSlug,
   getDateOfCalculationsOptions,
+  is2025FormPreviewActive,
   is2025PreviewActive,
+  NEW_SYSTEM_TAKES_PLACE_DATE,
 } from './utils'
 import * as styles from './PensionCalculatorResults.css'
 
@@ -285,11 +287,24 @@ const PensionCalculatorResults: CustomScreen<PensionCalculatorResultsProps> = ({
 
   const highlightedItems2025 = calculation2025.highlightedItems ?? []
 
-  const title = `${formatMessage(translationStrings.mainTitle)} ${
-    dateOfCalculationsOptions.find(
+  const allCalculatorsOptions = useMemo(() => {
+    const options = [...dateOfCalculationsOptions]
+
+    if (is2025FormPreviewActive(customPageData)) {
+      options.unshift({
+        label: formatMessage(translationStrings.form2025PreviewLabel),
+        value: NEW_SYSTEM_TAKES_PLACE_DATE.toISOString(),
+      })
+    }
+
+    return options
+  }, [customPageData, dateOfCalculationsOptions, formatMessage])
+
+  const title = `${formatMessage(translationStrings.mainTitle)} ${(
+    allCalculatorsOptions.find(
       (o) => o.value === calculationInput.dateOfCalculations,
-    )?.label ?? ''
-  }`
+    )?.label ?? dateOfCalculationsOptions[0].label
+  ).toLowerCase()}`
 
   const calculationIsPresent =
     typeof calculation.groups?.length === 'number' &&
diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts b/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
index 4c5373609c9f..30c0bfc8b130 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
@@ -17,6 +17,12 @@ export const translationStrings = defineMessages({
     defaultMessage: 'Þú vilt hefja töku eftir 67 ára aldur',
     description: 'Upplýsingar sem birtast ef þú vilt seinka töku ellilífeyris',
   },
+  form2025PreviewLabel: {
+    id: 'web.pensionCalculator:form2025PreviewLabel',
+    defaultMessage: 'Eftir 1. september 2025',
+    description:
+      'Valmöguleiki í dropdown fyrir "Allar reiknivélar" ef það á að leyfa eftir 1. sept 2025 preview',
+  },
   results2025ImageUrl: {
     id: 'web.pensionCalculator:results2025ImageUrl',
     defaultMessage:
@@ -54,6 +60,24 @@ export const translationStrings = defineMessages({
     defaultMessage: 'Ellilífeyrir',
     description: 'Tegund lífeyris, Ellilífeyrir',
   },
+  basePensionNewSystemDisabilityLabel: {
+    id: 'web.pensionCalculator:basePensionNewSystemDisabilityLabel',
+    defaultMessage: 'Örorkulífeyrir',
+    description:
+      'Tegund lífeyris fyrir nýtt kerfi þann 1. sept 2025, Örorkulífeyrir',
+  },
+  basePensionNewSystemPartialDisabilityLabel: {
+    id: 'web.pensionCalculator:basePensionNewSystemPartialDisabilityLabel',
+    defaultMessage: 'Hlutaörorkulífeyrir',
+    description:
+      'Tegund lífeyris fyrir nýtt kerfi þann 1. sept 2025, Hlutaörorkulífeyrir',
+  },
+  basePensionNewSystemMedicalAndRehabilitation: {
+    id: 'web.pensionCalculator:basePensionNewSystemMedicalAndRehabilitation',
+    defaultMessage: 'Sjúkra- og endurhæfing',
+    description:
+      'Tegund lífeyris fyrir nýtt kerfi þann 1. sept 2025, Sjúkra- og endurhæfing',
+  },
   basePensionFishermanRetirementLabel: {
     id: 'web.pensionCalculator:basePensionFishermanRetirementLabel',
     defaultMessage: 'Ellilífeyrir sjómanna',
diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/utils.ts b/apps/web/screens/Organization/SocialInsuranceAdministration/utils.ts
index 722370dda5ab..fb8cad0b51dc 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/utils.ts
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/utils.ts
@@ -153,3 +153,9 @@ export const extractSlug = (
 export const is2025PreviewActive = (customPageData?: CustomPage | null) => {
   return Boolean(customPageData?.configJson?.show2025Preview)
 }
+
+export const is2025FormPreviewActive = (customPageData?: CustomPage | null) => {
+  return Boolean(customPageData?.configJson?.show2025FormPreview)
+}
+
+export const NEW_SYSTEM_TAKES_PLACE_DATE = new Date(2025, 8, 2)

From ec48ce55502d985757efadf02724534f7b7f3b57 Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Fri, 6 Dec 2024 12:47:20 +0000
Subject: [PATCH 3/8] Add more translation strings

---
 .../translationStrings.ts                     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts b/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
index 30c0bfc8b130..e2625f94173f 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
@@ -972,6 +972,38 @@ export const translationStrings = defineMessages({
     defaultMessage: 'Örorkulífeyrir',
     description: 'Niðurstöðuskjár, Örorkulífeyrir 2025',
   },
+  'REIKNH.SJUKRAOGENDURH_HUPPBOT_2025': {
+    id: 'web.pensionCalculator:REIKNH.SJUKRAOGENDURH_HUPPBOT_2025',
+    defaultMessage: 'Sjúkra- og endurhæfingargreiðslur og heimilisuppbót',
+    description:
+      'Niðurstöðuskjár, Sjúkra- og endurhæfingargreiðslur og heimilisuppbót',
+  },
+  'REIKNH.SJUKRAOGENDURH_2025': {
+    id: 'web.pensionCalculator:REIKNH.SJUKRAOGENDURH_2025',
+    defaultMessage: 'Sjúkra- og endurhæfingargreiðslur',
+    description: 'Niðurstöðuskjár, Sjúkra- og endurhæfingargreiðslur',
+  },
+  'REIKNH.HLUTAORORKA_ALDURSV_HUPPBOT_2025': {
+    id: 'web.pensionCalculator:REIKNH.HLUTAORORKA_ALDURSV_HUPPBOT_2025',
+    defaultMessage: 'Hlutaörorkulífeyrir, aldursviðbót og heimilisuppbót',
+    description:
+      'Niðurstöðuskjár, Hlutaörorkulífeyrir, aldursviðbót og heimilisuppbót',
+  },
+  'REIKNH.HLUTAORORKA_ALDURSV_2025': {
+    id: 'web.pensionCalculator:REIKNH.HLUTAORORKA_ALDURSV_2025',
+    defaultMessage: 'Hlutaörorkulífeyrir og aldursviðbót',
+    description: 'Niðurstöðuskjár, Hlutaörorkulífeyrir og aldursviðbót',
+  },
+  'REIKNH.HLUTAORORKA_HUPPBOT_2025': {
+    id: 'web.pensionCalculator:REIKNH.HLUTAORORKA_HUPPBOT_2025',
+    defaultMessage: 'Hlutaörorkulífeyrir og heimilisuppbót',
+    description: 'Niðurstöðuskjár, Hlutaörorkulífeyrir og heimilisuppbót',
+  },
+  'REIKNH.HLUTAORORKA': {
+    id: 'web.pensionCalculator:REIKNH.HLUTAORORKA',
+    defaultMessage: 'Hlutaörorkulífeyrir',
+    description: 'Niðurstöðuskjár, Hlutaörorkulífeyrir',
+  },
   highlighedResultItemHeadingForTotalAfterTaxFromTR: {
     id: 'web.pensionCalculator:REIKNH.highlighedResultItemHeadingForTotalAfterTaxFromTR',
     defaultMessage: 'Þar af greiðslur frá TR',

From 8fdeb52cfe57f9909b598f769c93ed8a50d76524 Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Fri, 6 Dec 2024 14:55:11 +0000
Subject: [PATCH 4/8] Remove comment

---
 .../SocialInsuranceAdministration/PensionCalculator.tsx          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
index bed091fc0ebe..3f72da36ae76 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
@@ -73,7 +73,6 @@ const hasDisabilityAssessment = (
   return (
     typeOfBasePension === BasePensionType.Disability ||
     typeOfBasePension === BasePensionType.Rehabilitation ||
-    // TODO: verify
     typeOfBasePension === BasePensionType.NewSystemDisability ||
     typeOfBasePension === BasePensionType.NewSystemPartialDisability ||
     typeOfBasePension === BasePensionType.NewSystemMedicalAndRehabilitation

From 09041823672c74355eafc37a247a0f34c41c0e6e Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Mon, 9 Dec 2024 11:07:28 +0000
Subject: [PATCH 5/8] Add text for 2025 calculator

---
 .../SocialInsuranceAdministration/PensionCalculator.tsx     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
index 3f72da36ae76..8914ff758bbe 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
@@ -934,7 +934,11 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
                                   }
                                   label={formatMessage(
                                     typeOfBasePension ===
-                                      BasePensionType.Disability
+                                      BasePensionType.Disability ||
+                                      typeOfBasePension ===
+                                        BasePensionType.NewSystemDisability ||
+                                      typeOfBasePension ===
+                                        BasePensionType.NewSystemPartialDisability
                                       ? translationStrings.ageOfFirst75DisabilityAssessment
                                       : translationStrings.ageOfFirst75RehabilitationAssessment,
                                   )}

From 7c525546f343eb2512e9246b900ac897287a1491 Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Thu, 12 Dec 2024 10:10:59 +0000
Subject: [PATCH 6/8] Add translation string

---
 .../SocialInsuranceAdministration/PensionCalculator.tsx     | 6 +++++-
 .../SocialInsuranceAdministration/translationStrings.ts     | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
index 8914ff758bbe..76f95b203101 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
@@ -481,7 +481,11 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
     return options
   }, [defaultPensionDate, maxMonthPensionDelay, maxMonthPensionHurry])
 
-  const title = `${formatMessage(translationStrings.mainTitle)} ${(
+  const title = `${formatMessage(
+    isNewSystemActive
+      ? translationStrings.form2025PreviewMainTitle
+      : translationStrings.mainTitle,
+  )} ${(
     allCalculatorsOptions.find((o) => o.value === dateOfCalculations)?.label ??
     dateOfCalculationsOptions[0].label
   ).toLowerCase()}`
diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts b/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
index e2625f94173f..8a273868f14b 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
@@ -453,6 +453,11 @@ export const translationStrings = defineMessages({
     defaultMessage: 'Reiknivél lífeyris',
     description: 'Aðal titill',
   },
+  form2025PreviewMainTitle: {
+    id: 'web.pensionCalculator:form2025PreviewMainTitle',
+    defaultMessage: 'Reiknivél örorku- og endurhæfingargreiðslna',
+    description: 'Aðal titill fyrir nýju eftir 1. sept 2025 reiknivél',
+  },
   resultDisclaimer: {
     id: 'web.pensionCalculator:resultDisclaimer',
     defaultMessage:

From 44f6a69ef0c246c44767fecb1333feafcebc5dfa Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Fri, 13 Dec 2024 09:58:09 +0000
Subject: [PATCH 7/8] Decrease font size and wrap text

---
 .../PensionCalculator.tsx                     | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
index 76f95b203101..143a47f3b0de 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculator.tsx
@@ -485,11 +485,14 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
     isNewSystemActive
       ? translationStrings.form2025PreviewMainTitle
       : translationStrings.mainTitle,
-  )} ${(
+  )}`
+  const titlePostfix = `${(
     allCalculatorsOptions.find((o) => o.value === dateOfCalculations)?.label ??
     dateOfCalculationsOptions[0].label
   ).toLowerCase()}`
 
+  const titleVariant = isNewSystemActive ? 'h2' : 'h1'
+
   const startMonthOptions = useMemo(() => {
     if (!defaultPensionDate) {
       return monthOptions
@@ -551,9 +554,16 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
             >
               <Box paddingY={5}>
                 <Stack space={3}>
-                  <Text variant="h1" as="h1">
-                    {title}
-                  </Text>
+                  {isNewSystemActive && (
+                    <Text variant={titleVariant} as="h1">
+                      {title} <div>{titlePostfix}</div>
+                    </Text>
+                  )}
+                  {!isNewSystemActive && (
+                    <Text variant={titleVariant} as="h1">
+                      {title} {titlePostfix}
+                    </Text>
+                  )}
                   <Text>{formatMessage(translationStrings.isTurnedOff)}</Text>
                 </Stack>
               </Box>
@@ -574,9 +584,16 @@ const PensionCalculator: CustomScreen<PensionCalculatorProps> = ({
                     <Stack space={3}>
                       <Stack space={3}>
                         <Box paddingTop={6}>
-                          <Text variant="h1" as="h1">
-                            {title}
-                          </Text>
+                          {isNewSystemActive && (
+                            <Text variant={titleVariant} as="h1">
+                              {title} <div>{titlePostfix}</div>
+                            </Text>
+                          )}
+                          {!isNewSystemActive && (
+                            <Text variant={titleVariant} as="h1">
+                              {title} {titlePostfix}
+                            </Text>
+                          )}
                         </Box>
                       </Stack>
                       <Box

From 9226769be6ced68813ff4832f47a85ec1994eb51 Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Fri, 13 Dec 2024 15:12:06 +0000
Subject: [PATCH 8/8] Update title

---
 .../PensionCalculatorResults.tsx              | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
index 9b0e7470d093..4edace5cabe2 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
@@ -300,12 +300,24 @@ const PensionCalculatorResults: CustomScreen<PensionCalculatorResultsProps> = ({
     return options
   }, [customPageData, dateOfCalculationsOptions, formatMessage])
 
-  const title = `${formatMessage(translationStrings.mainTitle)} ${(
+  const isNewSystemActive =
+    is2025FormPreviewActive(customPageData) &&
+    calculationInput.dateOfCalculations ===
+      NEW_SYSTEM_TAKES_PLACE_DATE.toISOString()
+
+  const title = `${formatMessage(
+    isNewSystemActive
+      ? translationStrings.form2025PreviewMainTitle
+      : translationStrings.mainTitle,
+  )}`
+  const titlePostfix = `${(
     allCalculatorsOptions.find(
       (o) => o.value === calculationInput.dateOfCalculations,
     )?.label ?? dateOfCalculationsOptions[0].label
   ).toLowerCase()}`
 
+  const titleVariant = isNewSystemActive ? 'h2' : 'h1'
+
   const calculationIsPresent =
     typeof calculation.groups?.length === 'number' &&
     calculation.groups.length > 0
@@ -349,9 +361,16 @@ const PensionCalculatorResults: CustomScreen<PensionCalculatorResultsProps> = ({
                 >
                   <Box paddingY={5}>
                     <Stack space={3}>
-                      <Text variant="h1" as="h1">
-                        {title}
-                      </Text>
+                      {isNewSystemActive && (
+                        <Text variant={titleVariant} as="h1">
+                          {title} <div>{titlePostfix}</div>
+                        </Text>
+                      )}
+                      {!isNewSystemActive && (
+                        <Text variant={titleVariant} as="h1">
+                          {title} {titlePostfix}
+                        </Text>
+                      )}
                       <Text>
                         {formatMessage(translationStrings.isTurnedOff)}
                       </Text>
@@ -372,9 +391,16 @@ const PensionCalculatorResults: CustomScreen<PensionCalculatorResultsProps> = ({
                   <Box paddingY={6}>
                     <Stack space={5}>
                       <Stack space={2}>
-                        <Text variant="h1" as="h1">
-                          {title}
-                        </Text>
+                        {isNewSystemActive && (
+                          <Text variant={titleVariant} as="h1">
+                            {title} <div>{titlePostfix}</div>
+                          </Text>
+                        )}
+                        {!isNewSystemActive && (
+                          <Text variant={titleVariant} as="h1">
+                            {title} {titlePostfix}
+                          </Text>
+                        )}
                         <Box className={styles.textMaxWidth}>
                           <Text>
                             {formatMessage(