1xINTERNET · hossein-rashno · May 7, 2025 · May 7, 2025
diff --git a/apps/services/auth/ids-api/src/openapi.yaml b/apps/services/auth/ids-api/src/openapi.yaml
@@ -2360,7 +2360,7 @@ components:
         expiration:
           format: date-time
           type: string
-          example: 2025-05-08T07:40:13.069Z
+          example: 2025-05-08T09:53:30.554Z
         consumedTime:
           format: date-time
           type: string
@@ -2413,7 +2413,7 @@ components:
         expiration:
           format: date-time
           type: string
-          example: 2025-05-08T07:40:13.132Z
+          example: 2025-05-08T09:53:30.612Z
         consumedTime:
           type: object
         data:

diff --git a/apps/services/auth/personal-representative-public/src/openapi.yaml b/apps/services/auth/personal-representative-public/src/openapi.yaml
@@ -343,11 +343,11 @@ components:
         validFrom:
           format: date-time
           type: string
-          example: 2025-05-06T07:40:07.938Z
+          example: 2025-05-06T09:53:25.263Z
         validTo:
           format: date-time
           type: string
-          example: 2025-05-08T07:40:07.938Z
+          example: 2025-05-08T09:53:25.263Z
       required:
         - code
         - description

diff --git a/apps/services/auth/personal-representative/src/openapi.yaml b/apps/services/auth/personal-representative/src/openapi.yaml
@@ -1032,11 +1032,11 @@ components:
         validFrom:
           format: date-time
           type: string
-          example: 2025-05-06T07:40:11.453Z
+          example: 2025-05-06T09:53:29.098Z
         validTo:
           format: date-time
           type: string
-          example: 2025-05-08T07:40:11.453Z
+          example: 2025-05-08T09:53:29.098Z
       required:
         - code
         - description
@@ -1135,7 +1135,7 @@ components:
         validTo:
           format: date-time
           type: string
-          example: 2025-05-08T07:40:11.441Z
+          example: 2025-05-08T09:53:29.087Z
         rights:
           example: >-
             [{code:"health", description:"health descr", validFrom:"xx.yy.zzzz",
@@ -1222,7 +1222,7 @@ components:
         validTo:
           format: date-time
           type: string
-          example: 2025-05-08T07:40:11.444Z
+          example: 2025-05-08T09:53:29.090Z
         rightCodes:
           example: '["health", "finance"]'
           description: >-
@@ -1254,7 +1254,7 @@ components:
         validTo:
           format: date-time
           type: string
-          example: 2025-05-08T07:40:11.450Z
+          example: 2025-05-08T09:53:29.096Z
       required:
         - code
         - name

diff --git a/apps/services/endorsements/api/src/openapi.yaml b/apps/services/endorsements/api/src/openapi.yaml
@@ -1054,11 +1054,11 @@ components:
         openedDate:
           format: date-time
           type: string
-          default: 2025-05-07T07:37:58.838Z
+          default: 2025-05-07T09:51:13.496Z
         closedDate:
           format: date-time
           type: string
-          default: 2025-06-07T07:37:58.838Z
+          default: 2025-06-07T09:51:13.496Z
         adminLock:
           type: boolean
           default: false

diff --git a/apps/services/user-notification/src/openapi.yaml b/apps/services/user-notification/src/openapi.yaml
@@ -806,11 +806,11 @@ components:
         created:
           format: date-time
           type: string
-          example: '2025-05-07T07:37:52.399Z'
+          example: '2025-05-07T09:51:06.931Z'
         updated:
           format: date-time
           type: string
-          example: '2025-05-07T07:37:52.399Z'
+          example: '2025-05-07T09:51:06.931Z'
         read:
           type: boolean
           example: false

diff --git a/apps/tax/pages/_app.tsx b/apps/tax/pages/_app.tsx
@@ -1,12 +1,15 @@
-import Head from 'next/head'
 import React, { FC } from 'react'
+import Head from 'next/head'
+
+import { Header } from '@island.is/tax/components'
 
 const Layout: FC<React.PropsWithChildren<unknown>> = ({ children }) => {
   return (
     <div>
       <Head>
         <title>Ísland.is</title>
       </Head>
+      <Header megaMenuData={undefined} />
       {children}
     </div>
   )
@@ -20,16 +23,4 @@ const SupportApplication: any = ({ Component, pageProps }) => {
   )
 }
 
-SupportApplication.getInitialProps = async (appContext) => {
-  const { Component, ctx } = appContext
-  const customContext = {
-    ...ctx,
-  }
-  const pageProps = (await Component.getInitialProps(customContext)) as any
-
-  return {
-    pageProps,
-  }
-}
-
 export default SupportApplication
diff --git a/apps/tax/pages/tax/index.tsx b/apps/tax/pages/tax/index.tsx
@@ -0,0 +1,121 @@
+import React from 'react'
+
+import {
+  Box,
+  Button,
+  Checkbox,
+  FormStepperV2,
+  Icon,
+  Section,
+  Text,
+} from '@island.is/island-ui/core'
+import FormStepsLayout from '@island.is/tax/screens/Layouts/FormStepsLayout'
+
+export async function getServerSideProps() {
+  const taxData = {
+    country: 'test',
+    vatRate: 10,
+    description: 'test',
+  }
+
+  return {
+    props: {
+      taxInfo: taxData,
+    },
+  }
+}
+
+const Tax = ({ taxInfo }) => {
+  return (
+    <FormStepsLayout
+      sidebarContent={
+        <Box margin={3}>
+          <FormStepperV2
+            sections={[
+              <Section
+                isActive
+                section={'Gagnaöflun'}
+                sectionIndex={0}
+                key={0}
+              />,
+              <Section section={'Umsækjandi'} sectionIndex={1} key={1} />,
+              <Section section={'Tekjur'} sectionIndex={2} key={2} />,
+              <Section section={'Eignir'} sectionIndex={3} key={3} />,
+              <Section
+                section={'Skuldir og vaxtagjöld'}
+                sectionIndex={4}
+                key={4}
+              />,
+              <Section section={'Yfirlit'} sectionIndex={5} key={5} />,
+              <Section section={'Staðfesting'} sectionIndex={6} key={6} />,
+            ]}
+          />
+        </Box>
+      }
+    >
+      <Box
+        background="white"
+        borderRadius="large"
+        padding={[3, 3, 10]}
+        marginY={4}
+      >
+        <Text variant="h2" as="h2">
+          Gagnaöflun
+        </Text>
+        <Box paddingY={4} display="flex" alignItems={['center']}>
+          <Icon icon="fileTrayFull" type="outline" color="blue400" />
+          <Box paddingLeft={2}>
+            <Text variant="h4" as="h4">
+              Eftirfarandi gögn verða sótt rafrænt
+            </Text>
+          </Box>
+        </Box>
+        <Text variant="h5" as="h5" color="blue400">
+          Persónupplýsingar
+        </Text>
+        <Text fontWeight="light" color="dark400" paddingBottom={4}>
+          Upplýsingar frá Þjóðskrá um nafn, kennitölu og lögheimili.
+        </Text>
+        <Text variant="h5" as="h5" color="blue400">
+          Netfang og símanúmer
+        </Text>
+        <Text fontWeight="light" color="dark400" paddingBottom={4}>
+          Upplýsingar frá Mínum síðum á Ísland.is um netfang og símanúmer.
+        </Text>
+        <Text variant="h5" as="h5" color="blue400">
+          Upplýsingar frá Skattinum
+        </Text>
+        <Text fontWeight="light" color="dark400" paddingBottom={4}>
+          Upplýsingar um ráðstöfun persónuafsláttar og greiðslur í lífeyrissjóð
+          verður sótt til Skattsins.
+        </Text>
+
+        <Box paddingBottom={10}>
+          <Checkbox
+            large
+            subLabel="Ég skil að ofangreind gögn verði sótt rafrænt."
+          />
+        </Box>
+
+        <Box display="flex" justifyContent="spaceBetween">
+          <Button colorScheme="destructive" variant="ghost">
+            Hætta við
+          </Button>
+
+          <Button
+            colorScheme="default"
+            iconType="filled"
+            preTextIconType="filled"
+            size="default"
+            variant="primary"
+            icon="arrowForward"
+          >
+            Halda áfram
+          </Button>
+        </Box>
+      </Box>
+    </FormStepsLayout>
+  )
+}
+
+export default Tax
diff --git a/apps/tax/screens/Home.tsx b/apps/tax/screens/Home.tsx
@@ -1,3 +1,5 @@
+import router from 'next/router'
+
 import {
   Accordion,
   AccordionItem,
@@ -14,14 +16,12 @@ import {
   Stack,
   Text,
 } from '@island.is/island-ui/core'
-import { Header } from '@island.is/tax/components'
 import SidebarLayout from '@island.is/tax/screens/Layouts/SidebarLayout'
 
 const Home = () => {
   return (
     <div>
       <Page>
-        <Header megaMenuData={undefined} />
         <SidebarLayout
           sidebarContent={
             <Stack space={3}>
@@ -185,6 +185,7 @@ const Home = () => {
               cta={{
                 label: 'Sækja um',
                 variant: 'primary',
+                onClick: () => router.push('tax')
               }}
               heading="Umsókn um atvinnuleysisbætur"
               headingVariant="h3"

diff --git a/apps/tax/screens/Layouts/FormStepsLayout.tsx b/apps/tax/screens/Layouts/FormStepsLayout.tsx
@@ -0,0 +1,33 @@
+import React, { FC, ReactNode } from 'react'
+
+import {
+  Box,
+  GridColumn,
+  GridContainer,
+  GridRow,
+} from '@island.is/island-ui/core'
+
+interface FormStepsLayoutProps {
+  sidebarContent: ReactNode
+}
+
+export const FormStepsLayout: FC<
+  React.PropsWithChildren<FormStepsLayoutProps>
+> = ({ sidebarContent, children }) => {
+  return (
+    <Box background="purple100">
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '9/12']}>
+            {children}
+          </GridColumn>
+          <GridColumn span={['12/12', '12/12', '3/12']}>
+            {sidebarContent}
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+    </Box>
+  )
+}
+
+export default FormStepsLayout
diff --git a/apps/web/components/Organization/Slice/AccordionSlice/AccordionSlice.tsx b/apps/web/components/Organization/Slice/AccordionSlice/AccordionSlice.tsx
@@ -84,7 +84,7 @@ export const AccordionSlice: React.FC<React.PropsWithChildren<SliceProps>> = ({
                   (item.content?.[0] as Html)?.document?.content?.[0]
                     ?.content?.[0]?.value
                 }
-                cta={{
+
                   label: item.link?.text ?? 'Default',
                   icon: 'arrowForward',
                   onClick: () => {