fix(inheritance-report): Fixes for go live (#17295)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Dec 20, 2024 · 919a065 · 919a065
1 parent 9dd9a33
commit 919a065
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 9 deletions.
diff --git a/...cation/template-api-modules/src/lib/modules/templates/inheritance-report/utils/mappers.ts b/...cation/template-api-modules/src/lib/modules/templates/inheritance-report/utils/mappers.ts
@@ -157,6 +157,7 @@ export const expandAnswers = (
             deceasedShare: gun.deceasedShare ?? '',
             deceasedShareEnabled: gun.deceasedShareEnabled ?? [],
             deceasedShareAmount: gun.deceasedShareAmount ?? 0,
+            enabled: gun.enabled ?? true,
           }
         }),
         total: answers.assets.guns?.total ?? 0,
@@ -199,6 +200,7 @@ export const expandAnswers = (
             deceasedShare: realEstate.deceasedShare ?? '0',
             deceasedShareEnabled: realEstate.deceasedShareEnabled ?? [],
             deceasedShareAmount: realEstate.deceasedShareAmount ?? 0,
+            enabled: realEstate.enabled ?? true,
           }
         }),
         total: answers.assets.realEstate?.total ?? 0,
@@ -227,6 +229,7 @@ export const expandAnswers = (
             deceasedShare: vehicle.deceasedShare ?? '0',
             deceasedShareEnabled: vehicle.deceasedShareEnabled ?? [],
             deceasedShareAmount: vehicle?.deceasedShareAmount ?? 0,
+            enabled: vehicle.enabled ?? true,
           }
         }),
         total: answers.assets.vehicles?.total ?? 0,

diff --git a/libs/application/templates/inheritance-report/src/forms/prerequisites.ts b/libs/application/templates/inheritance-report/src/forms/prerequisites.ts
@@ -38,8 +38,6 @@ export const getForm = ({
                     value: ESTATE_INHERITANCE,
                     label: m.preDataCollectionApplicationForDefault,
                     disabled: !allowEstateApplication,
-                    //TODO: remove tooltip when this application is ready to go live
-                    tooltip: m.preDataCollectionApplicationForDefaultTooltip,
                   },
                   {
                     value: PREPAID_INHERITANCE,

diff --git a/libs/application/templates/inheritance-report/src/forms/sections/assets.ts b/libs/application/templates/inheritance-report/src/forms/sections/assets.ts
@@ -345,7 +345,7 @@ export const assets = buildSection({
                       [ESTATE_INHERITANCE]: m.bankAccountCapital,
                       [PREPAID_INHERITANCE]: m.bankAccountCapitalPrePaid,
                     },
-                    id: 'propertyValuation',
+                    id: 'amount',
                     required: true,
                     currency: true,
                   },
@@ -376,7 +376,7 @@ export const assets = buildSection({
                 fromExternalData: 'bankAccounts',
                 skipPushRight: true,
                 repeaterButtonText: m.bankAccountRepeaterButton,
-                sumField: 'propertyValuation',
+                sumField: 'amount',
                 sumField2: 'exchangeRateOrInterest',
               },
             ),
@@ -494,13 +494,19 @@ export const assets = buildSection({
                     format: '######-####',
                   },
                   {
-                    title: m.stocksFaceValue,
+                    title: {
+                      [ESTATE_INHERITANCE]: m.stocksFaceValue,
+                      [PREPAID_INHERITANCE]: m.stocksFaceValuePrePaid,
+                    },
                     id: 'amount',
                     currency: true,
                     required: true,
                   },
                   {
-                    title: m.stocksRateOfChange,
+                    title: {
+                      [ESTATE_INHERITANCE]: m.stocksRateOfChange,
+                      [PREPAID_INHERITANCE]: m.stocksRateOfChangePrePaid,
+                    },
                     id: 'exchangeRateOrInterest',
                     type: 'currency',
                     required: true,

diff --git a/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts b/libs/application/templates/inheritance-report/src/forms/sections/debtsAndFuneralCost.ts
@@ -87,6 +87,9 @@ export const debtsAndFuneralCost = buildSection({
                   {
                     label: DebtTypes.OtherDebts,
                   },
+                  {
+                    label: DebtTypes.InsuranceInstitute,
+                  },
                 ],
               },
             ),

diff --git a/...plication/templates/inheritance-report/src/forms/sections/prepaidInheritance/applicant.ts b/...plication/templates/inheritance-report/src/forms/sections/prepaidInheritance/applicant.ts
@@ -20,7 +20,7 @@ export const prePaidApplicant = buildSection({
       children: [
         buildNationalIdWithNameField({
           id: 'prePaidApplicant',
-          title: m.name,
+          title: '',
           width: 'full',
           required: true,
         }),

diff --git a/...templates/inheritance-report/src/forms/sections/prepaidInheritance/inheritanceExecutor.ts b/...templates/inheritance-report/src/forms/sections/prepaidInheritance/inheritanceExecutor.ts
@@ -26,7 +26,7 @@ export const inheritanceExecutor = buildSection({
         }),
         buildNationalIdWithNameField({
           id: 'executors.executor',
-          title: m.name,
+          title: '',
           required: true,
         }),
         buildTextField({
@@ -73,7 +73,7 @@ export const inheritanceExecutor = buildSection({
         }),
         buildNationalIdWithNameField({
           id: 'executors.spouse',
-          title: m.name,
+          title: '',
           required: true,
           condition: (answers) =>
             !!((answers.executors as any)?.includeSpouse as Array<string>)

diff --git a/libs/application/templates/inheritance-report/src/lib/dataSchema.ts b/libs/application/templates/inheritance-report/src/lib/dataSchema.ts
@@ -55,6 +55,7 @@ const assetSchema = ({ withShare }: { withShare?: boolean } = {}) =>
             .refine((v) => (withShare ? validateAssetNumber(v) : true)),
           description: z.string(),
           propertyValuation: z.string(),
+          enabled: z.boolean(),
           ...(withShare ? { share: z.string() } : {}),
           ...deceasedShare,
         })

diff --git a/libs/application/templates/inheritance-report/src/lib/messages.ts b/libs/application/templates/inheritance-report/src/lib/messages.ts
@@ -708,11 +708,21 @@ export const m = defineMessages({
   },
   stocksFaceValue: {
     id: 'ir.application:stocksFaceValue',
+    defaultMessage: 'Nafnverð á dánardegi',
+    description: '',
+  },
+  stocksFaceValuePrePaid: {
+    id: 'ir.application:stocksFaceValuePrePaid',
     defaultMessage: 'Nafnverð',
     description: '',
   },
   stocksRateOfChange: {
     id: 'ir.application:stocksRateOfChange',
+    defaultMessage: 'Gengi á dánardegi',
+    description: '',
+  },
+  stocksRateOfChangePrePaid: {
+    id: 'ir.application:stocksRateOfChangePrePaid',
     defaultMessage: 'Gengi',
     description: '',
   },

diff --git a/libs/application/templates/inheritance-report/src/types.ts b/libs/application/templates/inheritance-report/src/types.ts
@@ -305,4 +305,5 @@ export enum DebtTypes {
   PropertyFees = 'Fasteignagjöld',
   OtherDebts = 'Aðrar skuldir',
   PublicCharges = 'Opinber gjöld',
+  InsuranceInstitute = 'Tryggingarstofnun ríkisins',
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,9 @@ export const debtsAndFuneralCost = buildSection({ @@
                       {
                         label: DebtTypes.OtherDebts,
                       },
+                      {
+                        label: DebtTypes.InsuranceInstitute,
+                      },
                     ],
                   },
                 ),
@@ Expand Down @@