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.

Niloofar / generalize academy and general footer into a single footer #2494

Merged
3 commits merged into from
Jan 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/components/layout/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { DefaultFooter, FooterGrid } from './footer/common/style.js'
import LogoSection from './footer/logo'
import MainLinksSection from './footer/main-links'
import DisclaimerSection from './footer/disclaimer'
import DisclaimerSectionAcademy from './footer/disclaimer-academy'
import CopyrightSection from './footer/copyright'
import BottomSocialSection from './footer/bottom-social-wrapper'
import AdditionalEUSection from './footer/additional-eu'
Expand Down Expand Up @@ -39,7 +38,7 @@ const Footer = ({ type, is_ppc, is_ppc_redirect, academy }) => {
is_ppc_redirect={is_ppc_redirect}
is_eu_country={is_eu_country}
/>
{academy ? <DisclaimerSectionAcademy /> : <DisclaimerSection />}
<DisclaimerSection is_academy={academy} />
<CopyrightSection />
<BottomSocialSection type={type} />
<AdditionalEUSection />
Expand Down
181 changes: 0 additions & 181 deletions src/components/layout/footer/disclaimer-academy.js

This file was deleted.

20 changes: 18 additions & 2 deletions src/components/layout/footer/disclaimer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react'
import PropTypes from 'prop-types'
import {
DisclaimerWrapper,
DisclaimerParagraph,
Expand All @@ -10,7 +11,7 @@ import { Show } from 'components/containers'
import { Localize, localize } from 'components/localization'
import { loss_percent } from 'common/constants.js'

const DisclaimerSection = () => {
const DisclaimerSection = ({ is_academy }) => {
return (
<>
<DisclaimerWrapper>
Expand Down Expand Up @@ -70,7 +71,11 @@ const DisclaimerSection = () => {
</DisclaimerParagraph>
<DisclaimerParagraph>
<Localize
translate_text="Deriv (Europe) Limited, W Business Centre, Level 3, Triq Dun Karm, Birkirkara BKR 9033, Malta, is licensed and regulated for digital options based on synthetic indices by the Malta Gaming Authority (<0>licence no. MGA/B2C/102/2000</0>)."
translate_text={`Deriv (Europe) Limited, W Business Centre, Level 3, Triq Dun Karm, Birkirkara BKR 9033, Malta, is licensed and regulated for digital options based on synthetic indices by the Malta Gaming Authority (<0>licence no. MGA/B2C/102/2000</0>)${
is_academy
? ' and by the Revenue Commissioners for clients in Ireland (licence no. 1010285).'
: '.'
}`}
components={[
<StaticAsset
key={0}
Expand All @@ -92,6 +97,13 @@ const DisclaimerSection = () => {
"This website's services are not available in certain countries, including the USA, Canada, and Hong Kong, or to persons below 18.",
)}
</DisclaimerParagraph>
{is_academy && (
<DisclaimerParagraph>
{localize(
'The information contained in this academy is for educational purposes only and is not intended as financial or investment advice.',
)}
</DisclaimerParagraph>
)}
<RiskWarning>
<Show.Desktop>
<Show.NonEU>
Expand Down Expand Up @@ -173,4 +185,8 @@ const DisclaimerSection = () => {
)
}

DisclaimerSection.propTypes = {
is_academy: PropTypes.bool,
}

export default DisclaimerSection
2 changes: 2 additions & 0 deletions src/pages/dmt5/_start-trader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,15 @@ const ImageWrapper = styled.div`
const demoActive = css`
box-shadow: 0 16px 20px 0 rgba(0, 0, 0, 0.05), 0 0 20px 0 rgba(0, 0, 0, 0.05);
border: unset;

${Text} {
font-weight: bold;
}
`

const realActive = css`
box-shadow: unset;

${Text} {
font-weight: unset;
}
Expand Down