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.

Commit c886084

Browse files
Translation [FE Deriv.com squad] 85828 NikitK / Derived FX, add Vol 20 (#4067)
* feat: update derived_dx data * fix: path of image * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * feat: update description text of derived-fx * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch --------- Co-authored-by: DerivFE <[email protected]>
1 parent 6ffe151 commit c886084

35 files changed

+3613
-3502
lines changed

crowdin/messages.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
"210989591": "Add a Deriv X real account.",
133133
"213113093": "Sharp prices",
134134
"213336563": "<0>3351.46</0>",
135+
"214754372": "USD/CHF DFX20 Index",
135136
"216114973": "Stocks & indices",
136137
"216777430": "Log in.",
137138
"218274863": "Digital options",
@@ -229,7 +230,6 @@
229230
"341589956": "Air France KLM SA",
230231
"343021270": "Trade with a real CFDs account. Get access to leverage and trade positions larger than your existing capital.",
231232
"343586987": "So in this scenario, you would set your take profit level at <0>6.83 USD</0>.",
232-
"344242941": "These indices correspond to financial markets with volatilities of 10%. One tick is generated for every tick of the corresponding forex pair.",
233233
"349098817": "What’s new on Deriv.com?",
234234
"349994198": "Multipliers on Crash and Boom",
235235
"350443733": "Fedex",
@@ -794,6 +794,7 @@
794794
"1082977556": "<0>With an equivalent $100 margin trade</0>, with 1:500 leverage, you risk 2% * $50,000 = <1>$1,000 loss</1>.",
795795
"1084407062": "These indices correspond to simulated markets with <0>constant volatilities of 10%, 25%, 50%, 75%, and 100%.</0> There is an equal probability of an up or down jump <0>every 20 minutes</0>, on average. The jump size is <0>around 30 times</0> the normal price movement, on average.",
796796
"1084960586": "Disclose the terms of all contracts",
797+
"1088428939": "These indices correspond to financial markets with volatilities of 10% and 20%. One tick is generated for every tick of the corresponding forex pair.",
797798
"1094162624": "<0>High-Close:</0> When you purchase a ‘High-Close’ contract, your win or loss will be equal to the multiplier times the difference between the high and the close over the duration of the contract.",
798799
"1094997218": "<0>One tick</0> is generated <0>every second</0> for volatility indices <0>10 (1s), 25 (1s), 50 (1s), 75 (1s), 100 (1s), 200 (1s), and 300 (1s)</0>.",
799800
"1097133380": "0.35",
@@ -2555,6 +2556,10 @@
25552556
"-2051729853": "Responsive, easy-to-use online trading platforms",
25562557
"-1941767726": "Euro 50",
25572558
"-2109480025": "USD/CHF DFX10 Index",
2559+
"-505645949": "GBP/USD DFX20 Index",
2560+
"-1898335031": "EUR/USD DFX20 Index",
2561+
"-673933474": "AUD/USD DFX20 Index",
2562+
"-1138580834": "USD/JPY DFX20 Index",
25582563
"-1561480459": "Extended trading time, up to 18 hours a day",
25592564
"-231768654": "Open a real account, make a deposit, and start trading synthetics and other markets.",
25602565
"-1696668141": "Free from real-world market and liquidity risks",

src/components/elements/symbols.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import AUDNZD from 'images/svg/symbols/aud-nzd.svg'
1515
import AUDSGD from 'images/svg/symbols/aud-sgd.svg'
1616
import AUDUSD from 'images/svg/symbols/aud-usd.svg'
1717
import AUDUSD10 from 'images/svg/symbols/aud-usd-10.svg'
18-
import AUDUSD100 from 'images/svg/symbols/aud-usd-100.svg'
18+
import AUDUSD20 from 'images/svg/symbols/aud-usd-20.svg'
1919
import AUS200 from 'images/svg/symbols/aus-200.svg'
2020
import AVALANCHE from 'images/svg/symbols/avalanche.svg'
2121
import BA from 'images/svg/symbols/ba.svg'
@@ -86,7 +86,7 @@ import EURSEK from 'images/svg/symbols/eur-sek.svg'
8686
import EURTRY from 'images/svg/symbols/eur-try.svg'
8787
import EURUSD from 'images/svg/symbols/eur-usd.svg'
8888
import EURUSD10 from 'images/svg/symbols/eur-usd-10.svg'
89-
import EURUSD100 from 'images/svg/symbols/eur-usd-100.svg'
89+
import EURUSD20 from 'images/svg/symbols/eur-usd-20.svg'
9090
import EURZAR from 'images/svg/symbols/eur-zar.svg'
9191
import FB from 'images/svg/symbols/fb.svg'
9292
import FILECOIN from 'images/svg/symbols/filecoin.svg'
@@ -105,7 +105,7 @@ import GBPSEK from 'images/svg/symbols/gbp-sek.svg'
105105
import GBPTRY from 'images/svg/symbols/gbp-try.svg'
106106
import GBPUSD from 'images/svg/symbols/gbp-usd.svg'
107107
import GBPUSD10 from 'images/svg/symbols/gbp-usd-10.svg'
108-
import GBPUSD100 from 'images/svg/symbols/gbp-usd-100.svg'
108+
import GBPUSD20 from 'images/svg/symbols/gbp-usd-20.svg'
109109
import GM from 'images/svg/symbols/gm.svg'
110110
import GOLDBASKET from 'images/svg/symbols/gold-basket.svg'
111111
import GOLDEUR from 'images/svg/symbols/gold-eur.svg'
@@ -223,13 +223,13 @@ import USDBASKET from 'images/svg/symbols/usd-basket.svg'
223223
import USDCAD from 'images/svg/symbols/usd-cad.svg'
224224
import USDCHF from 'images/svg/symbols/usd-chf.svg'
225225
import USDCHF10 from 'images/svg/symbols/usd-chf-10.svg'
226-
import USDCHF100 from 'images/svg/symbols/usd-chf-100.svg'
226+
import USDCHF20 from 'images/svg/symbols/usd-chf-20.svg'
227227
import USDCNH from 'images/svg/symbols/usd-cnh.svg'
228228
import USDHKD from 'images/svg/symbols/usd-hkd.svg'
229229
import USDILS from 'images/svg/symbols/usd-ils.svg'
230230
import USDJPY from 'images/svg/symbols/usd-jpy.svg'
231231
import USDJPY10 from 'images/svg/symbols/usd-jpy-10.svg'
232-
import USDJPY100 from 'images/svg/symbols/usd-jpy-100.svg'
232+
import USDJPY20 from 'images/svg/symbols/usd-jpy-20.svg'
233233
import USDMXN from 'images/svg/symbols/usd-mxn.svg'
234234
import USDNOK from 'images/svg/symbols/usd-nok.svg'
235235
import USDBRENT from 'images/svg/symbols/usd-brent.svg'
@@ -372,7 +372,7 @@ export {
372372
AUDSGD,
373373
AUDUSD,
374374
AUDUSD10,
375-
AUDUSD100,
375+
AUDUSD20,
376376
AUS200,
377377
AVALANCHE,
378378
BA,
@@ -444,7 +444,7 @@ export {
444444
EURTRY,
445445
EURUSD,
446446
EURUSD10,
447-
EURUSD100,
447+
EURUSD20,
448448
EURZAR,
449449
FB,
450450
FDX,
@@ -463,7 +463,7 @@ export {
463463
GBPTRY,
464464
GBPUSD,
465465
GBPUSD10,
466-
GBPUSD100,
466+
GBPUSD20,
467467
GM,
468468
GOLDBASKET,
469469
GOLDEUR,
@@ -583,12 +583,12 @@ export {
583583
USDCAD,
584584
USDCHF,
585585
USDCHF10,
586-
USDCHF100,
586+
USDCHF20,
587587
USDHKD,
588588
USDILS,
589589
USDJPY,
590590
USDJPY10,
591-
USDJPY100,
591+
USDJPY20,
592592
USDMXN,
593593
USDNOK,
594594
USDPLN,

src/images/svg/symbols/aud-usd-100.svg

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/images/svg/symbols/aud-usd-20.svg

Lines changed: 20 additions & 0 deletions
Loading

src/images/svg/symbols/eur-usd-100.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/images/svg/symbols/eur-usd-20.svg

Lines changed: 18 additions & 0 deletions
Loading

src/images/svg/symbols/gbp-usd-100.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/images/svg/symbols/gbp-usd-20.svg

Lines changed: 24 additions & 0 deletions
Loading

src/images/svg/symbols/usd-chf-100.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/images/svg/symbols/usd-chf-20.svg

Lines changed: 18 additions & 0 deletions
Loading

src/images/svg/symbols/usd-jpy-100.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/images/svg/symbols/usd-jpy-20.svg

Lines changed: 18 additions & 0 deletions
Loading
Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,37 @@
11
import React from 'react'
2-
import { SymbolContainer } from '../../static/style/_markets-style'
2+
import { SymbolContainer, SymbolText } from '../../static/style/_markets-style'
33
import type { MarketSymbol } from '../../static/content/_market-symbols'
44
import { Text } from 'components/elements'
55

66
//TODO: refactor this component to always use instruments_type
77
type SymbolProps = MarketSymbol & { instruments_type?: MarketSymbol[] }
8-
const Symbol = ({ instruments_type, src, text }: SymbolProps) => (
9-
<React.Fragment>
10-
{instruments_type ? (
11-
<React.Fragment>
12-
{instruments_type.map((symbol, index) => (
13-
<SymbolContainer key={index}>
14-
<img src={symbol.src} alt="symbol" />
15-
<Text>{symbol.text}</Text>
16-
</SymbolContainer>
17-
))}
18-
</React.Fragment>
19-
) : (
20-
<SymbolContainer>
21-
<img src={src} alt="symbol" />
22-
<Text>{text}</Text>
23-
</SymbolContainer>
24-
)}
25-
</React.Fragment>
26-
)
8+
const Symbol = ({ instruments_type, src, text }: SymbolProps) => {
9+
const is_derived_fx = text.props.translate_text.includes('DFX')
10+
return (
11+
<React.Fragment>
12+
{instruments_type ? (
13+
<React.Fragment>
14+
{instruments_type.map((symbol, index) => (
15+
<SymbolContainer key={index}>
16+
<img src={symbol.src} alt="symbol" />
17+
<Text>{symbol.text}</Text>
18+
</SymbolContainer>
19+
))}
20+
</React.Fragment>
21+
) : (
22+
<SymbolContainer>
23+
<img src={src} alt="symbol" />
24+
{is_derived_fx ? (
25+
<SymbolText as="div" type="paragraph-2">
26+
{text}
27+
</SymbolText>
28+
) : (
29+
<Text>{text}</Text>
30+
)}
31+
</SymbolContainer>
32+
)}
33+
</React.Fragment>
34+
)
35+
}
2736

2837
export default Symbol

src/pages/markets/components/sections/_market_instruments.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,7 @@ const MarketInstruments = ({ market_content }: MarketInstrumentsProps) => {
7979
<Title>{content.title}</Title>
8080
)}
8181
</Col>
82-
<DerivedMarketsList
83-
has_right_border={true}
84-
col={content.col}
85-
tablet_col={content.tablet_col}
86-
mobile_col={content.mobile_col}
87-
padding={content.padding}
88-
gap={content.gap}
89-
gap_mobile={content.gap_mobile}
90-
>
91-
{content.component}
92-
</DerivedMarketsList>
82+
<DerivedMarketsList>{content.component}</DerivedMarketsList>
9383
</>
9484
) : (
9585
<>

src/pages/markets/static/content/_details.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ export const DerivedCFDsDetails = () => (
372372
<DetailsContainer>
373373
<Text>
374374
<Localize
375-
translate_text="These indices correspond to financial markets with volatilities of 10%. One tick is generated for every tick of the corresponding forex pair."
375+
translate_text="These indices correspond to financial markets with volatilities of 10% and 20%. One tick is generated for every tick of the corresponding forex pair."
376376
components={[<strong key={0} />]}
377377
/>
378378
</Text>

src/pages/markets/static/content/_market-symbols.tsx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,4 +1332,24 @@ export const derived_fx: MarketSymbol[] = [
13321332
src: icons.USDCHF10,
13331333
text: <Localize translate_text="USD/CHF DFX10 Index" />,
13341334
},
1335+
{
1336+
src: icons.GBPUSD20,
1337+
text: <Localize translate_text="GBP/USD DFX20 Index" />,
1338+
},
1339+
{
1340+
src: icons.EURUSD20,
1341+
text: <Localize translate_text="EUR/USD DFX20 Index" />,
1342+
},
1343+
{
1344+
src: icons.AUDUSD20,
1345+
text: <Localize translate_text="AUD/USD DFX20 Index" />,
1346+
},
1347+
{
1348+
src: icons.USDJPY20,
1349+
text: <Localize translate_text="USD/JPY DFX20 Index" />,
1350+
},
1351+
{
1352+
src: icons.USDCHF20,
1353+
text: <Localize translate_text="USD/CHF DFX20 Index" />,
1354+
},
13351355
]

src/pages/markets/static/style/_markets-style.tsx

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import styled, { css } from 'styled-components'
22
import { ReactElement } from 'react'
33
import { Box, CssGrid, Flex } from 'components/containers'
4-
import { Text } from 'components/elements'
4+
import { Header, Text } from 'components/elements'
55
import device from 'themes/device'
66

77
type DescriptionsProps = {
@@ -133,28 +133,22 @@ export const MarketsList = styled(CssGrid)<MarketsListProps>`
133133
grid-template-columns: ${({ tablet_col }) => `repeat(${tablet_col ?? 2}, 1fr)`};
134134
}
135135
`
136-
export const DerivedMarketsList = styled(CssGrid)<MarketsListProps>`
137-
${({ flex }) => flex && 'display:flex;'};
136+
export const DerivedMarketsList = styled.div<MarketsListProps>`
137+
display: flex;
138+
flex-direction: column;
139+
flex-wrap: wrap;
138140
border-left: 1px solid var(--color-grey-22);
139-
border-right: ${({ has_right_border }) =>
140-
has_right_border ? '1px solid var(--color-grey-22)' : 'unset'};
141-
grid-template-columns: ${({ col }) => `repeat(${col ?? 2}, 1fr)`};
141+
border-right: var(--solid-grey-22);
142142
width: 100%;
143-
height: fit-content;
144-
padding: ${({ padding }) => (padding ? padding : '24px')};
145-
gap: ${({ gap }) => (gap ? gap : '10px')};
143+
height: 272px;
144+
padding: 24px;
145+
gap: 10px;
146146
147147
@media ${device.tabletL} {
148-
grid-template-columns: ${({ tablet_col }) => `repeat(${tablet_col ?? 2}, 1fr)`};
149-
display: grid;
150-
min-height: 76px;
148+
height: 212px;
151149
}
152-
153150
@media ${device.mobileL} {
154-
grid-template-columns: ${({ mobile_col }) => `repeat(${mobile_col ?? 2}, 1fr)`};
155-
${({ mobile_template }) => mobile_template && 'border-left: unset;'};
156151
padding: 16px 8px;
157-
gap: ${({ gap_mobile }) => (gap_mobile ? gap_mobile : '8px 0')};
158152
}
159153
`
160154

@@ -246,6 +240,14 @@ export const SymbolContainer = styled(Flex)`
246240
}
247241
}
248242
`
243+
export const SymbolText = styled(Header)`
244+
font-weight: normal;
245+
246+
@media ${device.tabletL} {
247+
max-width: 100px;
248+
max-height: 28px;
249+
}
250+
`
249251

250252
export const Title = styled(Text)`
251253
text-align: center;

0 commit comments

Comments
 (0)