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.

fiona / update pdf #2004

Merged
2 commits merged into from
Aug 13, 2021
Merged

fiona / update pdf #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2938a66
update pdf
Aug 12, 2021
6d78d6e
resolve conflicts
Aug 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
53 changes: 32 additions & 21 deletions src/components/layout/footer/bottom-social-wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react'
import PropTypes from 'prop-types'
import SocialWrapperComponent from './social-wrapper'
import SocialWrapperComponent from './social-wrapper'
import { useWebsiteStatus } from 'components/hooks/use-website-status'
import { Show } from 'components/containers'
import { isUKOrMXAccount } from 'common/utility'
import { isUKOrMXAccount } from 'common/utility'
import {
fb_non_eu_url,
fb_uk_url,
Expand All @@ -21,29 +21,40 @@ const BottomSocialSection = ({ type }) => {
const current_client_country = website_status?.clients_country || ''

return (
<>
<Show.NonEU>
<SocialWrapperComponent is_career_page={type === 'careers'}
fb_url={fb_non_eu_url}
instagram_url={instagram_non_eu_url}
twitter_url={twitter_non_eu_url}
/>
</Show.NonEU>
<>
<Show.NonEU>
<SocialWrapperComponent
is_career_page={type === 'careers'}
fb_url={fb_non_eu_url}
instagram_url={instagram_non_eu_url}
twitter_url={twitter_non_eu_url}
/>
</Show.NonEU>

<Show.Eu>
<Show.Mobile>
<SocialWrapperComponent is_career_page={type === 'careers'}
<Show.Eu>
<Show.Mobile>
<SocialWrapperComponent
is_career_page={type === 'careers'}
fb_url={isUKOrMXAccount(current_client_country) ? fb_uk_url : fb_eu_url}
instagram_url={isUKOrMXAccount(current_client_country) ? instagram_uk_url : instagram_eu_url}
twitter_url={isUKOrMXAccount(current_client_country) ? twitter_uk_url : twitter_eu_url}
/>
</Show.Mobile>
</Show.Eu>
</>
)}
instagram_url={
isUKOrMXAccount(current_client_country)
? instagram_uk_url
: instagram_eu_url
}
twitter_url={
isUKOrMXAccount(current_client_country)
? twitter_uk_url
: twitter_eu_url
}
/>
</Show.Mobile>
</Show.Eu>
</>
)
}

BottomSocialSection.propTypes = {
type: PropTypes.string,
}

export default BottomSocialSection;
export default BottomSocialSection
21 changes: 15 additions & 6 deletions src/components/layout/footer/logo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import SocialWrapperComponent from './social-wrapper'
import { DerivLogoWrapper, StyledLogo, } from './common/style.js'
import SocialWrapperComponent from './social-wrapper'
import { DerivLogoWrapper, StyledLogo } from './common/style.js'
import { Show } from 'components/containers'
import { useWebsiteStatus } from 'components/hooks/use-website-status'
import DerivLogo from 'images/svg/deriv-footer.svg'
Expand All @@ -24,10 +24,19 @@ const LogoSection = ({ type }) => {
<StyledLogo src={DerivLogo} alt="logo" width="147" height="25" />
<Show.Eu>
<Show.Desktop>
<SocialWrapperComponent is_career_page={type === 'careers'}
<SocialWrapperComponent
is_career_page={type === 'careers'}
fb_url={isUKOrMXAccount(current_client_country) ? fb_uk_url : fb_eu_url}
instagram_url={isUKOrMXAccount(current_client_country) ? instagram_uk_url : instagram_eu_url}
twitter_url={isUKOrMXAccount(current_client_country) ? twitter_uk_url : twitter_eu_url}
instagram_url={
isUKOrMXAccount(current_client_country)
? instagram_uk_url
: instagram_eu_url
}
twitter_url={
isUKOrMXAccount(current_client_country)
? twitter_uk_url
: twitter_eu_url
}
/>
</Show.Desktop>
</Show.Eu>
Expand All @@ -39,4 +48,4 @@ LogoSection.propTypes = {
type: PropTypes.string,
}

export default LogoSection;
export default LogoSection
14 changes: 4 additions & 10 deletions src/components/layout/footer/social-wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,17 @@ const SocialWrapperComponent = ({ is_career_page, fb_url, instagram_url, twitter
const alt_string = (is_career_page ? 'career' : '') + ' icon link'
const accounts = [
{
link: is_career_page
? fb_url_career
: fb_url,
link: is_career_page ? fb_url_career : fb_url,
image: Facebook,
image_alt: `facebook ${alt_string}`,
},
{
link: is_career_page
? instagram_url_career
: instagram_url,
link: is_career_page ? instagram_url_career : instagram_url,
image: Instagram,
image_alt: `instagram ${alt_string}`,
},
{
link: is_career_page
? linkedin_url_career
: linkedin_url,
link: is_career_page ? linkedin_url_career : linkedin_url,
image: Linkedin,
image_alt: `linkedin ${alt_string}`,
},
Expand Down Expand Up @@ -80,4 +74,4 @@ SocialMediaComponent.propTypes = {
social_accounts: PropTypes.array,
}

export default SocialWrapperComponent;
export default SocialWrapperComponent
2 changes: 1 addition & 1 deletion src/pages/home/_what-our-clients-say.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ const WhatOurClientsSay = () => {
}

return (
<SectionContainer padding='5rem 0 0'>
<SectionContainer padding="5rem 0 0">
<Container direction="column">
<Header align="center" as="h3" type="section-title">
{localize('What our clients say about Deriv')}
Expand Down
Binary file modified static/tnc/deriv-investments-(europe)-limited.pdf
View file
Open in desktop
Binary file not shown.