* feat: #876 add explicit time in force labels * fix: update GTC and GTT * fix: update GTC and GTT * fix: deal ticket test update
This commit is contained in:
parent
e275460c76
commit
b9db97c276
@ -7,8 +7,8 @@ import { addDecimal } from '@vegaprotocol/react-helpers';
|
|||||||
import { fireEvent, render, screen, act } from '@testing-library/react';
|
import { fireEvent, render, screen, act } from '@testing-library/react';
|
||||||
import { DealTicket } from './deal-ticket';
|
import { DealTicket } from './deal-ticket';
|
||||||
import type { DealTicketQuery_market } from './__generated__/DealTicketQuery';
|
import type { DealTicketQuery_market } from './__generated__/DealTicketQuery';
|
||||||
import type { Order } from '../utils/get-default-order';
|
|
||||||
import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
|
import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
|
||||||
|
import type { Order } from '@vegaprotocol/orders';
|
||||||
|
|
||||||
const market: DealTicketQuery_market = {
|
const market: DealTicketQuery_market = {
|
||||||
__typename: 'Market',
|
__typename: 'Market',
|
||||||
@ -59,6 +59,7 @@ function generateJsx(order?: Order) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
describe('DealTicket', () => {
|
||||||
it('Displays ticket defaults', () => {
|
it('Displays ticket defaults', () => {
|
||||||
render(generateJsx());
|
render(generateJsx());
|
||||||
|
|
||||||
@ -129,7 +130,7 @@ it('Handles TIF select box dependent on order type', () => {
|
|||||||
Array.from(screen.getByTestId('order-tif').children).map(
|
Array.from(screen.getByTestId('order-tif').children).map(
|
||||||
(o) => o.textContent
|
(o) => o.textContent
|
||||||
)
|
)
|
||||||
).toEqual(['IOC', 'FOK']);
|
).toEqual(['Immediate or Cancel (IOC)', 'Fill or Kill (FOK)']);
|
||||||
|
|
||||||
// Switch to limit order and check all TIF options shown
|
// Switch to limit order and check all TIF options shown
|
||||||
fireEvent.click(screen.getByTestId('order-type-TYPE_LIMIT'));
|
fireEvent.click(screen.getByTestId('order-type-TYPE_LIMIT'));
|
||||||
@ -165,3 +166,4 @@ it('Handles TIF select box dependent on order type', () => {
|
|||||||
VegaWalletOrderTimeInForce.FOK
|
VegaWalletOrderTimeInForce.FOK
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
@ -11,6 +11,26 @@ interface TimeInForceSelectorProps {
|
|||||||
onSelect: (tif: VegaWalletOrderTimeInForce) => void;
|
onSelect: (tif: VegaWalletOrderTimeInForce) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// More detail in https://docs.vega.xyz/docs/mainnet/graphql/enums/order-time-in-force
|
||||||
|
export const timeInForceLabel = (tif: string) => {
|
||||||
|
switch (tif) {
|
||||||
|
case VegaWalletOrderTimeInForce.GTC:
|
||||||
|
return t(`Good 'til Cancelled`);
|
||||||
|
case VegaWalletOrderTimeInForce.IOC:
|
||||||
|
return t('Immediate or Cancel');
|
||||||
|
case VegaWalletOrderTimeInForce.FOK:
|
||||||
|
return t('Fill or Kill');
|
||||||
|
case VegaWalletOrderTimeInForce.GTT:
|
||||||
|
return t(`Good 'til Time`);
|
||||||
|
case VegaWalletOrderTimeInForce.GFN:
|
||||||
|
return t('Good for Normal');
|
||||||
|
case VegaWalletOrderTimeInForce.GFA:
|
||||||
|
return t('Good for Auction');
|
||||||
|
default:
|
||||||
|
return t(tif);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
export const TimeInForceSelector = ({
|
export const TimeInForceSelector = ({
|
||||||
value,
|
value,
|
||||||
orderType,
|
orderType,
|
||||||
@ -37,7 +57,7 @@ export const TimeInForceSelector = ({
|
|||||||
{options.map(([key, value]) => {
|
{options.map(([key, value]) => {
|
||||||
return (
|
return (
|
||||||
<option key={key} value={value}>
|
<option key={key} value={value}>
|
||||||
{key}
|
{`${timeInForceLabel(value)} (${key})`}
|
||||||
</option>
|
</option>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
Loading…
Reference in New Issue
Block a user