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.

Commit 44ede74

Browse files
mitra-derivmitra-deriv
authored
Mitra/ DEL EU footer changes (#2452)
* Requried changes on the footer for EU DEL * Removal of the commented section * Requried changes on the footer for EU DEL mobile * Removal of some platforms from footer menu for EU * Remove unused propType for MainLinksSection * Resolve conflicts * Remove redundant prop
1 parent bae6c26 commit 44ede74

File tree

5 files changed

+32
-116
lines changed

5 files changed

+32
-116
lines changed

‎src/components/layout/footer.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import LogoSection from './footer/logo'
77
import MainLinksSection from './footer/main-links'
88
import DisclaimerSection from './footer/disclaimer'
99
import BottomSocialSection from './footer/bottom-social-wrapper'
10-
import AdditionalEUSection from './footer/additional-eu'
1110
import { DerivStore } from 'store'
1211
// TODO: (discussion) make footer pure component, and move usage of footer to custom
1312

@@ -32,14 +31,9 @@ const Footer = ({ type, is_ppc, is_ppc_redirect, academy }) => {
3231
<Container>
3332
<FooterGrid>
3433
<LogoSection type={type} />
35-
<MainLinksSection
36-
is_ppc={is_ppc}
37-
is_ppc_redirect={is_ppc_redirect}
38-
is_eu_country={is_eu_country}
39-
/>
34+
<MainLinksSection is_ppc={is_ppc} is_ppc_redirect={is_ppc_redirect} />
4035
<DisclaimerSection is_academy={academy} />
4136
<BottomSocialSection type={type} />
42-
<AdditionalEUSection />
4337
</FooterGrid>
4438
</Container>
4539
</DefaultFooter>

‎src/components/layout/footer/additional-eu.js

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/components/layout/footer/common/style.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ export const CopyrightWrapper = styled(Flex)`
195195
p {
196196
font-size: var(--text-size-xs);
197197
line-height: 1.14;
198+
padding: 2rem 0;
198199
}
199200
200201
@media ${device.tabletL} {

‎src/components/layout/footer/disclaimer.js

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,6 @@ const DisclaimerSection = ({ is_academy }) => {
6969
]}
7070
/>
7171
</DisclaimerParagraph>
72-
<DisclaimerParagraph>
73-
<Localize
74-
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>)${
75-
is_academy
76-
? ' and by the Revenue Commissioners for clients in Ireland (licence no. 1010285).'
77-
: '.'
78-
}`}
79-
components={[
80-
<StaticAsset
81-
key={0}
82-
target="_blank"
83-
href="/regulatory/Deriv_(Europe)_Limited.pdf"
84-
rel="noopener noreferrer"
85-
/>,
86-
]}
87-
/>
88-
</DisclaimerParagraph>
8972
</Show.Eu>
9073
<DisclaimerParagraph>
9174
{localize(
@@ -94,7 +77,7 @@ const DisclaimerSection = ({ is_academy }) => {
9477
</DisclaimerParagraph>
9578
<DisclaimerParagraph>
9679
{localize(
97-
"This website's services are not available in certain countries, including the USA, Canada, and Hong Kong, or to persons below 18.",
80+
"This website's services are not available in certain countries, including the USA, Canada, and Hong Kong.",
9881
)}
9982
</DisclaimerParagraph>
10083
{is_academy && (
@@ -132,14 +115,6 @@ const DisclaimerSection = ({ is_academy }) => {
132115
<DisclaimerParagraph>
133116
<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." />
134117
</DisclaimerParagraph>
135-
<DisclaimerParagraph>
136-
<Localize
137-
translate_text="Gambling can be addictive, so please play responsibly. Visit <0>Secure and responsible trading</0> for more information."
138-
components={[
139-
<BoldLink key={0} target="_blank" to="/responsible/" />,
140-
]}
141-
/>
142-
</DisclaimerParagraph>
143118
</Show.Eu>
144119
</Show.Desktop>
145120
<Show.Mobile>
@@ -156,14 +131,6 @@ const DisclaimerSection = ({ is_academy }) => {
156131
<DisclaimerParagraph>
157132
<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." />
158133
</DisclaimerParagraph>
159-
<DisclaimerParagraph>
160-
<Localize
161-
translate_text="Gambling can be addictive, so please play responsibly. Visit <0>Secure and responsible trading</0> if you need further information."
162-
components={[
163-
<BoldLink key={0} target="_blank" to="/responsible/" />,
164-
]}
165-
/>
166-
</DisclaimerParagraph>
167134
</Show.Eu>
168135
<Show.NonEU>
169136
<DisclaimerParagraph no_margin>

‎src/components/layout/footer/main-links.js

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { localize } from 'components/localization'
55
import { Flex, Show } from 'components/containers'
66
import { deriv_status_page_url } from 'common/constants'
77

8-
const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
8+
const MainLinksSection = ({ is_ppc, is_ppc_redirect }) => {
99
return (
1010
<LinksWrapper>
1111
<Show.Desktop>
@@ -37,45 +37,45 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
3737
<LinkWrapper first_child="true">
3838
<Link to="/dtrader/">{localize('DTrader')}</Link>
3939
</LinkWrapper>
40-
{!is_eu_country && (
40+
<Show.NonEU>
4141
<LinkWrapper>
4242
<Link to="/landing/deriv-go/">{localize('Deriv GO')}</Link>
4343
</LinkWrapper>
44-
)}
45-
<LinkWrapper>
46-
<Link to="/dbot/">{localize('DBot')}</Link>
47-
</LinkWrapper>
44+
<LinkWrapper>
45+
<Link to="/dbot/">{localize('DBot')}</Link>
46+
</LinkWrapper>
47+
</Show.NonEU>
4848
<LinkWrapper>
4949
<Link to={is_ppc_redirect ? '/landing/dmt5/' : '/dmt5/'}>
5050
{localize('DMT5')}
5151
</Link>
5252
</LinkWrapper>
53-
{!is_eu_country && (
53+
<Show.NonEU>
5454
<LinkWrapper>
5555
<Link to="/derivx/">{localize('Deriv X')}</Link>
5656
</LinkWrapper>
57-
)}
58-
<LinkWrapper>
59-
<Link
60-
to="trading"
61-
type="smart_trader"
62-
external="true"
63-
target="_blank"
64-
rel="noopener noreferrer"
65-
>
66-
{localize('SmartTrader')}
67-
</Link>
68-
</LinkWrapper>
69-
<LinkWrapper>
70-
<Link
71-
to="https://bot.deriv.com"
72-
external="true"
73-
target="_blank"
74-
rel="noopener noreferrer"
75-
>
76-
{localize('Binary Bot')}
77-
</Link>
78-
</LinkWrapper>
57+
<LinkWrapper>
58+
<Link
59+
to="trading"
60+
type="smart_trader"
61+
external="true"
62+
target="_blank"
63+
rel="noopener noreferrer"
64+
>
65+
{localize('SmartTrader')}
66+
</Link>
67+
</LinkWrapper>
68+
<LinkWrapper>
69+
<Link
70+
to="https://bot.deriv.com"
71+
external="true"
72+
target="_blank"
73+
rel="noopener noreferrer"
74+
>
75+
{localize('Binary Bot')}
76+
</Link>
77+
</LinkWrapper>
78+
</Show.NonEU>
7979
</LinksCol>
8080
{!is_ppc && (
8181
<LinksCol>
@@ -210,7 +210,6 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
210210
export default MainLinksSection
211211

212212
MainLinksSection.propTypes = {
213-
is_eu_country: PropTypes.bool,
214213
is_ppc: PropTypes.bool,
215214
is_ppc_redirect: PropTypes.bool,
216215
type: PropTypes.string,

0 commit comments

Comments
 (0)