Skip to content

Suisin/chore: adding place of birth into complete user profile modal to supp… #18932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
habib-deriv merged 3 commits into from
Dec 12, 2025
Merged

Suisin/chore: adding place of birth into complete user profile modal to supp… #18932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ae77ea
chore: adding place of birth into complete user profile modal to supp…
suisin-deriv Nov 21, 2025
73f3ebd
Merge branch 'suisin/add_place_of_birth' of github.com:suisin-deriv/d…
suisin-deriv Dec 4, 2025
b71a016
chore: create place of birth not selected error
suisin-deriv Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 97 additions & 0 deletions .../core/src/App/Containers/Modals/complete-user-profile-modal/complete-account-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ type TCurrencyFormProps = {

type TPersonalDetailsFormProps = {
date_of_birth: GetSettings['date_of_birth'];
place_of_birth: GetSettings['place_of_birth'];
};

type TCountryandCitizenshipFormProps = {
Expand Down Expand Up @@ -116,13 +117,15 @@ const CompleteAccountSettings = observer(

const [address_state_to_display, setAddressStateToDisplay] = React.useState('');
const [citizen_to_display, setCitizenToDisplay] = React.useState('');
const [place_of_birth_to_display, setPlaceOfBirthToDisplay] = React.useState('');
const [submitting_currency, setSubmittingCurrency] = React.useState(false);

const { data: states_list, isFetched: state_list_fetched } = useStatesList(residence);

const {
citizen,
date_of_birth,
place_of_birth,
address_line_1,
address_line_2,
address_city,
Expand All @@ -134,6 +137,7 @@ const CompleteAccountSettings = observer(
currency: '',
citizen: citizen || '',
date_of_birth: date_of_birth || '',
place_of_birth: place_of_birth || '',
address_line_1: address_line_1 || '',
address_line_2: address_line_2 || '',
address_city: address_city || '',
Expand Down Expand Up @@ -397,6 +401,99 @@ const CompleteAccountSettings = observer(
)}
</>
)}
{!place_of_birth && (
<>
<Text
weight='bold'
className='complete-user-profile-modal__heading complete-user-profile-modal__bottom-margin'
>
<Localize i18n_default_text='Place of birth' />
</Text>
{!residence_list_fetched && (
<div className='details-form__loader'>
<Loading is_fullscreen={false} />
</div>
)}
{residence_list?.length > 0 ? (
<Field name='place_of_birth'>
{({ field }: FieldProps) => (
<>
{isDesktop ? (
<Autocomplete
{...field}
data-lpignore='true'
autoComplete='none'
type='text'
label={localize('Place of birth*')}
list_items={residence_list}
onItemSelection={({ value, text }) => {
setFieldValue('place_of_birth', value, true);
setPlaceOfBirthToDisplay(text);
}}
list_portal_id='modal_root'
hint={localize('Select your place of birth')}
className='complete-user-profile-modal__bottom-margin-field'
value={
place_of_birth_to_display ||
values.place_of_birth
}
required
onChange={e => {
if (place_of_birth_to_display) {
setPlaceOfBirthToDisplay('');
}
setFieldValue('place_of_birth', '', false);
field.onChange(e);
}}
onBlur={e => {
if (!e.target.value && values.place_of_birth) {
setPlaceOfBirthToDisplay(
residence_list.find(
item =>
item.value ===
values.place_of_birth
)?.text || values.place_of_birth
);
}
field.onBlur(e);
}}
/>
) : (
<SelectNative
{...field}
placeholder={localize('Place of birth')}
label={localize('Place of birth*')}
list_items={residence_list}
onChange={e => {
handleChange(e);
setFieldValue(
'place_of_birth',
e.target.value,
true
);
setPlaceOfBirthToDisplay(e.target.text);
}}
hint={localize('Select your place of birth')}
className='complete-user-profile-modal__bottom-margin-field'
required
/>
)}
</>
)}
</Field>
) : (
// Fallback to input field when residence list is empty
<FormInputField
className='complete-user-profile-modal__bottom-margin-field'
name='address_state'
label={localize('Place of birth*')}
placeholder={localize('Place of birth')}
hint={localize('Select your place of birth')}
required
/>
)}
</>
)}
{showAddressDetailsFields && (
<>
<Text
Expand Down
5 changes: 5 additions & 0 deletions packages/core/src/App/Containers/Modals/complete-user-profile-modal/validation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ export const ValidationSchema = (is_svg: boolean, account_settings?: Record<stri
then: schema => schema.required(localize('Citizenship is required.')),
otherwise: schema => schema,
}),
place_of_birth: Yup.string().when([], {
is: () => !account_settings?.place_of_birth,
then: schema => schema.required(localize('Place of birth is required.')),
otherwise: schema => schema,
}),
address_city: Yup.string().when([], {
is: () => !account_settings?.address_city,
then: schema =>
Expand Down
Loading