Skip to content
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

Jump to bottom

likhith/fix: 🐛 resolved required field error #8886

Merged
merged 3 commits into from
Jun 2, 2023
Merged

likhith/fix: 🐛 resolved required field error #8886

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1097894
fix: :bug: resolved required field error
likhith-deriv Jun 2, 2023
fee8c2e
Merge branch 'master' into likhith/865cfkdbj/required-field-error-for…
likhith-deriv Jun 2, 2023
380bc75
feat: fixed issue with Citizen field
likhith-deriv Jun 2, 2023
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
43 changes: 19 additions & 24 deletions packages/account/src/Sections/Profile/PersonalDetails/personal-details.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classNames from 'classnames';
import { Field, Formik } from 'formik';
import { Field, Formik, Form } from 'formik';
import PropTypes from 'prop-types';
import React from 'react';
import { withRouter } from 'react-router';
Expand Down Expand Up @@ -48,14 +48,7 @@ import LoadErrorMessage from 'Components/load-error-message';
import POAAddressMismatchHintBox from 'Components/poa-address-mismatch-hint-box';
import { connect } from 'Stores/connect';
import { getEmploymentStatusList } from 'Sections/Assessment/FinancialAssessment/financial-information-list';
import { validateName } from 'Helpers/utils';

const validate = (errors, values) => (fn, arr, err_msg) => {
arr.forEach(field => {
const value = values[field];
if (/^\s+$/.test(value) || (!fn(value) && !errors[field] && err_msg !== true)) errors[field] = err_msg;
});
};
import { validateName, validate } from 'Helpers/utils';

const InputGroup = ({ children, className }) => {
const { is_appstore } = React.useContext(PlatformContext);
Expand Down Expand Up @@ -300,19 +293,19 @@ export const PersonalDetailsForm = ({
if (is_virtual) return errors;

const required_fields = ['first_name', 'last_name', 'phone', 'address_line_1', 'address_city'];
if (is_eu) {
required_fields.push('citizen');
}

if (is_mf) {
const required_tax_fields = ['tax_residence', 'tax_identification_number', 'employment_status'];
required_fields.push(...required_tax_fields);
}

validateValues(val => val, required_fields, localize('This field is required'));

const residence_fields = ['citizen'];
const validateResidence = val => getLocation(residence_list, val, 'value');
validateValues(validateResidence, residence_fields, true);
if (is_eu) {
const residence_fields = ['citizen'];
const validateResidence = val => getLocation(residence_list, val, 'value');
validateValues(validateResidence, residence_fields, true);
}

const min_tax_identification_number = 0;
const max_tax_identification_number = 25;
Expand Down Expand Up @@ -341,8 +334,8 @@ export const PersonalDetailsForm = ({
);
}
}
errors.first_name = validateName(values.first_name);
errors.last_name = validateName(values.last_name);
if (values.first_name) errors.first_name = validateName(values.first_name);
if (values.last_name) errors.last_name = validateName(values.last_name);

if (values.phone) {
// minimum characters required is 9 numbers (excluding +- signs or space)
Expand Down Expand Up @@ -561,11 +554,11 @@ export const PersonalDetailsForm = ({
setTouched,
dirty,
}) => (
<>
<React.Fragment>
{Notifications && <Notifications />}
<LeaveConfirm onDirty={isMobile() ? showForm : null} />
{show_form && (
<form
<Form
noValidate
className={classNames('account-form account-form__personal-details', {
'account-form account-form__personal-details--dashboard': is_appstore,
Expand Down Expand Up @@ -638,10 +631,10 @@ export const PersonalDetailsForm = ({
required
disabled={!isChangeableField('first_name')}
error={errors.first_name}
id={'first_name'}
id='first_name'
/>
<Input
id={'last_name'}
id='last_name'
data-lpignore='true'
type='text'
name='last_name'
Expand Down Expand Up @@ -1127,7 +1120,9 @@ export const PersonalDetailsForm = ({
<Text as='p' size='xs'>
<Localize
i18n_default_text='By default, all {{brand_website_name}} clients are retail clients but anyone can request to be treated as a professional client.'
values={{ brand_website_name: getBrandWebsiteName() }}
values={{
brand_website_name: getBrandWebsiteName(),
}}
/>
</Text>
<Text as='p' size='xs'>
Expand Down Expand Up @@ -1271,9 +1266,9 @@ export const PersonalDetailsForm = ({
primary
/>
</FormFooter>
</form>
</Form>
)}
</>
</React.Fragment>
)}
</Formik>
);
Expand Down