From a36eaec3aa97fb980f4c7531a6225dc1161504e3 Mon Sep 17 00:00:00 2001
From: albinagu <47886428+albinagu@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:45:04 +0000
Subject: [PATCH] fix(inheritance-report): adding funeral service cost (#17159)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .../inheritance-report/src/fields/FuneralCost/index.tsx    | 4 +++-
 .../src/fields/Overview/OverviewDebts/index.tsx            | 6 ++++++
 .../src/forms/sections/debtsAndFuneralCost.ts              | 4 ++++
 .../templates/inheritance-report/src/lib/messages.ts       | 7 ++++++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/libs/application/templates/inheritance-report/src/fields/FuneralCost/index.tsx b/libs/application/templates/inheritance-report/src/fields/FuneralCost/index.tsx
index 3cfe9050e922..6222ecda7f0b 100644
--- a/libs/application/templates/inheritance-report/src/fields/FuneralCost/index.tsx
+++ b/libs/application/templates/inheritance-report/src/fields/FuneralCost/index.tsx
@@ -76,6 +76,7 @@ export const FuneralCost: FC<
     const rentCost = valueToNumber(values?.rent)
     const foodCost = valueToNumber(values?.food)
     const tombstoneCost = valueToNumber(values?.tombstone)
+    const servicesCost = valueToNumber(values?.service)
 
     let total =
       buildCost +
@@ -85,7 +86,8 @@ export const FuneralCost: FC<
       musicCost +
       rentCost +
       foodCost +
-      tombstoneCost
+      tombstoneCost +
+      servicesCost
 
     if (hasOther) {
       total += valueToNumber(values?.other)
diff --git a/libs/application/templates/inheritance-report/src/fields/Overview/OverviewDebts/index.tsx b/libs/application/templates/inheritance-report/src/fields/Overview/OverviewDebts/index.tsx
index 8ed7095c84c0..b7367e2a7eca 100644
--- a/libs/application/templates/inheritance-report/src/fields/Overview/OverviewDebts/index.tsx
+++ b/libs/application/templates/inheritance-report/src/fields/Overview/OverviewDebts/index.tsx
@@ -94,6 +94,12 @@ export const OverviewDebts: FC<React.PropsWithChildren<FieldBaseProps>> = ({
               getValueViaPath<string>(answers, 'funeralCost.tombstone') || '0',
             )}
           />
+          <Row
+            title={formatMessage(m.funeralServiceCost)}
+            value={formatCurrency(
+              getValueViaPath<string>(answers, 'funeralCost.service') || '0',
+            )}
+          />
           <Row
             title={formatMessage(m.funeralOtherCost)}
             value={formatCurrency(
diff --git a/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts b/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts
index c2db1b03f11b..ed46966a1955 100644
--- a/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts
+++ b/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts
@@ -155,6 +155,10 @@ export const debtsAndFuneralCost = buildSection({
                     id: 'tombstone',
                     title: m.funeralTombstoneCost,
                   },
+                  {
+                    id: 'service',
+                    title: m.funeralServiceCost,
+                  },
                 ],
               },
             ),
diff --git a/libs/application/templates/inheritance-report/src/lib/messages.ts b/libs/application/templates/inheritance-report/src/lib/messages.ts
index 1d764791a8e4..39003d0532a1 100644
--- a/libs/application/templates/inheritance-report/src/lib/messages.ts
+++ b/libs/application/templates/inheritance-report/src/lib/messages.ts
@@ -995,6 +995,11 @@ export const m = defineMessages({
     defaultMessage: 'Legsteinn (áætlaður kostnaður)',
     description: '',
   },
+  funeralServiceCost: {
+    id: 'ir.application:funeralServiceCost',
+    defaultMessage: 'Útfararþjónusta',
+    description: '',
+  },
   funeralOtherCostQuestion: {
     id: 'ir.application:funeralOtherCostQuestion',
     defaultMessage: 'Annar kostnaður?',
@@ -1253,7 +1258,7 @@ export const m = defineMessages({
   },
   deceasedShare: {
     id: 'ir.application:deceasedShare',
-    defaultMessage: 'Hlutfall séreignar',
+    defaultMessage: 'Búshluti maka',
     description: '',
   },
   spousesShareDescription: {