From 68a7b50164bf56ec072bee21ddd45e832805ee74 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Mon, 12 Jul 2021 15:40:21 +0300
Subject: [PATCH] nikolai.berestevich/feat/update links to blog page

---
 src/components/custom/other-platforms.js   |  6 +-
 src/components/elements/off-canvas-menu.js | 12 +---
 src/components/layout/footer/main-links.js | 67 ++++++----------------
 3 files changed, 19 insertions(+), 66 deletions(-)

diff --git a/src/components/custom/other-platforms.js b/src/components/custom/other-platforms.js
index 9d646f1f56a..b1722cb3784 100644
--- a/src/components/custom/other-platforms.js
+++ b/src/components/custom/other-platforms.js
@@ -539,11 +539,7 @@ export const NavResources = ({ onClick }) => (
             icon={() => <img src={Blog} alt="blog" width="24" height="24" />}
             title={localize('Blog')}
             onClick={onClick}
-            to=""
-            type="blog"
-            external="true"
-            target="_blank"
-            rel="noopener noreferrer"
+            to="/blog"
         />
     </Flex>
 )
diff --git a/src/components/elements/off-canvas-menu.js b/src/components/elements/off-canvas-menu.js
index 2e976d912f0..4380ad02402 100644
--- a/src/components/elements/off-canvas-menu.js
+++ b/src/components/elements/off-canvas-menu.js
@@ -501,21 +501,11 @@ export const OffCanvasMenuWrapper = (props) => {
                                 <img src={Diagonal} alt="diagonal" width="16" height="16" />
                             </SpanSvg>
                         </StyledLink>
-                        <StyledLink
-                            to=""
-                            type="blog"
-                            external="true"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            onClick={handleArrowClick}
-                        >
+                        <StyledLink to="/blog" onClick={handleArrowClick}>
                             <div>
                                 <img src={Blog} alt="blog" width="24" height="24" />
                             </div>
                             <Span>{localize('Blog')}</Span>
-                            <SpanSvg>
-                                <img src={Diagonal} alt="diagonal" width="16" height="16" />
-                            </SpanSvg>
                         </StyledLink>
                     </AccordionItem>
                     <AccordionItem
diff --git a/src/components/layout/footer/main-links.js b/src/components/layout/footer/main-links.js
index c28f2a233da..17f3a6d8e25 100644
--- a/src/components/layout/footer/main-links.js
+++ b/src/components/layout/footer/main-links.js
@@ -1,14 +1,11 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import {LinksWrapper, LinkWrapper, LinksCol, Title, Link } from './common/style.js'
+import { LinksWrapper, LinkWrapper, LinksCol, Title, Link } from './common/style.js'
 import { localize } from 'components/localization'
 import { Flex, Show } from 'components/containers'
-import {
-    deriv_status_page_url,
-} from 'common/constants'
-
-const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
+import { deriv_status_page_url } from 'common/constants'
 
+const MainLinksSection = ({ is_ppc, is_ppc_redirect, is_eu_country }) => {
     return (
         <LinksWrapper>
             <Show.Desktop>
@@ -24,14 +21,10 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
                             <Link to="/leadership/">{localize('Our leadership')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
-                            <Link to="/why-choose-us/">
-                                {localize('Why choose us?')}
-                            </Link>
+                            <Link to="/why-choose-us/">{localize('Why choose us?')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
-                            <Link to="/partners/">
-                                {localize('Partnership programmes')}
-                            </Link>
+                            <Link to="/partners/">{localize('Partnership programmes')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
                             <Link to="/contact_us/">{localize('Contact us')}</Link>
@@ -78,21 +71,15 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
                                 <title>Codestin Search App</title>
                             </LinkWrapper>
                             <LinkWrapper first_child="true">
-                                <Link to="/trade-types/margin/">
-                                    {localize('Margin trading')}
-                                </Link>
+                                <Link to="/trade-types/margin/">{localize('Margin trading')}</Link>
                             </LinkWrapper>
                             <Show.NonEU>
                                 <LinkWrapper>
-                                    <Link to="/trade-types/options/">
-                                        {localize('Options')}
-                                    </Link>
+                                    <Link to="/trade-types/options/">{localize('Options')}</Link>
                                 </LinkWrapper>
                             </Show.NonEU>
                             <LinkWrapper>
-                                <Link to="/trade-types/multiplier/">
-                                    {localize('Multipliers')}
-                                </Link>
+                                <Link to="/trade-types/multiplier/">{localize('Multipliers')}</Link>
                             </LinkWrapper>
                         </LinksCol>
                     )}
@@ -111,14 +98,10 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
                             </LinkWrapper>
                         )}
                         <LinkWrapper>
-                            <Link to="/markets/stock/">
-                                {localize('Stock indices')}
-                            </Link>
+                            <Link to="/markets/stock/">{localize('Stock indices')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
-                            <Link to="/markets/commodities/">
-                                {localize('Commodities')}
-                            </Link>
+                            <Link to="/markets/commodities/">{localize('Commodities')}</Link>
                         </LinkWrapper>
                     </LinksCol>
                     <LinksCol>
@@ -126,9 +109,7 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
                             <title>Codestin Search App</title>
                         </LinkWrapper>
                         <LinkWrapper first_child="true">
-                            <Link to="/regulatory">
-                                {localize('Regulatory information')}
-                            </Link>
+                            <Link to="/regulatory">{localize('Regulatory information')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
                             <Link to="/terms-and-conditions">
@@ -151,9 +132,7 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
                             </Link>
                         </LinkWrapper>
                         <LinkWrapper>
-                            <Link to="/partners/payment-agent/">
-                                {localize('Payment agents')}
-                            </Link>
+                            <Link to="/partners/payment-agent/">{localize('Payment agents')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
                             <Link
@@ -186,14 +165,10 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
                             </Link>
                         </LinkWrapper>
                         <LinkWrapper>
-                            <Link to="/trader-tools/">
-                                {localize('Traders’ tools')}
-                            </Link>
+                            <Link to="/trader-tools/">{localize('Traders’ tools')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
-                            <Link to="/payment-methods/">
-                                {localize('Payment methods')}
-                            </Link>
+                            <Link to="/payment-methods/">{localize('Payment methods')}</Link>
                         </LinkWrapper>
                         <LinkWrapper>
                             <Link
@@ -206,15 +181,7 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
                             </Link>
                         </LinkWrapper>
                         <LinkWrapper>
-                            <Link
-                                to=""
-                                type="blog"
-                                external="true"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                            >
-                                {localize('Blog')}
-                            </Link>
+                            <Link to="/blog">{localize('Blog')}</Link>
                         </LinkWrapper>
                     </LinksCol>
                 </Flex>
@@ -223,11 +190,11 @@ const MainLinksSection = ({is_ppc, is_ppc_redirect, is_eu_country }) => {
     )
 }
 
-export default MainLinksSection;
+export default MainLinksSection
 
 MainLinksSection.propTypes = {
     is_eu_country: PropTypes.bool,
     is_ppc: PropTypes.bool,
     is_ppc_redirect: PropTypes.bool,
     type: PropTypes.string,
-}
\ No newline at end of file
+}