From 4f0b8cf673ee7d6debc43aa0721ea13abd9568b5 Mon Sep 17 00:00:00 2001
From: Akmal Djumakhodjaev <akmal@binary.com>
Date: Mon, 6 Mar 2023 15:22:29 +0800
Subject: [PATCH 1/2] feat: remove unnecessary API calls while loading chart

---
 .../core/src/Stores/contract-replay-store.js  |  1 -
 .../ContractDrawer/contract-drawer-card.jsx   |  4 +--
 .../market-closed-contract-overlay.jsx        | 32 ++++---------------
 .../Contract/Containers/contract-replay.jsx   |  2 +-
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/packages/core/src/Stores/contract-replay-store.js b/packages/core/src/Stores/contract-replay-store.js
index cda5072fc45c..4731f359054b 100644
--- a/packages/core/src/Stores/contract-replay-store.js
+++ b/packages/core/src/Stores/contract-replay-store.js
@@ -102,7 +102,6 @@ export default class ContractReplayStore extends BaseStore {
             this.contract_id = contract_id;
             this.contract_store = new ContractStore(this.root_store, { contract_id });
             this.subscribeProposalOpenContract();
-            WS.storage.activeSymbols('brief');
             WS.setOnReconnect(() => {
                 if (!this.root_store.client.is_switching) {
                     this.subscribeProposalOpenContract();
diff --git a/packages/trader/src/App/Components/Elements/ContractDrawer/contract-drawer-card.jsx b/packages/trader/src/App/Components/Elements/ContractDrawer/contract-drawer-card.jsx
index d45519dd7ba2..78380de9174f 100644
--- a/packages/trader/src/App/Components/Elements/ContractDrawer/contract-drawer-card.jsx
+++ b/packages/trader/src/App/Components/Elements/ContractDrawer/contract-drawer-card.jsx
@@ -38,7 +38,7 @@ const ContractDrawerCard = ({
 }) => {
     const [hover_ref, should_hide_closed_overlay] = useHover();
 
-    const { profit, underlying: symbol } = contract_info;
+    const { profit, validation_error } = contract_info;
     const is_sold = !!getEndTime(contract_info);
     const display_name = getSymbolDisplayName(active_symbols, getMarketInformation(contract_info.shortcode).underlying);
 
@@ -124,7 +124,7 @@ const ContractDrawerCard = ({
                             'contract-card__market-closed--hidden': isDesktop() && should_hide_closed_overlay,
                         })}
                     >
-                        <MarketClosedContractOverlay symbol={symbol} />
+                        <MarketClosedContractOverlay validation_error={validation_error} />
                     </div>
                 )}
                 {contract_el}
diff --git a/packages/trader/src/App/Components/Elements/ContractDrawer/market-closed-contract-overlay.jsx b/packages/trader/src/App/Components/Elements/ContractDrawer/market-closed-contract-overlay.jsx
index 19a778aa189a..3770b874e454 100644
--- a/packages/trader/src/App/Components/Elements/ContractDrawer/market-closed-contract-overlay.jsx
+++ b/packages/trader/src/App/Components/Elements/ContractDrawer/market-closed-contract-overlay.jsx
@@ -2,32 +2,14 @@ import classNames from 'classnames';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Text } from '@deriv/components';
-import { Localize } from '@deriv/translations';
-// eslint-disable-next-line import/no-useless-path-segments
-import MarketCountdownTimer from '../market-countdown-timer.jsx';
 
-const MarketClosedContractOverlay = ({ symbol }) => {
-    const [is_timer_loading, setIsTimerLoading] = React.useState(true);
-
-    return (
-        <div
-            className={classNames('contract-card__market-closed', {
-                'contract-card__market-closed--loading': is_timer_loading,
-            })}
-        >
-            <Text
-                align='center'
-                as='p'
-                className='contract-card__market-closed__title'
-                styles={{ color: 'var(--brand-orange)' }}
-                weight='bold'
-            >
-                <Localize i18n_default_text='Market is closed' />
-            </Text>
-            <MarketCountdownTimer setIsTimerLoading={setIsTimerLoading} symbol={symbol} />
-        </div>
-    );
-};
+const MarketClosedContractOverlay = ({ validation_error }) => (
+    <div className={classNames('contract-card__market-closed', {})}>
+        <Text align='center' as='p' className='contract-card__market-closed__title' weight='bold'>
+            {validation_error}
+        </Text>
+    </div>
+);
 
 MarketClosedContractOverlay.propTypes = {
     symbol: PropTypes.string,
diff --git a/packages/trader/src/Modules/Contract/Containers/contract-replay.jsx b/packages/trader/src/Modules/Contract/Containers/contract-replay.jsx
index 27d0dd047f00..d4e74ccee9f4 100644
--- a/packages/trader/src/Modules/Contract/Containers/contract-replay.jsx
+++ b/packages/trader/src/Modules/Contract/Containers/contract-replay.jsx
@@ -260,7 +260,7 @@ const Chart = props => {
             topWidgets={ChartTopWidgets}
             isConnectionOpened={props.is_socket_opened}
             isStaticChart={false}
-            shouldFetchTradingTimes={!props.end_epoch}
+            shouldFetchTradingTimes={false}
             yAxisMargin={getChartYAxisMargin()}
             anchorChartToLeft={isMobile()}
             shouldFetchTickHistory={getDurationUnitText(getDurationPeriod(props.contract_info)) !== 'seconds'}

From 8185c04e20eff2bb8fe4f3776c9a17390800f4e9 Mon Sep 17 00:00:00 2001
From: Akmal Djumakhodjaev <akmal@binary.com>
Date: Mon, 20 Mar 2023 14:07:04 +0800
Subject: [PATCH 2/2] chore: remove classnames

---
 .../Elements/ContractDrawer/market-closed-contract-overlay.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/trader/src/App/Components/Elements/ContractDrawer/market-closed-contract-overlay.jsx b/packages/trader/src/App/Components/Elements/ContractDrawer/market-closed-contract-overlay.jsx
index 3770b874e454..8d3d47aeb479 100644
--- a/packages/trader/src/App/Components/Elements/ContractDrawer/market-closed-contract-overlay.jsx
+++ b/packages/trader/src/App/Components/Elements/ContractDrawer/market-closed-contract-overlay.jsx
@@ -1,10 +1,9 @@
-import classNames from 'classnames';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Text } from '@deriv/components';
 
 const MarketClosedContractOverlay = ({ validation_error }) => (
-    <div className={classNames('contract-card__market-closed', {})}>
+    <div className='contract-card__market-closed'>
         <Text align='center' as='p' className='contract-card__market-closed__title' weight='bold'>
             {validation_error}
         </Text>