@gearbox-protocol/ui-kit 4.0.0-next.43 → 4.0.0-next.44

package/dist/esm/components/base/strategy-apy-breakdown-card/strategy-apy-breakdown-card.js

@@ -1,105 +1,117 @@
-import { jsxs as A, jsx as t, Fragment as C } from "react/jsx-runtime";
+import { jsxs as A, jsx as o, Fragment as C } from "react/jsx-runtime";
 import { calcNetStrategyApy as x, calcEffectiveBorrowApy as D } from "@gearbox-protocol/sdk/onchain";
-import { ApyBreakdownBody as P, BREAKDOWN_DASH as v, formatBreakdownRate as r, ApyBreakdownRow as w, periodMessageId as b, ApyBreakdownDivider as q } from "../apy-breakdown-body/apy-breakdown-body.js";
-import { PointsIcon as O } from "../../points-icon/points-icon.js";
-import { TokenIcon as S } from "../../token-icon/token-icon.js";
-import { FormattedMessageTyped as s } from "../../typed-intl/index.js";
-import { totalApyOf as L, positiveTokenRewardsOf as M, pointProgramsOf as $ } from "../../../utils/apy-breakdown.js";
+import { ApyBreakdownBody as P, formatBreakdownRate as i, ApyBreakdownRow as v, periodMessageId as k, ApyBreakdownDivider as q, BREAKDOWN_DASH as O } from "../apy-breakdown-body/apy-breakdown-body.js";
+import { NoValue as b } from "../values/no-value.js";
+import "react";
+import { totalApyOf as S, positiveTokenRewardsOf as L, pointProgramsOf as M } from "../../../utils/apy-breakdown.js";
+import "clsx";
+import "tailwind-merge";
+import "sonner";
 import { formatLeverage as d } from "../../../utils/format-leverage.js";
+import "luxon";
+import "../../../utils/z-index.js";
+import { PointsIcon as $ } from "../../points-icon/points-icon.js";
+import "viem";
+import { TokenIcon as j } from "../../token-icon/token-icon.js";
+import { FormattedMessageTyped as r } from "../../typed-intl/index.js";
+import "../../tooltip/simple-tooltip.js";
+import "../../tooltip/tooltip.js";
+import "../../badge/badge.js";
+import "../../badge/chip.js";
 import { StrategyApyBreakdownCardTest as n } from "./constants.js";
-function j(c) {
-  const { borrowApyAvg7D: o, quotaRateAvg7D: i, liquidationThreshold: m } = c;
-  return o === void 0 || i === void 0 ? null : {
-    borrowApy: o,
-    quotaRate: i,
-    liquidationThreshold: m
+function z(c) {
+  const { borrowApyAvg7D: t, quotaRateAvg7D: p, liquidationThreshold: s } = c;
+  return t === void 0 || p === void 0 ? null : {
+    borrowApy: t,
+    quotaRate: p,
+    liquidationThreshold: s
   };
 }
-function J({
+function so({
   data: c,
-  leverage: o,
-  showFormula: i = !1,
-  period: m
+  leverage: t,
+  showFormula: p = !1,
+  period: s
 }) {
-  const a = j(c), l = a && c.collateralApyAvg7D ? c.collateralApyAvg7D : void 0, f = a !== null && l !== void 0, g = f && a && l ? {
+  const a = z(c), l = a && c.collateralApyAvg7D ? c.collateralApyAvg7D : void 0, f = a !== null && l !== void 0, g = f && a && l ? {
     organicApy: x(
       a,
       l.organicApy,
-      o
+      t
     ),
     totalApy: x(
       a,
       l.totalApy ?? l.organicApy,
-      o
+      t
     ),
     ...l.rewards ? { rewards: l.rewards } : {}
-  } : null, p = f && a ? D(a, o) : null, u = g === null ? null : L(g), I = u === null || p === null ? null : u + p, N = l ? M(l) : [], B = l ? $(l) : [], T = N.map((e) => ({
+  } : null, m = f && a ? D(a, t) : null, u = g === null ? null : S(g), I = u === null || m === null ? null : u + m, N = l ? L(l) : [], B = l ? M(l) : [], T = N.map((e) => ({
     reward: e,
-    value: Math.round(o * (e.supplyApr ?? 0))
-  })), y = I === null ? null : I - T.reduce((e, k) => e + k.value, 0), h = y !== null && o > 0 ? y / o : void 0, R = a && p !== null && o > 0 ? (p - a.borrowApy * (o - 1)) / o : void 0;
+    value: Math.round(t * (e.supplyApr ?? 0))
+  })), y = I === null ? null : I - T.reduce((e, w) => e + w.value, 0), h = y !== null && t > 0 ? y / t : void 0, R = a && m !== null && t > 0 ? (m - a.borrowApy * (t - 1)) / t : void 0;
   return /* @__PURE__ */ A(
     P,
     {
       testId: n.root,
-      title: /* @__PURE__ */ t(
-        s,
+      title: /* @__PURE__ */ o(
+        r,
         {
-          messageId: b(
-            m,
+          messageId: k(
+            s,
             "components.yieldBreakdown.titleNetAtLeverage",
             "components.yieldBreakdown.titleNetAtLeverage7d"
           ),
-          values: { leverage: d(o) }
+          values: { leverage: d(t) }
         }
       ),
-      chip: u === null ? v : r(u),
+      chip: u === null ? /* @__PURE__ */ o(b, { reason: s }) : i(u),
       chipPositive: (u ?? 0) > 0,
       chipTestId: n.net,
       children: [
-        /* @__PURE__ */ t(
-          w,
+        /* @__PURE__ */ o(
+          v,
           {
             testId: n.collateral,
             valueTestId: n.value,
             captionTestId: n.caption,
-            label: /* @__PURE__ */ t(
-              s,
+            label: /* @__PURE__ */ o(
+              r,
               {
-                messageId: b(
-                  m,
+                messageId: k(
+                  s,
                   "components.yieldBreakdown.collateralApy",
                   "components.yieldBreakdown.collateralApy7d"
                 )
               }
             ),
-            value: y === null ? v : r(y),
-            subtext: i && h !== void 0 ? /* @__PURE__ */ t(
-              s,
+            value: y === null ? /* @__PURE__ */ o(b, { reason: s }) : i(y),
+            subtext: p && h !== void 0 ? /* @__PURE__ */ o(
+              r,
               {
                 messageId: "components.strategyApyBreakdownCard.formula",
                 values: {
-                  leverage: d(o),
-                  base: r(h)
+                  leverage: d(t),
+                  base: i(h)
                 }
               }
             ) : void 0
           }
         ),
-        T.map(({ reward: e, value: k }) => /* @__PURE__ */ t(
-          w,
+        T.map(({ reward: e, value: w }) => /* @__PURE__ */ o(
+          v,
           {
             valueTestId: n.value,
             captionTestId: n.caption,
             label: /* @__PURE__ */ A("span", { className: "inline-flex items-center gap-1.5", children: [
-              /* @__PURE__ */ t("span", { children: /* @__PURE__ */ t(
-                s,
+              /* @__PURE__ */ o("span", { children: /* @__PURE__ */ o(
+                r,
                 {
                   messageId: "components.apyParts.extraAPY",
                   values: { symbol: e.token.symbol }
                 }
               ) }),
-              /* @__PURE__ */ t(
-                S,
+              /* @__PURE__ */ o(
+                j,
                 {
                   token: e.token,
                   symbol: e.token.symbol,
@@ -108,74 +120,74 @@ function J({
                 }
               )
             ] }),
-            value: r(k),
-            subtext: i ? /* @__PURE__ */ t(
-              s,
+            value: i(w),
+            subtext: p ? /* @__PURE__ */ o(
+              r,
               {
                 messageId: "components.strategyApyBreakdownCard.formula",
                 values: {
-                  leverage: d(o),
-                  base: r(e.supplyApr ?? 0)
+                  leverage: d(t),
+                  base: i(e.supplyApr ?? 0)
                 }
               }
             ) : void 0
           },
           `incentive-${e.token.address}-${e.supplyApr ?? 0}`
         )),
-        /* @__PURE__ */ t(
-          w,
+        /* @__PURE__ */ o(
+          v,
           {
             muted: !0,
             testId: n.borrow,
             valueTestId: n.value,
             captionTestId: n.caption,
-            label: /* @__PURE__ */ t(
-              s,
+            label: /* @__PURE__ */ o(
+              r,
               {
-                messageId: b(
-                  m,
+                messageId: k(
+                  s,
                   "components.yieldBreakdown.borrowRate",
                   "components.yieldBreakdown.borrowRate7d"
                 )
               }
             ),
-            value: p === null ? v : r(-p),
-            subtext: i && a && R !== void 0 ? /* @__PURE__ */ t(
-              s,
+            value: m === null ? /* @__PURE__ */ o(b, { reason: s }) : i(-m),
+            subtext: p && a && R !== void 0 ? /* @__PURE__ */ o(
+              r,
               {
                 messageId: "components.strategyApyBreakdownCard.borrowFormula",
                 values: {
-                  leverage: d(o),
+                  leverage: d(t),
                   // What the position is charged per unit of itself: base
                   // interest plus the quota, added before either is rounded, so
                   // the caption is not the sum of two figures it also printed.
-                  totalRate: r(a.borrowApy + R),
+                  totalRate: i(a.borrowApy + R),
                   // Magnitudes, not signed rates: the row above already carries
                   // the minus, and `− −0.88%` reads as arithmetic to decode
                   // rather than a cost to understand.
-                  borrowRate: r(a.borrowApy)
+                  borrowRate: i(a.borrowApy)
                 }
               }
             ) : void 0
           }
         ),
         B.length > 0 ? /* @__PURE__ */ A(C, { children: [
-          /* @__PURE__ */ t(q, {}),
-          B.map((e) => /* @__PURE__ */ t(
-            w,
+          /* @__PURE__ */ o(q, {}),
+          B.map((e) => /* @__PURE__ */ o(
+            v,
             {
               valueTestId: n.points,
               captionTestId: n.caption,
               label: /* @__PURE__ */ A("span", { className: "inline-flex items-center gap-1.5", children: [
-                /* @__PURE__ */ t("span", { children: /* @__PURE__ */ t(
-                  s,
+                /* @__PURE__ */ o("span", { children: /* @__PURE__ */ o(
+                  r,
                   {
                     messageId: "components.yieldBreakdown.programPoints",
                     values: { name: e.name }
                   }
                 ) }),
-                /* @__PURE__ */ t(
-                  O,
+                /* @__PURE__ */ o(
+                  $,
                   {
                     reward: { name: e.name, type: e.id },
                     size: 16,
@@ -183,13 +195,13 @@ function J({
                   }
                 )
               ] }),
-              value: e.multiplier != null ? `${d(e.multiplier * o)}×` : v,
-              subtext: i && e.multiplier != null ? /* @__PURE__ */ t(
-                s,
+              value: e.multiplier != null ? `${d(e.multiplier * t)}×` : O,
+              subtext: p && e.multiplier != null ? /* @__PURE__ */ o(
+                r,
                 {
                   messageId: "components.strategyApyBreakdownCard.formula",
                   values: {
-                    leverage: d(o),
+                    leverage: d(t),
                     base: d(e.multiplier)
                   }
                 }
@@ -203,6 +215,6 @@ function J({
   );
 }
 export {
-  J as StrategyApyBreakdownCard,
+  so as StrategyApyBreakdownCard,
   n as StrategyApyBreakdownCardTest
 };

package/dist/esm/components/base/token-amount/token-amount.js

@@ -1,30 +1,46 @@
-import { jsx as r, jsxs as i } from "react/jsx-runtime";
-import { Stack as s } from "../stack/stack.js";
-import { TokenTemplate as a } from "../../token-template/token-template.js";
-import { Typography as l } from "../../typography/typography.js";
-import { formatMoney as p } from "../../../utils/format-money.js";
-import { TokenAmountTest as n } from "./constants.js";
-function v({
+import { jsx as r, jsxs as e } from "react/jsx-runtime";
+import { Stack as n } from "../stack/stack.js";
+import { NoValue as a } from "../values/no-value.js";
+import "react";
+import "@gearbox-protocol/sdk/onchain";
+import "clsx";
+import "tailwind-merge";
+import "sonner";
+import { formatMoney as s } from "../../../utils/format-money.js";
+import "luxon";
+import "../../../utils/z-index.js";
+import "../../points-icon/points-icon.js";
+import "viem";
+import "../../token-icon/token-icon.js";
+import "react-intl";
+import "../../tooltip/simple-tooltip.js";
+import "../../tooltip/tooltip.js";
+import "../../badge/badge.js";
+import "../../badge/chip.js";
+import { TokenTemplate as l } from "../../token-template/token-template.js";
+import { Typography as u } from "../../typography/typography.js";
+import { TokenAmountTest as t } from "./constants.js";
+function C({
   data: o,
-  token: e,
-  align: t = "end"
+  token: m,
+  align: i = "end"
 }) {
   if (o === null)
     return /* @__PURE__ */ r(
       "span",
       {
         className: "text-secondary-foreground",
-        "data-testid": n.root,
+        "data-testid": t.root,
         children: "—"
       }
     );
-  const m = e ?? o.token;
-  return /* @__PURE__ */ i(s, { gap: "xs", align: t, "data-testid": n.root, children: [
-    /* @__PURE__ */ r(a, { value: o.value, token: m }),
-    /* @__PURE__ */ r(l, { as: "span", variant: "caption", color: "secondary", children: o.valueUsd === null ? "—" : p(o.valueUsd) })
+  const p = m ?? o.token;
+  return /* @__PURE__ */ e(n, { gap: "xs", align: i, "data-testid": t.root, children: [
+    /* @__PURE__ */ r(l, { value: o.value, token: p }),
+    /* @__PURE__ */ r(u, { as: "span", variant: "caption", color: "secondary", children: o.valueUsd === null ? /* @__PURE__ */ r(a, {}) : s(o.valueUsd) })
   ] });
 }
 export {
-  v as TokenAmount,
-  n as TokenAmountTest
+  C as TokenAmount,
+  t as TokenAmountTest
 };

package/dist/esm/components/base/values/constants.js

@@ -9,6 +9,7 @@ class a {
   static tokenBigint = "value-token-bigint";
   static points = "value-points";
   static placeholder = "value-placeholder";
+  static accruing = "value-accruing";
 }
 class e {
   static root = "position-short-label";

package/dist/esm/components/base/values/index.js

@@ -1,26 +1,28 @@
 import { PositionShortLabelTest as t, ValueTest as r } from "./constants.js";
-import { PnlValue as i } from "./pnl-value.js";
-import { PointsValue as p } from "./points-value.js";
-import { PositionShortLabel as s } from "./position-short-label.js";
+import { NoValue as i } from "./no-value.js";
+import { PnlValue as p } from "./pnl-value.js";
+import { PointsValue as u } from "./points-value.js";
+import { PositionShortLabel as V } from "./position-short-label.js";
 import { PositionStatusBadge as n } from "./position-status-badge.js";
-import { PositionTypeBadge as f } from "./position-type-badge.js";
-import { PriceImpactValue as P, priceImpact as c } from "./price-impact-value.js";
-import { ApyValue as T, HealthFactorValue as b, LeverageValue as d, TokenBigint as h, UsdValue as B, UtilizationValue as L, bps as S } from "./scalars.js";
+import { PositionTypeBadge as P } from "./position-type-badge.js";
+import { PriceImpactValue as g, priceImpact as T } from "./price-impact-value.js";
+import { ApyValue as d, HealthFactorValue as h, LeverageValue as B, TokenBigint as L, UsdValue as S, UtilizationValue as y, bps as I } from "./scalars.js";
 export {
-  T as ApyValue,
-  b as HealthFactorValue,
-  d as LeverageValue,
-  i as PnlValue,
-  p as PointsValue,
-  s as PositionShortLabel,
+  d as ApyValue,
+  h as HealthFactorValue,
+  B as LeverageValue,
+  i as NoValue,
+  p as PnlValue,
+  u as PointsValue,
+  V as PositionShortLabel,
   t as PositionShortLabelTest,
   n as PositionStatusBadge,
-  f as PositionTypeBadge,
-  P as PriceImpactValue,
-  h as TokenBigint,
-  B as UsdValue,
-  L as UtilizationValue,
+  P as PositionTypeBadge,
+  g as PriceImpactValue,
+  L as TokenBigint,
+  S as UsdValue,
+  y as UtilizationValue,
   r as ValueTest,
-  S as bps,
-  c as priceImpact
+  I as bps,
+  T as priceImpact
 };

package/dist/esm/components/base/values/no-value.js

@@ -0,0 +1,34 @@
+import { jsx as e, jsxs as a } from "react/jsx-runtime";
+import { HelpTip as o } from "../../help-tip/help-tip.js";
+import { useIntlTyped as i } from "../../typed-intl/index.js";
+import { ValueTest as n } from "./constants.js";
+const c = "—";
+function u({ reason: r }) {
+  const t = i();
+  if (r === void 0)
+    return /* @__PURE__ */ e(
+      "span",
+      {
+        className: "text-secondary-foreground",
+        "data-testid": n.placeholder,
+        children: c
+      }
+    );
+  const s = t.formatMessage({
+    messageId: "components.value.accruing"
+  });
+  return /* @__PURE__ */ a(
+    "span",
+    {
+      className: "inline-flex items-center leading-[0]",
+      "data-testid": n.accruing,
+      children: [
+        /* @__PURE__ */ e(o, { iconSize: 18, children: s }),
+        /* @__PURE__ */ e("span", { className: "sr-only", children: s })
+      ]
+    }
+  );
+}
+export {
+  u as NoValue
+};

package/dist/esm/components/base/values/pnl-value.js

@@ -5,23 +5,24 @@ import { cn as i } from "../../../utils/cn.js";
 import "sonner";
 import "luxon";
 import "../../../utils/z-index.js";
-import { ValueTest as o } from "./constants.js";
-function f({
-  data: e
+import { ValueTest as s } from "./constants.js";
+import { NoValue as m } from "./no-value.js";
+function V({
+  data: o
 }) {
-  const t = typeof e == "number" ? e : e?.total.valueUsd ?? null;
+  const t = typeof o == "number" ? o : o?.total.valueUsd ?? null;
   if (t === null)
-    return /* @__PURE__ */ r("span", { "data-testid": o.placeholder, children: "—" });
-  const s = t > 0 ? "+" : t < 0 ? "−" : "";
+    return /* @__PURE__ */ r(m, {});
+  const e = t > 0 ? "+" : t < 0 ? "−" : "";
   return /* @__PURE__ */ r(
     "span",
     {
-      "data-testid": o.pnl,
+      "data-testid": s.pnl,
       className: i(t > 0 && "text-success", t < 0 && "text-destructive"),
-      children: `${s}$${Math.abs(t).toFixed(2)}`
+      children: `${e}$${Math.abs(t).toFixed(2)}`
     }
   );
 }
 export {
-  f as PnlValue
+  V as PnlValue
 };

package/dist/esm/components/base/values/price-impact-value.js

@@ -8,15 +8,16 @@ import { formatPercentAmount as o } from "../../../utils/format-money.js";
 import "luxon";
 import "../../../utils/z-index.js";
 import { ValueTest as i } from "./constants.js";
-function e(r) {
+import { NoValue as m } from "./no-value.js";
+function p(r) {
   return `${r > 0n ? "+" : ""}${o(Number(r) / 1e4, 2)}%`;
 }
-function I({
+function x({
   data: r
 }) {
-  return r === void 0 ? /* @__PURE__ */ t("span", { "data-testid": i.placeholder, children: "—" }) : /* @__PURE__ */ t("span", { "data-testid": i.priceImpact, children: e(r) });
+  return r === void 0 ? /* @__PURE__ */ t(m, {}) : /* @__PURE__ */ t("span", { "data-testid": i.priceImpact, children: p(r) });
 }
 export {
-  I as PriceImpactValue,
-  e as priceImpact
+  x as PriceImpactValue,
+  p as priceImpact
 };

package/dist/esm/components/base/values/scalars.js

@@ -1,5 +1,5 @@
-import { jsx as r, jsxs as m } from "react/jsx-runtime";
-import { formatUnits as u } from "viem";
+import { jsx as r, jsxs as u } from "react/jsx-runtime";
+import { formatUnits as l } from "viem";
 import { CompoundAPY as p } from "../../compound-apy/compound-apy.js";
 import { SimpleTooltip as a } from "../../tooltip/simple-tooltip.js";
 import "../../tooltip/tooltip.js";
@@ -7,42 +7,39 @@ import "react";
 import "@gearbox-protocol/sdk/onchain";
 import { cn as c } from "../../../utils/cn.js";
 import "sonner";
-import { formatAssetAmount as d } from "../../../utils/format-asset-amount.js";
-import { formatLeverage as f } from "../../../utils/format-leverage.js";
+import { formatAssetAmount as f } from "../../../utils/format-asset-amount.js";
+import { formatLeverage as d } from "../../../utils/format-leverage.js";
 import { formatPercentAmount as h, formatMoney as v } from "../../../utils/format-money.js";
 import "luxon";
 import "../../../utils/z-index.js";
 import { ValueTest as i } from "./constants.js";
-const x = "—";
-function n() {
-  return /* @__PURE__ */ r("span", { "data-testid": i.placeholder, children: x });
-}
+import { NoValue as n } from "./no-value.js";
 function s(t) {
   return `${h(t / 100, 2)}%`;
 }
-function E({
+function w({
   data: t,
   tooltip: e = !0,
   period: o
 }) {
-  return t === void 0 ? /* @__PURE__ */ r(n, {}) : typeof t == "number" ? /* @__PURE__ */ r("span", { "data-testid": i.apy, children: s(t) }) : /* @__PURE__ */ r("span", { "data-testid": i.apy, children: /* @__PURE__ */ r(p, { apy: t, tooltip: e, period: o }) });
+  return t === void 0 ? /* @__PURE__ */ r(n, { reason: o }) : typeof t == "number" ? /* @__PURE__ */ r("span", { "data-testid": i.apy, children: s(t) }) : /* @__PURE__ */ r("span", { "data-testid": i.apy, children: /* @__PURE__ */ r(p, { apy: t, tooltip: e, period: o }) });
 }
-function H({
+function C({
   data: t
 }) {
   return t == null ? /* @__PURE__ */ r(n, {}) : /* @__PURE__ */ r("span", { "data-testid": i.usd, children: v(t) });
 }
-function N({
+function H({
   data: t
 }) {
-  return t === void 0 ? /* @__PURE__ */ r(n, {}) : /* @__PURE__ */ r("span", { "data-testid": i.leverage, children: `${f(t)}x` });
+  return t === void 0 ? /* @__PURE__ */ r(n, {}) : /* @__PURE__ */ r("span", { "data-testid": i.leverage, children: `${d(t)}x` });
 }
-function w({
+function M({
   data: t
 }) {
   return t === void 0 ? /* @__PURE__ */ r(n, {}) : /* @__PURE__ */ r("span", { "data-testid": i.utilization, children: s(t) });
 }
-function D({
+function S({
   data: t
 }) {
   if (t === void 0)
@@ -50,26 +47,26 @@ function D({
   const e = t < 1e4 ? "text-destructive" : t < 11e3 ? "text-warning" : "text-success";
   return /* @__PURE__ */ r("span", { "data-testid": i.healthFactor, className: c(e), children: (t / 1e4).toFixed(2) });
 }
-function M({
+function Y({
   data: t,
   token: e,
   showSymbol: o = !0
 }) {
   if (t === void 0 || e === void 0)
     return /* @__PURE__ */ r(n, {});
-  const l = u(t, e.decimals);
+  const m = l(t, e.decimals);
   return (
     // `title` also keeps the amount where a hover tooltip cannot reach:
     // keyboard, touch, and the browser's own find — and keeps the symbol
     // reachable there even when the row is the one printing it
-    /* @__PURE__ */ m("span", { "data-testid": i.tokenBigint, title: `${l} ${e.symbol}`, children: [
+    /* @__PURE__ */ u("span", { "data-testid": i.tokenBigint, title: `${m} ${e.symbol}`, children: [
       /* @__PURE__ */ r(
         a,
         {
           placement: "top",
           className: "break-all",
-          title: /* @__PURE__ */ r("span", { children: d(t, e.decimals) }),
-          children: /* @__PURE__ */ r("span", { children: l })
+          title: /* @__PURE__ */ r("span", { children: f(t, e.decimals) }),
+          children: /* @__PURE__ */ r("span", { children: m })
         }
       ),
       o && ` ${e.symbol}`
@@ -77,11 +74,11 @@ function M({
   );
 }
 export {
-  E as ApyValue,
-  D as HealthFactorValue,
-  N as LeverageValue,
-  M as TokenBigint,
-  H as UsdValue,
-  w as UtilizationValue,
+  w as ApyValue,
+  S as HealthFactorValue,
+  H as LeverageValue,
+  Y as TokenBigint,
+  C as UsdValue,
+  M as UtilizationValue,
   s as bps
 };