Skip to content

Commit 2e2e497

Browse files
authored
Merge pull request #1806 from gmx-io/hotfix-auto-cancel-tradebox-tpsl
Hotfix auto cancel tradebox tpsl
2 parents 1e23f00 + a92f9cf commit 2e2e497

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/context/SyntheticsStateContext/selectors/globalSelectors.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,5 @@ export const selectSubaccountForAction = createSelector((q) => {
118118
});
119119

120120
export const selectOracleSettings = (s: SyntheticsState) => s.globals.oracleSettings;
121+
122+
export const selectIsAutoCancelTPSLEnabled = (s: SyntheticsState) => s.settings.isAutoCancelTPSL;

src/context/SyntheticsStateContext/selectors/transactionsSelectors/tradeBoxOrdersSelectors.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@ import {
1313
} from "sdk/utils/orderTransactions";
1414
import { getIsValidTwapParams } from "sdk/utils/twap";
1515

16-
import { selectChainId, selectMaxAutoCancelOrders, selectSigner, selectUserReferralInfo } from "../globalSelectors";
16+
import {
17+
selectChainId,
18+
selectIsAutoCancelTPSLEnabled,
19+
selectMaxAutoCancelOrders,
20+
selectSigner,
21+
selectUserReferralInfo,
22+
} from "../globalSelectors";
1723
import { makeSelectOrdersByPositionKey } from "../orderSelectors";
1824
import {
1925
selectTradeboxAllowedSlippage,
@@ -191,6 +197,7 @@ export const selectTradeboxDecreaseOrderParams = createSelector((q) => {
191197
const maxAutoCancelOrders = q(selectMaxAutoCancelOrders);
192198
const positionOrders = q(makeSelectOrdersByPositionKey(selectedPositionKey));
193199
const { isLong, isTwap } = q(selectTradeboxTradeFlags);
200+
const isAutoCancelTPSLEnabled = q(selectIsAutoCancelTPSLEnabled);
194201

195202
if (
196203
!commonParams ||
@@ -203,7 +210,7 @@ export const selectTradeboxDecreaseOrderParams = createSelector((q) => {
203210
}
204211

205212
const existingAutoCancelOrders = positionOrders.filter((order) => order.autoCancel);
206-
const allowedAutoCancelOrdersNumber = Number(maxAutoCancelOrders);
213+
const allowedAutoCancelOrdersNumber = isAutoCancelTPSLEnabled ? Number(maxAutoCancelOrders) : 0;
207214
const autoCancelOrdersLimit = allowedAutoCancelOrdersNumber - existingAutoCancelOrders.length;
208215

209216
const decreaseOrderParams: DecreasePositionOrderParams = {

0 commit comments

Comments
 (0)