diff --git a/crowdin/messages.json b/crowdin/messages.json index 043613fd70c..5e23d1d0ba8 100644 --- a/crowdin/messages.json +++ b/crowdin/messages.json @@ -4195,8 +4195,8 @@ "-1114192634": "Slovenia", "-2054234308": "Spain", "-2121510827": "Sweden", - "-1357648282": "For fair resolution of any complaints, please <0>chat with us. To learn more, see our <1>complaint policy.", - "-1838458999": "For fair resolution of any complaints, please <0>chat with us.", + "-1528857737": "The Financial Commission", + "-791685634": "For fair resolution of any complaints, please contact us via <0>live chat.", "-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). 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.", "-672414153": "Financial Disclosures Annual Report 2022", @@ -4214,8 +4214,6 @@ "-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) and is a <1>member of the Financial Markets Association.", "-674534026": "Deriv (SVG) LLC (Company No. 273 LLC 2020), incorporated on the 12th February 2019, is registered in Saint Vincent and the Grenadines with its registered office located at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines.", - "-1528857737": "The Financial Commission", - "-791685634": "For fair resolution of any complaints, please contact us via <0>live chat.", "-1678516609": "Deriv operates and offers its products and services under the Deriv Group, which has several subsidiary companies licensed in their respective jurisdictions.", "-1937167246": "Return to log in", "-2054653788": "Forgot your Deriv password? Want to reset your password? Send us your email address and we’ll email you the instructions.", diff --git a/themes/gatsby-theme-deriv/src/components/hooks/use-is-row-cpa.ts b/themes/gatsby-theme-deriv/src/components/hooks/use-is-row-cpa.ts new file mode 100644 index 00000000000..475cf8ae62d --- /dev/null +++ b/themes/gatsby-theme-deriv/src/components/hooks/use-is-row-cpa.ts @@ -0,0 +1,21 @@ +import { useEffect, useState } from 'react' +import useRegion from './use-region' +import useBuildVariant from 'features/hooks/use-build-variant' + +function useIsRowCpa() { + const {region} = useBuildVariant() + const [is_row_cpa, setIsRowCpa] = useState(true) + const { is_cpa_plan } = useRegion() + + useEffect(() => { + if (region === "row" || is_cpa_plan) { + setIsRowCpa(false) + } else { + setIsRowCpa(true) + } + }, [region, is_cpa_plan]) + + return is_row_cpa +} + +export default useIsRowCpa diff --git a/themes/gatsby-theme-deriv/src/pages/regulatory/_financial_commission.tsx b/themes/gatsby-theme-deriv/src/pages/regulatory/_financial_commission.tsx index 0c9b47400b6..aba7d6a9771 100644 --- a/themes/gatsby-theme-deriv/src/pages/regulatory/_financial_commission.tsx +++ b/themes/gatsby-theme-deriv/src/pages/regulatory/_financial_commission.tsx @@ -1,62 +1,92 @@ import React from 'react' -import styled from 'styled-components' -import { Text, LinkText } from 'components/elements' -import { deriv_app_url } from 'common/constants' +import { ContentText } from '@deriv-com/blocks' +import { Text } from '@deriv/quill-design' import { useLivechat } from 'components/hooks/use-livechat' -import { Localize } from 'components/localization' -import useBuildVariant from 'features/hooks/use-build-variant' - -const TextLink = styled(LinkText).attrs({ as: 'span' })`` +import { deriv_app_url } from 'common/constants' +import { Localize, localize } from 'components/localization' +import useIsRowCpa from 'components/hooks/use-is-row-cpa' const FinancialCommission = () => { - const {region} = useBuildVariant(); const [is_livechat_interactive, LC_API] = useLivechat() + const is_row_cpa = useIsRowCpa() return ( <> - {is_livechat_interactive && ( -
- {region === "eu" && ( - - { - LC_API.open_chat_window() - }} - />, - , - ]} - /> - - )} - {region !== "eu" && ( - - { - LC_API.open_chat_window() - }} - />, - ]} - /> - - )} -
+ {!is_row_cpa ? ( + + + , + ]} + /> + + + { + is_livechat_interactive && LC_API.open_chat_window() + }} + />, + ]} + /> + + + ) : ( + + + , + ]} + /> + + + { + is_livechat_interactive && LC_API.open_chat_window() + }} + />, + , + ]} + /> + + )} ) diff --git a/themes/gatsby-theme-deriv/src/pages/regulatory/_info-row-cpa.tsx b/themes/gatsby-theme-deriv/src/pages/regulatory/_info-row-cpa.tsx index 4112f3b1e3c..3746f05f46b 100644 --- a/themes/gatsby-theme-deriv/src/pages/regulatory/_info-row-cpa.tsx +++ b/themes/gatsby-theme-deriv/src/pages/regulatory/_info-row-cpa.tsx @@ -2,21 +2,10 @@ import React from 'react' import { ContentText } from '@deriv-com/blocks' import { Text } from '@deriv/quill-design' import { Localize } from 'components/localization' -import useBuildVariant from 'features/hooks/use-build-variant' -import useRegion from 'components/hooks/use-region' +import useIsRowCpa from 'components/hooks/use-is-row-cpa' const InfoRowCpa = () => { - const {region} = useBuildVariant() - const { is_cpa_plan } = useRegion() - const [is_row_cpa, setIsRowCpa] = useState(true) - - useEffect(() => { - if (region === "row" || is_cpa_plan) { - setIsRowCpa(false) - } else { - setIsRowCpa(true) - } - }, [region, is_cpa_plan]) + const is_row_cpa = useIsRowCpa() if(is_row_cpa) return null; diff --git a/themes/gatsby-theme-deriv/src/pages/regulatory/_investment-europe.tsx b/themes/gatsby-theme-deriv/src/pages/regulatory/_investment-europe.tsx index 8db239e9e1d..42898cb7d94 100644 --- a/themes/gatsby-theme-deriv/src/pages/regulatory/_investment-europe.tsx +++ b/themes/gatsby-theme-deriv/src/pages/regulatory/_investment-europe.tsx @@ -1,29 +1,19 @@ import React from 'react' import { AccordionBlock, BlockWrapper } from '@deriv-com/blocks' import { Text, Heading } from '@deriv/quill-design' +import EUgrid from './_eu-grid' +import DocumentAccordion from './_document_accordion' +import * as styles from './eu_grid.module.scss' import InitialLoader from 'components/elements/dot-loader' import PDFIcon from 'images/svg/regulatory/pdf-icon-black.svg' import { Localize, localize } from 'components/localization' -import useBuildVariant from 'features/hooks/use-build-variant' import useRegion from 'components/hooks/use-region' -import EUgrid from './_eu-grid' -import DocumentAccordion from './_document_accordion' -import * as styles from './eu_grid.module.scss' - -const InvestmentEurope = ({ language }: { language: string }) => { - const {region} = useBuildVariant() - const { is_cpa_plan, is_region_loading } = useRegion() - const [is_row_cpa, setIsRowCpa] = useState(true) - - useEffect(() => { - if (region === "row" || is_cpa_plan) { - setIsRowCpa(false) - } else { - setIsRowCpa(true) - } - }, [region, is_cpa_plan]) +import useIsRowCpa from 'components/hooks/use-is-row-cpa' - if(is_region_loading) +const InvestmentEurope = () => { + const { is_region_loading } = useRegion() + const is_row_cpa = useIsRowCpa() + if(is_region_loading) return if(!is_row_cpa) return null; @@ -98,7 +88,7 @@ const InvestmentEurope = ({ language }: { language: string }) => { content: function noRefCheck() { return (
- +
) }, diff --git a/themes/gatsby-theme-deriv/src/pages/regulatory/index.tsx b/themes/gatsby-theme-deriv/src/pages/regulatory/index.tsx index 6ad1dcbb5e2..8718c6daa46 100644 --- a/themes/gatsby-theme-deriv/src/pages/regulatory/index.tsx +++ b/themes/gatsby-theme-deriv/src/pages/regulatory/index.tsx @@ -1,32 +1,19 @@ -import React, { useState, useEffect } from 'react' +import React from 'react' import { Hero, ContentText } from '@deriv-com/blocks' -import { Text, Heading } from '@deriv/quill-design' -import useRegion from 'components/hooks/use-region' -import { useLivechat } from 'components/hooks/use-livechat' -import InitialLoader from 'components/elements/dot-loader' -import { deriv_app_url } from 'common/constants' +import { Text } from '@deriv/quill-design' +import { RegulatoryProps } from './_type' +import InfoRowCpa from './_info-row-cpa' +import FinancialCommission from './_financial_commission' +import InvestmentEurope from './_investment-europe' import Layout from 'components/layout/layout' import { SEO } from 'components/containers' import { Localize, localize, WithIntl } from 'components/localization' import { TGatsbyHead } from 'features/types' -import { RegulatoryProps } from './_type' -import InfoRowCpa from './_info-row-cpa' -import InvestmentEurope from './_investment-europe' -const Regulatory = ({language, pageContext}: RegulatoryPageProps) => { - const {region} = pageContext; - const { is_row, is_cpa_plan, is_region_loading } = useRegion() - const [is_livechat_interactive, LC_API] = useLivechat() - const [is_row_cpa, setIsRowCpa] = useState(true) - const investment_europe = is_row_cpa ? : null +type RegulatoryPageProps = RegulatoryProps & TGatsbyHead - useEffect(() => { - if (is_row || is_cpa_plan) { - setIsRowCpa(false) - } else { - setIsRowCpa(true) - } - }, [is_row, is_cpa_plan]) +const Regulatory = ({ pageContext}: RegulatoryPageProps) => { + const {region} = pageContext; return ( @@ -34,11 +21,7 @@ const Regulatory = ({language, pageContext}: RegulatoryPageProps) => {
- - - } + title={} description={ } @@ -49,8 +32,8 @@ const Regulatory = ({language, pageContext}: RegulatoryPageProps) => {
- {is_region_loading ? : investment_europe} - {!is_row_cpa && } + + { )} - {!is_row_cpa ? ( - - - , - ]} - /> - - - { - is_livechat_interactive && LC_API.open_chat_window() - }} - />, - ]} - /> - - - ) : ( - - - , - ]} - /> - - - { - is_livechat_interactive && LC_API.open_chat_window() - }} - />, - , - ]} - /> - - - )} + ) }