Skip to content

Commit e7c12ed

Browse files
Revert "Revert "Akmal / feat: update entry spot description (#13854)" (#13865)" (#14415)
This reverts commit c63115e.
1 parent 5273ee0 commit e7c12ed

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

packages/trader/src/Modules/Trading/Components/Form/ContractType/ContractTypeInfo/contract-type-glossary.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ import { Localize } from '@deriv/translations';
66
const ContractTypeGlossary = ({
77
category,
88
is_vanilla_fx = false,
9-
is_major_pairs = false,
109
is_multiplier_fx = false,
1110
}: {
1211
category: string;
1312
is_vanilla_fx?: boolean;
14-
is_major_pairs?: boolean;
1513
is_multiplier_fx?: boolean;
1614
}) => {
1715
let content;
@@ -235,10 +233,8 @@ const ContractTypeGlossary = ({
235233
{ type: 'heading', text: <Localize i18n_default_text='Entry spot' /> },
236234
{
237235
type: 'paragraph',
238-
text: is_major_pairs ? (
239-
<Localize i18n_default_text='We use next-tick-execution mechanism, which is the next asset price when the trade opening is processed by our servers for Major Pairs.' />
240-
) : (
241-
<Localize i18n_default_text='We use current-tick-execution mechanism, which is the latest asset price when the trade opening is processed by our servers for Volatility Index, Basket Indices, Jump Indices and Crash/Boom Indices.' />
236+
text: (
237+
<Localize i18n_default_text='We use next-tick-execution mechanism, which is the next asset price when the trade opening is processed by our servers.' />
242238
),
243239
},
244240
{ type: 'heading', text: <Localize i18n_default_text='Exit spot' /> },

packages/trader/src/Modules/Trading/Components/Form/ContractType/ContractTypeInfo/contract-type-info.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { localize } from '@deriv/translations';
66
import { Analytics } from '@deriv-com/analytics';
77
import TradeCategories from 'Assets/Trading/Categories/trade-categories';
88
import TradeCategoriesGIF from 'Assets/Trading/Categories/trade-categories-gif';
9-
import { getContractTypes, isMajorPairsSymbol } from '../../../../Helpers/contract-type';
9+
import { getContractTypes } from '../../../../Helpers/contract-type';
1010
import ContractTypeGlossary from './contract-type-glossary';
1111
import classNames from 'classnames';
1212
import { useTraderStore } from 'Stores/useTraderStores';
@@ -31,9 +31,8 @@ const TABS = {
3131
type TSelectedTab = 'description' | 'glossary';
3232

3333
const Info = observer(({ handleSelect, item, selected_value, list, info_banner }: TInfo) => {
34-
const { cached_multiplier_cancellation_list, symbol } = useTraderStore();
34+
const { cached_multiplier_cancellation_list } = useTraderStore();
3535
const {
36-
active_symbols: { active_symbols },
3736
ui: { is_mobile },
3837
modules: {
3938
trade: { is_vanilla_fx },
@@ -131,7 +130,6 @@ const Info = observer(({ handleSelect, item, selected_value, list, info_banner }
131130
category={type.value}
132131
is_vanilla_fx={is_vanilla_fx}
133132
is_multiplier_fx={!cached_multiplier_cancellation_list?.length}
134-
is_major_pairs={isMajorPairsSymbol(symbol, active_symbols)}
135133
/>
136134
)}
137135
</div>

packages/trader/src/Modules/Trading/Components/Form/ContractType/__tests__/contract-type-glossary.spec.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,8 @@ describe('<ContractTypeGlossary />', () => {
3838
expect(screen.getByText(deal_cancellation)).toBeInTheDocument();
3939
expect(screen.getByText(stop_out)).toBeInTheDocument();
4040
});
41-
it('Ensure TRADE_TYPES.MULTIPLIER glossary is rendered properly if it is multiplier_fx', () => {
42-
render(<ContractTypeGlossary category={TRADE_TYPES.MULTIPLIER} is_multiplier_fx />);
43-
44-
expect(screen.queryByText(deal_cancellation)).not.toBeInTheDocument();
45-
expect(screen.getByText(/current-tick-execution/i)).toBeInTheDocument();
46-
expect(screen.queryByText(/next-tick-execution/i)).not.toBeInTheDocument();
47-
expect(screen.getByText(stop_out)).toBeInTheDocument();
48-
});
4941
it('Ensure TRADE_TYPES.MULTIPLIER glossary is rendered properly if it is major pairs symbol and multiplier_fx', () => {
50-
render(<ContractTypeGlossary category={TRADE_TYPES.MULTIPLIER} is_multiplier_fx is_major_pairs />);
42+
render(<ContractTypeGlossary category={TRADE_TYPES.MULTIPLIER} is_multiplier_fx />);
5143

5244
expect(screen.queryByText(deal_cancellation)).not.toBeInTheDocument();
5345
expect(screen.queryByText(/current-tick-execution/i)).not.toBeInTheDocument();

0 commit comments

Comments
 (0)