Merge branch 'main' into j-s/complete-indictment-review

island-is · May 10, 2024 · b6581dd · b6581dd
2 parents 30e101c + 1e05ec6
commit b6581dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/libs/application/templates/inheritance-report/src/fields/HeirsAndPartitionRepeater/index.tsx b/libs/application/templates/inheritance-report/src/fields/HeirsAndPartitionRepeater/index.tsx
@@ -22,6 +22,7 @@ import { InputController } from '@island.is/shared/form-fields'
 import { format as formatNationalId } from 'kennitala'
 import intervalToDuration from 'date-fns/intervalToDuration'
 import {
+  formatPhoneNumber,
   getEstateDataFromApplication,
   valueToNumber,
 } from '../../lib/utils/helpers'
@@ -273,6 +274,7 @@ export const HeirsAndPartitionRepeater: FC<
         (heir) => {
           return {
             ...heir,
+            phone: heir.phone ? formatPhoneNumber(heir.phone) : '', //Remove all non-digit characters and keep the last 7 digits
             initial: true,
             enabled: true,
           }
@@ -560,7 +562,6 @@ export const HeirsAndPartitionRepeater: FC<
       )}
       {fields.map((member: GenericFormField<EstateMember>, index) => {
         if (member.initial) return null
-
         return (
           <Box key={member.id}>
             <AdditionalHeir
@@ -571,7 +572,7 @@ export const HeirsAndPartitionRepeater: FC<
               relationOptions={relations}
               updateValues={updateValues}
               remove={remove}
-              error={error ?? null}
+              error={error[index] ?? null}
             />
           </Box>
         )

diff --git a/libs/application/templates/inheritance-report/src/lib/utils/helpers.ts b/libs/application/templates/inheritance-report/src/lib/utils/helpers.ts
@@ -58,6 +58,10 @@ export const isValidPhoneNumber = (phoneNumber: string) => {
   return phone && phone.isValid()
 }
 
+export const formatPhoneNumber = (phoneNumber: string) => {
+  return phoneNumber.replace(/\D/g, '').slice(-7)
+}
+
 /**
  * Returns zero if value is not a number or number string
  * @param value