From a3fb18fb16328cf5453588e1e81a321566392b79 Mon Sep 17 00:00:00 2001
From: njazuli <78890281+njazuli-deriv@users.noreply.github.com>
Date: Tue, 21 Sep 2021 11:07:59 +0800
Subject: [PATCH 1/3] change tags from market news to market report

---
 src/pages/academy/blog/posts/_style.js        | 7 ++++++-
 src/pages/academy/blog/posts/preview/index.js | 6 +++---
 src/pages/academy/index.js                    | 4 ++--
 src/templates/article.js                      | 7 ++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/pages/academy/blog/posts/_style.js b/src/pages/academy/blog/posts/_style.js
index f6f8f295938..4edc5cb8df5 100644
--- a/src/pages/academy/blog/posts/_style.js
+++ b/src/pages/academy/blog/posts/_style.js
@@ -1,6 +1,6 @@
 import styled, { css } from 'styled-components'
 import { Box, Flex, Container } from 'components/containers'
-import { LocalizedLinkText, Text } from 'components/elements'
+import { LocalizedLinkText, Header, Text } from 'components/elements'
 import device from 'themes/device'
 
 export const Background = styled.div`
@@ -51,6 +51,11 @@ export const BreadcrumbsWrapper = styled(Container)`
         flex-direction: column;
     }
 `
+export const ArticleTitle = styled(Header)`
+    @media ${device.desktopS} {
+        font-size: 48px;
+    }
+`
 export const HeroLeftWrapper = styled(Box)`
     max-width: 384px;
     margin-right: 24px;
diff --git a/src/pages/academy/blog/posts/preview/index.js b/src/pages/academy/blog/posts/preview/index.js
index 0a74f24547d..567ae561899 100644
--- a/src/pages/academy/blog/posts/preview/index.js
+++ b/src/pages/academy/blog/posts/preview/index.js
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import PropTypes from 'prop-types'
 import {
+    ArticleTitle,
     Background,
     HeroContainer,
     BreadcrumbsWrapper,
@@ -33,7 +34,6 @@ import ArticleEmailBanner from '../../../components/_side-subscription-banner'
 import { localize, WithIntl } from 'components/localization'
 import Layout from 'components/layout/layout'
 import { SEO, Show, Box, Flex, SectionContainer } from 'components/containers'
-import { Header } from 'components/elements'
 import { convertDate, isBrowser } from 'common/utility'
 import { cms_assets_end_point } from 'common/constants'
 import RightArrow from 'images/svg/black-right-arrow.svg'
@@ -134,9 +134,9 @@ const BlogPreview = () => {
                                         {post_data?.published_date &&
                                             convertDate(post_data?.published_date)}
                                     </InfoText>
-                                    <Header as="h1" type="page-title">
+                                    <ArticleTitle as="h1" type="page-title">
                                         {post_data?.blog_title}
-                                    </Header>
+                                    </ArticleTitle>
                                     <InfoText size="14px" mt="16px">
                                         {post_data?.read_time_in_minutes &&
                                             post_data?.read_time_in_minutes +
diff --git a/src/pages/academy/index.js b/src/pages/academy/index.js
index 5983521d6b8..4c04842531f 100644
--- a/src/pages/academy/index.js
+++ b/src/pages/academy/index.js
@@ -38,7 +38,7 @@ export const query = graphql`
             }
             market_news: blog(
                 filter: {
-                    tags: { tags_id: { tag_name: { _contains: "Market News" } } }
+                    tags: { tags_id: { tag_name: { _contains: "Market report" } } }
                     status: { _eq: "published" }
                 }
                 limit: 6
@@ -64,7 +64,7 @@ export const query = graphql`
             }
             market_news_eu: blog(
                 filter: {
-                    tags: { tags_id: { tag_name: { _contains: "Market News" } } }
+                    tags: { tags_id: { tag_name: { _contains: "Market report" } } }
                     status: { _eq: "published" }
                     hide_for_eu: { _eq: false }
                 }
diff --git a/src/templates/article.js b/src/templates/article.js
index c11641b4035..ad188f4c600 100644
--- a/src/templates/article.js
+++ b/src/templates/article.js
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react'
 import PropTypes from 'prop-types'
 import { graphql } from 'gatsby'
 import {
+    ArticleTitle,
     Background,
     HeroContainer,
     BreadcrumbsWrapper,
@@ -34,7 +35,7 @@ import SocialSharing from '../pages/academy/components/_social-sharing'
 import { localize, WithIntl } from 'components/localization'
 import Layout from 'components/layout/layout'
 import { SEO, Show, Box, Flex, SectionContainer } from 'components/containers'
-import { Header, QueryImage } from 'components/elements'
+import { QueryImage } from 'components/elements'
 import { convertDate } from 'common/utility'
 import RightArrow from 'images/svg/black-right-arrow.svg'
 
@@ -121,9 +122,9 @@ const ArticlesTemplate = (props) => {
                                         {post_data?.published_date &&
                                             convertDate(post_data?.published_date)}
                                     </InfoText>
-                                    <Header as="h1" type="page-title">
+                                    <ArticleTitle as="h1" type="page-title">
                                         {post_data?.blog_title}
-                                    </Header>
+                                    </ArticleTitle>
                                     <InfoText size="14px" mt="16px">
                                         {post_data?.read_time_in_minutes &&
                                             localize(post_data?.read_time_in_minutes + ' min read')}

From d399977c7d92da9bb867200264818311280f36d5 Mon Sep 17 00:00:00 2001
From: njazuli <78890281+njazuli-deriv@users.noreply.github.com>
Date: Tue, 21 Sep 2021 11:32:53 +0800
Subject: [PATCH 2/3] change weekly report tag to market report

---
 src/pages/academy/components/_markets-news.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/academy/components/_markets-news.js b/src/pages/academy/components/_markets-news.js
index eb862b0b7b8..efba5df8451 100644
--- a/src/pages/academy/components/_markets-news.js
+++ b/src/pages/academy/components/_markets-news.js
@@ -81,7 +81,7 @@ const MarketNews = ({ data }) => {
                                     <Flex ml="8px" fd="column">
                                         <Header type="paragraph-2" color="blue-9">
                                             {/* We'll stick to just weekly report for phase 1 */}
-                                            <StyledSpan>Weekly report</StyledSpan>
+                                            <StyledSpan>Market report</StyledSpan>
                                         </Header>
                                         <Header mt="8px" type="paragraph-1" weight="bold">
                                             {truncateString(data.blog_title, 38)}

From 9629c5e3e24be42d99b4ac9a1a08000165ae8a4c Mon Sep 17 00:00:00 2001
From: njazuli <78890281+njazuli-deriv@users.noreply.github.com>
Date: Tue, 21 Sep 2021 11:45:44 +0800
Subject: [PATCH 3/3] remove comments

---
 src/pages/academy/components/_markets-news.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/academy/components/_markets-news.js b/src/pages/academy/components/_markets-news.js
index efba5df8451..8cbee151d3f 100644
--- a/src/pages/academy/components/_markets-news.js
+++ b/src/pages/academy/components/_markets-news.js
@@ -80,7 +80,6 @@ const MarketNews = ({ data }) => {
                                     />
                                     <Flex ml="8px" fd="column">
                                         <Header type="paragraph-2" color="blue-9">
-                                            {/* We'll stick to just weekly report for phase 1 */}
                                             <StyledSpan>Market report</StyledSpan>
                                         </Header>
                                         <Header mt="8px" type="paragraph-1" weight="bold">