From f0686ed235a63634297aef0d0d2a86c530a22079 Mon Sep 17 00:00:00 2001 From: kate-deriv Date: Fri, 26 Jul 2024 09:59:42 +0300 Subject: [PATCH] refactor: remove some tradr params for multipliers and accumulators --- .../accumulators-information.scss | 14 ------ .../accumulators-information.tsx | 43 ------------------- .../AccumulatorsInformation/index.ts | 4 -- .../MultipliersInformation/index.ts | 4 -- .../multipliers-information.scss | 14 ------ .../multipliers-information.tsx | 43 ------------------- .../__tests__/trade-parameters.spec.tsx | 14 +----- .../TradeParameters/trade-parameters.tsx | 4 -- .../__tests__/trade-param-utils.spec.tsx | 8 +--- .../src/AppV2/Utils/trade-params-utils.tsx | 3 +- 10 files changed, 4 insertions(+), 147 deletions(-) delete mode 100644 packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/accumulators-information.scss delete mode 100644 packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/accumulators-information.tsx delete mode 100644 packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/index.ts delete mode 100644 packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/index.ts delete mode 100644 packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/multipliers-information.scss delete mode 100644 packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/multipliers-information.tsx diff --git a/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/accumulators-information.scss b/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/accumulators-information.scss deleted file mode 100644 index ab04ec211a56..000000000000 --- a/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/accumulators-information.scss +++ /dev/null @@ -1,14 +0,0 @@ -.accumulators-info { - &__wrapper { - width: 100%; - } - &__row { - display: flex; - justify-content: space-between; - align-items: center; - padding-block: var(--component-badge-notification-spacing-padding-sm); - } - &__title { - border-bottom: var(--core-borderWidth-75) dotted var(--component-textIcon-normal-default); - } -} diff --git a/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/accumulators-information.tsx b/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/accumulators-information.tsx deleted file mode 100644 index 271d00c30a47..000000000000 --- a/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/accumulators-information.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -import { observer } from 'mobx-react'; -import { Localize, localize } from '@deriv/translations'; -import { Money } from '@deriv/components'; -import { Text } from '@deriv-com/quill-ui'; -import { useTraderStore } from 'Stores/useTraderStores'; - -type TAccumulatorsInformationProps = { - is_minimized?: boolean; -}; - -const AccumulatorsInformation = observer(({ is_minimized }: TAccumulatorsInformationProps) => { - const { currency, maximum_payout, maximum_ticks } = useTraderStore(); - const content = [ - { - label: , - value: , - }, - { - label: , - value: `${maximum_ticks || 0} ${maximum_ticks === 1 ? localize('tick') : localize('ticks')}`, - }, - ]; - - if (is_minimized) return null; - - return ( -
- {content.map(({ label, value }) => ( -
- - {label} - - - {value} - -
- ))} -
- ); -}); - -export default AccumulatorsInformation; diff --git a/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/index.ts b/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/index.ts deleted file mode 100644 index e5851aa3fbb7..000000000000 --- a/packages/trader/src/AppV2/Components/TradeParameters/AccumulatorsInformation/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import AccumulatorsInformation from './accumulators-information'; -import './accumulators-information.scss'; - -export default AccumulatorsInformation; diff --git a/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/index.ts b/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/index.ts deleted file mode 100644 index 78a235c0f249..000000000000 --- a/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import MultipliersInformation from './multipliers-information'; -import './multipliers-information.scss'; - -export default MultipliersInformation; diff --git a/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/multipliers-information.scss b/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/multipliers-information.scss deleted file mode 100644 index 011683551a4f..000000000000 --- a/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/multipliers-information.scss +++ /dev/null @@ -1,14 +0,0 @@ -.multipliers-info { - &__wrapper { - width: 100%; - } - &__row { - display: flex; - justify-content: space-between; - align-items: center; - padding-block: var(--component-badge-notification-spacing-padding-sm); - } - &__title { - border-bottom: var(--core-borderWidth-75) dotted var(--component-textIcon-normal-default); - } -} diff --git a/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/multipliers-information.tsx b/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/multipliers-information.tsx deleted file mode 100644 index e283dcdee727..000000000000 --- a/packages/trader/src/AppV2/Components/TradeParameters/MultipliersInformation/multipliers-information.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -import { observer } from 'mobx-react'; -import { Localize } from '@deriv/translations'; -import { Money } from '@deriv/components'; -import { Text } from '@deriv-com/quill-ui'; -import { useTraderStore } from 'Stores/useTraderStores'; - -type TMultipliersInformationProps = { - is_minimized?: boolean; -}; - -const MultipliersInformation = observer(({ is_minimized }: TMultipliersInformationProps) => { - const { currency, commission, stop_out } = useTraderStore(); - const content = [ - { - label: , - value: commission, - }, - { - label: , - value: stop_out, - }, - ]; - - if (is_minimized) return null; - - return ( -
- {content.map(({ label, value }) => ( -
- - {label} - - - - -
- ))} -
- ); -}); - -export default MultipliersInformation; diff --git a/packages/trader/src/AppV2/Components/TradeParameters/__tests__/trade-parameters.spec.tsx b/packages/trader/src/AppV2/Components/TradeParameters/__tests__/trade-parameters.spec.tsx index 8419f6b1f2a6..228377937df5 100644 --- a/packages/trader/src/AppV2/Components/TradeParameters/__tests__/trade-parameters.spec.tsx +++ b/packages/trader/src/AppV2/Components/TradeParameters/__tests__/trade-parameters.spec.tsx @@ -14,10 +14,8 @@ const TRADE_PARAMS = { BARRIER: 'Barrier', GROWTH_RATE: 'GrowthRate', TAKE_PROFIT: 'TakeProfit', - ACCUMULATORS_INFORMATION: 'AccumulatorsInformation', MULTIPLIER: 'Multiplier', RISK_MANAGEMENT: 'RiskManagement', - MULTIPLIERS_INFORMATION: 'MultipliersInformation', TRADE_TYPE_TABS: 'TradeTypeTabs', STRIKE: 'Strike', PAYOUT_PER_POINT: 'PayoutPerPoint', @@ -31,14 +29,8 @@ jest.mock('../Stake', () => jest.fn(() =>
{TRADE_PA jest.mock('../Barrier', () => jest.fn(() =>
{TRADE_PARAMS.BARRIER}
)); jest.mock('../GrowthRate', () => jest.fn(() =>
{TRADE_PARAMS.GROWTH_RATE}
)); jest.mock('../TakeProfit', () => jest.fn(() =>
{TRADE_PARAMS.TAKE_PROFIT}
)); -jest.mock('../AccumulatorsInformation', () => - jest.fn(() =>
{TRADE_PARAMS.ACCUMULATORS_INFORMATION}
) -); jest.mock('../Multiplier', () => jest.fn(() =>
{TRADE_PARAMS.MULTIPLIER}
)); jest.mock('../RiskManagement', () => jest.fn(() =>
{TRADE_PARAMS.RISK_MANAGEMENT}
)); -jest.mock('../MultipliersInformation', () => - jest.fn(() =>
{TRADE_PARAMS.MULTIPLIERS_INFORMATION}
) -); jest.mock('../TradeTypeTabs', () => jest.fn(() =>
{TRADE_PARAMS.TRADE_TYPE_TABS}
)); jest.mock('../Strike', () => jest.fn(() =>
{TRADE_PARAMS.STRIKE}
)); jest.mock('../PayoutPerPoint', () => jest.fn(() =>
{TRADE_PARAMS.PAYOUT_PER_POINT}
)); @@ -72,8 +64,7 @@ describe('TradeParameters', () => { expect(screen.getByText(TRADE_PARAMS.GROWTH_RATE)).toBeInTheDocument(); expect(screen.getByText(TRADE_PARAMS.STAKE)).toBeInTheDocument(); expect(screen.getByText(TRADE_PARAMS.TAKE_PROFIT)).toBeInTheDocument(); - expect(screen.getByText(TRADE_PARAMS.ACCUMULATORS_INFORMATION)).toBeInTheDocument(); - expect(screen.getAllByTestId(data_test)).toHaveLength(4); + expect(screen.getAllByTestId(data_test)).toHaveLength(3); }); it('should render correct trade params for Vanillas', () => { @@ -106,8 +97,7 @@ describe('TradeParameters', () => { expect(screen.getByText(TRADE_PARAMS.MULTIPLIER)).toBeInTheDocument(); expect(screen.getByText(TRADE_PARAMS.STAKE)).toBeInTheDocument(); expect(screen.getByText(TRADE_PARAMS.RISK_MANAGEMENT)).toBeInTheDocument(); - expect(screen.getByText(TRADE_PARAMS.MULTIPLIERS_INFORMATION)).toBeInTheDocument(); - expect(screen.getAllByTestId(data_test)).toHaveLength(4); + expect(screen.getAllByTestId(data_test)).toHaveLength(3); }); it('should render correct trade params for Rise/Fall', () => { diff --git a/packages/trader/src/AppV2/Components/TradeParameters/trade-parameters.tsx b/packages/trader/src/AppV2/Components/TradeParameters/trade-parameters.tsx index bab8ae4fedda..72915a80f723 100644 --- a/packages/trader/src/AppV2/Components/TradeParameters/trade-parameters.tsx +++ b/packages/trader/src/AppV2/Components/TradeParameters/trade-parameters.tsx @@ -9,10 +9,8 @@ import Stake from './Stake'; import Barrier from './Barrier'; import GrowthRate from './GrowthRate'; import TakeProfit from './TakeProfit'; -import AccumulatorsInformation from './AccumulatorsInformation'; import Multiplier from './Multiplier'; import RiskManagement from './RiskManagement'; -import MultipliersInformation from './MultipliersInformation'; import TradeTypeTabs from './TradeTypeTabs'; import Strike from './Strike'; import PayoutPerPoint from './PayoutPerPoint'; @@ -48,8 +46,6 @@ const TradeParameters = observer(({ is_minimized }: TTradeParametersProps) => { {isVisible('take_profit') && } {isVisible('risk_management') && } {/* {isVisible('expiration') && } */} - {isVisible('accu_info_display') && } - {isVisible('mult_info_display') && }
); }); diff --git a/packages/trader/src/AppV2/Utils/__tests__/trade-param-utils.spec.tsx b/packages/trader/src/AppV2/Utils/__tests__/trade-param-utils.spec.tsx index 3c22d1ab9b88..c9acc0268846 100644 --- a/packages/trader/src/AppV2/Utils/__tests__/trade-param-utils.spec.tsx +++ b/packages/trader/src/AppV2/Utils/__tests__/trade-param-utils.spec.tsx @@ -7,12 +7,7 @@ describe('getTradeParams', () => { }); it('should return correct array with keys for Multipliers if symbol does not start with "cry"', () => { - expect(getTradeParams()[TRADE_TYPES.MULTIPLIER]).toEqual([ - 'multiplier', - 'stake', - 'risk_management', - 'mult_info_display', - ]); + expect(getTradeParams()[TRADE_TYPES.MULTIPLIER]).toEqual(['multiplier', 'stake', 'risk_management']); }); it('should return correct array with keys for Multipliers if symbol starts with "cry"', () => { @@ -21,7 +16,6 @@ describe('getTradeParams', () => { 'stake', 'risk_management', 'expiration', - 'mult_info_display', ]); }); }); diff --git a/packages/trader/src/AppV2/Utils/trade-params-utils.tsx b/packages/trader/src/AppV2/Utils/trade-params-utils.tsx index 4cfc33bc6f0b..1b8b424949d3 100644 --- a/packages/trader/src/AppV2/Utils/trade-params-utils.tsx +++ b/packages/trader/src/AppV2/Utils/trade-params-utils.tsx @@ -8,13 +8,12 @@ export const getTradeParams = (symbol?: string) => ({ [TRADE_TYPES.MATCH_DIFF]: ['last_digit', 'duration', 'stake'], [TRADE_TYPES.EVEN_ODD]: ['duration', 'stake'], [TRADE_TYPES.OVER_UNDER]: ['last_digit', 'duration', 'stake'], - [TRADE_TYPES.ACCUMULATOR]: ['growth_rate', 'stake', 'take_profit', 'accu_info_display'], + [TRADE_TYPES.ACCUMULATOR]: ['growth_rate', 'stake', 'take_profit'], [TRADE_TYPES.MULTIPLIER]: [ 'multiplier', 'stake', 'risk_management', ...(shouldShowExpiration(symbol) ? ['expiration'] : []), - 'mult_info_display', ], [TRADE_TYPES.TURBOS.LONG]: ['trade_type_tabs', 'duration', 'payout_per_point', 'stake', 'take_profit'], [TRADE_TYPES.TURBOS.SHORT]: ['trade_type_tabs', 'duration', 'payout_per_point', 'stake', 'take_profit'],