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 1502ba6

Browse files
suthesankvirtualpowwanjazuli-derivfiona-derivfiona-deriv
authored
Crowdin (#2027)
* Kevin/update stock indices to stocks and indices on header, footer, and market (#1826) * update stock indices to stocks and indices on header, footer, and market * add dev comments * Nuri/Feat : Deriv x seo changes (#1875) * p added seo for Deriv X pages * added back h2 to what is deriv x text * Suthesh/add-jump-indices (#1856) * added new metals, energy and jump indices * minimised svg * fiona / Change margin to CFDs (#1841) * add markets available for CFD trading * add start trading CFDs on deriv section * add styling for cfd page sections * add more CFDs page sections * add cfd page * change margin to cfd * update margin to cfds * minify svg file * fix: missing s and currencies * triger deployment * trigger deployment * update margin-calculator link * fix: spacing on title * align checklist icon with titles in responsive mode * remove real Deriv X * update text * remove extra space * change margin and swap calculator * implement pr changes * delete fragment * add redirect to cfds page * redirect margin to cfds * add markets available for CFD trading * add start trading CFDs on deriv section * add styling for cfd page sections * add more CFDs page sections * add cfd page * change margin to cfd * update margin to cfds * minify svg file * fix: missing s and currencies * update margin-calculator link * fix: spacing on title * align checklist icon with titles in responsive mode * remove real Deriv X * update text * remove extra space * change margin and swap calculator * implement pr changes * delete fragment * add redirect to cfds page * redirect margin to cfds * remove unused import * delete margin folder Co-authored-by: fiona-deriv <[email protected]> * Amina/Footer update (#1910) * pass_variables_to_footer_text * messages.json-extract * Revert "messages.json-extract" This reverts commit 1bb1e61. revert messages.json * suthesh/update-translations-crowdin (#1911) * added new strings for translations * added strings from Amina's PR * downloaded latest translations (incomplete) * Mahdiyeh/Fix: compare_accounts_content_for_eu_conuntries (#1888) * fix compare mt5 accounts content for eu and non_eu clients * fix typo * Al-amin/35136/Deriv p2p landing page update (#1906) * updating Deriv P2P landing page * added Deriv P2P articles on Help centre * address PR comment * addressed QA comments * handle youtube video mobile view * updated P2P numbers card * updated the iframe mobile view * addressed PR comment * nikolai.berestevich/text/update numbers on story page (#1917) Co-authored-by: Nikolai Berestevich <[email protected]> * change sentences (#1916) * added comma and updated crowdin platform (#1983) * replace bet with speculate (#1977) * enable derivx cfd in non eu country (#1970) * Kevin/DMT5 Signal change text content (#1951) * change text content * fix typo * Revert "Kevin/DMT5 Signal change text content (#1951)" (#1989) This reverts commit d30b025. * update hyperlink with second branch (#1941) * Revert "update hyperlink with second branch (#1941)" (#1991) This reverts commit f7c542f. * downloaded latest translations (#1999) * Suthesh/update crowdin hotfix (#2002) * extracted and uploaded * downloaded latest translations * removed space (#2006) * downloaded latest translations (#2012) * Suthesh/crowdin hotfix text (#2020) * edited text, extracted and uploaded * updated ach * downloaded latest translations Co-authored-by: Suthesan <[email protected]> Co-authored-by: Kevin <[email protected]> Co-authored-by: njazuli-deriv <[email protected]> Co-authored-by: fiona-deriv <[email protected]> Co-authored-by: fiona-deriv <[email protected]> Co-authored-by: amina-deriv <[email protected]> Co-authored-by: mahdiyeh-fs <[email protected]> Co-authored-by: Al-amin Abdulkareem <[email protected]> Co-authored-by: Nikolai Berestevich <[email protected]> Co-authored-by: Nikolai Berestevich <[email protected]> Co-authored-by: Habib Binary <[email protected]> Co-authored-by: behnaz-fs <[email protected]> Co-authored-by: Suthesan <[email protected]>
1 parent 6df47c2 commit 1502ba6

File tree

111 files changed

+4015
-2887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+4015
-2887
lines changed

‎crowdin/messages.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎gatsby-node.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ exports.onCreatePage = ({ page, actions }) => {
1515
const is_p2p = /responsible/g.test(page.path)
1616
const is_story = /story/g.test(page.path)
1717
const is_market = /markets/g.test(page.path)
18+
const is_cfds = /cfds/g.test(page.path)
1819

1920
if (is_responsible_trading) {
2021
createRedirect({
@@ -97,6 +98,21 @@ exports.onCreatePage = ({ page, actions }) => {
9798
})
9899
}
99100

101+
if (is_cfds) {
102+
createRedirect({
103+
fromPath: `/trade-types/margin/`,
104+
toPath: `/trade-types/cfds/`,
105+
redirectInBrowser: true,
106+
isPermanent: true,
107+
})
108+
createRedirect({
109+
fromPath: `/trade-types/margin`,
110+
toPath: `/trade-types/cfds/`,
111+
redirectInBrowser: true,
112+
isPermanent: true,
113+
})
114+
}
115+
100116
Object.keys(language_config).map((lang) => {
101117
// Use the values defined in "locales" to construct the path
102118
const { path, is_default } = language_config[lang]
@@ -226,6 +242,21 @@ exports.onCreatePage = ({ page, actions }) => {
226242
})
227243
}
228244

245+
if (is_cfds) {
246+
createRedirect({
247+
fromPath: `/${lang}/trade-types/margin/`,
248+
toPath: `/${lang}/trade-types/cfds/`,
249+
redirectInBrowser: true,
250+
isPermanent: true,
251+
})
252+
createRedirect({
253+
fromPath: `/${lang}/trade-types/margin`,
254+
toPath: `/${lang}/trade-types/cfds/`,
255+
redirectInBrowser: true,
256+
isPermanent: true,
257+
})
258+
}
259+
229260
return current_page
230261
})
231262
}

‎src/common/constants.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ export const map_api_key = 'AIzaSyAEha6-HeZuI95L9JWmX3m6o-AxQr_oFqU'
5959
export const mga_link_url =
6060
'https://authorisation.mga.org.mt/verification.aspx?lang=EN&company=a5fd1edc-d072-4c26-b0cd-ab3fa0f0cc40&details=1'
6161
export const p2p_playstore_url = 'https://play.google.com/store/apps/details?id=com.deriv.dp2p'
62+
export const p2p_applestore_url = 'https://apps.apple.com/us/app/deriv-dp2p/id1506901451'
63+
export const p2p_huawei_appgallery_url = 'https://appgallery.huawei.com/#/app/C103844755'
6264
export const pushwoosh_app_code = 'DD293-35A19'
6365
export const sample_rate = 25
6466
export const zoho_url = 'https://deriv.zohorecruit.com'

‎src/components/custom/_dtrading.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ const DTrading = ({ trading, reverse, two_title }) => {
131131
return (
132132
<Row flex_direction={!is_even ? 'row' : 'row-reverse'} key={index}>
133133
<Content margin_right={!is_even ? '2.4rem' : '0'}>
134-
<StyledHeader type="page-title">{item.title}</StyledHeader>
134+
<StyledHeader type="page-title" as="h2">
135+
{item.title}
136+
</StyledHeader>
135137
<Text>{item.subtitle}</Text>
136138
{two_title && (
137139
<>

‎src/components/custom/other-platforms.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import DTrader from 'images/svg/dtrader-icon.svg'
2929
import Forex from 'images/svg/forex-nav.svg'
3030
import Help from 'images/svg/menu/help-center.svg'
3131
import Leadership from 'images/svg/menu/leadership.svg'
32-
import Margin from 'images/svg/margin-trading-nav.svg'
32+
import CFD from 'images/svg/margin-trading-nav.svg'
3333
import Multipliers from 'images/svg/multipliers-nav.svg'
3434
import Options from 'images/svg/options-nav.svg'
3535
import Partner from 'images/svg/menu/partner.svg'
@@ -267,14 +267,14 @@ export const NavPlatform = ({ onClick, is_ppc, is_ppc_redirect }) => {
267267
<Flex direction="column" wrap="wrap" jc="flex-start">
268268
<StyledText>{localize('Trade types')}</StyledText>
269269
<NavCard
270-
aria_label="Margin trading"
271-
icon={() => <img src={Margin} alt="" width="32" height="32" />}
270+
aria_label="CFDs"
271+
icon={() => <img src={CFD} alt="" width="32" height="32" />}
272272
content={
273-
<Localize translate_text="Trade with leverage and low spreads for better returns on successful trades." />
273+
<Localize translate_text="Trade with leverage and tight spreads for better returns on successful trades." />
274274
}
275-
title={<Localize translate_text="Margin trading" />}
275+
title={<Localize translate_text="CFDs" />}
276276
onClick={onClick}
277-
to="/trade-types/margin/"
277+
to="/trade-types/cfds/"
278278
/>
279279
{!is_eu_country && (
280280
<NavCard
@@ -292,7 +292,7 @@ export const NavPlatform = ({ onClick, is_ppc, is_ppc_redirect }) => {
292292
aria_label="Multipliers"
293293
icon={() => <img src={Multipliers} alt="" width="32" height="32" />}
294294
content={
295-
<Localize translate_text="Combine the upside of margin trading with the simplicity of options." />
295+
<Localize translate_text="Combine the upside of CFDs with the simplicity of options." />
296296
}
297297
title={<Localize translate_text="Multipliers" />}
298298
onClick={onClick}
@@ -403,7 +403,7 @@ export const NavMarket = ({ onClick, is_ppc }) => (
403403
aria_label="Stocks & indices"
404404
icon={() => <img src={StockIndices} alt="" width="32" height="32" />}
405405
content={
406-
<Localize translate_text="Predict broader market trends and diversify your risk with stock indices." />
406+
<Localize translate_text="Predict broader market trends and diversify your risk with stocks & indices." />
407407
}
408408
title={<Localize translate_text="Stocks & indices" />}
409409
onClick={onClick}

‎src/components/elements/off-canvas-menu.js

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import DTrader from 'images/svg/dtrader-icon.svg'
2323
import Forex from 'images/svg/forex-nav.svg'
2424
import Help from 'images/svg/menu/help-center.svg'
2525
import Leadership from 'images/svg/menu/leadership.svg'
26-
import MarginTrading from 'images/svg/margin-trading-nav.svg'
26+
import CFD from 'images/svg/margin-trading-nav.svg'
2727
import Multipliers from 'images/svg/multipliers-nav.svg'
2828
import Options from 'images/svg/options-nav.svg'
2929
import Partner from 'images/svg/menu/partner.svg'
@@ -151,21 +151,14 @@ export const OffCanvasMenuWrapper = (props) => {
151151
</Text>
152152
<Flex mb="2rem">
153153
<NavCard
154-
aria_label="Margin trading"
155-
icon={() => (
156-
<img
157-
src={MarginTrading}
158-
alt=""
159-
width="32"
160-
height="32"
161-
/>
162-
)}
154+
aria_label="CFDs"
155+
icon={() => <img src={CFD} alt="" width="32" height="32" />}
163156
content={
164-
<Localize translate_text="Trade with leverage and low spreads for better returns on successful trades." />
157+
<Localize translate_text="Trade with leverage and tight spreads for better returns on successful trades." />
165158
}
166-
title={<Localize translate_text="Margin trading" />}
159+
title={<Localize translate_text="CFDs" />}
167160
onClick={handleArrowClick}
168-
to="/trade-types/margin/"
161+
to="/trade-types/cfds/"
169162
/>
170163
</Flex>
171164
{!is_eu_country && (
@@ -191,7 +184,7 @@ export const OffCanvasMenuWrapper = (props) => {
191184
<img src={Multipliers} alt="" width="32" height="32" />
192185
)}
193186
content={
194-
<Localize translate_text="Combine the upside of margin trading with the simplicity of options." />
187+
<Localize translate_text="Combine the upside of CFDs with the simplicity of options." />
195188
}
196189
title={<Localize translate_text="Multipliers" />}
197190
onClick={handleArrowClick}
@@ -314,7 +307,7 @@ export const OffCanvasMenuWrapper = (props) => {
314307
<img src={StockIndices} alt="" width="32" height="32" />
315308
)}
316309
content={localize(
317-
'Predict broader market trends and diversify your risk with stock indices.',
310+
'Predict broader market trends and diversify your risk with stocks & indices.',
318311
)}
319312
title={localize('Stocks & indices')}
320313
onClick={handleArrowClick}

‎src/components/elements/symbols.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import AAPL from 'images/svg/symbols/aapl.svg'
33
import ABNB from 'images/svg/symbols/abnb.svg'
44
import ADS from 'images/svg/symbols/ads.svg'
55
import AIG from 'images/svg/symbols/aig.svg'
6+
import ALUMINIUMUSD from 'images/svg/symbols/aluminium-usd.svg'
67
import AMZN from 'images/svg/symbols/amzn.svg'
78
import AUDCAD from 'images/svg/symbols/aud-cad.svg'
89
import AUDCHF from 'images/svg/symbols/aud-chf.svg'
@@ -27,6 +28,7 @@ import CADCHF from 'images/svg/symbols/cad-chf.svg'
2728
import CADJPY from 'images/svg/symbols/cad-jpy.svg'
2829
import CHFJPY from 'images/svg/symbols/chf-jpy.svg'
2930
import CLBRENT from 'images/svg/symbols/cl-brent.svg'
31+
import COPPERUSD from 'images/svg/symbols/copper-usd.svg'
3032
import CRASH1000 from 'images/svg/symbols/crash-indices-1000.svg'
3133
import CRASH500 from 'images/svg/symbols/crash-indices-500.svg'
3234
import CRM from 'images/svg/symbols/crm.svg'
@@ -69,6 +71,7 @@ import GBPSGD from 'images/svg/symbols/gbp-sgd.svg'
6971
import GBPTRY from 'images/svg/symbols/gbp-try.svg'
7072
import GBPUSD from 'images/svg/symbols/gbp-usd.svg'
7173
import GM from 'images/svg/symbols/gm.svg'
74+
import GOLDEUR from 'images/svg/symbols/gold-eur.svg'
7275
import GOLDUSD from 'images/svg/symbols/gold-usd.svg'
7376
import GOOGL from 'images/svg/symbols/googl.svg'
7477
import GS from 'images/svg/symbols/gs.svg'
@@ -92,16 +95,24 @@ import INTC from 'images/svg/symbols/intc.svg'
9295
import JNJ from 'images/svg/symbols/jnj.svg'
9396
import JP225 from 'images/svg/symbols/jp-225.svg'
9497
import JPM from 'images/svg/symbols/jpm.svg'
98+
import JUMP10 from 'images/svg/symbols/jump-10.svg'
99+
import JUMP25 from 'images/svg/symbols/jump-25.svg'
100+
import JUMP50 from 'images/svg/symbols/jump-50.svg'
101+
import JUMP75 from 'images/svg/symbols/jump-75.svg'
102+
import JUMP100 from 'images/svg/symbols/jump-100.svg'
95103
import KO from 'images/svg/symbols/ko.svg'
104+
import LEADUSD from 'images/svg/symbols/lead-usd.svg'
96105
import LTCUSD from 'images/svg/symbols/lct-usd.svg'
97106
import MA from 'images/svg/symbols/ma.svg'
98107
import MARKETBEAR from 'images/svg/symbols/marketbear.svg'
99108
import MARKETBULL from 'images/svg/symbols/marketbull.svg'
100109
import MCD from 'images/svg/symbols/mcd.svg'
101110
import MRNA from 'images/svg/symbols/mrna.svg'
102111
import MSFT from 'images/svg/symbols/msft.svg'
112+
import NATURALGAS from 'images/svg/symbols/natural-gas.svg'
103113
import NED25 from 'images/svg/symbols/ned-25.svg'
104114
import NFLX from 'images/svg/symbols/nflx.png'
115+
import NICKELUSD from 'images/svg/symbols/nickel-usd.svg'
105116
import NKE from 'images/svg/symbols/nke.svg'
106117
import NVDA from 'images/svg/symbols/nvda.svg'
107118
import NZDCAD from 'images/svg/symbols/nzd-cad.svg'
@@ -157,6 +168,7 @@ import USDZAR from 'images/svg/symbols/usd-zar.svg'
157168
import V from 'images/svg/symbols/v.svg'
158169
import WMT from 'images/svg/symbols/wmt.svg'
159170
import XRPUSD from 'images/svg/symbols/xrp-usd.svg'
171+
import SILVEREUR from 'images/svg/symbols/silver-eur.svg'
160172
import STOCKSUS500 from 'images/svg/symbols/markets-stocks-and-indices/american-indices/us-500.svg'
161173
import STOCKSUSTECH100 from 'images/svg/symbols/markets-stocks-and-indices/american-indices/us-tech-100.svg'
162174
import STOCKSWALLSTREET30 from 'images/svg/symbols/markets-stocks-and-indices/american-indices/wall-street-30.svg'
@@ -217,6 +229,7 @@ import STOCKSVISA from 'images/svg/symbols/markets-stocks-and-indices/american-s
217229
import STOCKSWALMART from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-wal-mart-stores-inc.svg'
218230
import STOCKSWALTDISNEY from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-walt-disney-company.svg'
219231
import STOCKSZOOM from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-zoom-video-communications-inc.svg'
232+
import ZINCUSD from 'images/svg/symbols/zinc-usd.svg'
220233
import ZM from 'images/svg/symbols/zm.svg'
221234
import BNB from 'images/svg/symbols/binance_coin_flag.svg'
222235
import BTC from 'images/svg/symbols/bitcoin_flag.svg'
@@ -240,6 +253,7 @@ export {
240253
ABNB,
241254
ADS,
242255
AIG,
256+
ALUMINIUMUSD,
243257
AMZN,
244258
AUDCAD,
245259
AUDCHF,
@@ -264,6 +278,7 @@ export {
264278
CADJPY,
265279
CHFJPY,
266280
CLBRENT,
281+
COPPERUSD,
267282
CRASH1000,
268283
CRASH500,
269284
CRM,
@@ -306,6 +321,7 @@ export {
306321
GBPTRY,
307322
GBPUSD,
308323
GM,
324+
GOLDEUR,
309325
GOLDUSD,
310326
GOOGL,
311327
GS,
@@ -329,16 +345,24 @@ export {
329345
JNJ,
330346
JP225,
331347
JPM,
348+
JUMP10,
349+
JUMP25,
350+
JUMP50,
351+
JUMP75,
352+
JUMP100,
332353
KO,
354+
LEADUSD,
333355
LTCUSD,
334356
MA,
335357
MARKETBEAR,
336358
MARKETBULL,
337359
MCD,
338360
MRNA,
339361
MSFT,
362+
NATURALGAS,
340363
NED25,
341364
NFLX,
365+
NICKELUSD,
342366
NKE,
343367
NVDA,
344368
NZDCAD,
@@ -394,6 +418,7 @@ export {
394418
V,
395419
WMT,
396420
XRPUSD,
421+
SILVEREUR,
397422
STOCKSUS500,
398423
STOCKSUSTECH100,
399424
STOCKSWALLSTREET30,
@@ -454,6 +479,7 @@ export {
454479
STOCKSZOOM,
455480
STOCKSSWISS20,
456481
STOCKSHONGKONG50,
482+
ZINCUSD,
457483
ZM,
458484
BNB,
459485
BTC,

‎src/components/layout/footer/bottom-social-wrapper.js

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
import SocialWrapperComponent from './social-wrapper'
3+
import SocialWrapperComponent from './social-wrapper'
44
import { useWebsiteStatus } from 'components/hooks/use-website-status'
55
import { Show } from 'components/containers'
6-
import { isUKOrMXAccount } from 'common/utility'
6+
import { isUKOrMXAccount } from 'common/utility'
77
import {
88
fb_non_eu_url,
99
fb_uk_url,
@@ -21,29 +21,40 @@ const BottomSocialSection = ({ type }) => {
2121
const current_client_country = website_status?.clients_country || ''
2222

2323
return (
24-
<>
25-
<Show.NonEU>
26-
<SocialWrapperComponent is_career_page={type === 'careers'}
27-
fb_url={fb_non_eu_url}
28-
instagram_url={instagram_non_eu_url}
29-
twitter_url={twitter_non_eu_url}
30-
/>
31-
</Show.NonEU>
24+
<>
25+
<Show.NonEU>
26+
<SocialWrapperComponent
27+
is_career_page={type === 'careers'}
28+
fb_url={fb_non_eu_url}
29+
instagram_url={instagram_non_eu_url}
30+
twitter_url={twitter_non_eu_url}
31+
/>
32+
</Show.NonEU>
3233

33-
<Show.Eu>
34-
<Show.Mobile>
35-
<SocialWrapperComponent is_career_page={type === 'careers'}
34+
<Show.Eu>
35+
<Show.Mobile>
36+
<SocialWrapperComponent
37+
is_career_page={type === 'careers'}
3638
fb_url={isUKOrMXAccount(current_client_country) ? fb_uk_url : fb_eu_url}
37-
instagram_url={isUKOrMXAccount(current_client_country) ? instagram_uk_url : instagram_eu_url}
38-
twitter_url={isUKOrMXAccount(current_client_country) ? twitter_uk_url : twitter_eu_url}
39-
/>
40-
</Show.Mobile>
41-
</Show.Eu>
42-
</>
43-
)}
39+
instagram_url={
40+
isUKOrMXAccount(current_client_country)
41+
? instagram_uk_url
42+
: instagram_eu_url
43+
}
44+
twitter_url={
45+
isUKOrMXAccount(current_client_country)
46+
? twitter_uk_url
47+
: twitter_eu_url
48+
}
49+
/>
50+
</Show.Mobile>
51+
</Show.Eu>
52+
</>
53+
)
54+
}
4455

4556
BottomSocialSection.propTypes = {
4657
type: PropTypes.string,
4758
}
4859

49-
export default BottomSocialSection;
60+
export default BottomSocialSection

0 commit comments

Comments
 (0)