Merge branch 'master' into translators

binary-com · Oct 9, 2023 · f996d07 · f996d07
2 parents a46e07c + 6b48572
commit f996d07
Show file tree

Hide file tree

Showing 83 changed files with 2,126 additions and 1,418 deletions.
diff --git a/.github/workflows/generate-preview-link.yml b/.github/workflows/generate-preview-link.yml
@@ -182,15 +182,33 @@ jobs:
                   message: ${{steps.generate_preview_url.outputs.comment || steps.generate_failure_comment.outputs.comment }}
                   recreate: true
 
-            - name: E2E Smoke Test
-              run: |
-                  curl -X POST \
-                  -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-                  -H "Accept: application/vnd.github.everest-preview+json" \
-                  "https://api.github.com/repos/deriv-com/e2e-deriv-com/dispatches" \
-                  -d '{
-                    "event_type": "run-e2e-tests",
-                    "client_payload": {
-                      "baseurl": "${{steps.publish-to-pages.outputs.preview_url}}"
-                    }
-                  }'
+            - name: e2e Smoke Tests
+              uses: actions/checkout@v4
+              with:
+                repository: deriv-com/e2e-deriv-com # Replace with your repository name
+
+            - name: Cypress run
+              # Uses the official Cypress GitHub action https://github.com/cypress-io/github-action
+              uses: cypress-io/github-action@v6
+              with:
+                # Starts web server for E2E tests - replace with your own server invocation
+                # https://docs.cypress.io/guides/continuous-integration/introduction#Boot-your-server
+                # start: npm start
+                # wait-on: 'http://localhost:3000' # Waits for above
+                # Records to Cypress Cloud 
+                # https://docs.cypress.io/guides/cloud/projects#Set-up-a-project-to-record
+                record: true
+                parallel: true # Runs test in parallel using settings above
+                spec: cypress/e2e/smoke/*.js
+                group: 'Smoke Tests'
+
+              env:
+                # For recording and parallelization to work you must set your CYPRESS_RECORD_KEY
+                # in GitHub repo → Settings → Secrets → Actions
+                CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+                # Creating a token https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token
+                GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+                # Set Base Url from client_payload.
+                CYPRESS_BASE_URL: ${{steps.publish-to-pages.outputs.preview_url}}
+                # Send PR and Repo details to Cypress Cloud test run
+                COMMIT_INFO_MESSAGE: PR "${{steps.pr_information.outputs.issue_number}}" in Repo "${{ github.repository }}" 
diff --git a/crowdin/messages.json b/crowdin/messages.json
@@ -121,6 +121,7 @@
   "103740464": "<p>To open a Up/Down contract, you'll need to:</p> <ul><li> Select your preferred market and trading asset.</li><li>Choose the type of Up/Down option you want to trade (Rise/Fall; Rise Equals/Falls Equals; Higher/Lower).</li><li>Set other optional contract parameters.</li><li> Choose the contract duration.</li><li> Enter your stake or preferred potential payout amount.</li><li> Open your contract.</li></ul>",
   "104744952": "Complete the form and click Submit.",
   "105613424": "What is the minimum amount to open a position on Deriv MT5?",
+  "106492474": "high-close option trade",
   "106560608": "Instagram",
   "109865596": "Enjoy weekend trading on Deriv and get the most out of your trades",
   "110140669": "If you are a professional trader, the MT5 trading signals service allows you to share your strategies with other traders for free or a subscription fee that you determine. When traders subscribe to your signal, your deals are automatically replicated on their accounts each time you place a trade.",
@@ -277,6 +278,7 @@
   "272283021": "You can now log in to Deriv MT5 with your new password.",
   "273070806": "Earn commission from your clients’ trades on Deriv MT5 and Deriv X.",
   "273133328": "EEM.US",
+  "273847089": "ends between/ends outside option trade",
   "273946464": "Contact us via <0>live chat</0>.",
   "274268819": "Volatility 100 Index",
   "274392779": "the Labuan Financial Services Authority",
@@ -604,6 +606,7 @@
   "575534504": "Low spreads",
   "576793632": "0 - 15 million <0>(Crypto)</0>",
   "577779861": "Withdrawal",
+  "580973510": "higher/lower option trade",
   "581168980": "Legal",
   "581220884": "Log in to your Deriv affiliate account and go to <0>Finances</0> > <0>Payment instructions</0>.",
   "581576971": "Hit <0>Reset</0> at the bottom of stats panel.",
@@ -697,6 +700,7 @@
   "662679188": "DTrader | Online trading platform | Deriv",
   "663180477": "Customer-first trading experience",
   "663689984": "Diagonal",
+  "664572363": "stays between/goes outside option trade",
   "665599274": "Fill up the form and click <0>Confirm</0>.",
   "665777772": "XLM/USD",
   "666057433": "Trade popular assets in the commodities market such as silver, gold, oil, and more without owning the underlying asset. Speculate on the price movements and benefit from our high leverage and competitive spreads.",
@@ -775,6 +779,7 @@
   "744748902": "Max 1 hour",
   "745037442": "Accumulator options allow you to predict whether the current spot price remains within a predefined range from the previous spot price.",
   "746928132": "Yes, you’ll need a Deriv real account to process deposits and withdrawals for our clients.",
+  "750427805": "matches/differs option trade",
   "751493857": "USD 4",
   "752024971": "Reached maximum number of digits",
   "754014828": "Start trading derived FX on Deriv in 3 simple steps",
@@ -994,6 +999,7 @@
   "944896800": "How does it transform our partnership?",
   "947541466": "Trade 24/7 on our proprietary synthetics that simulate real-world market movements. These indices are unaffected by regular<br /> market hours, global events, or market and liquidity risks. Manage your exposure by selecting the volatility level to suit your risk appetite.",
   "948545552": "150+",
+  "949495445": "even/odd option trade",
   "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.",
@@ -1011,6 +1017,7 @@
   "968367390": "Traders typically analyse the underlying market and price trends to determine the likelihood of prices rising or falling over a given time period.",
   "968576099": "Up/Down",
   "968627888": "24/7 trading, including weekends and public holidays",
+  "970654740": "fast, secure deposit and withdrawal",
   "971775193": "<0>Using a quick strategy</0>",
   "972090300": "Why should I switch to Deriv.com?",
   "973734471": "Finland",
@@ -1029,6 +1036,7 @@
   "990019749": "We hope these answers have helped you to know more about Deriv.com and our motivation for the rebranding.",
   "992411597": "If you select ‘Even’, you will win the payout if the last digit of the last tick is an even number (i.e. 2, 4, 6, 8, or 0).",
   "992485806": "Your position is automatically closed when your stop loss level is at <0>1.1750</0> and when your stop loss pip value is <0>24 USD</0>.",
+  "993380717": "info symbol",
   "995624454": "Target position",
   "1000512133": "API",
   "1000991093": "Forex online trading platforms | Forex trading demo account | Deriv",
@@ -1162,6 +1170,7 @@
   "1120025399": "Options trades available on {{market_name}}",
   "1120122161": "For further information, see Section 4 on Deriv P2P in <0>our terms</0>.",
   "1120526496": "Forex and metals",
+  "1121213064": "close-low option trade",
   "1121705391": "24/7 chat",
   "1122860902": "No, the trade types allow you to choose the duration or expiry time but the contract will be held till the end of duration or expiry selected.",
   "1123456902": "They ask you to download unsecure mobile apps in the form of APK files that aren’t offered on Google Play Store or Apple App Store. ",
@@ -1364,6 +1373,7 @@
   "1316697520": "Markets available for multipliers trading",
   "1320418221": "Estimate the margin you need to hold your positions. The result depends on leverage, volume lot, and your Deriv MT5 account balance.",
   "1324376913": "Our values are the fabric of our culture",
+  "1326142154": "high-low option trade",
   "1326235397": "These indices correspond to simulated markets with constant volatilities of 10%, 25%, 50%, 75%, and 100%.",
   "1327067520": "Deriv P2P makes withdrawals and deposits simple, it’s the best user-friendly app.",
   "1328010458": "A professional trader searching for a liquidity solutions provider",
@@ -1784,6 +1794,7 @@
   "1692056155": "Unsubscribe | Emails | Deriv",
   "1692148560": "Measures the value of gold against a basket of five global currencies (EUR, GBP, JPY, AUD, USD), each weighted by 20%.",
   "1692290832": "What marketing support do you provide?",
+  "1693205308": "Deriv EZ online trading platform",
   "1693556143": "This is to protect you from losing your money when using deal cancellation. With deal cancellation, you are allowed to reclaim your full stake amount (minus a small fee) if you cancel your contract within an hour of opening the position. Stop loss, on the other hand, will close your contract at a loss if the market moves against your position. However, once the deal cancellation expires, you can set a stop loss level on the open contract.",
   "1693902817": "Risk awareness and management",
   "1694241835": "5. Check profit",
@@ -1869,6 +1880,7 @@
   "1772406884": "Deriv P2P is good. It’s easy to deposit and withdraw for small traders.",
   "1773351605": "The completion rate is the percentage of orders that the advertiser could complete within 1 hour.",
   "1774791951": "Predict whether the exit spot will be inside or outside two price targets at the end of the contract period.",
+  "1781738442": "reset call/reset put option trade",
   "1782703044": "Sign up",
   "1783526986": "How do I build a trading bot?",
   "1783629999": "Access over 150 assets in multiple markets simultaneously on one platform.",
@@ -1972,6 +1984,7 @@
   "1872384056": "Light and dark mode features for a more enjoyable experience",
   "1872568231": "GBP/TRY",
   "1872607463": "banner",
+  "1873182175": "Apple account sign in page",
   "1873188024": "A deal for 1 lot of the Volatility Index 75 for a price of USD 500,000 per USD 100,000 turnover will pay out a commission of USD 5. The minimum volume required to receive the minimum commission of USD 0.01 is determined using this formula:",
   "1874424045": "I lost my phone. How can I disable two-factor authentication (2FA)?",
   "1875123330": "24.88",
@@ -2060,6 +2073,7 @@
   "1935401816": "Narrow spreads",
   "1936980019": "<0>4 lots</0> with 1,000 leverage:",
   "1937399907": "Multipliers - synthetics: Crash 300 Index",
+  "1937982609": "Deriv Partners",
   "1938567033": "{ ( -7.54",
   "1939014728": "How do I remove blocks from the workspace?",
   "1939374383": "Earn",
@@ -3092,11 +3106,15 @@
   "-1353183095": "CFDs and other products offered on this website are complex instruments with high risk of losing money rapidly owing to leverage. You should consider whether you understand how these products work and whether you can afford to risk losing your money.",
   "-773544978": "Home",
   "-1793603559": "Locations",
+  "-1871016038": "Deriv Careers",
   "-1174851024": "Explore jobs",
+  "-53881046": "deriv-logo",
   "-674205520": "Affiliate log in",
   "-1547132756": "Affiliate sign up",
   "-1788474476": "Affiliate & IB sign up",
   "-373212993": "Deriv website",
+  "-1151648694": "Google account sign in page",
+  "-1753467119": "Facebook account sign in page",
   "-1816672668": "Please enter your corporate email.",
   "-1387776242": "Please enter your full name.",
   "-115645240": "Please enter your mobile number.",
@@ -3146,7 +3164,6 @@
   "-238387918": "Trade forex, stocks & indices, cryptocurrencies, commodities, and derived indices in one place.",
   "-707160742": "Easy start",
   "-897434771": "Already have a Deriv account? Use those credentials to sign in to Deriv cTrader.",
-  "-1930452638": "Deriv EZ logo",
   "-151281957": "CFDs trading platform",
   "-1252238038": "Add a Deriv EZ demo account.",
   "-2085932861": "Start trading on the Deriv GO mobile app.",
@@ -3204,8 +3221,12 @@
   "-2022407176": "XLK.US",
   "-1690761595": "Open a real account, make a deposit, and start trading baskets and other markets.",
   "-1299708281": "CFD trading allows you to trade on the price movement of an asset without buying or owning the underlying asset.",
+  "-347302050": "low-cost trading",
+  "-1763361912": "intraday trading opportunities",
   "-2043132110": "Fast, secure deposit and withdrawal options",
+  "-967416945": "powerful and intuitive platforms",
   "-519772806": "Smart and friendly support, 7 days a week",
+  "-2015932855": "smart and friendly support",
   "-1690667791": "Why trade ETFs on Deriv",
   "-244980648": "What are accumulator options?",
   "-1018568023": "How do accumulator options work?",
@@ -3373,6 +3394,7 @@
   "-544288925": "cTrader – a CFD trading platform | Deriv",
   "-247192100": "Deriv EZ – a CFD trading platform | Deriv",
   "-612077545": "Deriv EZ is our intuitive CFD trading platform where you can trade forex, commodities, stocks & indices, cryptocurrencies, and derived indices.",
+  "-677391007": "Deriv Go",
   "-2082435325": "A trading platform for on-the-go traders",
   "-1607871978": "Android and Huawei",
   "-1444700007": "Android, and iOS",
@@ -3889,10 +3911,16 @@
   "-691684850": "Negative Drift Regime (also known as a Bearish Trend), and",
   "-1396228755": "Driftless Regime (also known as a Sideways Trend)",
   "-812482393": "The <0>DSI10</0> switches between regimes every <1>10 minutes</1> on average.",
+  "-1119895973": "rise/fall option trade",
   "-1312740087": "<0>Higher/Lower:</0> Predict whether the exit spot will be higher or lower than a price target (the barrier) at the end of the contract period.",
+  "-1379066258": "touch/no touch option trade",
   "-467543474": "<0>Matches/Differs:</0> Predict what number will be the last digit of the last tick of a contract.",
+  "-370101516": "over/under option trade",
   "-12379677": "<0>Even/Odd:</0> Predict whether the last digit of the last tick of a contract will be an even number or an odd number.",
+  "-1144677500": "high/low ticks option trade",
+  "-1935715732": "asians option trade",
   "-632683307": "Predict whether the exit spot (last tick) will be higher or lower than the average of the ticks at the end of the contract period.",
+  "-431979686": "only ups/only downs option trade",
   "-1316646998": "Predict whether consecutive ticks will rise or fall successively after the entry spot.",
   "-1064775608": "<0>High-Low:</0> When you purchase a ‘High-Low’ contract, your win or loss will be equal to the multiplier times the difference between the high and the low over the duration of the contract.",
   "-1262587128": "Daily reset indices",
@@ -4047,6 +4075,7 @@
   "-1656878113": "Definitely. We’ll provide you with banners, videos, reviews, links, and text ads that you can use to bring new clients to our DMT5 platform.",
   "-951485970": "Account management",
   "-1255868362": "Referral tools",
+  "-1894718164": "polkadot background",
   "-1537800570": "Minimum volume requirement",
   "-1918487001": "Example:",
   "-761516892": "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 this formula:",

diff --git a/src/components/custom/_dhero-dmt5.tsx b/src/components/custom/_dhero-dmt5.tsx
@@ -137,7 +137,7 @@ const DCommonBanner = () => {
             <StyledContainer jc="flex-start">
                 <ContentWrapperStyle is_rtl={is_rtl}>
                     <Content>
-                        <StyledTradingLogin src={DerivMT5Logo} />
+                        <StyledTradingLogin src={DerivMT5Logo} alt={localize('_t_Deriv MT5_t_')} />
                         <CommonHeaderSection
                             title="_t_The all-in-one CFD trading platform_t_"
                             title_font_size={is_mobile ? '32px' : '64px'}

diff --git a/src/components/custom/_dhero.tsx b/src/components/custom/_dhero.tsx
@@ -167,7 +167,12 @@ const DHero = ({ join_us_for_free, is_live_demo, image_name }: DHeroProps) => {
             <StyledContainer jc="flex-start">
                 <ContentWrapperStyle is_rtl={is_rtl}>
                     <Content>
-                        <img width="237px" height="64px" src={DerivTLogo} />
+                        <img
+                            width="237px"
+                            height="64px"
+                            src={DerivTLogo}
+                            alt={localize('_t_Deriv Trader_t_')}
+                        />
                         <CommonHeaderSection
                             title="_t_A user-friendly trading platform_t_"
                             title_font_size={`${is_mobile ? 32 : 64}px`}

diff --git a/src/components/elements/roadmap.tsx b/src/components/elements/roadmap.tsx
@@ -92,7 +92,13 @@ const Roadmap = ({ portal: { frame, link, paragraph } }: RoadmapProps) => {
             </Container>
 
             <StyledFrame>
-                <iframe src={frame} frameBorder="0" height="100%" width="100%"></iframe>
+                <iframe
+                    src={frame}
+                    title="product board"
+                    frameBorder="0"
+                    height="100%"
+                    width="100%"
+                ></iframe>
                 <StyledButton tertiary external to={link} target="_blank" rel="noopener noreferrer">
                     <Localize translate_text="_t_Go to portal_t_" />
                 </StyledButton>