binary-com · habib-deriv · Jan 19, 2022 · Dec 9, 2021 · Dec 13, 2021 · Dec 13, 2021
@@ -16,22 +16,6 @@ exports.onCreatePage = ({ page, actions }) => {
     const is_story = /story/g.test(page.path)
     const is_market = /markets/g.test(page.path)
     const is_cfds = /cfds/g.test(page.path)
-    const is_landing_ebooks =/landing\/ebooks/g.test(page.path)
-
-    if (is_landing_ebooks) {
-        createRedirect({
-            fromPath: `/landing/ebooks/`,
-            toPath: `/404/`,
-            redirectInBrowser: true,
-            isPermanent: true,
-        })
-        createRedirect({
-            fromPath: `/landing/ebooks`,
-            toPath: `/404`,
-            redirectInBrowser: true,
-            isPermanent: true,
-        })
-    }
 
     if (is_responsible_trading) {
         createRedirect({
@@ -87,13 +71,13 @@ exports.onCreatePage = ({ page, actions }) => {
     if (is_story) {
         createRedirect({
             fromPath: `/about/`,
-            toPath: `/story/`,
+            toPath: `/who-we-are/`,
             redirectInBrowser: true,
             isPermanent: true,
         })
         createRedirect({
             fromPath: `/about`,
-            toPath: `/story/`,
+            toPath: `/who-we-are/`,
             redirectInBrowser: true,
             isPermanent: true,
         })
@@ -191,20 +175,6 @@ exports.onCreatePage = ({ page, actions }) => {
                 isPermanent: true,
             })
         }
-        if (is_landing_ebooks) {
-            createRedirect({
-                fromPath: `/${lang}/landing/ebooks/`,
-                toPath: `/${lang}/404/`,
-                redirectInBrowser: true,
-                isPermanent: true,
-            })
-            createRedirect({
-                fromPath: `/${lang}/landing/ebooks`,
-                toPath: `/${lang}/404`,
-                redirectInBrowser: true,
-                isPermanent: true,
-            })
-        }
 
         if (is_contact_us) {
             createRedirect({
@@ -245,13 +215,13 @@ exports.onCreatePage = ({ page, actions }) => {
         if (is_story) {
             createRedirect({
                 fromPath: `/${lang}/about/`,
-                toPath: `/${lang}/story/`,
+                toPath: `/${lang}/who-we-are/`,
                 redirectInBrowser: true,
                 isPermanent: true,
             })
             createRedirect({
                 fromPath: `/${lang}/about`,
-                toPath: `/${lang}/story/`,
+                toPath: `/${lang}/who-we-are/`,
                 redirectInBrowser: true,
                 isPermanent: true,
             })

@@ -315,7 +315,7 @@ export const addScript = (settings) => {
 // Function to get the user selected language, can be used in the future once need to check other languages
 export const isChoosenLanguage = () => ({ english: getLanguage() === 'en' })
 
-// Function to manually replace server's locale ("zh_tw" or "zh_cn")  to "zh-tw"/"zh-cn"
+// Function to manually replace server's locale ("zh_tw" or "zh_cn") to "zh-tw"/"zh-cn"
 export const replaceLocale = (locale) => {
     let checked_locale = locale
     if (locale === 'zh_tw') {

@@ -30,7 +30,6 @@ import DTrader from 'images/svg/dtrader/dtrader-icon.svg'
 import DerivGo from 'images/svg/deriv-go/deriv-go-icon.svg'
 import Forex from 'images/svg/custom/forex-nav.svg'
 import Help from 'images/svg/menu/help-center.svg'
-import Leadership from 'images/svg/menu/leadership.svg'
 import CFD from 'images/svg/custom/margin-trading-nav.svg'
 import Multipliers from 'images/svg/custom/multipliers-nav.svg'
 import Options from 'images/svg/custom/options-nav.svg'
@@ -470,15 +469,9 @@ export const NavCompany = ({ onClick }) => (
     <Flex direction="column" wrap="wrap" jc="flex-start" max_width="42rem">
         <CardLink
             icon={() => <img src={Story} alt="" width="24" height="24" />}
-            title={localize('Our story')}
+            title={localize('Who we are')}
             onClick={onClick}
-            to="/story/"
-        />
-        <CardLink
-            icon={() => <img src={Leadership} alt="" width="24" height="24" />}
-            title={localize('Our leadership')}
-            onClick={onClick}
-            to="/leadership/"
+            to="/who-we-are/"
         />
         <CardLink
             icon={() => <img src={RegulatoryInfo} alt="" width="24" height="24" />}

@@ -24,7 +24,6 @@ import DTrader from 'images/svg/dtrader/dtrader-icon.svg'
 import DerivGo from 'images/svg/deriv-go/deriv-go-icon.svg'
 import Forex from 'images/svg/custom/forex-nav.svg'
 import Help from 'images/svg/menu/help-center.svg'
-import Leadership from 'images/svg/menu/leadership.svg'
 import CFD from 'images/svg/custom/margin-trading-nav.svg'
 import Multipliers from 'images/svg/custom/multipliers-nav.svg'
 import Options from 'images/svg/custom/options-nav.svg'
@@ -377,17 +376,11 @@ export const OffCanvasMenuWrapper = (props) => {
                         header_style={header_style}
                         style={content_style}
                     >
-                        <StyledLink to="/story/" onClick={handleArrowClick}>
+                        <StyledLink to="/who-we-are/" onClick={handleArrowClick}>
                             <div>
                                 <img src={Story} alt="" width="24" height="24" />
                             </div>
-                            <span>{localize('Our story')}</span>
-                        </StyledLink>
-                        <StyledLink to="/leadership/" onClick={handleArrowClick}>
-                            <div>
-                                <img src={Leadership} alt="" width="24" height="24" />
-                            </div>
-                            <span>{localize('Our leadership')}</span>
+                            <span>{localize('Who we are')}</span>
                         </StyledLink>
                         <StyledLink to="/partners/" onClick={handleArrowClick}>
                             <div>

@@ -12,7 +12,7 @@ type QueryImageProps = {
     loading?: 'eager' | 'lazy'
 }
 
-type ImageWrapperProps = {
+export type ImageWrapperProps = {
     width: string
     height: string
     className?: string

@@ -101,6 +101,7 @@ export const SharedButtonStyle = css`
                 padding: 17px 24px;
                 font-size: 20px;
                 line-height: 30px;
+                border-radius: 8px;
 
                 &:hover {
                     background-color: var(--color-red-3);

@@ -15,10 +15,7 @@ const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
                             <Title>{localize('ABOUT')}</Title>
                         </LinkWrapper>
                         <LinkWrapper first_child="true">
-                            <Link to="/story/">{localize('Our story')}</Link>
-                        </LinkWrapper>
-                        <LinkWrapper>
-                            <Link to="/leadership/">{localize('Our leadership')}</Link>
+                            <Link to="/who-we-are/">{localize('Who we are')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
                             <Link to="/why-choose-us/">{localize('Why choose us?')}</Link>

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 import styled from 'styled-components'
 import useGTMData from '../hooks/use-gtm-data'
 import Copyright from './copyright'
-import { Nav, NavStatic, NavPartners, NavInterim } from './nav'
+import { Nav, NavStatic, NavPartners, NavInterim, NavSticky } from './nav'
 import JumpIndicesNav from './jump-indices/nav'
 import { NavCareers } from './nav-careers'
 import { LocationProvider } from './location-context'
@@ -209,6 +209,10 @@ const Layout = ({
             Navigation = <NavCareers />
             FooterNav = <Footer no_language={true} type={type} />
             break
+        case 'about-us':
+            Navigation = <NavSticky is_ppc_redirect={is_ppc_redirect} is_ppc={is_ppc} />
+            FooterNav = <Footer is_ppc={is_ppc} is_ppc_redirect={is_ppc_redirect} />
+            break
         default:
             Navigation = <Nav is_ppc_redirect={is_ppc_redirect} is_ppc={is_ppc} />
             FooterNav = <Footer is_ppc={is_ppc} is_ppc_redirect={is_ppc_redirect} />