From 734ef268a4cb2b4892ccbde28513bac01a024816 Mon Sep 17 00:00:00 2001
From: Eusebio <e.chirino@1xinternet.de>
Date: Wed, 7 May 2025 21:05:19 +0200
Subject: [PATCH] Add confirmation screen

---
 apps/tax/pages/tax/index.tsx             |   6 +-
 apps/tax/screens/Tax/steps/StepSeven.tsx |  43 ++
 apps/tax/screens/Tax/steps/StepSix.tsx   | 554 +++++++++++++++++++++++
 3 files changed, 601 insertions(+), 2 deletions(-)
 create mode 100644 apps/tax/screens/Tax/steps/StepSeven.tsx
 create mode 100644 apps/tax/screens/Tax/steps/StepSix.tsx

diff --git a/apps/tax/pages/tax/index.tsx b/apps/tax/pages/tax/index.tsx
index e32bf932..70fdd8c1 100644
--- a/apps/tax/pages/tax/index.tsx
+++ b/apps/tax/pages/tax/index.tsx
@@ -5,6 +5,8 @@ import FormStepsLayout from '@island.is/tax/screens/Layouts/FormStepsLayout'
 import StepFive from '@island.is/tax/screens/Tax/steps/StepFive'
 import StepFour from '@island.is/tax/screens/Tax/steps/StepFour'
 import StepOne from '@island.is/tax/screens/Tax/steps/StepOne'
+import StepSeven from '@island.is/tax/screens/Tax/steps/StepSeven'
+import StepSix from '@island.is/tax/screens/Tax/steps/StepSix'
 import StepThree from '@island.is/tax/screens/Tax/steps/StepThree'
 import StepTwo from '@island.is/tax/screens/Tax/steps/StepTwo'
 
@@ -48,9 +50,9 @@ const Tax = ({ taxInfo }) => {
       case 4:
         return <StepFive onForward={onForward} onBackward={onBackward}></StepFive>
       case 5:
-        return <div>Step6</div>
+        return <StepSix onForward={onForward} onBackward={onBackward}></StepSix>
       case 6:
-        return <div>Step7</div>
+        return <StepSeven onForward={onForward} onBackward={onBackward}></StepSeven>
       default:
         break
     }
diff --git a/apps/tax/screens/Tax/steps/StepSeven.tsx b/apps/tax/screens/Tax/steps/StepSeven.tsx
new file mode 100644
index 00000000..e94c2e78
--- /dev/null
+++ b/apps/tax/screens/Tax/steps/StepSeven.tsx
@@ -0,0 +1,43 @@
+import {
+  AlertMessage,
+  Box,
+  Button,
+  Text,
+} from '@island.is/island-ui/core'
+
+import Buttons from '../Buttons'
+
+type StepSevenProps = {
+  onForward: () => void
+  onBackward: () => void
+}
+
+const StepSeven = ({ onForward, onBackward }: StepSevenProps) => {
+  return (
+    <Box
+      background="white"
+      borderRadius="large"
+      padding={[3, 3, 10]}
+      marginY={4}
+    >
+      <Text variant="h2" paddingBottom={4}>
+        Staðfesting
+      </Text>
+      <Box paddingBottom={4}>
+        <AlertMessage title="Þú hefur skilað inn framtali" type="success" />
+      </Box>
+      <Text variant="h3" paddingBottom={2}>
+        Þú getur nálgast álagningarseðil á mínum síðum
+      </Text>
+      <Text fontWeight="light" paddingBottom={2}>
+        Þú getur einnig sótt stafrænt afrit af framtali, fylgiskjölum og
+        álagningarseðli á mínum síðum. Þar má finna rafrænt afrit af
+        skattaframtölum fyrir gjaldárin 2006 og síðar. Ef þú skilaðir ekki
+        framtali er einungis álagningarseðill birtur.
+      </Text>
+      <Buttons onBackward={onBackward} onForward={onForward}></Buttons>
+    </Box>
+  )
+}
+
+export default StepSeven
diff --git a/apps/tax/screens/Tax/steps/StepSix.tsx b/apps/tax/screens/Tax/steps/StepSix.tsx
new file mode 100644
index 00000000..41a081e6
--- /dev/null
+++ b/apps/tax/screens/Tax/steps/StepSix.tsx
@@ -0,0 +1,554 @@
+import {
+  Box,
+  Checkbox,
+  Divider,
+  GridColumn,
+  GridContainer,
+  GridRow,
+  Text,
+} from '@island.is/island-ui/core'
+
+import Buttons from '../Buttons'
+
+type StepSixProps = {
+  onForward: () => void
+  onBackward: () => void
+}
+
+const StepSix = ({ onForward, onBackward }: StepSixProps) => {
+  return (
+    <Box
+      background="white"
+      borderRadius="large"
+      padding={[3, 3, 10]}
+      marginY={4}
+    >
+      <Text variant="h2" paddingBottom={2}>
+        Yfirlit skattframtal
+      </Text>
+      <Text fontWeight="light" paddingTop={2}>
+        Vinsamlegast farðu yfir gögnin hér að neðan til að staðfesta að réttar
+        upplýsingar hafi verið gefnar upp.{' '}
+      </Text>
+      <Box paddingY={[4]}>
+        <Divider />
+      </Box>
+      <Text variant="h3" paddingBottom={[2]}>
+        Umsækjandi
+      </Text>
+
+      <Text>Jökull Þórðarson</Text>
+      <Text>120389-4569</Text>
+      <Text>Bláfjallagata 12, 105 Reykjavík</Text>
+      <Text>+354 772-8391</Text>
+      <Text>jokull.thordarson@email.is</Text>
+
+      <Box paddingY={[4]}>
+        <Divider />
+      </Box>
+
+      <Text variant="h3" paddingBottom={2}>
+        Tekjur ársins 2024
+      </Text>
+
+      <Text variant="h4" paddingBottom={1}>
+        Launatekjur og starfstengdar greiðslur
+      </Text>
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                {' '}
+                Norðurljós Software ehf. :
+              </Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                9.360.000 kr.
+              </Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                {' '}
+                Mús & Merki ehf. :
+              </Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                900.000 kr.
+              </Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                Samtals launagreiðslur :{' '}
+              </Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold" paddingBottom={1}>
+                10.260.000 kr.
+              </Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+
+      <Text variant="h4" paddingTop={3} paddingBottom={1}>
+        Ökutækjastyrkur, dagpeningar og hlunnindi
+      </Text>
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                {' '}
+                Dagpeningar :
+              </Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                {' '}
+                120.000 kr.
+              </Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                Samtals greiðslur :
+              </Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold" paddingBottom={1}>
+                {' '}
+                120.000 kr.
+              </Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+
+      <Text variant="h4" paddingTop={3} paddingBottom={1}>
+        Lífeyrisgreiðslur, greiðslur frá Tryggingastofnun, aðrar bótagreiðslur,
+        styrkir o.fl.
+      </Text>
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                Norðurljós Software ehf., Íþróttastyrkur :
+              </Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                75.000 kr.
+              </Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                VR, Starfsmenntastyrkur :
+              </Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                900.000 kr.
+              </Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light" paddingBottom={1}>
+                Samtals greiðslur :{' '}
+              </Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold" paddingBottom={1}>
+                {' '}
+                975.000 kr.
+              </Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+
+      <Box paddingY={[4]}>
+        <Divider />
+      </Box>
+
+      <Text variant="h3" paddingBottom={2}>
+        Eignir ársins 2024
+      </Text>
+
+      <Text variant="h4" paddingBottom={1}>
+        Innlendar fasteignir
+      </Text>
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light"> 210-9876, Bláfjallagata 12 :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">52.000.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light"> MSamtals fasteignir:</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold">52.000.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+
+      <Text variant="h4" paddingTop={2} paddingBottom={1}>
+        Bifreiðar og önnur farartæki
+      </Text>
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light"> KB-521 / 2021 :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">3.100.000 kr..</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light"> JU-329 / 2012 :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">430.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light"> Samtals bifreiðar:</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold">3.220.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+
+      <Box paddingY={[4]}>
+        <Divider />
+      </Box>
+
+      <Text variant="h3" paddingBottom={2}>
+        Skuldir og vaxtagjöld
+      </Text>
+
+      <Text variant="h4" paddingBottom={2}>
+        Upplýsingar um eign: Bláfjallagata 12
+      </Text>
+
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Lántökudagur :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">15.06.2021</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light"> Lánstími í árum :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">30</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Samtals vaxtagjöld :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold">920.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Samtals eftirstöðvar :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold">28.540.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+      </GridContainer>
+
+      <Text variant="h4" paddingY={2}>
+        Aðrar skuldir og vaxtagjöld
+      </Text>
+      <Text fontWeight="light">Kreditkort 4469 88XX XXXX 4567</Text>
+      <GridContainer>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Vaxtagjöld :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">39.200 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Eftirstöðvar :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">217.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <Text fontWeight="light">Aukalán</Text>
+
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Vaxtagjöld :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">86.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Eftirstöðvar :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">980.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <Text fontWeight="light">Varðan: 0142-26-732645</Text>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Vaxtagjöld :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">14.500 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Eftirstöðvar :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">62.000 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <Text fontWeight="light">Kílómetragjald, Skatturinn</Text>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Vaxtagjöld :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">0 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Eftirstöðvar :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">2.370 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <Text fontWeight="light">Þing- og sveitarsjóðsgjöld, Skatturinn</Text>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Vaxtagjöld :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">224kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Eftirstöðvar :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="light">0kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Samtals vaxtagjöld :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold">139.924 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+
+        <GridRow>
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'left'}>
+              <Text fontWeight="light">Samtals eftirstöðvar :</Text>
+            </Box>
+          </GridColumn>
+
+          <GridColumn span={['12/12', '12/12', '6/12']}>
+            <Box textAlign={'right'}>
+              <Text fontWeight="semiBold">1.261.370 kr.</Text>
+            </Box>
+          </GridColumn>
+        </GridRow>
+
+        <Box paddingY={[4]}>
+          <Divider />
+        </Box>
+      </GridContainer>
+
+      <Box paddingBottom={10}>
+        <Checkbox
+          large
+          subLabel="Hér með staðfestist að viðlögðum drengskap að skýrsla þessi um tekjur og eignir er gefin eftir bestu vitund. Áritaðar fjárhæðir hafa verið yfirfarnar og jafnframt leiðréttar, hafi það reynst nauðsynlegt. Mér er kunnugt um að ófullnægjandi eða röng upplýsingagjöf getur haft í för með sér álagsbeitingu eða refsingu."
+        />
+      </Box>
+      <Buttons onBackward={onBackward} onForward={onForward}></Buttons>
+    </Box>
+  )
+}
+
+export default StepSix