@kodiak-finance/orderly-portfolio 2.8.26-beta.2 → 2.8.27

package/dist/index.js

@@ -4952,7 +4952,7 @@ __export(feeTierHeader_exports, {
   FeeTierHeader: () => FeeTierHeader,
   MobileHeaderItem: () => MobileHeaderItem
 });
-var isEffective, formatDiscountRate, parsePercent, getDiscountedPercent, getVipTierLabel, formatStakedValue, openLink, VipTierValue, RefCodeValue, FeeRateValue, EffectiveFeeDialog, MobileHeaderItem, DesktopHeaderItem, FeeTierHeader;
+var isEffective, formatDiscountRate, getVipTierLabel, formatStakedValue, openLink, VipTierValue, RefCodeValue, FeeRateValue, EffectiveFeeDialog, MobileHeaderItem, DesktopHeaderItem, FeeTierHeader;
 var init_feeTierHeader = __esm({
   "src/pages/feeTier/feeTierHeader.tsx"() {
     init_context();
@@ -4964,23 +4964,6 @@ var init_feeTierHeader = __esm({
       const normalized = rate <= 1 ? new orderlyUtils.Decimal(rate).mul(100) : new orderlyUtils.Decimal(rate);
       return `${normalized.toFixed(0)}%`;
     };
-    parsePercent = (value) => {
-      if (!value || value === "--")
-        return null;
-      const match = value.match(/-?\d+(?:\.\d+)?/);
-      if (!match)
-        return null;
-      return new orderlyUtils.Decimal(match[0]);
-    };
-    getDiscountedPercent = (value, discountRate) => {
-      if (!discountRate || discountRate <= 0)
-        return null;
-      const base = parsePercent(value);
-      if (!base)
-        return null;
-      const discounted = base.mul(new orderlyUtils.Decimal(1).minus(discountRate));
-      return `${discounted.toFixed(3)}%`;
-    };
     getVipTierLabel = (vipTier) => {
       return vipTier?.name || vipTier?.tier || "--";
     };
@@ -5105,10 +5088,40 @@ var init_feeTierHeader = __esm({
       ] }) });
     };
     FeeRateValue = (props) => {
-      const { baseRate, rwaRate, discountRate, size = "base" } = props;
+      const {
+        baseRate,
+        baseRwaRate,
+        effectiveRate,
+        effectiveRwaRate,
+        size = "base"
+      } = props;
       const { isMobile } = orderlyUi.useScreen();
-      const discounted = getDiscountedPercent(baseRate, discountRate);
-      const rwaDiscounted = getDiscountedPercent(rwaRate, discountRate);
+      let discounted = false;
+      let rwaDiscounted = false;
+      const normalizeRate = (value) => {
+        if (!value || value === "-" || value === "--")
+          return null;
+        const match = value.match(/-?\d+(?:\.\d+)?/);
+        if (!match)
+          return null;
+        const raw = new orderlyUtils.Decimal(match[0]);
+        if (value.includes("%")) {
+          return { fraction: raw.div(100), display: value };
+        }
+        return { fraction: raw, display: `${raw.mul(100).toNumber()}%` };
+      };
+      const effectiveRateValue = normalizeRate(effectiveRate);
+      const baseRateValue = normalizeRate(baseRate);
+      if (effectiveRateValue && baseRateValue) {
+        discounted = effectiveRateValue.fraction.lt(baseRateValue.fraction);
+      }
+      const effectiveRwaRateValue = normalizeRate(effectiveRwaRate);
+      const baseRwaRateValue = normalizeRate(baseRwaRate);
+      if (effectiveRwaRateValue && baseRwaRateValue) {
+        rwaDiscounted = effectiveRwaRateValue.fraction.lt(
+          baseRwaRateValue.fraction
+        );
+      }
       return /* @__PURE__ */ jsxRuntime.jsxs(
         orderlyUi.Flex,
         {
@@ -5117,15 +5130,15 @@ var init_feeTierHeader = __esm({
           itemAlign: isMobile ? "end" : "start",
           children: [
             /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Flex, { itemAlign: "center", gap: 2, children: discounted ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-              /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size, intensity: 54, className: "oui-line-through", children: baseRate || "--" }),
-              /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text.gradient, { color: "brand", size, children: discounted })
-            ] }) : /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text.gradient, { color: "brand", size, children: baseRate || "--" }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size, intensity: 54, className: "oui-line-through", children: baseRateValue?.display ?? "--" }),
+              /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text.gradient, { color: "brand", size, children: effectiveRate })
+            ] }) : /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text.gradient, { color: "brand", size, children: effectiveRate || "--" }) }),
             /* @__PURE__ */ jsxRuntime.jsxs(orderlyUi.Flex, { itemAlign: "center", gap: 1, children: [
               /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "2xs", intensity: 54, children: "RWA:" }),
               rwaDiscounted ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "2xs", intensity: 54, className: "oui-line-through", children: rwaRate || "--" }),
-                /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "2xs", intensity: 80, children: rwaDiscounted })
-              ] }) : /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "2xs", intensity: 54, children: rwaRate || "--" })
+                /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "2xs", intensity: 54, className: "oui-line-through", children: baseRwaRateValue?.display ?? "--" }),
+                /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "2xs", intensity: 80, children: effectiveRwaRate })
+              ] }) : /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "2xs", intensity: 54, children: effectiveRwaRate || "--" })
             ] })
           ]
         }
@@ -5326,6 +5339,7 @@ var init_feeTierHeader = __esm({
         headerDataAdapter,
         vipTier,
         vipTierEnabled,
+        vipTierBaseFeeRates,
         vipTierDocsUrl,
         vipTierStakeUrl
       } = props;
@@ -5333,7 +5347,6 @@ var init_feeTierHeader = __esm({
       const { refereeRebate, refererCode, ...others } = orderlyHooks.useFeeState();
       const refCode = refererCode || "--";
       const isEffectiveFee = isEffective(refereeRebate);
-      const discountRate = vipTier?.discountRate;
       const { routerAdapter: mobileRouterAdapter } = useLayoutContext();
       const { routerAdapter: desktopRouterAdapter } = orderlyUiScaffold.useScaffoldContext();
       const routerAdapter = desktopRouterAdapter ?? mobileRouterAdapter;
@@ -5378,13 +5391,7 @@ var init_feeTierHeader = __esm({
         {
           label: t("portfolio.feeTier.header.refCode"),
           interactive: false,
-          value: /* @__PURE__ */ jsxRuntime.jsx(
-            RefCodeValue,
-            {
-              code: refCode,
-              discountRate: refereeRebate
-            }
-          )
+          value: /* @__PURE__ */ jsxRuntime.jsx(RefCodeValue, { code: refCode, discountRate: refereeRebate })
         },
         {
           label: t("portfolio.feeTier.header.takerFeeRate"),
@@ -5392,9 +5399,10 @@ var init_feeTierHeader = __esm({
           value: /* @__PURE__ */ jsxRuntime.jsx(
             FeeRateValue,
             {
-              baseRate: isEffectiveFee ? others.effectiveTakerFee : others.takerFee,
-              rwaRate: isEffectiveFee ? others.rwaEffectiveTakerFee : others.rwaTakerFee,
-              discountRate,
+              baseRate: vipTierBaseFeeRates?.takerFeeRate,
+              baseRwaRate: vipTierBaseFeeRates?.rwaTakerFeeRate,
+              effectiveRate: isEffectiveFee ? others.effectiveTakerFee : others.takerFee,
+              effectiveRwaRate: isEffectiveFee ? others.rwaEffectiveTakerFee : others.rwaTakerFee,
               size: isMobile ? "xs" : "base"
             }
           )
@@ -5405,9 +5413,10 @@ var init_feeTierHeader = __esm({
           value: /* @__PURE__ */ jsxRuntime.jsx(
             FeeRateValue,
             {
-              baseRate: isEffectiveFee ? others.effectiveMakerFee : others.makerFee,
-              rwaRate: isEffectiveFee ? others.rwaEffectiveMakerFee : others.rwaMakerFee,
-              discountRate,
+              baseRate: vipTierBaseFeeRates?.makerFeeRate,
+              baseRwaRate: vipTierBaseFeeRates?.rwaMakerFeeRate,
+              effectiveRate: isEffectiveFee ? others.effectiveMakerFee : others.makerFee,
+              effectiveRwaRate: isEffectiveFee ? others.rwaEffectiveMakerFee : others.rwaMakerFee,
               size: isMobile ? "xs" : "base"
             }
           )
@@ -8108,6 +8117,7 @@ var formatDiscountRate2 = (rate) => {
 var VipTierTable = (props) => {
   const { tiers, currentTier, baseFeeRates } = props;
   const { t } = orderlyI18n.useTranslation();
+  const { isMobile } = orderlyUi.useScreen();
   if (!tiers.length)
     return null;
   const formatFeeRate = (rate) => {
@@ -8159,20 +8169,24 @@ var VipTierTable = (props) => {
       dataIndex: "discountRate",
       align: "center",
       render: (value) => formatDiscountRate2(value) || "--"
-    },
-    {
-      title: t("portfolio.feeTier.column.maker"),
-      dataIndex: "makerFeeRate",
-      align: "center",
-      render: (_value, row) => formatFeeRate(row.effectiveFeeRates?.makerFeeRate)
-    },
-    {
-      title: t("portfolio.feeTier.column.taker"),
-      dataIndex: "takerFeeRate",
-      align: "center",
-      render: (_value, row) => formatFeeRate(row.effectiveFeeRates?.takerFeeRate)
     }
   ];
+  if (!isMobile) {
+    columns.push(
+      {
+        title: t("portfolio.feeTier.column.maker"),
+        dataIndex: "makerFeeRate",
+        align: "center",
+        render: (_value, row) => formatFeeRate(row.effectiveFeeRates?.makerFeeRate)
+      },
+      {
+        title: t("portfolio.feeTier.column.taker"),
+        dataIndex: "takerFeeRate",
+        align: "center",
+        render: (_value, row) => formatFeeRate(row.effectiveFeeRates?.takerFeeRate)
+      }
+    );
+  }
   const baseRow = {
     tier: 0,
     name: t("portfolio.feeTier.vip.base"),
@@ -8287,19 +8301,9 @@ var FeeTierTable = (props) => {
 };
 var CardTitle3 = () => {
   const { t } = orderlyI18n.useTranslation();
-  const { isMobile } = orderlyUi.useScreen();
-  if (isMobile) {
-    return /* @__PURE__ */ jsxRuntime.jsxs(orderlyUi.Flex, { itemAlign: "center", justify: "center", gap: 2, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "xs", intensity: 54, children: t("portfolio.feeTier.updatedDailyBy") }),
-      /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "xs", intensity: 80, children: "~2:15 UTC" })
-    ] });
-  }
   return /* @__PURE__ */ jsxRuntime.jsxs(orderlyUi.Flex, { itemAlign: "center", justify: "between", children: [
     /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "lg", children: t("portfolio.feeTier") }),
-    /* @__PURE__ */ jsxRuntime.jsxs(orderlyUi.Flex, { itemAlign: "center", justify: "center", gap: 1, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "xs", intensity: 54, children: t("portfolio.feeTier.updatedDailyBy") }),
-      /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Text, { size: "xs", intensity: 80, children: "~2:15 UTC" })
-    ] })
+    /* @__PURE__ */ jsxRuntime.jsx(orderlyUi.Flex, { itemAlign: "center", justify: "center", gap: 1 })
   ] });
 };
 var FeeTier = (props) => {
@@ -8338,6 +8342,7 @@ var FeeTier = (props) => {
             headerDataAdapter,
             vipTier,
             vipTierEnabled,
+            vipTierBaseFeeRates,
             vipTierDocsUrl,
             vipTierStakeUrl
           }
@@ -8603,8 +8608,12 @@ function normalizeEffectiveFeeRates(value) {
   return {
     makerFeeRate: toNumber(rates.makerFeeRate ?? rates.maker_fee_rate),
     takerFeeRate: toNumber(rates.takerFeeRate ?? rates.taker_fee_rate),
-    rwaMakerFeeRate: toNumber(rates.rwaMakerFeeRate ?? rates.rwa_maker_fee_rate),
-    rwaTakerFeeRate: toNumber(rates.rwaTakerFeeRate ?? rates.rwa_taker_fee_rate)
+    rwaMakerFeeRate: toNumber(
+      rates.rwaMakerFeeRate ?? rates.rwa_maker_fee_rate
+    ),
+    rwaTakerFeeRate: toNumber(
+      rates.rwaTakerFeeRate ?? rates.rwa_taker_fee_rate
+    )
   };
 }
 var buildVipTierUrl = (endpoint, address) => {