Merge pull request #580 from reportportal/hotfix/update-pricing-text-…

…in-header

Sync develop with master

src/components/Layout/Layout.tsx

@@ -1,12 +1,9 @@
 import React, { FC, ReactElement, useCallback, useRef } from 'react';
-import { useLocation } from '@reach/router';
 import Snowfall, { SnowfallProps } from 'react-snowfall';
 import { StyleProvider } from '@ant-design/cssinjs';
 import { useAtom } from 'jotai';
-import { AnimatePresence } from 'framer-motion';
 import classNames from 'classnames';
-import { announcementOpenAtom, isNewYearMode, watchProductOverviewAtom } from '@app/utils';
-import { AnnouncementBar } from '@app/components/AnnouncementBar';
+import { isNewYearMode, watchProductOverviewAtom } from '@app/utils';
 
 // eslint-disable-next-line import/no-unresolved
 import '../../../static/antd.min.css'; // Will be generated at build time
@@ -31,12 +28,9 @@ interface LayoutProps {
 }
 
 export const Layout: FC<LayoutProps> = ({ children, className }) => {
-  const location = useLocation();
   const [watchProductOverviewState, setWatchProductOverviewState] =
     useAtom(watchProductOverviewAtom);
-  const [isAnnouncementBarOpen] = useAtom(announcementOpenAtom);
   const announcementBarRef = useRef<HTMLDivElement>(null);
-  const isIndexPage = location.pathname === '/';
 
   const toggleEmbedVideoOpen = useCallback(
     () => setWatchProductOverviewState(({ isOpen }) => ({ isOpen: !isOpen })),
@@ -46,13 +40,6 @@ export const Layout: FC<LayoutProps> = ({ children, className }) => {
   return (
     <StyleProvider hashPriority="high">
       <div className={classNames(className, { 'new-year-mode': isNewYearMode })}>
-        <AnimatePresence>
-          {isAnnouncementBarOpen && isIndexPage && (
-            <div ref={announcementBarRef}>
-              <AnnouncementBar />
-            </div>
-          )}
-        </AnimatePresence>
         <Navigation announcementBarRef={announcementBarRef} />
         <main>{children}</main>
         <Footer />

src/components/Layout/Navigation/Navigation.tsx

@@ -28,18 +28,26 @@ import {
   CrossIcon,
   ArrowIconMobile,
 } from './icons';
-import { MENU_INITIAL_STATE, MENU_ORDER } from './constants';
+import {
+  MENU_INITIAL_STATE,
+  MENU_ORDER,
+  OFFERINGS,
+  LEARN,
+  COMMUNITY,
+  PRODUCT,
+  SOLUTIONS,
+} from './constants';
 
 import './Navigation.scss';
 
 const { Panel } = Collapse;
 
 const menuItems = {
-  product: { Component: ProductMenu },
-  solutions: { Component: SolutionsMenu },
-  offerings: { Component: OfferingsMenu },
-  learn: { Component: LearnMenu },
-  community: { Component: CommunityMenu },
+  [PRODUCT]: { Component: ProductMenu },
+  [SOLUTIONS]: { Component: SolutionsMenu },
+  [OFFERINGS]: { Component: OfferingsMenu },
+  [LEARN]: { Component: LearnMenu },
+  [COMMUNITY]: { Component: CommunityMenu },
 };
 
 const getBlocksWith = createBemBlockBuilder(['top-header']);

src/components/Layout/Navigation/constants.ts

@@ -1,9 +1,15 @@
+export const PRODUCT = 'product';
+export const SOLUTIONS = 'solutions';
+export const OFFERINGS = 'pricing';
+export const LEARN = 'learn';
+export const COMMUNITY = 'community';
+
 export const MENU_INITIAL_STATE = {
-  product: false,
-  solutions: false,
-  offerings: false,
-  learn: false,
-  community: false,
+  [PRODUCT]: false,
+  [SOLUTIONS]: false,
+  [OFFERINGS]: false,
+  [LEARN]: false,
+  [COMMUNITY]: false,
 };
 
 export interface MenuProps {
@@ -12,4 +18,4 @@ export interface MenuProps {
   isDesktop?: boolean;
 }
 
-export const MENU_ORDER = ['product', 'solutions', 'offerings', 'learn', 'community'];
+export const MENU_ORDER = [PRODUCT, SOLUTIONS, OFFERINGS, LEARN, COMMUNITY];

src/containers/BlogPostPage/constants.tsx

@@ -7,7 +7,7 @@ import { CopyToClipboardButton } from '@app/components/CopyToClipboardButton';
 
 export const OPTIONS = {
   renderMark: {
-    [MARKS.BOLD]: text => <b className="blog-post-page__bold-text">{text}</b>,
+    [MARKS.BOLD]: text => <strong className="blog-post-page__bold-text">{text}</strong>,
     [MARKS.CODE]: text => (
       <pre>
         <code>{text}</code>