From b1947e7c211ca8737283ca13583e48007cb343aa Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 30 Dec 2021 11:28:08 +0300
Subject: [PATCH 1/5] nikolai.berestevich/fix/tom-linkedin

---
 src/pages/about-us/_OurLeadership.tsx | 3 ++-
 src/pages/about-us/_data.ts           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/about-us/_OurLeadership.tsx b/src/pages/about-us/_OurLeadership.tsx
index 42e0c9fcac0..00012779758 100644
--- a/src/pages/about-us/_OurLeadership.tsx
+++ b/src/pages/about-us/_OurLeadership.tsx
@@ -185,6 +185,7 @@ const Modal = ({ name, position, link }: ModalPropsType) => {
             >
                 {position}
             </Header>
+            {/* Tom doesn't have linkedin page so we don't use linkedin icon */}
             {link && (
                 <LocalizedLink external="true" to={link} target="_blank" rel="noopener noreferrer">
                     <StyledLogo src={Linkedin} alt="" />
@@ -252,7 +253,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.',
     ),
 ]
 

From 31d13ac1786c2f795c67785306b70a8a0efbac5e Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 30 Dec 2021 12:24:31 +0300
Subject: [PATCH 2/5] nikolai.berestevich/fix/tom-linkedin

---
 src/pages/about-us/_OurLeadership.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/about-us/_OurLeadership.tsx b/src/pages/about-us/_OurLeadership.tsx
index 00012779758..15be622fc74 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<StyledLogoType>`
     width: 32px;
     height: 32px;
     filter: grayscale(100%);
     margin-bottom: 5px;
     &:hover {
-        filter: unset;
+        filter: ${(props) => (props.link ? 'unset' : 'grayscale(100%)')};
     }
 `
 
@@ -186,10 +188,12 @@ const Modal = ({ name, position, link }: ModalPropsType) => {
                 {position}
             </Header>
             {/* Tom doesn't have linkedin page so we don't use linkedin icon */}
-            {link && (
+            {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>
     )

From df0b5e40413f35194409a169cf44777e4317f667 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 30 Dec 2021 12:41:45 +0300
Subject: [PATCH 3/5] nikolai.berestevich/fix/refactoring

---
 src/components/elements/off-canvas-menu.js | 2 +-
 src/pages/about-us/_AboutUsBanner.tsx      | 2 +-
 src/pages/about-us/_OurLeadership.tsx      | 6 +++---
 src/pages/about-us/index.tsx               | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

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}
                     >
-                        <StyledLink to="/about-us" onClick={handleArrowClick}>
+                        <StyledLink to="/about-us/" onClick={handleArrowClick}>
                             <div>
                                 <img src={Story} alt="" width="24" height="24" />
                             </div>
diff --git a/src/pages/about-us/_AboutUsBanner.tsx b/src/pages/about-us/_AboutUsBanner.tsx
index 1eb65f4bbd2..f9073535aae 100644
--- a/src/pages/about-us/_AboutUsBanner.tsx
+++ b/src/pages/about-us/_AboutUsBanner.tsx
@@ -72,7 +72,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">
diff --git a/src/pages/about-us/_OurLeadership.tsx b/src/pages/about-us/_OurLeadership.tsx
index 15be622fc74..39263108bb8 100644
--- a/src/pages/about-us/_OurLeadership.tsx
+++ b/src/pages/about-us/_OurLeadership.tsx
@@ -205,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)
     }
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 (
         <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.',

From b2cbc6aeeb6bdf054bcd938d54d40ecf233c02c9 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 30 Dec 2021 12:57:41 +0300
Subject: [PATCH 4/5] nikolai.berestevich/fix/refactoring

---
 src/pages/about-us/_AboutUsBanner.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/about-us/_AboutUsBanner.tsx b/src/pages/about-us/_AboutUsBanner.tsx
index f9073535aae..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;
     }
 `

From a9e0ad3bd55df9e85ddc6677440eba0ad1329651 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 30 Dec 2021 13:00:46 +0300
Subject: [PATCH 5/5] nikolai.berestevich/fix/refactoring

---
 src/pages/about-us/_OurLeadership.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/about-us/_OurLeadership.tsx b/src/pages/about-us/_OurLeadership.tsx
index 39263108bb8..f355166ef49 100644
--- a/src/pages/about-us/_OurLeadership.tsx
+++ b/src/pages/about-us/_OurLeadership.tsx
@@ -187,7 +187,7 @@ const Modal = ({ name, position, link }: ModalPropsType) => {
             >
                 {position}
             </Header>
-            {/* Tom doesn't have linkedin page so we don't use linkedin icon */}
+            {/* 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="" link={link} />