fix(estate): foreign phone numbers (#15826)

island-is · Sep 2, 2024 · cc3ff7d · cc3ff7d
1 parent d5a49f7
commit cc3ff7d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 38 deletions.
diff --git a/libs/application/templates/estate/src/fields/EstateMembersRepeater/index.tsx b/libs/application/templates/estate/src/fields/EstateMembersRepeater/index.tsx
@@ -12,7 +12,6 @@ import {
 } from '@island.is/island-ui/core'
 import { m } from '../../lib/messages'
 import * as kennitala from 'kennitala'
-import { EstateRegistrant } from '@island.is/clients/syslumenn'
 import { Answers, EstateMember } from '../../types'
 import { AdditionalEstateMember } from './AdditionalEstateMember'
 import { getValueViaPath } from '@island.is/application/core'
@@ -175,7 +174,12 @@ export const EstateMembersRepeater: FC<
           ...acc,
           <Box marginTop={index > 0 ? 7 : 0} key={index}>
             <Box display="flex" justifyContent="spaceBetween" marginBottom={3}>
-              <Text variant="h4">{formatMessage(m.estateMember)}</Text>
+              <Text
+                color={member.enabled ? 'currentColor' : 'dark300'}
+                variant="h4"
+              >
+                {formatMessage(m.estateMember)}
+              </Text>
               <Box>
                 <Button
                   variant="text"
@@ -349,13 +353,12 @@ export const EstateMembersRepeater: FC<
                     />
                   </GridColumn>
                   <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-                    <InputController
+                    <PhoneInputController
                       id={`${id}[${index}].advocate.phone`}
                       name={`${id}[${index}].advocate.phone`}
                       label={formatMessage(m.phone)}
                       backgroundColor="blue"
                       disabled={!member.enabled}
-                      format="###-####"
                       defaultValue={member.advocate?.phone || ''}
                       error={
                         error && error[index] && error[index].advocate?.phone

diff --git a/libs/application/templates/estate/src/forms/Sections/announcerInfo.ts b/libs/application/templates/estate/src/forms/Sections/announcerInfo.ts
@@ -68,8 +68,7 @@ export const announcerInfo = buildSection({
           title: m.phone,
           width: 'half',
           required: true,
-          disableDropdown: true,
-          allowedCountryCodes: ['IS'],
+          disableDropdown: false,
           defaultValue: (application: Application) => {
             const phone =
               (

diff --git a/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/AdditionalHeir.tsx b/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/AdditionalHeir.tsx
@@ -5,6 +5,7 @@ import {
   CheckboxController,
   DatePickerController,
   InputController,
+  PhoneInputController,
   SelectController,
 } from '@island.is/shared/form-fields'
 import * as kennitala from 'kennitala'
@@ -229,13 +230,12 @@ export const AdditionalHeir = ({
               />
             </GridColumn>
             <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-              <InputController
+              <PhoneInputController
                 id={phoneField}
                 name={phoneField}
                 label={formatMessage(m.phone)}
                 defaultValue={field.phone || ''}
                 backgroundColor="blue"
-                format={'###-####'}
                 error={error?.phone}
                 required
               />
@@ -354,12 +354,11 @@ export const AdditionalHeir = ({
               />
             </GridColumn>
             <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-              <InputController
+              <PhoneInputController
                 id={advocatePhoneField}
                 name={advocatePhoneField}
                 label={formatMessage(m.phone)}
                 backgroundColor="blue"
-                format="###-####"
                 error={(error?.advocate as unknown as ErrorValue)?.phone}
                 size="sm"
                 required
@@ -409,12 +408,11 @@ export const AdditionalHeir = ({
               />
             </GridColumn>
             <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-              <InputController
+              <PhoneInputController
                 id={advocatePhoneField2}
                 name={advocatePhoneField2}
                 label={formatMessage(m.phone)}
                 backgroundColor="blue"
-                format="###-####"
                 size="sm"
               />
             </GridColumn>

diff --git a/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/index.tsx b/libs/application/templates/inheritance-report/src/fields/HeirsRepeater/index.tsx
@@ -17,7 +17,10 @@ import { formatCurrency } from '@island.is/application/ui-components'
 import { Answers, EstateMember, heirAgeValidation } from '../../types'
 import { AdditionalHeir } from './AdditionalHeir'
 import { getValueViaPath } from '@island.is/application/core'
-import { InputController } from '@island.is/shared/form-fields'
+import {
+  InputController,
+  PhoneInputController,
+} from '@island.is/shared/form-fields'
 import { format as formatNationalId, info } from 'kennitala'
 import intervalToDuration from 'date-fns/intervalToDuration'
 import {
@@ -404,13 +407,12 @@ export const HeirsRepeater: FC<
                       />
                     </GridColumn>
                     <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-                      <InputController
+                      <PhoneInputController
                         id={`${fieldIndex}.phone`}
                         name={`${fieldIndex}.phone`}
                         label={formatMessage(m.phone)}
                         backgroundColor="blue"
                         disabled={!member.enabled}
-                        format="###-####"
                         defaultValue={member.phone || ''}
                         error={
                           error && error[mainIndex] && error[mainIndex].phone
@@ -529,13 +531,12 @@ export const HeirsRepeater: FC<
                       />
                     </GridColumn>
                     <GridColumn span={['1/1', '1/2']} paddingBottom={2}>
-                      <InputController
+                      <PhoneInputController
                         id={`${fieldIndex}.advocate.phone`}
                         name={`${fieldIndex}.advocate.phone`}
                         label={formatMessage(m.phone)}
                         backgroundColor="blue"
                         disabled={!member.enabled}
-                        format="###-####"
                         defaultValue={member.advocate?.phone || ''}
                         error={
                           error &&

diff --git a/libs/application/templates/inheritance-report/src/forms/sections/applicant.ts b/libs/application/templates/inheritance-report/src/forms/sections/applicant.ts
@@ -1,5 +1,6 @@
 import {
   buildMultiField,
+  buildPhoneField,
   buildSection,
   buildSelectField,
   buildTextField,
@@ -48,12 +49,12 @@ export const applicant = buildSection({
             return externalData.nationalRegistry?.data.address.streetAddress
           },
         }),
-        buildTextField({
+        buildPhoneField({
           id: 'applicant.phone',
           title: m.phone,
           width: 'half',
           required: true,
-          format: '###-####',
+          disableDropdown: false,
           defaultValue: (application: Application) => {
             const phone =
               (

diff --git a/...plication/templates/inheritance-report/src/forms/sections/prepaidInheritance/applicant.ts b/...plication/templates/inheritance-report/src/forms/sections/prepaidInheritance/applicant.ts
@@ -1,12 +1,11 @@
 import {
   buildMultiField,
   buildNationalIdWithNameField,
+  buildPhoneField,
   buildSection,
   buildSelectField,
   buildTextField,
 } from '@island.is/application/core'
-import { UserProfile, Application } from '@island.is/api/schema'
-import { removeCountryCode } from '@island.is/application/ui-components'
 import { m } from '../../../lib/messages'
 import { RelationEnum } from '../../../types'
 
@@ -25,32 +24,18 @@ export const prePaidApplicant = buildSection({
           width: 'full',
           required: true,
         }),
-        buildTextField({
+        buildPhoneField({
           id: 'prePaidApplicant.phone',
           title: m.phone,
           width: 'half',
           required: true,
-          format: '###-####',
-          defaultValue: (application: Application) => {
-            const phone =
-              (
-                application.externalData.userProfile?.data as {
-                  mobilePhoneNumber?: string
-                }
-              )?.mobilePhoneNumber ?? ''
-
-            return removeCountryCode(phone)
-          },
+          disableDropdown: false,
         }),
         buildTextField({
           id: 'prePaidApplicant.email',
           title: m.email,
           width: 'half',
           required: true,
-          defaultValue: ({ externalData }: Application) => {
-            const data = externalData.userProfile?.data as UserProfile
-            return data?.email
-          },
         }),
         buildSelectField({
           id: 'prePaidApplicant.relation',

diff --git a/...templates/inheritance-report/src/forms/sections/prepaidInheritance/inheritanceExecutor.ts b/...templates/inheritance-report/src/forms/sections/prepaidInheritance/inheritanceExecutor.ts
@@ -41,6 +41,7 @@ export const inheritanceExecutor = buildSection({
           title: m.phone,
           width: 'half',
           required: true,
+          disableDropdown: false,
         }),
         buildDescriptionField({
           id: 'description_empty',

diff --git a/libs/application/templates/inheritance-report/src/lib/dataSchema.ts b/libs/application/templates/inheritance-report/src/lib/dataSchema.ts
@@ -15,7 +15,6 @@ import {
   PrePaidInheritanceOptions,
   RelationSpouse,
 } from './constants'
-import { DebtTypes } from '../types'
 
 const deceasedShare = {
   deceasedShare: z.string().nonempty().optional(),