@orderly.network/ui-order-entry 3.1.12 → 3.2.0-alpha.0

package/dist/index.d.mts

@@ -162,6 +162,7 @@ declare const useOrderEntryScript: (inputs: OrderEntryScriptInputs) => {
     onBBOChange: (value: _orderly_network_types.BBOOrderType) => void;
     toggleBBO: () => void;
     currentLtv: number;
+    usdcBorrowLimit: number;
     fillMiddleValue: () => void;
     symbol: string;
     soundAlert: any;
@@ -170,9 +171,7 @@ declare const useOrderEntryScript: (inputs: OrderEntryScriptInputs) => {
     walletAddress: string | undefined;
     isPermissionlessListing: boolean;
     isSymbolPostOnly: boolean;
-    submit: (options?: {
-        resetOnSuccess?: boolean;
-    }) => Promise<{
+    submit: (options?: _orderly_network_hooks.SubmitOrderOptions) => Promise<{
         success: boolean;
         data: Record<string, any>;
         timestamp: number;
@@ -191,8 +190,9 @@ declare const useOrderEntryScript: (inputs: OrderEntryScriptInputs) => {
     estLeverage: number | null;
     estSlippage: number | null;
     helper: {
-        validator: () => Promise<_orderly_network_hooks.OrderValidationResult | null>;
-        validate: (otherErrors?: _orderly_network_hooks.OrderValidationResult) => Promise<_orderly_network_hooks.OrderValidationResult | null>;
+        validator: () => Promise<_orderly_network_types.OrderlyOrder>;
+        validate: (otherErrors?: _orderly_network_hooks.OrderValidationResult) => Promise<_orderly_network_types.OrderlyOrder>;
+        getProjectedUSDCBorrow: (order: Partial<_orderly_network_types.OrderlyOrder>) => number | null;
     };
     freeCollateral: number;
     metaState: {

package/dist/index.d.ts

@@ -162,6 +162,7 @@ declare const useOrderEntryScript: (inputs: OrderEntryScriptInputs) => {
     onBBOChange: (value: _orderly_network_types.BBOOrderType) => void;
     toggleBBO: () => void;
     currentLtv: number;
+    usdcBorrowLimit: number;
     fillMiddleValue: () => void;
     symbol: string;
     soundAlert: any;
@@ -170,9 +171,7 @@ declare const useOrderEntryScript: (inputs: OrderEntryScriptInputs) => {
     walletAddress: string | undefined;
     isPermissionlessListing: boolean;
     isSymbolPostOnly: boolean;
-    submit: (options?: {
-        resetOnSuccess?: boolean;
-    }) => Promise<{
+    submit: (options?: _orderly_network_hooks.SubmitOrderOptions) => Promise<{
         success: boolean;
         data: Record<string, any>;
         timestamp: number;
@@ -191,8 +190,9 @@ declare const useOrderEntryScript: (inputs: OrderEntryScriptInputs) => {
     estLeverage: number | null;
     estSlippage: number | null;
     helper: {
-        validator: () => Promise<_orderly_network_hooks.OrderValidationResult | null>;
-        validate: (otherErrors?: _orderly_network_hooks.OrderValidationResult) => Promise<_orderly_network_hooks.OrderValidationResult | null>;
+        validator: () => Promise<_orderly_network_types.OrderlyOrder>;
+        validate: (otherErrors?: _orderly_network_hooks.OrderValidationResult) => Promise<_orderly_network_types.OrderlyOrder>;
+        getProjectedUSDCBorrow: (order: Partial<_orderly_network_types.OrderlyOrder>) => number | null;
     };
     freeCollateral: number;
     metaState: {

package/dist/index.js

@@ -611,9 +611,9 @@ var OrderConfirmDialog = (props) => {
   const { t } = i18n.useTranslation();
   const [{ rows: positions }] = hooks.usePositionStream(symbol);
   const position = React3.useMemo(
-    () => orderMarginMode != null ? positions?.find(
-      (row) => row.symbol === symbol && row.margin_mode === orderMarginMode
-    ) : positions?.[0],
+    () => positions?.find(
+      (row) => row.symbol === symbol && (row.margin_mode ?? types.MarginMode.CROSS) === (orderMarginMode ?? types.MarginMode.CROSS)
+    ),
     [positions, symbol, orderMarginMode]
   );
   const positionQty = position?.position_qty;
@@ -686,15 +686,17 @@ var OrderConfirmDialog = (props) => {
     );
   };
   const renderTPSLQty = () => {
+    if (order.position_type === types.PositionType.FULL)
+      return /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { justify: "between", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: t("common.orderQty") }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: t("tpsl.entirePosition") })
+      ] });
     if (!positionQty || !order.order_quantity) {
       return null;
     }
-    let qty = new utils.Decimal(order.order_quantity);
-    if (order.position_type === types.PositionType.FULL) {
-      qty = qty.plus(new utils.Decimal(positionQty ?? 0));
-    }
+    const qty = new utils.Decimal(order.order_quantity);
     return /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { justify: "between", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: order.position_type === types.PositionType.FULL ? t("common.positionQty") : t("common.orderQty") }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: t("common.orderQty") }),
       /* @__PURE__ */ jsxRuntime.jsx(
         ui.Text.numeral,
         {
@@ -1913,18 +1915,6 @@ var LTVRiskTooltipUI = (props) => {
     }
   );
 };
-var useConvertThreshold = () => {
-  const { data, error, isLoading } = hooks.useQuery(
-    "/v1/public/auto_convert_threshold",
-    { errorRetryCount: 3 }
-  );
-  return {
-    ltv_threshold: new utils.Decimal(data?.ltv_threshold ?? 0).mul(100).toNumber(),
-    negative_usdc_threshold: data?.negative_usdc_threshold,
-    isLoading,
-    error
-  };
-};
 var useLTVTooltipScript = (marginMode) => {
   const { isMobile } = ui.useScreen();
   const { data: holdingList = [], isLoading: isHoldingLoading } = hooks.useHoldingStream();
@@ -1932,7 +1922,8 @@ var useLTVTooltipScript = (marginMode) => {
     ltv_threshold,
     negative_usdc_threshold,
     isLoading: isThresholdLoading
-  } = useConvertThreshold();
+  } = hooks.useConvertThreshold();
+  const ltvThresholdPercentage = new utils.Decimal(ltv_threshold ?? 0).mul(100).toNumber();
   const tokensInfo = hooks.useAppStore((state) => state.tokensInfo);
   const { getIndexPrice } = hooks.useIndexPricesStream();
   const holdingData = holdingList.map((item) => {
@@ -1963,7 +1954,7 @@ var useLTVTooltipScript = (marginMode) => {
   return {
     holdingData,
     isHoldingLoading,
-    ltv_threshold,
+    ltv_threshold: ltvThresholdPercentage,
     negative_usdc_threshold,
     isThresholdLoading,
     currentLtv,
@@ -3363,6 +3354,7 @@ var LeverageBadge = (props) => {
   const { enabled } = hooks.useFeatureFlag(hooks.FlagKeys.IsolatedMargin);
   const marginMode = props.marginMode;
   const isDisabled = !!disabled;
+  const isMarginModeDisabled = isDisabled || !enabled;
   const curLeverage = symbolLeverage ?? 1;
   const showLeverageModal = () => {
     if (isDisabled) return;
@@ -3375,7 +3367,7 @@ var LeverageBadge = (props) => {
     });
   };
   const showMarginModeModal = () => {
-    if (isDisabled || !enabled) {
+    if (isMarginModeDisabled) {
       return;
     }
     const modalId = isMobile ? MarginModeSwitchSheetId : MarginModeSwitchDialogId;
@@ -3402,11 +3394,11 @@ var LeverageBadge = (props) => {
               "oui-flex oui-flex-1 oui-items-center oui-justify-center oui-gap-x-1",
               "oui-px-3 oui-py-1.5",
               "oui-text-xs oui-font-semibold oui-text-base-contrast-54",
-              isDisabled ? "oui-cursor-not-allowed" : "oui-cursor-pointer"
+              isMarginModeDisabled ? "oui-cursor-not-allowed" : "oui-cursor-pointer"
             ),
             "data-testid": "oui-testid-orderEntry-margin-mode",
             "aria-label": t("marginMode.switchMarginMode"),
-            disabled: isDisabled,
+            disabled: isMarginModeDisabled,
             onClick: showMarginModeModal,
             children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: marginMode === void 0 ? "--" : marginMode === types.MarginMode.ISOLATED ? t("marginMode.isolated") : t("marginMode.cross") })
           }
@@ -5700,7 +5692,8 @@ var OrderEntry = (props) => {
     currentFocusInput,
     walletAddress,
     isPermissionlessListing,
-    symbol
+    symbol,
+    usdcBorrowLimit
   } = props;
   const [maxQtyConfirmOpen, setMaxQtyConfirmOpen] = React3.useState(false);
   const [selectedExtraId, setSelectedExtraId] = React3.useState(null);
@@ -5784,6 +5777,15 @@ var OrderEntry = (props) => {
         return Promise.reject();
       }
     ).then((order) => {
+      const projectedBorrow = helper.getProjectedUSDCBorrow(order);
+      if (projectedBorrow !== null && projectedBorrow > usdcBorrowLimit) {
+        throw new hooks.USDCBorrowLimitExceededError(
+          projectedBorrow,
+          usdcBorrowLimit
+        );
+      }
+      return order;
+    }).then((order) => {
       const shouldShowPermissionlessNotice = isPermissionlessListing && walletAddress && !(permissionlessAcknowledgedKeys ?? []).includes(
         `${walletAddress}_${symbol}`
       );
@@ -5815,7 +5817,10 @@ var OrderEntry = (props) => {
       }
       return true;
     }).then(() => {
-      return submit({ resetOnSuccess: false }).then((result) => {
+      return submit({
+        resetOnSuccess: false,
+        usdcBorrowLimit
+      }).then((result) => {
         if (!result.success && result.message) {
           ui.toast.error(result.message);
         } else if (result.success && isScaledOrder) {
@@ -5826,6 +5831,17 @@ var OrderEntry = (props) => {
         }
       });
     }).catch((error) => {
+      if (error instanceof hooks.USDCBorrowLimitExceededError) {
+        ui.modal.alert({
+          title: t("orderEntry.usdcBorrowLimit.title"),
+          message: t("orderEntry.usdcBorrowLimit.content", {
+            limit: new Intl.NumberFormat("en-US", {
+              maximumFractionDigits: 8
+            }).format(error.borrowLimit)
+          })
+        });
+        return;
+      }
       if (error?.message) {
         ui.toast.error(error.message);
       }
@@ -6616,6 +6632,8 @@ var useOrderEntryScript = (inputs) => {
     }
   }, [isSymbolPostOnly, formattedOrder.order_type, setOrderValues]);
   const currentLtv = hooks.useComputedLTV();
+  const { negative_usdc_threshold } = hooks.useConvertThreshold();
+  const usdcBorrowLimit = hooks.normalizeUSDCBorrowLimit(negative_usdc_threshold);
   const askAndBid = useAskAndBid();
   const fillMiddleValue = () => {
     if (bboStatus === "on" /* ON */) {
@@ -6712,6 +6730,7 @@ var useOrderEntryScript = (inputs) => {
     onBBOChange,
     toggleBBO,
     currentLtv,
+    usdcBorrowLimit,
     fillMiddleValue,
     symbol,
     soundAlert,