Skip to content

Commit

Permalink
Amina/fix: 89134_real_account_signup_fields_not_editable (#7688)
Browse files Browse the repository at this point in the history 
* fix: 89134_real_account_signup_fields_not_editable

* fix: real account editable fields
  • Loading branch information
@amina-deriv
amina-deriv committed Feb 22, 2023
1 parent ac43d24 commit ecaa61d
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 17 deletions.
19 changes: 12 additions & 7 deletions packages/account/src/Components/address-details/address-details.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const AddressDetails = ({
is_gb_residence,
onSubmitEnabledChange,
selected_step_ref,
has_real_account,
...props
}) => {
const { is_appstore } = React.useContext(PlatformContext);
Expand Down Expand Up @@ -158,7 +159,7 @@ const AddressDetails = ({
}
maxLength={255}
placeholder={localize('First line of address')}
disabled={props.value?.address_line_1}
disabled={props.value?.address_line_1 && has_real_account}
/>
<InputField
name='address_line_2'
Expand All @@ -170,7 +171,7 @@ const AddressDetails = ({
}
maxLength={255}
placeholder={localize('Second line of address')}
disabled={props.value?.address_line_2}
disabled={props.value?.address_line_2 && has_real_account}
/>
<InputField
name='address_city'
Expand All @@ -181,7 +182,7 @@ const AddressDetails = ({
: localize('Town/City')
}
placeholder={localize('Town/City')}
disabled={props.value?.address_city}
disabled={props.value?.address_city && has_real_account}
/>
{!has_fetched_states_list && (
<div className='details-form__loader'>
Expand Down Expand Up @@ -212,7 +213,9 @@ const AddressDetails = ({
setAddressStateToDisplay('');
}}
list_portal_id={is_appstore ? '' : 'modal_root'}
disabled={props.value?.address_state}
disabled={
props.value?.address_state && has_real_account
}
/>
</DesktopWrapper>
<MobileWrapper>
Expand All @@ -230,7 +233,9 @@ const AddressDetails = ({
);
setAddressStateToDisplay('');
}}
disabled={props.value?.address_state}
disabled={
props.value?.address_state && has_real_account
}
/>
</MobileWrapper>
</>
Expand All @@ -242,7 +247,7 @@ const AddressDetails = ({
name='address_state'
label={localize('State/Province')}
placeholder={localize('State/Province')}
disabled={props.value?.address_state}
disabled={props.value?.address_state && has_real_account}
/>
)}
<InputField
Expand All @@ -256,7 +261,7 @@ const AddressDetails = ({
setFieldTouched('address_postcode', true);
handleChange(e);
}}
disabled={props.value?.address_postcode}
disabled={props.value?.address_postcode && has_real_account}
/>
</div>
</ThemedScrollbars>
Expand Down
21 changes: 13 additions & 8 deletions packages/account/src/Components/personal-details/personal-details.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ const PersonalDetails = ({
onSubmitEnabledChange,
selected_step_ref,
closeRealAccountSignup,
has_real_account,
...props
}) => {
const { is_appstore } = React.useContext(PlatformContext);
Expand Down Expand Up @@ -266,7 +267,8 @@ const PersonalDetails = ({
}
hint={getFieldHint(localize('first name'))}
disabled={
disabled_items.includes('first_name') || props.value?.first_name
disabled_items.includes('first_name') ||
(props.value?.first_name && has_real_account)
}
placeholder={localize('John')}
data-testid='first_name'
Expand All @@ -279,7 +281,8 @@ const PersonalDetails = ({
label={getLastNameLabel()}
hint={getFieldHint(localize('last name'))}
disabled={
disabled_items.includes('last_name') || props.value?.last_name
disabled_items.includes('last_name') ||
(props.value?.last_name && has_real_account)
}
placeholder={localize('Doe')}
data-testid='last_name'
Expand All @@ -298,7 +301,7 @@ const PersonalDetails = ({
hint={getFieldHint(localize('date of birth'))}
disabled={
disabled_items.includes('date_of_birth') ||
props.value?.date_of_birth
(props.value?.date_of_birth && has_real_account)
}
placeholder={localize('01-07-1999')}
portal_id={is_appstore ? '' : 'modal_root'}
Expand All @@ -315,7 +318,7 @@ const PersonalDetails = ({
disabled={
(!!props.value.place_of_birth &&
disabled_items.includes('place_of_birth')) ||
props.value?.place_of_birth
(props.value?.place_of_birth && has_real_account)
}
data-lpignore='true'
autoComplete='off' // prevent chrome autocomplete
Expand Down Expand Up @@ -345,7 +348,7 @@ const PersonalDetails = ({
disabled={
(!!props.value.place_of_birth &&
disabled_items.includes('place_of_birth')) ||
props.value?.place_of_birth
(props.value?.place_of_birth && has_real_account)
}
label={
is_mf
Expand Down Expand Up @@ -395,7 +398,7 @@ const PersonalDetails = ({
(props.value.citizen && is_fully_authenticated) ||
(!!props.value.citizen &&
disabled_items.includes('citizen')) ||
props.value?.citizen
(props.value?.citizen && has_real_account)
}
list_items={residence_list}
onItemSelection={({ value, text }) =>
Expand All @@ -414,7 +417,7 @@ const PersonalDetails = ({
(props.value.citizen && is_fully_authenticated) ||
(!!props.value.citizen &&
disabled_items.includes('citizen')) ||
props.value?.citizen
(props.value?.citizen && has_real_account)
}
label={
is_mf
Expand Down Expand Up @@ -455,6 +458,7 @@ const PersonalDetails = ({
disabled={
disabled_items.includes('phone') ||
(props.value?.phone &&
has_real_account &&
validPhone(props.value?.phone) &&
props.value?.phone?.length >= 9 &&
props.value?.phone?.length <= 35)
Expand Down Expand Up @@ -564,7 +568,8 @@ const PersonalDetails = ({
data-testid='tax_identification_number'
disabled={
disabled_items.includes('tax_identification_number') ||
props.value?.tax_identification_number
(props.value?.tax_identification_number &&
has_real_account)
}
/>
<div
Expand Down
2 changes: 1 addition & 1 deletion packages/account/src/Configs/address-details-config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const addressDetailsConfig = (
is_svg,
is_mf,
},
passthrough: ['residence_list', 'is_fully_authenticated'],
passthrough: ['residence_list', 'is_fully_authenticated', 'has_real_account'],
icon: 'IcDashboardAddress',
};
};
Expand Down
2 changes: 1 addition & 1 deletion packages/account/src/Configs/personal-details-config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ const personalDetailsConfig = (
],
disabled_items,
},
passthrough: ['residence_list', 'is_fully_authenticated'],
passthrough: ['residence_list', 'is_fully_authenticated', 'has_real_account'],
icon: 'IcDashboardPersonalDetails',
};
};
Expand Down

1 comment on commit ecaa61d

@vercel
Copy link

@vercel vercel bot commented on ecaa61d Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

deriv-app – ./

deriv-app.vercel.app
deriv-app.binary.sx
binary.sx
deriv-app-git-master.binary.sx

Please sign in to comment.