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

Shaheer/feature/90115/update jurisdiction #62

Merged
merged 3 commits into from
Apr 27, 2023
Merged

Shaheer/feature/90115/update jurisdiction #62

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
1c491a5
Merge pull request #19 from amina-deriv/amina/feature/90115/update_ju…
shaheer-deriv Apr 27, 2023
875850e
refactor: :recycle: refactors the code
shaheer-deriv Apr 27, 2023
5b15629
refactor: :recycle: refactors jurisdiction localize usages
shaheer-deriv Apr 27, 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
6 changes: 3 additions & 3 deletions packages/account/src/Components/poi-poa-docs-submitted/poi-poa-docs-submitted.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ const PoiPoaDocsSubmitted = ({
const getDescription = () => {
const { manual_status, poi_verified_for_vanuatu_maltainvest, poi_verified_for_bvi_labuan, poa_pending } =
getAuthenticationStatusInfo(account_status);
const is_vanuatu_or_maltainvest_selected =
jurisdiction_selected_shortcode === Jurisdiction.VANUATU ||
jurisdiction_selected_shortcode === Jurisdiction.MALTA_INVEST;
const is_vanuatu_or_maltainvest_selected = [Jurisdiction.VANUATU, Jurisdiction.MALTA_INVEST].includes(
jurisdiction_selected_shortcode
);
if (
(is_vanuatu_or_maltainvest_selected && poi_verified_for_vanuatu_maltainvest && poa_pending) ||
(!is_vanuatu_or_maltainvest_selected && poi_verified_for_bvi_labuan && poa_pending) ||
Expand Down
1 change: 1 addition & 0 deletions packages/cfd/src/Components/props.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ export type TJurisdictionCardItemVerificationItem =
| 'identity_document'
| 'name_and_address'
| 'not_applicable';

export type TJurisdictionCardItemVerification = Array<TJurisdictionCardItemVerificationItem>;

export type TJurisdictionCardItems = {
Expand Down
48 changes: 22 additions & 26 deletions packages/cfd/src/Constants/jurisdiction-contents/jurisdiction-bvi-contents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,84 +7,80 @@ export const jurisdictionBviContents = (): TJurisdictionCardItems => ({
synthetic_contents: [
{
key: 'assets',
title: `${localize('Assets')}`,
description: `${localize('Synthetics, Basket indices and Derived FX')}`,
title: localize('Assets'),
description: localize('Synthetics, Basket indices and Derived FX'),
title_indicators: {
type: 'displayText',
display_text: `${localize('40+')}`,
display_text: localize('40+'),
display_text_skin_color: 'red-darker',
},
},
{
key: 'leverage',
title: `${localize('Leverage')}`,
title: localize('Leverage'),
title_indicators: {
type: 'displayText',
display_text: `${localize('1:1000')}`,
display_text: localize('1:1000'),
display_text_skin_color: 'yellow-light',
},
},
{
key: 'verifications',
title: `${localize('Verifications')}`,
title: localize('Verifications'),
title_indicators: { type: 'displayIcons' },
clickable_description: [
{ type: 'link', text: `${localize('Learn more')}` },
{ type: 'text', text: `${localize('about verifications needed.')}` },
{ type: 'link', text: localize('Learn more') },
{ type: 'text', text: localize('about verifications needed.') },
],
},
{
key: 'regulator',
title: `${localize('Regulator/EDR')}`,
description: `${localize(
'British Virgin Islands Financial Services Commission (License no. SIBA/L/18/1114)'
)}`,
title: localize('Regulator/EDR'),
description: localize('British Virgin Islands Financial Services Commission (License no. SIBA/L/18/1114)'),
},
],
financial_contents: [
{
key: 'assets',
title: `${localize('Assets')}`,
description: `${localize('Forex, Stocks, Stock indices, Commodities, and Cryptocurrencies')}`,
title: localize('Assets'),
description: localize('Forex, Stocks, Stock indices, Commodities, and Cryptocurrencies'),
title_indicators: {
type: 'displayText',
display_text: `${localize('170+')}`,
display_text: localize('170+'),
display_text_skin_color: 'red-light',
},
},
{
key: 'leverage',
title: `${localize('Leverage')}`,
title: localize('Leverage'),
title_indicators: {
type: 'displayText',
display_text: `${localize('1:1000')}`,
display_text: localize('1:1000'),
display_text_skin_color: 'yellow-light',
},
},
{
key: 'spreadsFrom',
title: `${localize('Spreads from')}`,
title: localize('Spreads from'),
title_indicators: {
type: 'displayText',
display_text: `${localize('0.5 pips')}`,
display_text: localize('0.5 pips'),
display_text_skin_color: 'violet-dark',
},
},
{
key: 'verifications',
title: `${localize('Verifications')}`,
title: localize('Verifications'),
title_indicators: { type: 'displayIcons' },
clickable_description: [
{ type: 'link', text: `${localize('Learn more')}` },
{ type: 'text', text: `${localize('about verifications needed.')}` },
{ type: 'link', text: localize('Learn more') },
{ type: 'text', text: localize('about verifications needed.') },
],
},
{
key: 'regulator',
title: `${localize('Regulator/EDR')}`,
description: `${localize(
'British Virgin Islands Financial Services Commission (License no. SIBA/L/18/1114)'
)}`,
title: localize('Regulator/EDR'),
description: localize('British Virgin Islands Financial Services Commission (License no. SIBA/L/18/1114)'),
},
],
synthetic_verification_docs: ['document_number', 'name_and_address'],
Expand Down
40 changes: 20 additions & 20 deletions packages/cfd/src/Constants/jurisdiction-contents/jurisdiction-labuan-contents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,69 +6,69 @@ export const jurisdictionLabuanContents = (): TJurisdictionCardItems => ({
is_over_header_available: true,
header: localize('Labuan'),
synthetic_contents: [
{ key: 'assets', title: `${localize('Assets')}`, description: `${localize('Forex and Cryptocurrencies')}` },
{ key: 'leverage', title: `${localize('Leverage')}` },
{ key: 'assets', title: localize('Assets'), description: localize('Forex and Cryptocurrencies') },
{ key: 'leverage', title: localize('Leverage') },
{
key: 'spreadsFrom',
title: `${localize('Spreads from')}`,
title: localize('Spreads from'),
},
{
key: 'verifications',
title: `${localize('Verifications')}`,
title: localize('Verifications'),
title_indicators: { type: 'displayIcons' },
clickable_description: [
{ type: 'link', text: `${localize('Learn more')}` },
{ type: 'text', text: `${localize('about verifications needed.')}` },
{ type: 'link', text: localize('Learn more') },
{ type: 'text', text: localize('about verifications needed.') },
],
},
{
key: 'regulator',
title: `${localize('Regulator/EDR')}`,
description: `${localize('Labuan Financial Services Authority (licence no. MB/18/0024)')}`,
title: localize('Regulator/EDR'),
description: localize('Labuan Financial Services Authority (licence no. MB/18/0024)'),
},
],
financial_contents: [
{
key: 'assets',
title: `${localize('Assets')}`,
description: `${localize('Forex and Cryptocurrencies')}`,
title: localize('Assets'),
description: localize('Forex and Cryptocurrencies'),
title_indicators: {
type: 'displayText',
display_text: `${localize('90+')}`,
display_text: localize('90+'),
display_text_skin_color: 'red-dark',
},
},
{
key: 'leverage',
title: `${localize('Leverage')}`,
title: localize('Leverage'),
title_indicators: {
type: 'displayText',
display_text: `${localize('1:100')}`,
display_text: localize('1:100'),
display_text_skin_color: 'yellow-dark',
},
},
{
key: 'spreadsFrom',
title: `${localize('Spreads from')}`,
title: localize('Spreads from'),
title_indicators: {
type: 'displayText',
display_text: `${localize('0.6 pips')}`,
display_text: localize('0.6 pips'),
display_text_skin_color: 'violet-dark',
},
},
{
key: 'verifications',
title: `${localize('Verifications')}`,
title: localize('Verifications'),
title_indicators: { type: 'displayIcons' },
clickable_description: [
{ type: 'link', text: `${localize('Learn more')}` },
{ type: 'text', text: `${localize('about verifications needed.')}` },
{ type: 'link', text: localize('Learn more') },
{ type: 'text', text: localize('about verifications needed.') },
],
},
{
key: 'regulator',
title: `${localize('Regulator/EDR')}`,
description: `${localize('Labuan Financial Services Authority (licence no. MB/18/0024)')}`,
title: localize('Regulator/EDR'),
description: localize('Labuan Financial Services Authority (licence no. MB/18/0024)'),
},
],
synthetic_verification_docs: ['document_number', 'name_and_address'],
Expand Down
44 changes: 22 additions & 22 deletions packages/cfd/src/Constants/jurisdiction-contents/jurisdiction-svg-contents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,78 +7,78 @@ export const jurisdictionSvgContents = (): TJurisdictionCardItems => ({
synthetic_contents: [
{
key: 'assets',
title: `${localize('Assets')}`,
description: `${localize('Synthetics, Basket indices and Derived FX')}`,
title: localize('Assets'),
description: localize('Synthetics, Basket indices and Derived FX'),
title_indicators: {
type: 'displayText',
display_text: `${localize('40+')}`,
display_text: localize('40+'),
display_text_skin_color: 'red-darker',
},
},
{
key: 'leverage',
title: `${localize('Leverage')}`,
title: localize('Leverage'),
title_indicators: {
type: 'displayText',
display_text: `${localize('1:1000')}`,
display_text: localize('1:1000'),
display_text_skin_color: 'yellow-light',
},
},
{
key: 'verifications',
title: `${localize('Verifications')}`,
title: localize('Verifications'),
title_indicators: { type: 'displayIcons' },
description: `${localize(
description: localize(
'You will need to submit proof of identity and address once you reach certain thresholds.'
)}`,
),
},
{
key: 'regulator',
title: `${localize('Regulator/EDR')}`,
description: `${localize('Deriv (SVG) LLC (company no. 273 LLC 2020)')}`,
title: localize('Regulator/EDR'),
description: localize('Deriv (SVG) LLC (company no. 273 LLC 2020)'),
},
],
financial_contents: [
{
key: 'assets',
title: `${localize('Assets')}`,
description: `${localize('Forex, Stocks, Stock indices, Commodities, and Cryptocurrencies')}`,
title: localize('Assets'),
description: localize('Forex, Stocks, Stock indices, Commodities, and Cryptocurrencies'),
title_indicators: {
type: 'displayText',
display_text: `${localize('170+')}`,
display_text: localize('170+'),
display_text_skin_color: 'red-light',
},
},
{
key: 'leverage',
title: `${localize('Leverage')}`,
title: localize('Leverage'),
title_indicators: {
type: 'displayText',
display_text: `${localize('1:1000')}`,
display_text: localize('1:1000'),
display_text_skin_color: 'yellow-light',
},
},
{
key: 'spreadsFrom',
title: `${localize('Spreads from')}`,
title: localize('Spreads from'),
title_indicators: {
type: 'displayText',
display_text: `${localize('0.6 pips')}`,
display_text: localize('0.6 pips'),
display_text_skin_color: 'violet-dark',
},
},
{
key: 'verifications',
title: `${localize('Verifications')}`,
title: localize('Verifications'),
title_indicators: { type: 'displayIcons' },
description: `${localize(
description: localize(
'You will need to submit proof of identity and address once you reach certain thresholds.'
)}`,
),
},
{
key: 'regulator',
title: `${localize('Regulator/EDR')}`,
description: `${localize('Deriv (SVG) LLC (company no. 273 LLC 2020)')}`,
title: localize('Regulator/EDR'),
description: localize('Deriv (SVG) LLC (company no. 273 LLC 2020)'),
},
],
synthetic_verification_docs: ['not_applicable'],
Expand Down
Loading