diff --git a/src/components/elements/off-canvas-menu.js b/src/components/elements/off-canvas-menu.js index 1310fee2c35..6704e7bf07f 100644 --- a/src/components/elements/off-canvas-menu.js +++ b/src/components/elements/off-canvas-menu.js @@ -361,7 +361,7 @@ export const OffCanvasMenuWrapper = (props) => { header_style={header_style} style={content_style} > - +
diff --git a/src/pages/about-us/_AboutUsBanner.tsx b/src/pages/about-us/_AboutUsBanner.tsx index 1eb65f4bbd2..13e3631f5af 100644 --- a/src/pages/about-us/_AboutUsBanner.tsx +++ b/src/pages/about-us/_AboutUsBanner.tsx @@ -59,6 +59,7 @@ const StyledHeader = styled(Header)` line-height: 40px; @media ${device.tablet} { + font-size: 28px; line-height: 34px; } ` @@ -72,7 +73,7 @@ const AboutUsBanner = () => { - + {localize('We have a huge mission, an incredible team, and rapid growth.')} diff --git a/src/pages/about-us/_OurLeadership.tsx b/src/pages/about-us/_OurLeadership.tsx index 42e0c9fcac0..f355166ef49 100644 --- a/src/pages/about-us/_OurLeadership.tsx +++ b/src/pages/about-us/_OurLeadership.tsx @@ -159,14 +159,16 @@ type ModalPropsType = { position: string link?: string } - -const StyledLogo = styled.img` +type StyledLogoType = { + link: string +} +const StyledLogo = styled.img` width: 32px; height: 32px; filter: grayscale(100%); margin-bottom: 5px; &:hover { - filter: unset; + filter: ${(props) => (props.link ? 'unset' : 'grayscale(100%)')}; } ` @@ -185,10 +187,13 @@ const Modal = ({ name, position, link }: ModalPropsType) => { > {position} - {link && ( + {/* Tom doesn't have linkedin page so we don't use LocalizedLink */} + {link ? ( - + + ) : ( + )} ) @@ -200,12 +205,12 @@ type LeaderType = { image: ImageDataLike } -type LeaderPopsType = { +type LeaderProps = { leader: LeaderType key: number } -const Leader: React.FC = ({ leader }) => { - const [isPopupShown, setIsPopupShown] = React.useState(false) +const Leader = ({ leader }: LeaderProps) => { + const [isPopupShown, setIsPopupShown] = React.useState(false) const showModal = (event: FocusEvent) => { setIsPopupShown(true) } @@ -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, }, { diff --git a/src/pages/about-us/_data.ts b/src/pages/about-us/_data.ts index 132b6ddd0db..aa589b919ea 100644 --- a/src/pages/about-us/_data.ts +++ b/src/pages/about-us/_data.ts @@ -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.', ), ] diff --git a/src/pages/about-us/index.tsx b/src/pages/about-us/index.tsx index 9d2974fe81f..29a7d446949 100644 --- a/src/pages/about-us/index.tsx +++ b/src/pages/about-us/index.tsx @@ -36,11 +36,10 @@ const EndSeparator = styled.div` } ` -const AboutUs = (): React.ReactNode => { +const AboutUs = () => { return (