Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Pavel Latyshou / Task - IB Commission Plan change for EU location also #2575

Merged
merged 3 commits into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
198 changes: 6 additions & 192 deletions src/pages/partners/affiliate-ib/_deriv-ib-programme.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { SectionContainer, Container, Flex } from 'components/containers'
import { Header } from 'components/elements/typography'
import { localize, Localize } from 'components/localization'
import { LinkButton } from 'components/form'
import { DerivStore } from 'store'
import device from 'themes/device'

const TitleWrapper = styled.div`
Expand Down Expand Up @@ -111,7 +110,6 @@ const SubtitleHeader = styled(Header)`
`

const DerivIBProgramme = () => {
const { is_eu_country } = React.useContext(DerivStore)
return (
<StyledSection shadow id="deriv-ib">
<Container direction="column">
Expand All @@ -134,14 +132,8 @@ const DerivIBProgramme = () => {
</StyledHeaderCommission>
<StyledCardWrapper>
<DERIVIBDMT5Cards data={ib_dmt5_synthetic} />
<DERIVIBDMT5Cards
data={is_eu_country ? ib_dmt5_financial : ib_dmt5_financial_non_eu}
/>
<DERIVIBDMT5Cards
data={
is_eu_country ? ib_dmt5_financialSTP : ib_dmt5_financialSTP_non_eu
}
/>
<DERIVIBDMT5Cards data={ib_dmt5_financial} />
<DERIVIBDMT5Cards data={ib_dmt5_financialSTP} />
</StyledCardWrapper>
<DecideSection align="center">
<StyledHeader
Expand Down Expand Up @@ -356,51 +348,11 @@ const ib_dmt5_financial = {
assets: [
{
title: <Localize key={0} translate_text="Asset" />,
list: [
<Localize key={1} translate_text="BTC/USD" />,
<Localize key={2} translate_text="BTC/XAG" />,
<Localize key={3} translate_text="BTC/XAU" />,
<Localize key={4} translate_text="ETH/USD" />,
<Localize key={5} translate_text="LTC/USD" />,
<Localize key={6} translate_text="BCH/USD" />,
<Localize key={7} translate_text="XRP/USD" />,
<Localize key={8} translate_text="DSH/USD" />,
<Localize key={9} translate_text="EOS/USD" />,
<Localize key={10} translate_text="ZEC/USD" />,
<Localize key={11} translate_text="XMR/USD" />,
<Localize key={12} translate_text="BNB/USD" />,
<Localize key={13} translate_text="IOT/USD" />,
<Localize key={14} translate_text="NEO/USD" />,
<Localize key={15} translate_text="OMG/USD" />,
<Localize key={16} translate_text="TRX/USD" />,
<Localize key={17} translate_text="XLM/USD" />,
<Localize key={18} translate_text="BTC/ETH" />,
<Localize key={19} translate_text="BTC/LTC" />,
],
list: [<Localize key={1} translate_text="Cryptocurrencies" />],
},
{
title: <Localize key={0} translate_text="Commission per USD 100k turnover" />,
list: [
<Localize key={1} translate_text="20" />,
<Localize key={2} translate_text="20" />,
<Localize key={3} translate_text="20" />,
<Localize key={4} translate_text="20" />,
<Localize key={5} translate_text="25" />,
<Localize key={6} translate_text="25" />,
<Localize key={7} translate_text="25" />,
<Localize key={8} translate_text="250" />,
<Localize key={9} translate_text="250" />,
<Localize key={10} translate_text="250" />,
<Localize key={11} translate_text="250" />,
<Localize key={12} translate_text="25" />,
<Localize key={13} translate_text="150" />,
<Localize key={14} translate_text="150" />,
<Localize key={15} translate_text="150" />,
<Localize key={16} translate_text="25" />,
<Localize key={17} translate_text="25" />,
<Localize key={18} translate_text="20" />,
<Localize key={19} translate_text="20" />,
],
list: [<Localize key={1} translate_text="10" />],
},
],
},
Expand Down Expand Up @@ -441,66 +393,6 @@ const ib_dmt5_financial = {
],
}

const ib_dmt5_financial_non_eu = {
...ib_dmt5_financial,
type: [
{
title: <Localize translate_text="Forex and metals" />,
headerHeight: '8.0rem',
assets: [
{
title: <Localize key={0} translate_text="Asset" />,
list: [
<Localize key={1} translate_text="Forex" />,
<Localize key={2} translate_text="Metals" />,
],
},
{
title: <Localize key={0} translate_text="Commission per lot" />,
list: [
<Localize key={1} translate_text="USD 2" />,
<Localize key={2} translate_text="USD 4" />,
],
},
],
},
{
title: <Localize translate_text="Stock indices" />,
headerHeight: '6.4rem',
assets: [
{
title: <Localize key={0} translate_text="Asset" />,
list: [
<Localize key={1} translate_text="Stock indices" />,
<Localize key={2} translate_text="Stocks" />,
],
},
{
title: <Localize key={0} translate_text="Commission per USD 100k turnover" />,
list: [
<Localize key={1} translate_text="USD 1" />,
<Localize key={2} translate_text="USD 10" />,
],
},
],
},
{
title: <Localize translate_text="Cryptocurrencies" />,
headerHeight: '6.4rem',
assets: [
{
title: <Localize key={0} translate_text="Asset" />,
list: [<Localize key={1} translate_text="Cryptocurrencies" />],
},
{
title: <Localize key={0} translate_text="Commission per USD 100k turnover" />,
list: [<Localize key={1} translate_text="10" />],
},
],
},
],
}

const ib_dmt5_financialSTP = {
name: <Localize translate_text="Deriv MT5 Financial STP" />,
description: (
Expand Down Expand Up @@ -532,51 +424,11 @@ const ib_dmt5_financialSTP = {
assets: [
{
title: <Localize key={0} translate_text="Asset" />,
list: [
<Localize key={1} translate_text="BTC/USD" />,
<Localize key={2} translate_text="BTC/XAG" />,
<Localize key={3} translate_text="BTC/XAU" />,
<Localize key={4} translate_text="ETH/USD" />,
<Localize key={5} translate_text="LTC/USD" />,
<Localize key={6} translate_text="BCH/USD" />,
<Localize key={7} translate_text="XRP/USD" />,
<Localize key={8} translate_text="DSH/USD" />,
<Localize key={9} translate_text="EOS/USD" />,
<Localize key={10} translate_text="ZEC/USD" />,
<Localize key={11} translate_text="XMR/USD" />,
<Localize key={12} translate_text="BNB/USD" />,
<Localize key={13} translate_text="IOT/USD" />,
<Localize key={14} translate_text="NEO/USD" />,
<Localize key={15} translate_text="OMG/USD" />,
<Localize key={16} translate_text="TRX/USD" />,
<Localize key={17} translate_text="XLM/USD" />,
<Localize key={18} translate_text="BTC/ETH" />,
<Localize key={19} translate_text="BTC/LTC" />,
],
list: [<Localize key={1} translate_text="Cryptocurrencies" />],
},
{
title: <Localize key={0} translate_text="Commission per USD 100k turnover" />,
list: [
<Localize key={1} translate_text="20" />,
<Localize key={2} translate_text="20" />,
<Localize key={3} translate_text="20" />,
<Localize key={4} translate_text="20" />,
<Localize key={5} translate_text="25" />,
<Localize key={6} translate_text="25" />,
<Localize key={7} translate_text="25" />,
<Localize key={8} translate_text="250" />,
<Localize key={9} translate_text="250" />,
<Localize key={10} translate_text="250" />,
<Localize key={11} translate_text="250" />,
<Localize key={12} translate_text="25" />,
<Localize key={13} translate_text="150" />,
<Localize key={14} translate_text="150" />,
<Localize key={15} translate_text="150" />,
<Localize key={16} translate_text="25" />,
<Localize key={17} translate_text="25" />,
<Localize key={18} translate_text="20" />,
<Localize key={19} translate_text="20" />,
],
list: [<Localize key={1} translate_text="10" />],
},
],
},
Expand Down Expand Up @@ -617,42 +469,4 @@ const ib_dmt5_financialSTP = {
],
}

const ib_dmt5_financialSTP_non_eu = {
...ib_dmt5_financialSTP,
type: [
{
title: <Localize translate_text="Forex" />,
headerHeight: '8.0rem',
assets: [
{
title: <Localize key={0} translate_text="Asset" />,
list: [<Localize key={1} translate_text="Forex" />],
},
{
title: (
<Localize
key={0}
translate_text="Commission per lot (1 standard lot is 100k units)"
/>
),
list: [<Localize key={1} translate_text="2.5" />],
},
],
},
{
title: <Localize translate_text="Cryptocurrencies" />,
headerHeight: '6.4rem',
assets: [
{
title: <Localize key={0} translate_text="Asset" />,
list: [<Localize key={1} translate_text="Cryptocurrencies" />],
},
{
title: <Localize key={0} translate_text="Commission per USD 100k turnover" />,
list: [<Localize key={1} translate_text="10" />],
},
],
},
],
}
export default DerivIBProgramme
10 changes: 5 additions & 5 deletions src/pages/partners/affiliate-ib/_minimum-volume.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const MinimumVolume = () => {
<CalculationWrapper ai="center" mb="24px">
<LeftWrapper>
<Text size="16px">
<Localize translate_text="A deal for 1 lot of BTC/USD (with a BTC to USD exchange rate of USD 50,000) per USD 100,000 turnover will pay out a commission of USD 20. The minimum volume required to receive the minimum commission of USD 0.01 is determined using the following formula:" />
<Localize translate_text="A deal for 1 lot of BTC/USD (with a BTC to USD exchange rate of USD 50,000) per USD 100,000 turnover will pay out a commission of USD 10. The minimum volume required to receive the minimum commission of USD 0.01 is determined using the following formula:" />
</Text>
</LeftWrapper>
<RightWrapper>
Expand Down Expand Up @@ -151,14 +151,14 @@ const firstCalculatedFormula = {
next_operator: '÷',
},
{
item: '20',
item: '10',
description: <Localize translate_text="Commission rate" />,
},
],
result: {
total: (
<Localize
translate_text="<0>USD 50</0> Volume"
translate_text="<0>USD 100</0> Volume"
components={[<ResultStrong key={0} />]}
/>
),
Expand All @@ -168,7 +168,7 @@ const firstCalculatedFormula = {
totalItem: 2,
formula: [
{
item: 'USD 50',
item: 'USD 100',
description: <Localize translate_text="Volume" />,
next_operator: '÷',
},
Expand All @@ -180,7 +180,7 @@ const firstCalculatedFormula = {
result: {
total: (
<Localize
translate_text="<0>0.001 lots</0>"
translate_text="<0>0.002 lots</0>"
components={[<ResultStrong key={0} />]}
/>
),
Expand Down