fix(aod): UI updates in announcement-of-death application

libs/application/template-api-modules/src/lib/modules/templates/announcement-of-death/announcement-of-death.service.ts

@@ -12,7 +12,7 @@ import {
 } from '@island.is/clients/syslumenn'
 import {
   Answers as aodAnswers,
-  OtherPropertiesEnum,
+  PropertiesEnum,
 } from '@island.is/application/templates/announcement-of-death/types'
 import { NationalRegistry, RoleConfirmationEnum, PickRole } from './types'
 import {
@@ -75,18 +75,10 @@ export class AnnouncementOfDeathService extends BaseTemplateApiService {
     }
 
     for (const estate in estates) {
-      estates[estate].assets = estates[estate].assets.map(baseMapper)
-      estates[estate].vehicles = [
-        ...estates[estate].vehicles,
-        ...estates[estate].ships,
-        ...estates[estate].flyers,
-      ].map(baseMapper)
       estates[estate].estateMembers =
         estates[estate].estateMembers.map(baseMapper)
       // TODO: remove once empty array diff problem is resolved
       //       in the application system (property dropped before deepmerge)
-      estates[estate].assets.unshift(dummyAsset as EstateAsset)
-      estates[estate].vehicles.unshift(dummyAsset as EstateAsset)
       estates[estate].estateMembers.unshift(dummyMember as EstateMember)
       estates[estate].guns.unshift(dummyAsset as EstateAsset)
     }
@@ -230,32 +222,30 @@ export class AnnouncementOfDeathService extends BaseTemplateApiService {
         estateMembers: JSON.stringify(
           answers.estateMembers.members.filter((member) => !member?.dummy),
         ),
-        assets: JSON.stringify(
-          answers.assets.assets.filter((asset) => !asset?.dummy),
-        ),
-        vehicles: JSON.stringify(
-          answers.vehicles.vehicles.filter((vehicle) => !vehicle?.dummy),
-        ),
         hadFirearms: answers.hadFirearms,
         firearm: JSON.stringify(answers.firearmApplicant),
         bankcodeSecuritiesOrShares: otherProperties.includes(
-          OtherPropertiesEnum.ACCOUNTS,
+          PropertiesEnum.ACCOUNTS,
         )
           ? 'true'
           : 'false',
         selfOperatedCompany: otherProperties.includes(
-          OtherPropertiesEnum.OWN_BUSINESS,
+          PropertiesEnum.OWN_BUSINESS,
         )
           ? 'true'
           : 'false',
         occupationRightViaCondominium: otherProperties.includes(
-          OtherPropertiesEnum.RESIDENCE,
+          PropertiesEnum.RESIDENCE,
         )
           ? 'true'
           : 'false',
-        assetsAbroad: otherProperties.includes(
-          OtherPropertiesEnum.ASSETS_ABROAD,
-        )
+        assetsAbroad: otherProperties.includes(PropertiesEnum.ASSETS_ABROAD)
+          ? 'true'
+          : 'false',
+        realEstate: otherProperties.includes(PropertiesEnum.REAL_ESTATE)
+          ? 'true'
+          : 'false',
+        vehicles: otherProperties.includes(PropertiesEnum.VEHICLES)
           ? 'true'
           : 'false',
         districtCommissionerHasWill:

libs/application/templates/announcement-of-death/src/forms/done.ts

@@ -11,7 +11,6 @@ import { Form, FormModes } from '@island.is/application/types'
 import CoatOfArms from '../assets/CoatOfArms'
 import { m } from '../lib/messages'
 import {
-  extraInfo,
   files,
   firearmApplicant,
   inheritance,
@@ -66,7 +65,6 @@ export const done: Form = buildForm({
             ...inheritance,
             ...properties,
             ...files,
-            ...extraInfo,
           ],
         }),
       ],

libs/application/templates/announcement-of-death/src/forms/draft/draft.ts

@@ -34,9 +34,9 @@ export const draft: Form = buildForm({
       children: [
         subSectionInfo,
         subSectionWillAndTrade,
-        subSectionFirearms,
         subSectionInheritance,
         subSectionProperties,
+        subSectionFirearms,
         subSectionFiles,
       ],
     }),

libs/application/templates/announcement-of-death/src/forms/draft/sectionOverview.ts

@@ -7,11 +7,10 @@ import { DefaultEvents } from '@island.is/application/types'
 import { m } from '../../lib/messages'
 import {
   additionalInfo,
-  extraInfo,
+  properties,
   files,
   firearmApplicant,
   inheritance,
-  properties,
   testament,
   theAnnouncer,
   theDeceased,
@@ -30,11 +29,10 @@ export const sectionOverview = buildSection({
         ...theDeceased,
         ...theAnnouncer,
         ...testament,
-        ...firearmApplicant,
         ...inheritance,
         ...properties,
+        ...firearmApplicant,
         ...files,
-        ...extraInfo,
         ...additionalInfo,
         buildSubmitField({
           id: 'submit',

libs/application/templates/announcement-of-death/src/forms/draft/subSectionInfo.ts

@@ -6,6 +6,7 @@ import {
 } from '@island.is/application/core'
 import { m } from '../../lib/messages'
 import { Application } from '../../types/schema'
+import { removeCountryCode } from '@island.is/application/ui-components'
 
 export const subSectionInfo = buildSubSection({
   id: 'infoStep',
@@ -33,9 +34,16 @@ export const subSectionInfo = buildSubSection({
           format: '###-####',
           placeholder: '',
           width: 'half',
-          defaultValue: (application: Application) =>
-            application.externalData?.userProfile?.data?.mobilePhoneNumber ??
-            '',
+          defaultValue: (application: Application) => {
+            const phone =
+              (
+                application.externalData.userProfile?.data as {
+                  mobilePhoneNumber?: string
+                }
+              )?.mobilePhoneNumber ?? ''
+
+            return removeCountryCode(phone)
+          },
         }),
         buildTextField({
           id: 'applicantEmail',

libs/application/templates/announcement-of-death/src/forms/draft/subSectionInheritance.ts

@@ -3,6 +3,8 @@ import {
   buildMultiField,
   buildSubSection,
   buildCustomField,
+  buildCheckboxField,
+  YES,
 } from '@island.is/application/core'
 import { m } from '../../lib/messages'
 
@@ -28,6 +30,19 @@ export const subSectionInheritance = buildSubSection({
           component: 'EstateMemberRepeater',
           childInputIds: ['estateMembers.encountered', 'estateMembers.members'],
         }),
+        buildDescriptionField({
+          id: 'inheritanceConfirmationDescription',
+          title: '',
+          description: m.inheritanceConfirmationDescription,
+          space: 'containerGutter',
+        }),
+        buildCheckboxField({
+          id: 'estateMembers.confirmation',
+          title: '',
+          large: false,
+          backgroundColor: 'white',
+          options: [{ value: YES, label: m.inheritanceConfirmation }],
+        }),
       ],
     }),
   ],

libs/application/templates/announcement-of-death/src/forms/draft/subSectionProperties.ts

@@ -6,7 +6,7 @@ import {
   buildCheckboxField,
 } from '@island.is/application/core'
 import { m } from '../../lib/messages'
-import { OtherPropertiesEnum } from '../../types'
+import { PropertiesEnum } from '../../types'
 
 export const subSectionProperties = buildSubSection({
   id: 'propertiesStep',
@@ -18,37 +18,6 @@ export const subSectionProperties = buildSubSection({
       description: m.propertiesDescription,
       space: 2,
       children: [
-        buildDescriptionField({
-          id: 'realEstatesTitle',
-          title: m.realEstatesTitle,
-          titleVariant: 'h3',
-          description: m.realEstatesDescription,
-        }),
-        buildCustomField({
-          title: 'realEstateRepeater',
-          id: 'assets',
-          component: 'RealEstateRepeater',
-        }),
-        buildDescriptionField({
-          id: 'vehiclesTitle',
-          title: m.vehiclesTitle,
-          description: m.vehiclesDescription,
-          space: 5,
-          titleVariant: 'h3',
-        }),
-        buildCustomField({
-          title: 'Vehicles!',
-          id: 'vehicles',
-          component: 'VehiclesRepeater',
-          childInputIds: ['vehicles.vehicles', 'vehicles.encountered'],
-        }),
-        buildDescriptionField({
-          id: 'otherPropertiesTitle',
-          title: m.otherPropertiesTitle,
-          titleVariant: 'h3',
-          description: m.otherPropertiesDescription,
-          space: 5,
-        }),
         buildCheckboxField({
           id: 'otherProperties',
           title: '',
@@ -57,21 +26,29 @@ export const subSectionProperties = buildSubSection({
           doesNotRequireAnswer: true,
           defaultValue: '',
           options: [
+            {
+              label: m.propertiesRealEstate,
+              value: PropertiesEnum.REAL_ESTATE,
+            },
+            {
+              label: m.propertiesVehicles,
+              value: PropertiesEnum.VEHICLES,
+            },
             {
               label: m.otherPropertiesAccounts,
-              value: OtherPropertiesEnum.ACCOUNTS,
+              value: PropertiesEnum.ACCOUNTS,
             },
             {
               label: m.otherPropertiesOwnBusiness,
-              value: OtherPropertiesEnum.OWN_BUSINESS,
+              value: PropertiesEnum.OWN_BUSINESS,
             },
             {
               label: m.otherPropertiesResidence,
-              value: OtherPropertiesEnum.RESIDENCE,
+              value: PropertiesEnum.RESIDENCE,
             },
             {
               label: m.otherPropertiesAssetsAbroad,
-              value: OtherPropertiesEnum.ASSETS_ABROAD,
+              value: PropertiesEnum.ASSETS_ABROAD,
             },
           ],
         }),