@compass-labs/widgets 0.1.27 → 0.1.29

package/dist/index.mjs

@@ -6475,7 +6475,7 @@ function useRebalancingData(chainOverride) {
         if (usdValue <= 0) continue;
         balances.push({
           token: symbol,
-          balance: parseFloat(td.balance || "0"),
+          balance: parseFloat(td.balanceFormatted || td.balance_formatted || "0"),
           usdValue
         });
       }
@@ -6757,9 +6757,9 @@ function PortfolioBalanceCard({
   totalIdleUsd,
   idleBalances,
   earnAccountAddress,
-  isPositionsExpanded,
-  onTogglePositions,
+  onViewPositions,
   positionCount,
+  totalEarned = 0,
   showTopUp = true,
   onTopUp
 }) {
@@ -6857,27 +6857,43 @@ function PortfolioBalanceCard({
           /* @__PURE__ */ jsx(
             "button",
             {
-              onClick: onTogglePositions,
-              className: "flex items-center justify-between w-full text-left transition-opacity hover:opacity-80",
+              onClick: onViewPositions,
+              disabled: positionCount === 0,
+              className: "flex items-center justify-between w-full text-left transition-opacity hover:opacity-80 disabled:hover:opacity-100 disabled:cursor-default",
               children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col", style: { gap: "calc(var(--compass-spacing-unit) * 0.25)" }, children: [
                 /* @__PURE__ */ jsxs("div", { className: "flex items-center", style: { gap: "calc(var(--compass-spacing-unit) * 0.5)" }, children: [
                   /* @__PURE__ */ jsxs("span", { className: "text-sm", style: { color: "var(--compass-color-text-tertiary)" }, children: [
                     "Earning interest",
-                    positionCount > 0 ? ` \xB7 ${positionCount} ${positionCount === 1 ? "position" : "positions"}` : ""
+                    positionCount > 1 ? ` \xB7 ${positionCount} positions` : ""
                   ] }),
-                  positionCount > 0 && (isPositionsExpanded ? /* @__PURE__ */ jsx(ChevronDown, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } }) : /* @__PURE__ */ jsx(ChevronRight, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } }))
+                  positionCount > 0 && /* @__PURE__ */ jsx(ChevronRight, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } })
                 ] }),
-                /* @__PURE__ */ jsx(
-                  "span",
-                  {
-                    className: "font-semibold",
-                    style: {
-                      color: "var(--compass-color-text)",
-                      fontSize: "1rem"
-                    },
-                    children: formatUSD(earningInterestUsd)
-                  }
-                )
+                /* @__PURE__ */ jsxs("div", { className: "flex items-center", style: { gap: "calc(var(--compass-spacing-unit) * 0.75)" }, children: [
+                  /* @__PURE__ */ jsx(
+                    "span",
+                    {
+                      className: "font-semibold",
+                      style: {
+                        color: "var(--compass-color-text)",
+                        fontSize: "1rem"
+                      },
+                      children: formatUSD(earningInterestUsd)
+                    }
+                  ),
+                  positionCount > 0 && totalEarned !== 0 && /* @__PURE__ */ jsxs(
+                    "span",
+                    {
+                      className: "text-sm font-medium",
+                      style: {
+                        color: totalEarned >= 0 ? "var(--compass-color-success)" : "var(--compass-color-error)"
+                      },
+                      children: [
+                        totalEarned >= 0 ? "+" : "",
+                        formatUSD(totalEarned)
+                      ]
+                    }
+                  )
+                ] })
               ] })
             }
           )
@@ -6908,6 +6924,55 @@ var VENUE_LABELS = {
   aave: "Aave",
   pendle_pt: "Pendle PT"
 };
+function formatPercent(value) {
+  if (value === 0) return "0%";
+  if (Number.isInteger(value)) return `${value}%`;
+  const str = value.toFixed(2).replace(/0+$/, "").replace(/\.$/, "");
+  return `${str}%`;
+}
+function PercentInput({ value, onChange }) {
+  const [localValue, setLocalValue] = useState(value.toString());
+  const [isFocused, setIsFocused] = useState(false);
+  if (!isFocused && localValue !== value.toString()) {
+    const parsed = parseFloat(localValue);
+    if (isNaN(parsed) || Math.abs(parsed - value) > 1e-3) {
+      setLocalValue(value.toString());
+    }
+  }
+  return /* @__PURE__ */ jsx(
+    "input",
+    {
+      type: "text",
+      inputMode: "decimal",
+      value: isFocused ? localValue : formatPercent(value).replace("%", ""),
+      onFocus: () => {
+        setIsFocused(true);
+        setLocalValue(value.toString());
+      },
+      onChange: (e) => {
+        const raw = e.target.value;
+        setLocalValue(raw);
+        const parsed = parseFloat(raw);
+        if (!isNaN(parsed)) {
+          onChange(Math.max(0, Math.min(100, parsed)));
+        }
+      },
+      onBlur: () => {
+        setIsFocused(false);
+        const parsed = parseFloat(localValue);
+        if (!isNaN(parsed)) {
+          onChange(Math.max(0, Math.min(100, parsed)));
+        }
+      },
+      className: "w-16 text-center text-xs font-mono rounded bg-transparent outline-none",
+      style: {
+        color: "var(--compass-color-text)",
+        border: "1px solid var(--compass-color-border)",
+        padding: "2px 0"
+      }
+    }
+  );
+}
 function AllocationEditor({
   portfolio,
   targets,
@@ -7044,20 +7109,10 @@ function AllocationEditor({
                     ),
                     /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-0.5 flex-shrink-0", children: [
                       /* @__PURE__ */ jsx(
-                        "input",
+                        PercentInput,
                         {
-                          type: "number",
-                          value: target.targetPercent.toFixed(3),
-                          onChange: (e) => onUpdatePercent(index, parseFloat(e.target.value) || 0),
-                          className: "w-16 text-center text-xs font-mono rounded bg-transparent outline-none",
-                          style: {
-                            color: "var(--compass-color-text)",
-                            border: "1px solid var(--compass-color-border)",
-                            padding: "2px 0"
-                          },
-                          min: 0,
-                          max: 100,
-                          step: 1e-3
+                          value: target.targetPercent,
+                          onChange: (val) => onUpdatePercent(index, val)
                         }
                       ),
                       /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)", width: "12px" }, children: "%" })
@@ -7069,10 +7124,9 @@ function AllocationEditor({
                       className: "text-xs font-mono",
                       style: { color: diff > 0 ? "var(--compass-color-success)" : "var(--compass-color-error)", fontSize: "10px" },
                       children: [
-                        currentPercent.toFixed(3),
-                        "% \u2192 ",
-                        target.targetPercent.toFixed(3),
-                        "%"
+                        formatPercent(currentPercent),
+                        " \u2192 ",
+                        formatPercent(target.targetPercent)
                       ]
                     }
                   ) })
@@ -7114,8 +7168,8 @@ function AllocationEditor({
           color: "var(--compass-color-text-secondary)"
         },
         children: [
-          targetSum.toFixed(3),
-          "% allocated"
+          formatPercent(targetSum),
+          " allocated"
         ]
       }
     ) })
@@ -7181,7 +7235,8 @@ function RebalancingWidget({
   const [errorMessage, setErrorMessage] = useState(null);
   const [txHash, setTxHash] = useState(null);
   const [hasInitializedTargets, setHasInitializedTargets] = useState(false);
-  const [isPositionsExpanded, setIsPositionsExpanded] = useState(false);
+  const [isEarningsModalOpen, setIsEarningsModalOpen] = useState(false);
+  const [isAddMarketExpanded, setIsAddMarketExpanded] = useState(false);
   const [marketTab, setMarketTab] = useState("variable");
   const [selectedMarket, setSelectedMarket] = useState(null);
   const [selectedToken, setSelectedToken] = useState("USDC");
@@ -7199,7 +7254,7 @@ function RebalancingWidget({
     setErrorMessage(null);
     setTxHash(null);
     setHasInitializedTargets(false);
-    setIsPositionsExpanded(false);
+    setIsAddMarketExpanded(false);
     setSelectedMarket(null);
     setDepositAmount("");
     setDepositError(null);
@@ -7271,11 +7326,22 @@ function RebalancingWidget({
   const handleUpdatePercent = useCallback((index, value) => {
     setTargets((prev) => prev.map((t, i) => i === index ? { ...t, targetPercent: Math.max(0, Math.min(100, value)) } : t));
   }, []);
+  const ensureCorrectChain = useCallback(async () => {
+    const targetChainId = EVM_CHAIN_IDS2[CHAIN_ID];
+    if (!targetChainId) return;
+    if (walletChainId !== void 0 && walletChainId !== targetChainId) {
+      if (!switchChain) {
+        throw new Error(`Please switch your wallet to ${CHAIN_ID} (chain ${targetChainId})`);
+      }
+      await switchChain(targetChainId);
+    }
+  }, [walletChainId, switchChain, CHAIN_ID]);
   const handlePreview = useCallback(async () => {
     if (!portfolio || !hasChanges || !address) return;
     setWidgetState("previewing");
     setErrorMessage(null);
     try {
+      await ensureCorrectChain();
       const response = await fetch("/api/compass/rebalance/preview", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -7304,7 +7370,7 @@ function RebalancingWidget({
       setWidgetState("error");
       onError?.(err instanceof Error ? err : new Error("Preview failed"));
     }
-  }, [portfolio, hasChanges, address, CHAIN_ID, targets, defaultSlippage, clientPreview, onError]);
+  }, [portfolio, hasChanges, address, CHAIN_ID, targets, defaultSlippage, clientPreview, onError, ensureCorrectChain]);
   const handleExecute = useCallback(async () => {
     if (!serverPreview?.eip712 || !address) return;
     setWidgetState("signing");
@@ -7351,16 +7417,59 @@ function RebalancingWidget({
     return idleBalance?.balance ?? 0;
   }, [portfolio, selectedToken]);
   const needsSwap = selectedMarket ? selectedToken !== selectedMarket.underlyingToken : false;
-  const ensureCorrectChain = useCallback(async () => {
-    const targetChainId = EVM_CHAIN_IDS2[CHAIN_ID];
-    if (!targetChainId) return;
-    if (walletChainId !== void 0 && walletChainId !== targetChainId) {
-      if (!switchChain) {
-        throw new Error(`Please switch your wallet to ${CHAIN_ID} (chain ${targetChainId})`);
-      }
-      await switchChain(targetChainId);
-    }
-  }, [walletChainId, switchChain, CHAIN_ID]);
+  const rawPositionsQuery = useQuery({
+    queryKey: ["rebalancingRawPositions", CHAIN_ID, address],
+    queryFn: async () => {
+      if (!address) return [];
+      const response = await fetch(`/api/compass/positions?chain=${CHAIN_ID}&owner=${address}`);
+      if (!response.ok) return [];
+      const data = await response.json();
+      return data.positions || [];
+    },
+    enabled: !!address,
+    staleTime: 3e4
+  });
+  const earningsPositions = useMemo(() => {
+    return (rawPositionsQuery.data || []).map((pos, index) => ({
+      id: `pos-${index}`,
+      marketType: pos.protocol,
+      marketName: pos.name,
+      marketId: `${pos.protocol}-${index}`,
+      amount: parseFloat(pos.balance || "0"),
+      token: pos.symbol,
+      apy: pos.apy || 0,
+      performance: parseFloat(pos.pnl?.totalPnl || "0"),
+      pnl: pos.pnl ? {
+        unrealizedPnl: parseFloat(pos.pnl.unrealizedPnl || "0"),
+        realizedPnl: parseFloat(pos.pnl.realizedPnl || "0"),
+        totalPnl: parseFloat(pos.pnl.totalPnl || "0")
+      } : void 0,
+      transactions: [
+        ...(pos.deposits || []).map((d, i) => ({
+          id: `dep-${index}-${i}`,
+          type: "deposit",
+          amount: parseFloat(d.amount || "0"),
+          token: pos.symbol,
+          txHash: d.txHash || "",
+          timestamp: d.timestamp || void 0
+        })),
+        ...(pos.withdrawals || []).map((w, i) => ({
+          id: `wit-${index}-${i}`,
+          type: "withdraw",
+          amount: parseFloat(w.amount || "0"),
+          token: pos.symbol,
+          txHash: w.txHash || "",
+          timestamp: w.timestamp || void 0
+        }))
+      ].sort((a, b) => {
+        if (a.timestamp && b.timestamp) return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();
+        if (a.timestamp) return -1;
+        if (b.timestamp) return 1;
+        return 0;
+      })
+    }));
+  }, [rawPositionsQuery.data]);
+  const totalEarned = useMemo(() => earningsPositions.reduce((sum, p) => sum + p.performance, 0), [earningsPositions]);
   const buildVenueParamsFromMarket = (market) => {
     switch (market.type) {
       case "aave":
@@ -7615,14 +7724,14 @@ function RebalancingWidget({
                     totalUsd: portfolio.totalUsd,
                     totalIdleUsd: portfolio.totalIdleUsd,
                     idleBalances: portfolio.idleBalances,
-                    isPositionsExpanded,
-                    onTogglePositions: () => setIsPositionsExpanded((prev) => !prev),
+                    onViewPositions: () => setIsEarningsModalOpen(true),
                     positionCount: portfolio.positions.length,
+                    totalEarned,
                     showTopUp,
                     onTopUp: () => earnBalanceRef.current?.openTransferModal()
                   }
                 ),
-                isPositionsExpanded && /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(
+                /* @__PURE__ */ jsx(
                   AllocationEditor,
                   {
                     portfolio,
@@ -7635,8 +7744,30 @@ function RebalancingWidget({
                     onResetToCurrent: handleResetToCurrent,
                     onEqualSplit: handleEqualSplit
                   }
-                ) }),
-                !isPositionsExpanded && /* @__PURE__ */ jsxs(Fragment, { children: [
+                ),
+                /* @__PURE__ */ jsxs(
+                  "button",
+                  {
+                    onClick: () => setIsAddMarketExpanded((prev) => !prev),
+                    className: "flex items-center font-medium transition-all hover:opacity-80",
+                    style: {
+                      backgroundColor: "var(--compass-color-surface)",
+                      border: "1px solid var(--compass-color-border)",
+                      color: "var(--compass-color-text-secondary)",
+                      borderRadius: "var(--compass-border-radius-lg)",
+                      padding: "calc(var(--compass-spacing-unit) * 0.75) calc(var(--compass-spacing-unit) * 1)",
+                      gap: "calc(var(--compass-spacing-unit) * 0.5)",
+                      fontSize: "0.8125rem",
+                      width: "100%",
+                      justifyContent: "center"
+                    },
+                    children: [
+                      isAddMarketExpanded ? /* @__PURE__ */ jsx(ChevronDown, { size: 14 }) : /* @__PURE__ */ jsx(Plus, { size: 14 }),
+                      isAddMarketExpanded ? "Hide" : "Add new market"
+                    ]
+                  }
+                ),
+                isAddMarketExpanded && /* @__PURE__ */ jsxs(Fragment, { children: [
                   /* @__PURE__ */ jsx(
                     MarketSelector,
                     {
@@ -8056,7 +8187,17 @@ function RebalancingWidget({
             ]
           }
         ) }),
-        /* @__PURE__ */ jsx(EarnAccountBalance, { ref: earnBalanceRef, compact: true, hideVisual: true, onTransferComplete: () => refetch() })
+        /* @__PURE__ */ jsx(EarnAccountBalance, { ref: earnBalanceRef, compact: true, hideVisual: true, onTransferComplete: () => refetch() }),
+        /* @__PURE__ */ jsx(
+          EarningsModal,
+          {
+            isOpen: isEarningsModalOpen,
+            onClose: () => setIsEarningsModalOpen(false),
+            positions: earningsPositions,
+            totalEarned,
+            isLoading: rawPositionsQuery.isLoading
+          }
+        )
       ]
     }
   );