Skip to content

Commit

Permalink
Merge pull request #38 from suisin-deriv/suisin/DIEL_flow_change
Browse files Browse the repository at this point in the history
chore: update code based on latest pr
  • Loading branch information
shaheer-deriv authored Jun 5, 2023
2 parents ba06b03 + 3e2dcdf commit cdfbdc4
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 19 deletions.
35 changes: 18 additions & 17 deletions packages/account/src/Components/forms/personal-details-form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,23 +124,24 @@ const PersonalDetailsForm = ({
{'salutation' in values && (
<div>
<Text size={isMobile() ? 'xs' : 'xxs'} align={isMobile() && 'center'}>
{is_virtual ? (
localize(
'Please remember that it is your responsibility to keep your answers accurate and up to date. You can update your personal details at any time in your account settings.'
)
) : (
<Localize
i18n_default_text='Please remember that it is your responsibility to keep your answers accurate and up to date. You can update your personal details at any time in your <0>account settings</0>.'
components={[
<Link
to={routes.personal_details}
key={0}
className='link'
onClick={closeRealAccountSignup}
/>,
]}
/>
)}
{!is_mf &&
(is_virtual ? (
localize(
'Please remember that it is your responsibility to keep your answers accurate and up to date. You can update your personal details at any time in your account settings.'
)
) : (
<Localize
i18n_default_text='Please remember that it is your responsibility to keep your answers accurate and up to date. You can update your personal details at any time in your <0>account settings</0>.'
components={[
<Link
to={routes.personal_details}
key={0}
className='link'
onClick={closeRealAccountSignup}
/>,
]}
/>
))}
</Text>
</div>
)}
Expand Down
6 changes: 5 additions & 1 deletion packages/appstore/src/modules/traders-hub/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ const TradersHub = () => {
is_from_signup_account &&
!eu_user_closed_real_account_first_time
) {
openRealAccountSignup();
if (is_eu_user) {
openRealAccountSignup('maltainvest');
} else {
openRealAccountSignup('svg');
}
}
}, []);

Expand Down
6 changes: 5 additions & 1 deletion packages/core/src/Stores/traders-hub-store.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,11 @@ export default class TradersHubStore extends BaseStore {
await switchAccount(account_list.find(acc => acc.is_virtual && !acc.is_disabled)?.loginid);
} else if (account_type === 'real') {
if (!has_active_real_account) {
this.root_store.ui.openRealAccountSignup();
if (this.is_eu_user) {
this.root_store.ui.openRealAccountSignup('maltainvest');
} else {
this.root_store.ui.openRealAccountSignup('svg');
}
return;
}
if (prev_real_account_loginid) {
Expand Down

0 comments on commit cdfbdc4

Please sign in to comment.