Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/binary-com/deriv-com
Browse files Browse the repository at this point in the history
  • Loading branch information
aswathy-deriv committed May 20, 2024
2 parents 36c8140 + 4b2d9df commit 0027266
Show file tree
Hide file tree
Showing 62 changed files with 5,968 additions and 6,048 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/smoketests-eu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
steps:
- name: Download artifact
id: download-artifact
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4
with:
workflow_conclusion: success
run_id: ${{ github.event.workflow_run.id }}
run-id: ${{ github.event.workflow_run.id }}
name: 'pr-${{ github.event.workflow_run.id }}'
path: pr
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Retrieve pull request
id: pr_information
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/smoketests-row.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
steps:
- name: Download artifact
id: download-artifact
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4
with:
workflow_conclusion: success
run_id: ${{ github.event.workflow_run.id }}
run-id: ${{ github.event.workflow_run.id }}
name: 'pr-${{ github.event.workflow_run.id }}'
path: pr
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Retrieve pull request
id: pr_information
Expand Down
36 changes: 20 additions & 16 deletions crowdin/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"26480598": "General",
"26596220": "Finance",
"27830635": "Deriv (V) Ltd",
"28675270": "Chief Financial Officer",
"28681430": "Join great marketing minds at Deriv’s office in Ciudad del Este, Paraguay. Be part of a vibrant team that develops the company’s growth in the region.",
"29394238": "<0> 280,000</0>",
"29654660": "Deriv X:",
Expand Down Expand Up @@ -81,6 +82,7 @@
"71535160": "Calculate the overnight fees for holding any open positions. The fees can be positive or negative depending on your swap rate.",
"71630191": "Do not share your account information and other personal details with anyone via Telegram.",
"71650838": "Speak simply and plainly, and not hide behind ambiguity",
"73765361": "Chief Audit Executive",
"74138086": "Take control of your trades on Deriv MT5",
"74593350": "3. Select Real account or Demo account.",
"76083876": "<0>A social media admin</0><br/>Promote our products and services on your social media pages, and earn commission when you convert your audience into traders.",
Expand Down Expand Up @@ -362,6 +364,7 @@
"357105933": "Go to the Trader’s hub and choose the Demo option.",
"358257887": "Once your submitted document has been approved, go to Cashier > DP2P to register your Deriv P2P account.",
"358369253": "Can I close In/Out options before the end of the trade duration?",
"358838306": "Vice President of Customer Support",
"360357815": "High/Low ticks | Digital options contract | Deriv",
"361051814": "Let’s say you want to calculate the take profit level and pip value when you want to sell 3 lots of Volatility 50 Index priced at 249.5961 USD with a take profit amount of 84 USD.",
"362961755": "No, the accumulated payout for accumulator options is not correlated with the direction of the underlying index.",
Expand Down Expand Up @@ -659,6 +662,7 @@
"636857983": "Take advantage of a highly liquid market with round-the-clock trading. Profit from correctly predicting the movement of the world's most popular cryptocurrencies.",
"636968212": "If you encounter any issues with a transaction on Deriv P2P, first try to resolve it with the trader you’re dealing with. If they’re not willing to help, please let us know via <0>live chat</0>, and we’ll help you resolve it.",
"637013579": "Our classic \"drag-and-drop\" tool for creating trading bots, featuring pop-up trading charts, for advanced users.",
"640307277": "Vice President of Engineering",
"640979467": "<0>IWM.US</0> The iShares Russell 2000 ETF tracks the investment results of an index of small-capitalisation US equities.",
"642995056": "Email",
"643714136": "Binary bot for creating trading bot",
Expand Down Expand Up @@ -993,7 +997,6 @@
"949617971": "Your Deriv X password is linked to the standalone Deriv X trading platform while your Deriv password gives you access to platforms hosted on our website such as DTrader and DBot.",
"949859957": "Submit",
"953170529": "Enjoy zero commission trading on all assets.",
"953539018": "Head of Client Funding Facilities",
"954358534": "Rating a great experience lets you show your appreciation towards your trade partners. They’ll be encouraged to maintain their excellent standards upon receiving your positive ratings. Your ratings and recommendations will also help other Deriv P2P users find reliable trade partners.",
"955451911": "Take advantage of high leverage and tight spreads on Deriv’s CFD trading platforms.",
"957496593": "We got you covered",
Expand Down Expand Up @@ -1127,7 +1130,6 @@
"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.",
"1089110190": "You accidentally gave us another email address (usually a work or a personal one instead of the one you meant).",
"1089165018": "Get in touch",
"1089912642": "Head of Products & Growth",
"1090964405": "Monthly volume requirement",
"1091197091": "How are payouts calculated for In/Out options?",
"1091315173": "<strong>Scan for viruses:</strong> Run a full system scan on your computer and any devices you used to access your account. Make sure your antivirus and anti-malware software is up to date.",
Expand Down Expand Up @@ -1222,6 +1224,7 @@
"1185518626": "Enjoy trading a wide range of offerings that mimic characteristics of financial markets.",
"1185936927": "The Deriv Introducing Broker (IB) Programme is a partnership opportunity where you benefit from referring new clients to trade on our CFD trading platforms.",
"1186149510": "Can I open multiple Reset Call/Reset Put contracts with different barriers simultaneously?",
"1186732014": "iFX Expo Asia Exhibitor",
"1187487273": "Volatility 15 (1s) Index",
"1189346909": "To withdraw from your Deriv account into your personal account, go to Cashier, click \"Withdrawal\", and follow the instructions on the screen. You’ll need to verify your withdrawal request and confirm your withdrawal amount.",
"1189875009": "Proven track record",
Expand Down Expand Up @@ -1451,6 +1454,7 @@
"1403848854": "The Deriv MT5 Standard account offers new and experienced traders high leverage and variable spreads for maximum flexibility.",
"1404594106": "Swap short (Daily points)",
"1405194573": "Locate the live chat widget on our website or app at the bottom right corner of the screen.",
"1405237333": "Head of People Management",
"1405929527": "Your IB commissions earned from Deriv X are credited directly into your Deriv account daily.",
"1406209174": "Trade with a regulated industry pioneer trusted by traders for more than 20 years.",
"1406360927": "Minor pairs",
Expand Down Expand Up @@ -1499,7 +1503,6 @@
"1452901553": "Derived trading gives you a chance to make a profit from correctly predicting the price movement of instruments that mimic characteristics of financial markets or are derived from them.",
"1454068319": "To use Deriv P2P, you’ll first need a Deriv real USD account. If you don’t already have one, <0>sign up for free</0>.",
"1454243296": "Minimal capital requirements, limited risk",
"1454367216": "Since 1999, the Deriv group of companies has served traders around the world with integrity and reliability. We always hold ourselves to the highest ethical standards and regulatory requirements.",
"1454599585": "<0>Escrow fund protection</0>",
"1456673219": "How and when will I receive my commission payout?",
"1456712815": "- Specifying the duration of the trade",
Expand Down Expand Up @@ -1551,6 +1554,7 @@
"1497689723": "The limits will reset when a loss condition is triggered or when someone trading the same combination closes their position. When this happens, you’ll be able to open new contracts again as normal.",
"1497761103": "Multiplier commission:",
"1498651658": "Yes. <0>Contact us via live chat</0>, and we'll help you through it. We'll need the following information:",
"1498661772": "Deriv Investments (Europe) Limited, incorporated on 22 April 2015 (Company No. C 70156), is based in Malta with its registered address at Level 3, W Business Centre, Triq Dun Karm, Birkirkara BKR9033, and is regulated by the Malta Financial Services Authority under the Investments Services Act to provide investment services (view licence). This website is intended for Retail, Professional Clients, and Eligible Counterparties. It serves clients in the European Union, offering accounts for trading financial instruments, and is authorised to operate in other EU member states through EU passporting rights in the following member states:",
"1499173053": "AUD/USD DFX10 Index",
"1499964738": "Who can partner with Deriv Prime?",
"1501210063": "affiliate",
Expand Down Expand Up @@ -1831,6 +1835,7 @@
"1733322890": "Effortless",
"1733660945": "Funds available as soon as confirmed",
"1734026582": "This plan is available exclusively for affiliates who promote to clients residing in EU.",
"1734683614": "Chief Executive Officer",
"1737371600": "Where can I trade vanilla options on Deriv?",
"1739086943": "Wall Street 30",
"1739322571": "XLE.US",
Expand Down Expand Up @@ -3256,7 +3261,6 @@
"-1330380888": "Established since",
"-1692319801": "Trade with leverage, unbeatable spreads, and fast execution on the widest range of markets.",
"-711756091": "Trade CFDs and multipliers",
"-766186087": "{{trustScore}} out of 5 based on {{numberOfReviews}} reviews",
"-779264061": "Bots",
"-954684507": "The most popular and comprehensive <0>CFDs</0> platform.",
"-895675910": "Flagship trading platform for <0>multipliers</0>.",
Expand Down Expand Up @@ -3362,9 +3366,8 @@
"-1678879119": "Corporate email*",
"-488343037": "Connect with us if you want to know more about our trailblazing liquidity solution",
"-1066941187": "Global liquidity for all",
"-1180837625": "9-11 April 2024",
"-589354937": "iFX Expo Latam Exhibitor",
"-681877195": "iFX Expo International Cyprus Exhibitor",
"-454667592": "16-18 September 2024",
"-538614715": "Forex Expo Dubai Exhibitor",
"-1150976117": "Meet us there",
"-2064793652": "Investment funds",
Expand Down Expand Up @@ -3410,6 +3413,7 @@
"-1863275344": "250+ tradeable financial and derived assests",
"-2125275828": "Unique trade types. Hundreds of instruments. Financial and derived markets.",
"-154889447": "Ready to join over 2.5 million traders who have chosen Deriv as their trusted broker? Enter your email address to create a free demo account.",
"-766186087": "{{trustScore}} out of 5 based on {{numberOfReviews}} reviews",
"-1957784093": "Easy And Free Sign Up | Online Trading | Deriv.com",
"-323355149": "deriv careers",
"-507845880": "Cyberjaya bridge and lake view",
Expand Down Expand Up @@ -4229,19 +4233,20 @@
"-2121510827": "Sweden",
"-1528857737": "The Financial Commission",
"-791685634": "For fair resolution of any complaints, please contact us via <0>live chat</0>.",
"-672208523": "Deriv Investments (Europe) Limited, incorporated on 22 April 2015 (Company No. C 70156), is based in Malta with its registered address at Level 3, W Business Centre, Triq Dun Karm, Birkirkara BKR9033, and is regulated by the Malta Financial Services Authority under the Investments Services Act to provide investment services (<0>view licence</0>). It serves clients in the European Union, offering accounts for trading financial instruments, and is authorised to operate in other EU member states through EU passporting rights.",
"-632020980": "Here are the EU countries with access to Deriv.com through EU passporting rights.",
"-1595083103": "Financial Disclosures Annual Report 2023",
"-410643288": "RTS28 2022",
"-1446148261": "CFDs - Forex",
"-1121949345": "CFDs - Stock indices",
"-33096025": "CFDs - Cryptocurrencies",
"-2132026042": "CFDs - Commodities",
"-1238176624": "CFDs - Synthetics: Volatility 250 (1s) Index",
"-1966493594": "CFDs - Derived indices: Volatility Indices",
"-604366950": "CFDs - Synthetics: DEX",
"-1467964959": "CFDs - Synthetics: Drift Switch Index",
"-871196357": "CFDs - Derived indices: Jump Indices",
"-349809595": "Vanilla Options - Derived indices",
"-1076679821": "Multipliers - Cryptocurrencies",
"-812435767": "Multipliers - Synthetics: Crash 300 Index",
"-1410321639": "Since 1999, the Deriv group of companies has served traders around the world with integrity and reliability. We<br /> always hold ourselves to the highest ethical standards and regulatory requirements.",
"-1269257733": "Clients in the rest of the world (except for restricted countries such as the USA, Canada, and Hong Kong) who wish to trade CFDs on forex and cryptocurrencies can have MT5 Financial STP accounts under Deriv (FX) Ltd.",
"-1352186495": "Clients in the rest of the world (except for certain countries such as the USA, Canada, and Hong Kong) who wish to trade CFDs on financial instruments (via MT5 Financial accounts) and derived indices (via MT5 Derived accounts) can have Deriv MT5 accounts under Deriv (BVI) Ltd.",
"-2067457289": "Deriv (V) Ltd (Company No. 014556), incorporated on the 17th February 2016, is registered in the Republic of Vanuatu with its registered office located at 1276, Govant Building, Kumul Highway, Port Vila, Republic of Vanuatu. Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<0>view licence</0>) and is a <1>member</1> of the Financial Markets Association.",
Expand Down Expand Up @@ -4623,15 +4628,14 @@
"-418008452": "Our principles are the framework for our decisions",
"-3618456": "Learn more about our principles",
"-1855417261": "Our leadership",
"-1593526027": "Co-Chief Executive Officer",
"-1277783292": "Chief Operating Officer",
"-1369524546": "Chief Information Officer",
"-2049472334": "Chief Risk & Compliance Officer",
"-942399507": "Co-Chief Financial Officer",
"-1018318927": "Chief Human Resources Officer",
"-216767904": "Chief Administrative Officer",
"-2090485097": "Head of Engineering",
"-607033827": "Senior Vice President (Product)",
"-1315613352": "Vice President (Engineering)",
"-667609659": "Vice President (Customer Experience)",
"-197772643": "Head of Marketing & Global Partnerships",
"-290006480": "Vice President of Product",
"-871474425": "Vice President of IT Operations",
"-864130274": "Head of Accounts",
"-275117592": "withdrawals last month",
"-608807773": "trades last month",
"-1165835520": "employees",
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@
"build:row": "npm run build --workspace @deriv/row && node scripts/copy-htaccess.js row",
"build:eu": "npm run build --workspace @deriv/eu && node scripts/copy-htaccess.js eu",
"update:deriv-com-libs": "npm i @deriv-com/blocks@latest @deriv-com/components@latest @deriv-com/hooks@latest @deriv-com/providers@latest --workspace gatsby-theme-deriv",
"partytown:row": "partytown copylib sites/row/public/~partytown",
"partytown:eu": "partytown copylib sites/eu/public/~partytown",
"develop:row": "npm run develop --workspace @deriv/row",
"clean:row": "npm run clean --workspace @deriv/row",
"develop:eu": "npm run develop --workspace @deriv/eu",
Expand Down
6 changes: 0 additions & 6 deletions themes/gatsby-theme-deriv/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ module.exports = {
author: 'Deriv.com',
siteUrl: site_url,
},
partytownProxiedURLs: [
`https://assets.customer.io/assets/track-eu.js`,
`https://assets.customer.io/assets/track.js`,
`https://static.deriv.com/scripts/cookie.js`,
`https://widget.trustpilot.com/bootstrap/v5/tp.widget.bootstrap.min.js`,
],
plugins: [
'gatsby-plugin-postcss',
{
Expand Down
4 changes: 0 additions & 4 deletions themes/gatsby-theme-deriv/gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
const language_config = require(`./i18n-config.js`)
const language_config_en = require(`./i18n-config-en.js`)
const path = require('path')
const { copyLibFiles } = require('@builder.io/partytown/utils')
const { exec } = require('child_process')
const StylelintPlugin = require('stylelint-webpack-plugin')
const TerserPlugin = require('terser-webpack-plugin')
Expand Down Expand Up @@ -33,9 +32,6 @@ const fetchTrustpilotData = () => {
})
}

exports.onPreBuild = async () => {
await copyLibFiles(path.join(__dirname, 'static', '~partytown'))
}
exports.onPreInit = () => {
// Update truspilot.json file with latest data
fetchTrustpilotData()
Expand Down
21 changes: 0 additions & 21 deletions themes/gatsby-theme-deriv/gatsby-ssr.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react'
import { Partytown } from '@builder.io/partytown/react'
import { WrapPagesWithLocaleContext } from './src/components/localization'
import './src/components/localization/config'
import GlobalProvider from './src/store/global-provider'
Expand All @@ -17,31 +16,11 @@ export const onRenderBody = ({ setHeadComponents }) => {
setHeadComponents([
<link key="preconnect-gstatic" rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="true" />,
<link key="preload-font" rel="preload" href="https://fonts.gstatic.com/s/ibmplexsans/v19/zYX9KVElMYYaJe8bpLHnCwDKjWr7AIFsdP3pBms.woff2" as="font" type="font/woff2" crossOrigin="true" />,
// Partytown setup
<Partytown key="partytown" />,
<script
key="partytown-vanilla-config"
dangerouslySetInnerHTML={{
__html: `partytown = {
resolveUrl(url, location) {
// Use a secure connection
if (url?.protocol === 'http:') {
url = new URL(url.href.replace('http', 'https'))
}
// Point to our proxied URL
const proxyUrl = new URL(location.origin + '/__third-party-proxy')
proxyUrl.searchParams.append('url', url)
return proxyUrl
}
}`,
}}
/>,

// GTM setup
(gtmTrackingId && (
<script
key="gtm-script"
type="text/partytown"
async
src={`https://www.googletagmanager.com/gtm.js?id=${gtmTrackingId}`}
></script>
Expand Down
1 change: 0 additions & 1 deletion themes/gatsby-theme-deriv/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"license": "ISC",
"dependencies": {
"@artsy/fresnel": "^6.2.1",
"@builder.io/partytown": "^0.8.1",
"@deriv-com/analytics": "^1.5.0",
"@deriv-com/blocks": "^0.118.0",
"@deriv-com/components": "^0.59.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Localize } from 'components/localization'
const DesktopText = ({ loss_percent }: { loss_percent: number }) => {
return (
<div className="hidden sm:!block">
<Text className="text-solid-slate-50" size="sm">
<Text className="text-solid-slate-50" size="md">
<Localize
translate_text="_t_The products offered on our website are complex derivative products that carry a significant risk of potential loss. CFDs are complex instruments with a high risk of losing money rapidly due to leverage. {{loss_percent}}% of retail investor accounts lose money when trading CFDs with this provider. You should consider whether you understand how these products work and whether you can afford to take the high risk of losing your money._t_"
values={{ loss_percent }}
Expand Down
Loading

0 comments on commit 0027266

Please sign in to comment.