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.

Nikolai.berestevich/fix/about us tom fix +refactoring #2415

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
2 changes: 1 addition & 1 deletion src/components/elements/off-canvas-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export const OffCanvasMenuWrapper = (props) => {
header_style={header_style}
style={content_style}
>
<StyledLink to="/about-us" onClick={handleArrowClick}>
<StyledLink to="/about-us/" onClick={handleArrowClick}>
<div>
<img src={Story} alt="" width="24" height="24" />
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/pages/about-us/_AboutUsBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const StyledHeader = styled(Header)`
line-height: 40px;

@media ${device.tablet} {
font-size: 28px;
line-height: 34px;
}
`
Expand All @@ -72,7 +73,7 @@ const AboutUsBanner = () => {
<StyledSectionContainer>
<StyledFlex direction="column" height="288px" width="1200px">
<PictureFlex jc="start" ai="start" direction="column">
<StyledHeader width="100%" type="section-title" as="h2" size="32px">
<StyledHeader width="100%" type="unset" as="h2" size="32px">
{localize('We have a huge mission, an incredible team, and rapid growth.')}
</StyledHeader>
<Styledtext width="100%" type="paragraph-2" as="p">
Expand Down
23 changes: 14 additions & 9 deletions src/pages/about-us/_OurLeadership.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,16 @@ type ModalPropsType = {
position: string
link?: string
}

const StyledLogo = styled.img`
type StyledLogoType = {
link: string
}
const StyledLogo = styled.img<StyledLogoType>`
width: 32px;
height: 32px;
filter: grayscale(100%);
margin-bottom: 5px;
&:hover {
filter: unset;
filter: ${(props) => (props.link ? 'unset' : 'grayscale(100%)')};
}
`

Expand All @@ -185,10 +187,13 @@ const Modal = ({ name, position, link }: ModalPropsType) => {
>
{position}
</Header>
{link && (
{/* Tom doesn't have linkedin page so we don't use LocalizedLink */}
{link ? (
<LocalizedLink external="true" to={link} target="_blank" rel="noopener noreferrer">
<StyledLogo src={Linkedin} alt="" />
<StyledLogo src={Linkedin} alt="" link={link} />
</LocalizedLink>
) : (
<StyledLogo src={Linkedin} alt="" link={link} />
)}
</ModalFlex>
)
Expand All @@ -200,12 +205,12 @@ type LeaderType = {
image: ImageDataLike
}

type LeaderPopsType = {
type LeaderProps = {
leader: LeaderType
key: number
}
const Leader: React.FC<LeaderPopsType> = ({ leader }) => {
const [isPopupShown, setIsPopupShown] = React.useState<boolean>(false)
const Leader = ({ leader }: LeaderProps) => {
const [isPopupShown, setIsPopupShown] = React.useState(false)
const showModal = (event: FocusEvent<any>) => {
setIsPopupShown(true)
}
Expand Down Expand Up @@ -252,7 +257,7 @@ const OurLeadership = () => {
{
name: 'Tom Molesworth',
position: 'Chief Technology Officer',
link: 'https://www.linkedin.com/company/derivdotcom/life/0171ced9-e623-47fa-970b-39f7ef77962e/',
link: '',
image: leaders_data.tom,
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/pages/about-us/_data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const first_section_texts: string[] = [
'From inception, our goal was to break free of the high commissions and clunky products offered by traditional brokers. Also, we aim to deliver a first-class experience to digitally inclined traders, regardless of the size of their accounts.',
),
localize(
'In a journey spanning more than 22 years, we have grown to over 2.5 million customers worldwide. But the mission has remained the same.',
'In a journey spanning more than 22 years, we have grown to over 2.5 million customers worldwide. But our mission has remained the same.',
),
]

Expand Down
3 changes: 1 addition & 2 deletions src/pages/about-us/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ const EndSeparator = styled.div`
}
`

const AboutUs = (): React.ReactNode => {
const AboutUs = () => {
return (
<Layout type="about-us" margin_top="0">
<SEO
// title and description from story page, needs new?
title={localize('About Us | An Online Trading Platform | Deriv.com')}
description={localize(
'Deriv.com - A Binary.com brand, is a pioneer and award-winning online trading platform in the trading market.',
Expand Down