From 96034c0764826a8b47b0e9f79e307693bcb52bf6 Mon Sep 17 00:00:00 2001 From: John Huang Date: Thu, 25 Jan 2024 10:30:53 -0800 Subject: [PATCH 1/2] better cancel reason strings --- config/localization/en/app.json | 27 +++++++++++++++------------ package.json | 2 +- scripts/generated/app.ts | 3 +++ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 131e87b41..9972266fd 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -981,18 +981,21 @@ "ORDER_FILLED": "Filled", "ORDER_LINES": "Order Lines", "ORDER_LINES_TOOLTIP": "Display or hide order lines", - "ORDER_REMOVAL_REASON_EXPIRED": "Expired", - "ORDER_REMOVAL_REASON_FOK_ORDER_COULD_NOT_BE_FULLY_FULLED": "Fill or Kill order could not be fully filled", - "ORDER_REMOVAL_REASON_IMMEDIATE_OR_CANCEL_WOULD_REST_ON_BOOK": "Immediate or Cancel order would rest on book", - "ORDER_REMOVAL_REASON_INDEXER_EXPIRED": "Internal error", - "ORDER_REMOVAL_REASON_INTERNAL_ERROR": "Internal error", - "ORDER_REMOVAL_REASON_POST_ONLY_WOULD_CROSS_MAKER_ORDER": "Post Only would match maker order", - "ORDER_REMOVAL_REASON_REDUCED_ONLY_RESIZE": "Reduced only resize", - "ORDER_REMOVAL_REASON_REPLACED": "Replaced", - "ORDER_REMOVAL_REASON_SELF_TRADE_ERROR": "Self trade error", - "ORDER_REMOVAL_REASON_UNDERCOLLATERALIZED": "Undercollateralized", - "ORDER_REMOVAL_REASON_UNSPECIFIED": "Unspecified", - "ORDER_REMOVAL_REASON_USER_CANCELED": "User canceled", + "ORDER_REMOVAL_REASON_EQUITY_TIER": "The subaccount does not satisfy the equity tier requirements.", + "ORDER_REMOVAL_REASON_EXPIRED": "The order has expired.", + "ORDER_REMOVAL_REASON_FOK_ORDER_COULD_NOT_BE_FULLY_FULLED": "The FOK order could not be fully filled.", + "ORDER_REMOVAL_REASON_FINAL_SETTLEMENT": "The order's ClobPair has entered final settlement.", + "ORDER_REMOVAL_REASON_FULLY_FILLED": "The order has been fully-filled.", + "ORDER_REMOVAL_REASON_IMMEDIATE_OR_CANCEL_WOULD_REST_ON_BOOK": "The IOC order has not been fully filled.", + "ORDER_REMOVAL_REASON_INDEXER_EXPIRED": "The order has expired.", + "ORDER_REMOVAL_REASON_INTERNAL_ERROR": "The order caused an internal error during order placement.", + "ORDER_REMOVAL_REASON_POST_ONLY_WOULD_CROSS_MAKER_ORDER": "The order would have matched against maker orders on the orderbook despite being a post-only order.", + "ORDER_REMOVAL_REASON_REDUCED_ONLY_RESIZE": "The reduce-only order has either closed the subaccount's position, or the existing position has closed or flipped.", + "ORDER_REMOVAL_REASON_REPLACED": "The order has been replaced.", + "ORDER_REMOVAL_REASON_SELF_TRADE_ERROR": "The order would have matched against another order placed by the same subaccount.", + "ORDER_REMOVAL_REASON_UNDERCOLLATERALIZED": "The order was removed due to being undercollateralized.", + "ORDER_REMOVAL_REASON_UNSPECIFIED": "Unspecified error.", + "ORDER_REMOVAL_REASON_USER_CANCELED": "The order was canceled by a user.", "ORDER_TYPE": "Order type", "ORDERBOOK": "Order book", "ORDERBOOK_ASK_PRICE": "Ask Price", diff --git a/package.json b/package.json index cb1fbb566..a20e69286 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.16", + "version": "1.1.17", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index c5f8e9043..6f59b31cf 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1236,8 +1236,11 @@ export const APP_STRING_KEYS = { ORDER_FILLED: 'APP.TRADE.ORDER_FILLED', ORDER_LINES: 'APP.TRADE.ORDER_LINES', ORDER_LINES_TOOLTIP: 'APP.TRADE.ORDER_LINES_TOOLTIP', + ORDER_REMOVAL_REASON_EQUITY_TIER: 'APP.TRADE.ORDER_REMOVAL_REASON_EQUITY_TIER', ORDER_REMOVAL_REASON_EXPIRED: 'APP.TRADE.ORDER_REMOVAL_REASON_EXPIRED', + ORDER_REMOVAL_REASON_FINAL_SETTLEMENT: 'APP.TRADE.ORDER_REMOVAL_REASON_FINAL_SETTLEMENT', ORDER_REMOVAL_REASON_FOK_ORDER_COULD_NOT_BE_FULLY_FULLED: 'APP.TRADE.ORDER_REMOVAL_REASON_FOK_ORDER_COULD_NOT_BE_FULLY_FULLED', + ORDER_REMOVAL_REASON_FULLY_FILLED: 'APP.TRADE.ORDER_REMOVAL_REASON_FULLY_FILLED', ORDER_REMOVAL_REASON_IMMEDIATE_OR_CANCEL_WOULD_REST_ON_BOOK: 'APP.TRADE.ORDER_REMOVAL_REASON_IMMEDIATE_OR_CANCEL_WOULD_REST_ON_BOOK', ORDER_REMOVAL_REASON_INDEXER_EXPIRED: 'APP.TRADE.ORDER_REMOVAL_REASON_INDEXER_EXPIRED', ORDER_REMOVAL_REASON_INTERNAL_ERROR: 'APP.TRADE.ORDER_REMOVAL_REASON_INTERNAL_ERROR', From f2c589637002bcdf097b6e8cc4f936f3bdc56396 Mon Sep 17 00:00:00 2001 From: John Huang Date: Wed, 31 Jan 2024 08:55:11 -0800 Subject: [PATCH 2/2] Up version --- config/localization/en/app.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 976868960..4d798a099 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -988,10 +988,10 @@ "ORDER_LINES_TOOLTIP": "Display or hide order lines", "ORDER_REMOVAL_REASON_EQUITY_TIER": "The subaccount does not satisfy the equity tier requirements.", "ORDER_REMOVAL_REASON_EXPIRED": "The order has expired.", - "ORDER_REMOVAL_REASON_FOK_ORDER_COULD_NOT_BE_FULLY_FULLED": "The FOK order could not be fully filled.", + "ORDER_REMOVAL_REASON_FOK_ORDER_COULD_NOT_BE_FULLY_FULLED": "The Fill-Or-Kill order could not be fully filled.", "ORDER_REMOVAL_REASON_FINAL_SETTLEMENT": "The order's ClobPair has entered final settlement.", "ORDER_REMOVAL_REASON_FULLY_FILLED": "The order has been fully-filled.", - "ORDER_REMOVAL_REASON_IMMEDIATE_OR_CANCEL_WOULD_REST_ON_BOOK": "The IOC order has not been fully filled.", + "ORDER_REMOVAL_REASON_IMMEDIATE_OR_CANCEL_WOULD_REST_ON_BOOK": "The Immediate-Or-Cancel order has not been fully filled.", "ORDER_REMOVAL_REASON_INDEXER_EXPIRED": "The order has expired.", "ORDER_REMOVAL_REASON_INTERNAL_ERROR": "The order caused an internal error during order placement.", "ORDER_REMOVAL_REASON_POST_ONLY_WOULD_CROSS_MAKER_ORDER": "The order would have matched against maker orders on the orderbook despite being a post-only order.", diff --git a/package.json b/package.json index 24a709b3c..f9a06eab8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.19", + "version": "1.1.20", "description": "v4 localization", "main": "index.ts", "scripts": {