Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Sara / Made the laws and Jurisdiction sentences same as deriv #6583

Merged
merged 8 commits into from
Jun 23, 2021
Merged

Sara / Made the laws and Jurisdiction sentences same as deriv #6583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
335b9a5
Added shortcode switch to add regulatory sentence
sara-fs Jun 7, 2021
d91ec93
Merge branch 'master' into fix-mx-message
sara-fs Jun 7, 2021
638292f
Added break to switch case
sara-fs Jun 7, 2021
447ffa0
Reverted changes in package-lock
sara-fs Jun 7, 2021
a136507
Changed regulatory message
sara-fs Jun 14, 2021
fd3e47e
Merge branch 'master' into fix-mx-message
sara-fs Jun 14, 2021
520d361
updated branch
sara-fs Jun 14, 2021
747c036
Added the before sentence
sara-fs Jun 14, 2021
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
16 changes: 15 additions & 1 deletion src/javascript/app/common/account_opening.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,22 @@ const AccountOpening = (() => {
handleTaxIdentificationNumber();
const landing_company = State.getResponse('landing_company');
const lc_to_upgrade_to = landing_company[is_financial ? 'financial_company' : 'gaming_company'] || landing_company.financial_company;
switch (lc_to_upgrade_to.shortcode){
case 'iom':
CommonFunctions.elementTextContent(CommonFunctions.getElementById('lc-regulator'), 'regulated by the UK Gaming Commission (UKGC),');
break;
case 'malta':
CommonFunctions.elementTextContent(CommonFunctions.getElementById('lc-regulator'), 'regulated by the Malta Gaming Authority,');
break;
case 'maltainvest':
CommonFunctions.elementTextContent(CommonFunctions.getElementById('lc-regulator'), 'regulated by the Malta Financial Services Authority (MFSA),');
break;
default:
break;
}

CommonFunctions.elementTextContent(CommonFunctions.getElementById('lc-name'), lc_to_upgrade_to.name);
CommonFunctions.elementTextContent(CommonFunctions.getElementById('lc-country'), lc_to_upgrade_to.country);
CommonFunctions.elementTextContent(CommonFunctions.getElementById('lc-country'), lc_to_upgrade_to.shortcode === 'iom' ? `the ${lc_to_upgrade_to.country}` : lc_to_upgrade_to.country);
if (getPropertyValue(landing_company, ['financial_company', 'shortcode']) === 'maltainvest') {
professionalClient.init(is_financial, false);
}
Expand Down
2 changes: 1 addition & 1 deletion src/templates/_common/components/forms_common_rows.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export const Tnc = () => (
export const Jurisdiction = () => (
<Fieldset legend={it.L('Jurisdiction and Choice of Law')}>
<div className='gr-12'>
<p>{it.L('Your account will be opened with [_1], and will be subject to the jurisdiction and laws of [_2].', '<span id="lc-name"></span>', '<span id="lc-country"></span>')}</p>
<p>{it.L('Your account will be opened with [_1], [_2] and will be subject to the laws of [_3].', '<span id="lc-name"></span>', '<span id="lc-regulator"></span>', '<span id="lc-country"></span>')}</p>
</div>
</Fieldset>
);
Expand Down