Skip to content

Commit

Permalink
refactor: remove some tradr params for multipliers and accumulators
Browse files Browse the repository at this point in the history
  • Loading branch information
kate-deriv committed Jul 26, 2024
1 parent a1b3680 commit f0686ed
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 147 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -31,14 +29,8 @@ jest.mock('../Stake', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PA
jest.mock('../Barrier', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.BARRIER}</div>));
jest.mock('../GrowthRate', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.GROWTH_RATE}</div>));
jest.mock('../TakeProfit', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.TAKE_PROFIT}</div>));
jest.mock('../AccumulatorsInformation', () =>
jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.ACCUMULATORS_INFORMATION}</div>)
);
jest.mock('../Multiplier', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.MULTIPLIER}</div>));
jest.mock('../RiskManagement', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.RISK_MANAGEMENT}</div>));
jest.mock('../MultipliersInformation', () =>
jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.MULTIPLIERS_INFORMATION}</div>)
);
jest.mock('../TradeTypeTabs', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.TRADE_TYPE_TABS}</div>));
jest.mock('../Strike', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.STRIKE}</div>));
jest.mock('../PayoutPerPoint', () => jest.fn(() => <div data-testid={data_test}>{TRADE_PARAMS.PAYOUT_PER_POINT}</div>));
Expand Down Expand Up @@ -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', () => {
Expand Down Expand Up @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -48,8 +46,6 @@ const TradeParameters = observer(({ is_minimized }: TTradeParametersProps) => {
{isVisible('take_profit') && <TakeProfit is_minimized={is_minimized} />}
{isVisible('risk_management') && <RiskManagement is_minimized={is_minimized} />}
{/* {isVisible('expiration') && <MultipliersExpirationInfo />} */}
{isVisible('accu_info_display') && <AccumulatorsInformation is_minimized={is_minimized} />}
{isVisible('mult_info_display') && <MultipliersInformation is_minimized={is_minimized} />}
</div>
);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"', () => {
Expand All @@ -21,7 +16,6 @@ describe('getTradeParams', () => {
'stake',
'risk_management',
'expiration',
'mult_info_display',
]);
});
});
Expand Down
3 changes: 1 addition & 2 deletions packages/trader/src/AppV2/Utils/trade-params-utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down

0 comments on commit f0686ed

Please sign in to comment.