Merge branch 'master' of https://github.com/binary-com/deriv-com into…

… remove-omni_usdt
binary-com · Sep 28, 2023 · 7ce6749 · 7ce6749
2 parents 0f3427a + 74f84b9
commit 7ce6749
Show file tree

Hide file tree

Showing 77 changed files with 6,050 additions and 5,318 deletions.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -22,7 +22,7 @@ env:
     GATSBY_RUDDERSTACK_STAGING_KEY: ${{ secrets.GATSBY_RUDDERSTACK_STAGING_KEY }}
     GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
     GATSBY_RUDDERSTACK_URL: ${{ secrets.GATSBY_RUDDERSTACK_URL }}
-    
+
 jobs:
     release-beta:
         timeout-minutes: 30
@@ -53,7 +53,7 @@ jobs:
               with:
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  command: pages publish public --project-name=deriv-com-pages --branch=beta
+                  command: pages deploy public --project-name=deriv-com-pages --branch=beta
 
             - name: Cloudflare preview link ✨
               run: echo "New beta website - https://beta.deriv.com"

diff --git a/.github/workflows/generate-preview-link.yml b/.github/workflows/generate-preview-link.yml
@@ -181,3 +181,17 @@ jobs:
                   number: ${{steps.pr_information.outputs.issue_number}}
                   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.e2e-deriv-com }}" \
+                -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}}"
+                  }
+                }'
+                 
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -58,7 +58,7 @@ jobs:
               with:
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  command: pages publish public --project-name=deriv-com-pages --branch=main
+                  command: pages deploy public --project-name=deriv-com-pages --branch=main
 
             - name: Cloudflare production link ✨
               run: echo "New website - http://cf-pages-deriv-com.deriv.com"

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -55,7 +55,7 @@ jobs:
               with:
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  command: pages publish public --project-name=deriv-com-pages --branch=staging
+                  command: pages deploy public --project-name=deriv-com-pages --branch=staging
 
             - name: Cloudflare preview link ✨
               run: echo "New staging website - http://staging.cf-pages-deriv-com.deriv.com"

diff --git a/crowdin/messages.json b/crowdin/messages.json
diff --git a/src/features/components/templates/footer/disclaimer/data.tsx b/src/features/components/templates/footer/disclaimer/data.tsx
@@ -6,7 +6,7 @@ export const disclaimerContent: SmartDisclaimerParagraph[] = [
     {
         id: 0,
         data: {
-            text: '_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence</0>). Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiary with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_',
+            text: '_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act <0>(licence)</0>. Deriv.com Limited is the holding company for the above subsidiary with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_',
             components: [
                 <Link
                     weight="bold"
@@ -27,7 +27,7 @@ export const disclaimerContent: SmartDisclaimerParagraph[] = [
     {
         id: 1,
         data: {
-            text: '_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence</0>). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence</1>). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence</2>). Deriv (V) Ltd is licensed and regulated by the Vanuatu Financial Services Commission (<3>licence</3>). Deriv (SVG) LLC has a registered office at Hinds Buildings, Kingstown, St. Vincent and the Grenadines. Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_',
+            text: '_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence</0>). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence</1>). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence</2>). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<3>licence</3>). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_',
             components: [
                 <Link
                     weight="bold"
@@ -78,7 +78,7 @@ export const disclaimerContent: SmartDisclaimerParagraph[] = [
     {
         id: 2,
         data: {
-            text: '_t_Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<0>licence</0>). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<1>licence</1>). Deriv (V) Ltd is licensed and regulated by the Vanuatu Financial Services Commission (<2>licence</2>). Deriv (SVG) LLC has a registered office at Hinds Buildings, Kingstown, St. Vincent and the Grenadines. Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_',
+            text: '_t_Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<0>licence</0>). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<1>licence</1>). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<2>licence</2>). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_',
             components: [
                 <Link
                     weight="bold"

diff --git a/src/features/pages/markets/etf/check-trading/index.tsx b/src/features/pages/markets/etf/check-trading/index.tsx
@@ -0,0 +1,38 @@
+import React from 'react'
+import * as styles from './styles.module.scss'
+import Flex from 'features/components/atoms/flex-box'
+import { Localize } from 'components/localization'
+import LinkButton from 'features/components/atoms/link-button'
+import Typography from 'features/components/atoms/typography'
+
+const CheckTrading = () => {
+    return (
+        <Flex.Box direction="col" container="fixed" className={styles.item_container}>
+            <Flex.Box
+                direction="col"
+                container="fluid"
+                justify="center"
+                align="center"
+                pb="30x"
+                pt="20x"
+                md={{ pb: '40x', mb: '20x' }}
+            >
+                <Typography.Paragraph mb="10x" textcolor="black" align="center">
+                    <Localize translate_text="_t_Want to know more about CFD trading conditions for the instruments we offer?_t_" />
+                </Typography.Paragraph>
+                <LinkButton.Primary
+                    font_family="UBUNTU"
+                    size="medium"
+                    url={{
+                        type: 'internal',
+                        to: '/trading-specification',
+                    }}
+                >
+                    <Localize translate_text="_t_Check trading specs_t_" />
+                </LinkButton.Primary>
+            </Flex.Box>
+        </Flex.Box>
+    )
+}
+
+export default CheckTrading
diff --git a/src/features/pages/markets/etf/check-trading/styles.module.scss b/src/features/pages/markets/etf/check-trading/styles.module.scss
@@ -0,0 +1,10 @@
+@use 'features/styles/theme/theme-mixins' as *;
+@import 'features/styles/theme/variables';
+
+.item_container {
+    box-shadow: rgba(0, 0, 0, 0.1) 0 0 3px 0;
+
+    @include breakpoints(tablet) {
+        box-shadow: none;
+    }
+}
diff --git a/src/features/pages/markets/etf/index.tsx b/src/features/pages/markets/etf/index.tsx
@@ -5,6 +5,7 @@ import Banner from './banner'
 import InstrumentsTable from './instruments'
 import InstrumentsContent from './instrumental-content'
 import TradeTypes from './trades-available'
+import CheckTrading from './check-trading'
 import SignupPublic from 'features/components/templates/signup/with-banner'
 import Flex from 'features/components/atoms/flex-box'
 import OtherMarketsSlider from 'features/components/molecules/other-markets-slider'
@@ -24,10 +25,12 @@ const ETFMarket = () => {
                 direction="col"
                 as="section"
                 padding_inline="8x"
+                md={{ pb: '20x' }}
             >
                 <InstrumentsTable />
                 <InstrumentsContent />
             </Flex.Box>
+            <CheckTrading />
             <WhyTrade />
             <Steps />
             <OtherMarketsSlider current_market="etfs" />

diff --git a/src/features/pages/markets/etf/instrumental-content/index.tsx b/src/features/pages/markets/etf/instrumental-content/index.tsx
@@ -11,13 +11,14 @@ const InstrumentsContent = () => {
             <Flex.Box
                 container="fixed"
                 className={styles.content_wrapper}
-                mb="20x"
+                mb="12x"
                 padding_inline="7x"
                 padding_block="15x"
                 gap="8x"
                 direction="col"
                 md={{
                     padding_inline: '15x',
+                    mb: '0x',
                 }}
             >
                 {instrumental_content.map((data) => (

diff --git a/src/images/common/regulatory/bvi.png b/src/images/common/regulatory/bvi.png