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.

Mitra/ DEL EU footer changes #2452

Merged
merged 15 commits into from
Jan 26, 2022
Merged

Mitra/ DEL EU footer changes #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
968e8c1
Requried changes on the footer for EU DEL
mitra-deriv Jan 4, 2022
107c62e
Removal of the commented section
mitra-deriv Jan 4, 2022
2d3ce20
Requried changes on the footer for EU DEL mobile
mitra-deriv Jan 4, 2022
8d8a43e
Merge branch 'master' into del-eu-footer-changes
mitra-deriv Jan 5, 2022
5556201
Removal of some platforms from footer menu for EU
mitra-deriv Jan 5, 2022
196402f
Remove unused propType for MainLinksSection
mitra-deriv Jan 5, 2022
0b244c7
Merge branch 'master' into del-eu-footer-changes
mitra-deriv Jan 9, 2022
4bf3cb4
Resolve conflicts
mitra-deriv Jan 12, 2022
b817a8d
Merge branch 'master' of github.com:binary-com/deriv-com into del-eu-…
mitra-deriv Jan 12, 2022
0d21ed8
Remove redundant prop
mitra-deriv Jan 12, 2022
70b3059
Merge branch 'master' into del-eu-footer-changes
mitra-deriv Jan 16, 2022
03e25ad
Resolve conflicts
mitra-deriv Jan 17, 2022
c6df836
Merge branch 'master' into del-eu-footer-changes
mitra-deriv Jan 20, 2022
6f97f3f
Merge branch 'master' into del-eu-footer-changes
mitra-deriv Jan 24, 2022
bff41b3
Merge branch 'master' into del-eu-footer-changes
mitra-deriv Jan 26, 2022
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
8 changes: 1 addition & 7 deletions src/components/layout/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import LogoSection from './footer/logo'
import MainLinksSection from './footer/main-links'
import DisclaimerSection from './footer/disclaimer'
import BottomSocialSection from './footer/bottom-social-wrapper'
import AdditionalEUSection from './footer/additional-eu'
import { DerivStore } from 'store'
// TODO: (discussion) make footer pure component, and move usage of footer to custom

Expand All @@ -32,14 +31,9 @@ const Footer = ({ type, is_ppc, is_ppc_redirect, academy }) => {
<Container>
<FooterGrid>
<LogoSection type={type} />
<MainLinksSection
is_ppc={is_ppc}
is_ppc_redirect={is_ppc_redirect}
is_eu_country={is_eu_country}
/>
<MainLinksSection is_ppc={is_ppc} is_ppc_redirect={is_ppc_redirect} />
<DisclaimerSection is_academy={academy} />
<BottomSocialSection type={type} />
<AdditionalEUSection />
</FooterGrid>
</Container>
</DefaultFooter>
Expand Down
45 changes: 0 additions & 45 deletions src/components/layout/footer/additional-eu.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/components/layout/footer/common/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ export const CopyrightWrapper = styled(Flex)`
p {
font-size: var(--text-size-xs);
line-height: 1.14;
padding: 2rem 0;
}

@media ${device.tabletL} {
Expand Down
35 changes: 1 addition & 34 deletions src/components/layout/footer/disclaimer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,6 @@ const DisclaimerSection = ({ is_academy }) => {
]}
/>
</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>)${
is_academy
? ' and by the Revenue Commissioners for clients in Ireland (licence no. 1010285).'
: '.'
}`}
components={[
<StaticAsset
key={0}
target="_blank"
href="/regulatory/Deriv_(Europe)_Limited.pdf"
rel="noopener noreferrer"
/>,
]}
/>
</DisclaimerParagraph>
</Show.Eu>
<DisclaimerParagraph>
{localize(
Expand All @@ -94,7 +77,7 @@ const DisclaimerSection = ({ is_academy }) => {
</DisclaimerParagraph>
<DisclaimerParagraph>
{localize(
"This website's services are not available in certain countries, including the USA, Canada, and Hong Kong, or to persons below 18.",
"This website's services are not available in certain countries, including the USA, Canada, and Hong Kong.",
)}
</DisclaimerParagraph>
{is_academy && (
Expand Down Expand Up @@ -132,14 +115,6 @@ const DisclaimerSection = ({ is_academy }) => {
<DisclaimerParagraph>
<Localize translate_text="The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money." />
</DisclaimerParagraph>
<DisclaimerParagraph>
<Localize
translate_text="Gambling can be addictive, so please play responsibly. Visit <0>Secure and responsible trading</0> for more information."
components={[
<BoldLink key={0} target="_blank" to="/responsible/" />,
]}
/>
</DisclaimerParagraph>
</Show.Eu>
</Show.Desktop>
<Show.Mobile>
Expand All @@ -156,14 +131,6 @@ const DisclaimerSection = ({ is_academy }) => {
<DisclaimerParagraph>
<Localize translate_text="The products mentioned here may be affected by changes in currency exchange rates. If you invest in these products, you may lose some or all of your investment and the value of your investment may fluctuate. You should never invest money that you cannot afford to lose and never trade with borrowed money." />
</DisclaimerParagraph>
<DisclaimerParagraph>
<Localize
translate_text="Gambling can be addictive, so please play responsibly. Visit <0>Secure and responsible trading</0> if you need further information."
components={[
<BoldLink key={0} target="_blank" to="/responsible/" />,
]}
/>
</DisclaimerParagraph>
</Show.Eu>
<Show.NonEU>
<DisclaimerParagraph no_margin>
Expand Down
59 changes: 29 additions & 30 deletions src/components/layout/footer/main-links.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { localize } from 'components/localization'
import { Flex, Show } from 'components/containers'
import { deriv_status_page_url } from 'common/constants'

const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
const MainLinksSection = ({ is_ppc, is_ppc_redirect }) => {
return (
<LinksWrapper>
<Show.Desktop>
Expand Down Expand Up @@ -37,45 +37,45 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
<LinkWrapper first_child="true">
<Link to="/dtrader/">{localize('DTrader')}</Link>
</LinkWrapper>
{!is_eu_country && (
<Show.NonEU>
<LinkWrapper>
<Link to="/landing/deriv-go/">{localize('Deriv GO')}</Link>
</LinkWrapper>
)}
<LinkWrapper>
<Link to="/dbot/">{localize('DBot')}</Link>
</LinkWrapper>
<LinkWrapper>
<Link to="/dbot/">{localize('DBot')}</Link>
</LinkWrapper>
</Show.NonEU>
<LinkWrapper>
<Link to={is_ppc_redirect ? '/landing/dmt5/' : '/dmt5/'}>
{localize('DMT5')}
</Link>
</LinkWrapper>
{!is_eu_country && (
<Show.NonEU>
<LinkWrapper>
<Link to="/derivx/">{localize('Deriv X')}</Link>
</LinkWrapper>
)}
<LinkWrapper>
<Link
to="trading"
type="smart_trader"
external="true"
target="_blank"
rel="noopener noreferrer"
>
{localize('SmartTrader')}
</Link>
</LinkWrapper>
<LinkWrapper>
<Link
to="https://bot.deriv.com"
external="true"
target="_blank"
rel="noopener noreferrer"
>
{localize('Binary Bot')}
</Link>
</LinkWrapper>
<LinkWrapper>
<Link
to="trading"
type="smart_trader"
external="true"
target="_blank"
rel="noopener noreferrer"
>
{localize('SmartTrader')}
</Link>
</LinkWrapper>
<LinkWrapper>
<Link
to="https://bot.deriv.com"
external="true"
target="_blank"
rel="noopener noreferrer"
>
{localize('Binary Bot')}
</Link>
</LinkWrapper>
</Show.NonEU>
</LinksCol>
{!is_ppc && (
<LinksCol>
Expand Down Expand Up @@ -210,7 +210,6 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
export default MainLinksSection

MainLinksSection.propTypes = {
is_eu_country: PropTypes.bool,
is_ppc: PropTypes.bool,
is_ppc_redirect: PropTypes.bool,
type: PropTypes.string,
Expand Down