@loafmarkets/ui 0.1.268 → 0.1.270

package/dist/index.mjs

@@ -13602,6 +13602,7 @@ function EditableField({ value, onCommit, format }) {
 function PortfolioActivityPanel({
   positions = [],
   showPositionsTab = false,
+  showSubscriptionsTab = true,
   onPositionClick,
   onClosePosition,
   offeringOrders = [],
@@ -13620,7 +13621,7 @@ function PortfolioActivityPanel({
   className,
   style
 }) {
-  const resolvedDefaultTab = defaultTab ?? (showPositionsTab ? "positions" : "subscriptions");
+  const resolvedDefaultTab = defaultTab ?? (showPositionsTab ? "positions" : showSubscriptionsTab ? "subscriptions" : "orders");
   const [activeTab, setActiveTab] = useState(resolvedDefaultTab);
   const [activityPage, setActivityPage] = useState(0);
   const [pendingCancelOrderId, setPendingCancelOrderId] = useState(null);
@@ -13703,6 +13704,27 @@ function PortfolioActivityPanel({
       setAllExpanded(true);
     }
   };
+  const mergedOrderHistory = useMemo(() => {
+    if (showSubscriptionsTab || offeringOrders.length === 0) return orderHistory;
+    const mapped = offeringOrders.map((o, i) => ({
+      id: o.ipoOrderId ?? -(i + 1),
+      propertyId: 0,
+      tokenName: o.tokenName,
+      side: "BUY",
+      type: "MARKET",
+      timeInForce: "GTC",
+      quantity: o.quantity,
+      price: o.price,
+      status: o.status.toUpperCase() === "ALLOCATED" ? "FILLED" : o.status.toUpperCase(),
+      filledQuantity: o.status.toUpperCase() === "ALLOCATED" || o.status.toUpperCase() === "FILLED" || o.status.toUpperCase() === "CONFIRMED" ? o.quantity : 0,
+      rejectionReason: null,
+      deadline: 0,
+      filledAt: o.status.toUpperCase() === "ALLOCATED" || o.status.toUpperCase() === "FILLED" || o.status.toUpperCase() === "CONFIRMED" ? o.createdAt : null,
+      cancelledAt: null,
+      createdAt: o.createdAt
+    }));
+    return [...orderHistory, ...mapped].sort((a, b) => b.createdAt - a.createdAt);
+  }, [showSubscriptionsTab, offeringOrders, orderHistory]);
   const activeTabTotal = useMemo(() => {
     switch (activeTab) {
       case "positions":
@@ -13712,7 +13734,7 @@ function PortfolioActivityPanel({
       case "open-orders":
         return openOrders.length;
       case "orders":
-        return orderHistory.length;
+        return mergedOrderHistory.length;
       case "trades":
         return tradeHistory.length;
       case "transfers":
@@ -13720,15 +13742,15 @@ function PortfolioActivityPanel({
       default:
         return 0;
     }
-  }, [activeTab, positions.length, offeringOrders.length, openOrders.length, orderHistory.length, tradeHistory.length, transfers.length]);
+  }, [activeTab, positions.length, offeringOrders.length, openOrders.length, mergedOrderHistory.length, tradeHistory.length, transfers.length]);
   const positionsCount = positions.length;
   const openOrdersCount = useMemo(
     () => openOrders.filter((o) => o.status === "OPEN" || o.status === "PARTIALLY_FILLED").length,
     [openOrders]
   );
   const pendingHistoryCount = useMemo(
-    () => orderHistory.filter((o) => o.status === "OPEN" || o.status === "PARTIALLY_FILLED").length,
-    [orderHistory]
+    () => mergedOrderHistory.filter((o) => o.status === "OPEN" || o.status === "PARTIALLY_FILLED").length,
+    [mergedOrderHistory]
   );
   const pendingOfferingsCount = useMemo(
     () => offeringOrders.filter((o) => {
@@ -13754,7 +13776,7 @@ function PortfolioActivityPanel({
           ")"
         ] })
       ] }),
-      /* @__PURE__ */ jsxs(Tab, { $active: activeTab === "subscriptions", onClick: () => handleTabChange("subscriptions"), children: [
+      showSubscriptionsTab && /* @__PURE__ */ jsxs(Tab, { $active: activeTab === "subscriptions", onClick: () => handleTabChange("subscriptions"), children: [
         "Initial Offerings",
         pendingOfferingsCount > 0 && /* @__PURE__ */ jsxs(TabCount, { children: [
           " (",
@@ -14032,8 +14054,8 @@ function PortfolioActivityPanel({
         ] })
       ] }),
       activeTab === "orders" && /* @__PURE__ */ jsxs(Fragment, { children: [
-        orderHistory.length === 0 && /* @__PURE__ */ jsx(EmptyState, { children: "No orders yet. Place a trade to see it appear here." }),
-        orderHistory.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
+        mergedOrderHistory.length === 0 && /* @__PURE__ */ jsx(EmptyState, { children: "No orders yet. Place a trade to see it appear here." }),
+        mergedOrderHistory.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsxs(GridHeader, { $columns: "1.2fr 0.6fr 0.7fr 0.8fr 1fr 0.8fr 0.8fr 1fr", children: [
             /* @__PURE__ */ jsx(GridHeaderCell, { children: "Asset" }),
             /* @__PURE__ */ jsx(GridHeaderCell, { children: "Side" }),
@@ -14044,7 +14066,7 @@ function PortfolioActivityPanel({
             /* @__PURE__ */ jsx(GridHeaderCell, { children: "Status" }),
             /* @__PURE__ */ jsx(GridHeaderCell, { children: "Date" })
           ] }),
-          pageSlice(orderHistory).map((order) => {
+          pageSlice(mergedOrderHistory).map((order) => {
             const meta = getOrderStatusMeta(order.status);
             const isMarket = order.type === "MARKET";
             const filledPercent = order.quantity > 0 ? Math.round(order.filledQuantity / order.quantity * 100) : 0;
@@ -14201,6 +14223,7 @@ var ContentScroll = styled9.div`
   flex: 1;
   overflow-y: auto;
   min-height: 0;
+  padding-bottom: 1rem;
   scrollbar-width: thin;
   scrollbar-color: rgba(255, 255, 255, 0.1) transparent;
   &::-webkit-scrollbar { width: 4px; }