LaconicNetwork/vega-frontend-monorepo
3
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix(orders): cancel all and pegged orders amendable (#3843)

Browse Source
This commit is contained in:
m.ray 2023-05-19 17:55:08 +03:00 committed by GitHub
parent 0db5d0ce87
commit fd338c7400
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/trading-e2e/src/integration/trading-orders.cy.ts
View File

@ -482,7 +482,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
testOrderCancellation(order);
});
});
it('must be able to cancel all orders on a market', () => {
it('must be able to cancel all orders on all markets', () => {
// 7003-MORD-009
// 7003-MORD-010
// 7003-MORD-011
@ -496,9 +496,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
.should('have.text', 'Cancel all')
.then(($btn) => {
cy.wrap($btn).click({ force: true });
const order: OrderCancellation = {
marketId: 'market-0',
};
const order: OrderCancellation = {};
testOrderCancellation(order);
});
});

6
libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx
View File

@ -133,11 +133,9 @@ export const OrderListManager = ({
const cancelAll = useCallback(() => {
create({
orderCancellation: {
marketId,
},
orderCancellation: {},
});
}, [create, marketId]);
}, [create]);
return (
<>

4
libs/orders/src/lib/components/order-list/order-list.spec.tsx
View File

@ -226,8 +226,8 @@ describe('OrderListTable', () => {
const amendCell = getAmendCell();
const typeCell = screen.getAllByRole('gridcell')[2];
expect(typeCell).toHaveTextContent('Mid - 10.0 Peg limit');
expect(amendCell.queryByTestId('edit')).not.toBeInTheDocument();
expect(amendCell.queryByTestId('cancel')).not.toBeInTheDocument();
expect(amendCell.queryByTestId('edit')).toBeInTheDocument();
expect(amendCell.queryByTestId('cancel')).toBeInTheDocument();
});
it.each([

2
libs/orders/src/lib/components/order-list/order-list.tsx
View File

@ -329,7 +329,7 @@ export const isOrderActive = (status: Schema.OrderStatus) => {
};
export const isOrderAmendable = (order: Order | undefined) => {
if (!order || order.peggedOrder || order.liquidityProvision) {
if (!order || order.liquidityProvision) {
return false;
}