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.

Arome/37724/Hotfix OG tags DMT5 #1915

Merged
4 commits merged into from
Jul 13, 2021
Merged

Arome/37724/Hotfix OG tags DMT5 #1915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5a17d3
Hotfix for DMT5 page OG
arome-binary Jul 9, 2021
a7bfbec
DMT5 og Hotfix
arome-binary Jul 12, 2021
081c0f8
DMT5 hotfix resolving conflict
arome-binary Jul 12, 2021
9b64a05
OG DMT5 hotfix
arome-binary Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/custom/_dtrading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const DTrading = ({ trading, reverse, two_title }) => {
const data = useStaticQuery(query)
return (
<StyledSection>
<Container direction='column'>
<Container direction="column">
{trading.map((item, index) => {
let is_even = reverse ? (index + 1) % 2 : index % 2
return (
Expand Down
5 changes: 1 addition & 4 deletions src/components/custom/_signup-new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,7 @@ const SignupNew = ({
required
/>
</InputGroup>
<AgreementLabel
isChecked={is_checked}
handleChangeCheckbox={handleChange}
/>
<AgreementLabel isChecked={is_checked} handleChangeCheckbox={handleChange} />
<EmailButton
isChecked={is_checked}
type="submit"
Expand Down
76 changes: 38 additions & 38 deletions src/components/elements/typography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,45 +93,45 @@ export const Header = styled(({ as = 'h1', children, ...props }) =>

@media ${device.tabletL} {
font-size: ${(props) => {
if (props.type === 'main-landing-title') return '40px'
if (props.type === 'display-title') return '40px'
if (props.type === 'page-title') return '32px'
if (props.type === 'section-title') return '24px'
if (props.type === 'sub-section-title') return '20px'
if (props.type === 'main-paragraph') return '16px'
if (props.type === 'sub-paragraph') return '14px'
// The above is deprecated and should not be used for any new designs on Figma
if (props.type === 'hero') return '40px'
if (props.type === 'heading-1') return '32px'
if (props.type === 'heading-2') return '28px'
if (props.type === 'heading-3') return '24px'
if (props.type === 'subtitle-1') return '18px'
if (props.type === 'subtitle-2') return '16px'
if (props.type === 'paragraph-1') return '14px'
if (props.type === 'paragraph-2') return '12px'
if (props.type === 'small') return '10px'
if (props.type === 'extra-small') return '8px'
}};
if (props.type === 'main-landing-title') return '40px'
if (props.type === 'display-title') return '40px'
if (props.type === 'page-title') return '32px'
if (props.type === 'section-title') return '24px'
if (props.type === 'sub-section-title') return '20px'
if (props.type === 'main-paragraph') return '16px'
if (props.type === 'sub-paragraph') return '14px'
// The above is deprecated and should not be used for any new designs on Figma
if (props.type === 'hero') return '40px'
if (props.type === 'heading-1') return '32px'
if (props.type === 'heading-2') return '28px'
if (props.type === 'heading-3') return '24px'
if (props.type === 'subtitle-1') return '18px'
if (props.type === 'subtitle-2') return '16px'
if (props.type === 'paragraph-1') return '14px'
if (props.type === 'paragraph-2') return '12px'
if (props.type === 'small') return '10px'
if (props.type === 'extra-small') return '8px'
}};
line-height: ${(props) => {
if (props.type === 'main-landing-title') return '50px'
if (props.type === 'display-title') return '50px'
if (props.type === 'page-title') return '40px'
if (props.type === 'section-title') return '30px'
if (props.type === 'sub-section-title') return '25px'
if (props.type === 'main-paragraph') return '24px'
if (props.type === 'sub-paragraph') return '21px'
// The above is deprecated and should not be used for any new designs on Figma
if (props.type === 'hero') return '50px'
if (props.type === 'heading-1') return '40px'
if (props.type === 'heading-2') return '34px'
if (props.type === 'heading-3') return '30px'
if (props.type === 'subtitle-1') return '26px'
if (props.type === 'subtitle-2') return '24px'
if (props.type === 'paragraph-1') return '20px'
if (props.type === 'paragraph-2') return '18px'
if (props.type === 'small') return '14px'
if (props.type === 'extra-small') return '12px'
}};
if (props.type === 'main-landing-title') return '50px'
if (props.type === 'display-title') return '50px'
if (props.type === 'page-title') return '40px'
if (props.type === 'section-title') return '30px'
if (props.type === 'sub-section-title') return '25px'
if (props.type === 'main-paragraph') return '24px'
if (props.type === 'sub-paragraph') return '21px'
// The above is deprecated and should not be used for any new designs on Figma
if (props.type === 'hero') return '50px'
if (props.type === 'heading-1') return '40px'
if (props.type === 'heading-2') return '34px'
if (props.type === 'heading-3') return '30px'
if (props.type === 'subtitle-1') return '26px'
if (props.type === 'subtitle-2') return '24px'
if (props.type === 'paragraph-1') return '20px'
if (props.type === 'paragraph-2') return '18px'
if (props.type === 'small') return '14px'
if (props.type === 'extra-small') return '12px'
}};
}
`

Expand Down
1 change: 0 additions & 1 deletion src/components/hooks/use-client-information.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { useState, useEffect } from 'react'
import { getClientInformation, getDomain } from 'common/utility'

export const useClientInformation = () => {

const [client_information, setClientInformation] = useState(false)
const [current_client_information, setCurrentClientInformation] = useState(false)

Expand Down
1 change: 0 additions & 1 deletion src/components/hooks/use-livechat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export const useLivechat = () => {
const domain = getDomain()
if (is_livechat_interactive) {
window.LiveChatWidget.on('ready', () => {

// we open and close the window to trigger the widget to listen for new events
window.LC_API.open_chat_window()
window.LC_API.hide_chat_window()
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/besquare/style/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const ContentContainer = styled(Container)`

export const FollowUsContainer = styled.div`
display: grid;
grid-template-columns: 68px repeat(4,26.67px);
grid-template-columns: 68px repeat(4, 26.67px);
grid-column-gap: 21px;
grid-template-areas: ' follow-us icon icon icon icon ';
`
Expand Down
9 changes: 5 additions & 4 deletions src/components/localization/language-switcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,11 @@ const LanguageSwitch = ({ i18n, is_high_nav, short_name }) => {
if (`/${current_lang}/` !== id) {
const current_path = window.location.pathname
const current_hash = window.location.hash
const destination_path = `${path}${current_lang === 'en'
? current_path.replace(/\//u, '')
: nonENLangUrlReplace(current_path)
}${current_hash}`
const destination_path = `${path}${
current_lang === 'en'
? current_path.replace(/\//u, '')
: nonENLangUrlReplace(current_path)
}${current_hash}`

if (path === '/ach/') {
localStorage.setItem('i18n', 'ach')
Expand Down
1,595 changes: 1,594 additions & 1 deletion src/lotties/JumpIndicesChart.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions src/pages/besquare/components/sections/_what-is_besquare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@ const WhatIsBeSquare = () => {
<Section>
<ContentContainer>
<ContentWrapper>
<Title as="h2" text_align={'left'} max_width={['450px']} margin={['0', '0 auto']}>
<Title
as="h2"
text_align={'left'}
max_width={['450px']}
margin={['0', '0 auto']}
>
{what_is_be_square.title}
</Title>
<TextWrapper max_width={['486px', '328px']} margin={['8px 0 0', '16px 0']} >
<TextWrapper max_width={['486px', '328px']} margin={['8px 0 0', '16px 0']}>
{what_is_be_square.subtitle}
</TextWrapper>
</ContentWrapper>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/besquare/static/style/_hero.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const HeroContainer = styled.div`
@media ${device.laptop} {
grid-template-columns: auto;
}

@media ${device.tablet} {
height: 370px;
}
Expand Down
1 change: 0 additions & 1 deletion src/pages/besquare/static/style/_what-is-besquare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export const Section = styled(SectionContainer)`
`

export const ContentContainer = styled(Container)`

@media ${device.tabletL} {
display: grid;
}
Expand Down
7 changes: 4 additions & 3 deletions src/pages/dmt5-trading-signals/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ import { useTabState } from 'components/hooks/use-tab-state'
import device from 'themes/device'

const meta_attributes = {
og_title: localize('DMT5 Signals'),
og_description: localize('Deriv MT5 signals'),
og_title: localize('Deriv MetaTrader 5 trading signals | Resources | Deriv'),
og_description: localize(
'Subscribe to Deriv MetaTrader 5 trading signals to copy the trades of experienced traders, or become a signal provider and share your strategies.',
),
}

const signal_content_subscriber = {
header: (
<Localize
Expand Down
33 changes: 21 additions & 12 deletions src/pages/dmt5/_why-trader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,31 @@ const card_content = [
header: localize('Quick demo account sign-up'),
text: localize('Practise with a demo account preloaded with unlimited virtual funds.'),
image: InstantAccess,
alt: "instant access"
alt: 'instant access',
},
{
header: localize('Multiple assets on a single platform'),
text: localize('Explore forex, synthetic indices, stocks, and commodities on an all-in-one platform.'),
text: localize(
'Explore forex, synthetic indices, stocks, and commodities on an all-in-one platform.',
),
image: SyntheticIndices,
alt: "syntethic indices"
alt: 'syntethic indices',
},
{
header: localize('24/7 trading'),
text: localize('Trade round-the-clock, even on weekends, with our proprietary synthetic indices.'),
text: localize(
'Trade round-the-clock, even on weekends, with our proprietary synthetic indices.',
),
image: Seven,
alt: "seven"
alt: 'seven',
},
{
header: localize('Licensed and regulated'),
text: localize('Trade with a regulated industry pioneer trusted by traders for more than 20 years.'),
text: localize(
'Trade with a regulated industry pioneer trusted by traders for more than 20 years.',
),
image: MinimalRisk,
alt: "minimal risk"
alt: 'minimal risk',
},
]

Expand Down Expand Up @@ -109,18 +115,21 @@ const WhyTrader = () => {
{localize('Why trade with DMT5')}
</StyledHeader>
<CardContainer>
{card_content.map(card => {
{card_content.map((card) => {
return (
<Card key={card.alt}>
<div>
<img src={card.image} alt={card.alt} />
</div>
<StyledCardHeader mt="0.8rem" mb="0.8rem" as="h4" type="sub-section-title">
<StyledCardHeader
mt="0.8rem"
mb="0.8rem"
as="h4"
type="sub-section-title"
>
{card.header}
</StyledCardHeader>
<StyledText>
{card.text}
</StyledText>
<StyledText>{card.text}</StyledText>
</Card>
)
})}
Expand Down
3 changes: 2 additions & 1 deletion src/pages/help-centre/account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ const RecoveringPassword = () => (
]}
/>
</Text>
</ArticleWrapper>)
</ArticleWrapper>
)

const CloseAccount = () => (
<ArticleWrapper>
Expand Down
12 changes: 3 additions & 9 deletions src/pages/help-centre/deriv-x.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const ExternalLink = styled.a`
:hover {
text-decoration: underline;
}

`

const WhatisDerivX = () => (
Expand Down Expand Up @@ -164,7 +163,8 @@ const ResetDerivXPassowrd = () => (
rel="noopener noreferrer"
key={0}
/>,
]} deriv_x_app_url
]}
deriv_x_app_url
/>
</Text>
<StyledText>
Expand Down Expand Up @@ -240,13 +240,7 @@ const WithdrawDerivX = () => (
<Text mt="1.7rem">
<Localize
translate_text="After the required processing time of your selected payment method, your funds will be deposited into your personal account. You can check processing times on our <0>Payment methods</0> page."
components={[
<LocalizedLinkText
to="/payment-methods"
color="red"
key={0}
/>,
]}
components={[<LocalizedLinkText to="/payment-methods" color="red" key={0} />]}
/>
</Text>
</ArticleWrapper>
Expand Down
28 changes: 17 additions & 11 deletions src/pages/help-centre/dmt5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ const DifferentAccounts = () => (
<ArticleWrapper>
<StyledHeader as="h4">
{localize(
'What are the differences between the DMT5 Synthetic Indices, Financial and Financial STP accounts?'
'What are the differences between the DMT5 Synthetic Indices, Financial and Financial STP accounts?',
)}
</StyledHeader>
<Text>
{localize(
'The DMT5 Standard account offers new and experienced traders high leverage and variable spreads for maximum flexibility.'
'The DMT5 Standard account offers new and experienced traders high leverage and variable spreads for maximum flexibility.',
)}
</Text>
<StyledText>
{localize(
'The DMT5 Advanced account is a 100% A Book account where your trades are passed straight through to the market, giving you direct access to forex liquidity providers.'
'The DMT5 Advanced account is a 100% A Book account where your trades are passed straight through to the market, giving you direct access to forex liquidity providers.',
)}
</StyledText>
<StyledText>
{localize(
'The DMT5 Synthetic Indices account allows you to trade contracts for difference (CFDs) on synthetic indices that mimic real-world movements. It is available for trading 24/7 and audited for fairness by an independent third party.'
'The DMT5 Synthetic Indices account allows you to trade contracts for difference (CFDs) on synthetic indices that mimic real-world movements. It is available for trading 24/7 and audited for fairness by an independent third party.',
)}
</StyledText>
</ArticleWrapper>
Expand Down Expand Up @@ -102,7 +102,7 @@ const WithdrawDMT5 = () => (
target="_blank"
rel="noopener noreferrer"
key={1}
/>
/>,
]}
/>
</Text>
Expand All @@ -121,7 +121,7 @@ const LoginCredentials = () => (
</StyledHeader>
<Text>
{localize(
'MT5 on Deriv is a standalone trading platform that isn’t hosted on our website. Your DMT5 login details give you access to the MT5 platform while your Deriv login details give you access to the platforms hosted on our website, such as DTrader and DBot.'
'MT5 on Deriv is a standalone trading platform that isn’t hosted on our website. Your DMT5 login details give you access to the MT5 platform while your Deriv login details give you access to the platforms hosted on our website, such as DTrader and DBot.',
)}
</Text>
</ArticleWrapper>
Expand All @@ -140,7 +140,7 @@ const ResetDMT5Password = () => (
rel="noopener noreferrer"
key={1}
/>,
<strong key={0} />
<strong key={0} />,
]}
/>
</Text>
Expand All @@ -157,16 +157,20 @@ const DMT5Article = () => {
title={localize('Help centre | Frequently asked questions | DMT5 | Deriv')}
description={localize('Frequently asked questions - DMT5')}
>
<WhatIsDMT5 text={localize('What is DMT5?')}
<WhatIsDMT5
text={localize('What is DMT5?')}
label="what-is-dmt5"
is_mounted={is_mounted} />
is_mounted={is_mounted}
/>
<DifferenceDMT5DTrader
text={localize('What are the major differences between DTrader and DMT5?')}
label="differences-of-dtrader-and-dmt5"
is_mounted={is_mounted}
/>
<DifferentAccounts
text={localize('What are the differences between the DMT5 Synthetic Indices, Financial and Financial STP accounts?')}
text={localize(
'What are the differences between the DMT5 Synthetic Indices, Financial and Financial STP accounts?',
)}
label="differences-of-dmt5-accounts"
is_mounted={is_mounted}
/>
Expand All @@ -176,7 +180,9 @@ const DMT5Article = () => {
is_mounted={is_mounted}
/>
<LoginCredentials
text={localize('Why are my DMT5 login details different from my Deriv login details?')}
text={localize(
'Why are my DMT5 login details different from my Deriv login details?',
)}
label="login-credentials"
is_mounted={is_mounted}
/>
Expand Down
Loading