diff --git a/src/constants/markets.ts b/src/constants/markets.ts index 4e44252531..d353e7e335 100644 --- a/src/constants/markets.ts +++ b/src/constants/markets.ts @@ -16,6 +16,9 @@ export type MarketData = { // Displayable Market id (e.g. 'ETH-USD' or 'BUFFI-USD') displayId: Nullable; + // Displayable asset id so just 'ETH' or 'BUFFI + displayableAsset: Nullable; + clobPairId: string; effectiveInitialMarginFraction: Nullable; logo: string; diff --git a/src/lib/marketsHelpers.ts b/src/lib/marketsHelpers.ts index 67dd2d1d46..3510998acb 100644 --- a/src/lib/marketsHelpers.ts +++ b/src/lib/marketsHelpers.ts @@ -2,7 +2,11 @@ import { AssetData, PerpetualMarketSummary } from '@/abacus-ts/types/summaryType import { ISOLATED_LIQUIDITY_TIER_INFO, MarketData } from '@/constants/markets'; -import { getDisplayableTickerFromMarket, getMarketIdFromAsset } from './assetUtils'; +import { + getDisplayableAssetFromTicker, + getDisplayableTickerFromMarket, + getMarketIdFromAsset, +} from './assetUtils'; import { BIG_NUMBERS, MustBigNumber } from './numbers'; import { safeAssign } from './objectHelpers'; @@ -28,6 +32,7 @@ export function getMarketDataFromPerpetualMarketSummary( ticker: id, assetId, displayableTicker: displayId, + displayableAsset, clobPairId, effectiveInitialMarginFraction, logo, @@ -54,6 +59,7 @@ export function getMarketDataFromPerpetualMarketSummary( id, assetId, displayId, + displayableAsset, clobPairId, effectiveInitialMarginFraction, logo, @@ -94,11 +100,13 @@ export function getMarketDataFromAsset(asset: AssetData, favoritedMarkets: strin const ticker = getMarketIdFromAsset(assetId); const displayId = getDisplayableTickerFromMarket(ticker); + const displayableAsset = getDisplayableAssetFromTicker(ticker); return safeAssign({}, { id: ticker, assetId, displayId, + displayableAsset, clobPairId: '-1', effectiveInitialMarginFraction: ISOLATED_LIQUIDITY_TIER_INFO.initialMarginFraction, logo, diff --git a/src/lib/orders.ts b/src/lib/orders.ts index 5555697055..8980b9373c 100644 --- a/src/lib/orders.ts +++ b/src/lib/orders.ts @@ -170,7 +170,7 @@ export const isMarketOrderTypeNew = (type?: IndexerOrderType) => IndexerOrderType.STOPMARKET, IndexerOrderType.TAKEPROFITMARKET, IndexerOrderType.TRAILINGSTOP, - ].some((t) => t === type); + ].includes(type); export const isLimitOrderType = (type?: AbacusOrderTypes) => type && @@ -180,9 +180,7 @@ export const isLimitOrderType = (type?: AbacusOrderTypes) => export const isLimitOrderTypeNew = (type?: IndexerOrderType) => type && - [IndexerOrderType.LIMIT, IndexerOrderType.STOPLIMIT, IndexerOrderType.TAKEPROFIT].some( - (t) => t === type - ); + [IndexerOrderType.LIMIT, IndexerOrderType.STOPLIMIT, IndexerOrderType.TAKEPROFIT].includes(type); export const isStopLossOrder = (order: SubaccountOrder, isSlTpLimitOrdersEnabled: boolean) => { const validOrderTypes = isSlTpLimitOrdersEnabled @@ -197,7 +195,7 @@ export const isStopLossOrderNew = ( const validOrderTypes = isSlTpLimitOrdersEnabled ? [IndexerOrderType.STOPLIMIT, IndexerOrderType.STOPMARKET] : [IndexerOrderType.STOPMARKET]; - return validOrderTypes.some((type) => type === order.type) && order.reduceOnly; + return order.reduceOnly && validOrderTypes.includes(order.type); }; export const isTakeProfitOrder = (order: SubaccountOrder, isSlTpLimitOrdersEnabled: boolean) => { @@ -214,7 +212,7 @@ export const isTakeProfitOrderNew = ( const validOrderTypes = isSlTpLimitOrdersEnabled ? [IndexerOrderType.TAKEPROFIT, IndexerOrderType.TAKEPROFITMARKET] : [IndexerOrderType.TAKEPROFITMARKET]; - return validOrderTypes.some((type) => type === order.type) && order.reduceOnly; + return order.reduceOnly && validOrderTypes.includes(order.type); }; export const isSellOrder = (order: SubaccountOrder) => { diff --git a/src/views/menus/useGlobalCommands.tsx b/src/views/menus/useGlobalCommands.tsx index 529f7ecfe1..bc2f53b2f2 100644 --- a/src/views/menus/useGlobalCommands.tsx +++ b/src/views/menus/useGlobalCommands.tsx @@ -91,11 +91,11 @@ export const useGlobalCommands = (): MenuConfig ({ + items: markets.map(({ name, id, logo, displayableAsset, assetId }) => ({ value: id, slotBefore: , label: name, - tag: displayId, + tag: displayableAsset, onSelect: () => navigate(`${AppRoute.Trade}/${id}`), })), },