@mohasinac/appkit 4.11.2 → 4.12.0

package/dist/features/orders/components/index.js

@@ -1,4 +1,5 @@
 export { OrderCard, OrdersList } from "./OrdersList";
+export { OrderAddonBadges, } from "./OrderAddonBadges";
 export { MarketplaceOrderCard, } from "./MarketplaceOrderCard";
 export { OrderFilters, ORDER_FILTER_KEYS, ORDER_ADMIN_SORT_OPTIONS, ORDER_SELLER_SORT_OPTIONS, ORDER_USER_SORT_OPTIONS, getOrderFilterKeys, getOrderSortOptions, } from "./OrderFilters";
 export { OrderSiblingPayments } from "./OrderSiblingPayments";

package/dist/features/orders/repository/orders.repository.d.ts

@@ -101,6 +101,22 @@ declare class OrderRepository extends BaseRepository<OrderDocument> {
             canFilter: boolean;
             canSort: boolean;
         };
+        whatsappNotifyAddon: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
+        giftWrapAddon: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
+        shipmentProtectionAddon: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
+        couponCode: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
     };
     listForSeller(productIds: string[], model: SieveModel): Promise<FirebaseSieveResult<OrderDocument>>;
     listForUser(userId: string, model: SieveModel): Promise<FirebaseSieveResult<OrderDocument>>;
@@ -175,6 +191,26 @@ declare class OrderRepository extends BaseRepository<OrderDocument> {
             canFilter: boolean;
             canSort: boolean;
         };
+        orderType: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
+        whatsappNotifyAddon: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
+        giftWrapAddon: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
+        shipmentProtectionAddon: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
+        couponCode: {
+            canFilter: boolean;
+            canSort: boolean;
+        };
     };
     listAll(model: SieveModel): Promise<FirebaseSieveResult<OrderDocument>>;
     /**

package/dist/features/orders/repository/orders.repository.js

@@ -496,6 +496,13 @@ OrderRepository.SELLER_SIEVE_FIELDS = {
     orderDate: { canFilter: true, canSort: true, parseValue: parseSieveDateValue },
     createdAt: { canFilter: true, canSort: true, parseValue: parseSieveDateValue },
     contestable: { canFilter: true, canSort: false },
+    // Fulfilment flags. Filterable so "which of my orders need gift wrap?" is a
+    // query against the orders themselves — the whole point of recording the
+    // add-on on the order rather than keeping a side list of who asked for what.
+    whatsappNotifyAddon: { canFilter: true, canSort: false },
+    giftWrapAddon: { canFilter: true, canSort: false },
+    shipmentProtectionAddon: { canFilter: true, canSort: false },
+    couponCode: { canFilter: true, canSort: false },
 };
 OrderRepository.ADMIN_SIEVE_FIELDS = {
     id: { canFilter: true, canSort: false },
@@ -516,6 +523,17 @@ OrderRepository.ADMIN_SIEVE_FIELDS = {
     // S-SBUNI-RULES 2026-05-13 — refund + batch fields
     paymentBatchId: { canFilter: true, canSort: false },
     contestable: { canFilter: true, canSort: false },
+    // Lane segregation on /user/orders — "standard"/"auction"/"offer" etc.
+    // Never filtered as "standard" via Firestore == (see listForUser callers):
+    // orders written before this field existed have no value to match.
+    orderType: { canFilter: true, canSort: false },
+    // Same fulfilment flags as SELLER_SIEVE_FIELDS — admin needs to answer
+    // "who opted into WhatsApp updates?" when a status change goes out, without
+    // maintaining a parallel tracker.
+    whatsappNotifyAddon: { canFilter: true, canSort: false },
+    giftWrapAddon: { canFilter: true, canSort: false },
+    shipmentProtectionAddon: { canFilter: true, canSort: false },
+    couponCode: { canFilter: true, canSort: false },
 };
 const orderRepository = new OrderRepository();
 export { OrderRepository, orderRepository };

package/dist/features/orders/types/index.d.ts

@@ -1,6 +1,8 @@
 import { type PaymentGateway, PaymentGatewayValues } from "../../payments/schemas";
 export { type PaymentGateway, PaymentGatewayValues };
 import type { ListingType } from "../../products/types/index";
+import type { OrderType } from "../utils/order-splitter";
+import type { AppliedOrderDiscount } from "../schemas/firestore";
 export type PaymentStatus = "pending" | "processing" | "paid" | "failed" | "refunded" | "partial_refund";
 export interface UserAddress {
     id: string;
@@ -57,6 +59,13 @@ export interface Order {
     address: UserAddress;
     orderStatus: OrderStatus;
     paymentStatus: PaymentStatus;
+    /**
+     * Which checkout lane produced this order. Absent on orders written before
+     * the field existed — treat missing as `"standard"`, never filter it out.
+     */
+    orderType?: OrderType;
+    /** Set when this order settled an accepted Make-an-Offer. */
+    offerId?: string;
     paymentGateway?: PaymentGateway;
     subtotal: number;
     shippingCost?: number;
@@ -64,7 +73,36 @@ export interface Order {
     tax?: number;
     total: number;
     currency: string;
+    /**
+     * First applied coupon's code only. Kept for back-compat; prefer
+     * `appliedDiscounts` when rendering, since a cart may stack one coupon per
+     * store plus one platform-wide coupon and this scalar shows only one of them.
+     */
     couponCode?: string;
+    /** Total rupee value of every discount applied to this order. */
+    couponDiscount?: number;
+    /** Every discount applied to this order — the full stack, not just the first. */
+    appliedDiscounts?: AppliedOrderDiscount[];
+    /**
+     * Paid add-ons the buyer opted into for THIS order (= this store).
+     *
+     * These are operational flags, not just billing records: `whatsappNotifyAddon`
+     * is what the status-change notifier checks to decide whether to send a
+     * WhatsApp message, and `giftWrapAddon`/`shipmentProtectionAddon` are what
+     * the packer needs to see before dispatch. They live on the order itself and
+     * are filterable (`orders` SIEVE_FIELDS) precisely so nobody has to keep a
+     * separate list of who asked for what.
+     */
+    whatsappNotifyAddon?: boolean;
+    whatsappNotifyFee?: number;
+    giftWrapAddon?: boolean;
+    giftWrapFee?: number;
+    /** The buyer's gift message — the packer has to physically include this. */
+    giftWrapMessage?: string;
+    shipmentProtectionAddon?: boolean;
+    shipmentProtectionFee?: number;
+    /** Buyer-facing platform commission apportioned to this order. */
+    platformFee?: number;
     trackingNumber?: string;
     shippingCarrier?: string;
     /** Carrier tracking page URL — rendered as an external link that opens in a new tab. No live-tracking API integration; this is just the passthrough URL a seller/admin entered. */

package/dist/features/pre-orders/components/PreOrderBottomActions.d.ts

@@ -2,4 +2,4 @@ export interface PreOrderBottomActionsProps {
     price: number | null;
     currency: string;
 }
-export declare function PreOrderBottomActions({ price, currency, }: PreOrderBottomActionsProps): null;
+export declare function PreOrderBottomActions({ price, currency, }: PreOrderBottomActionsProps): import("react").JSX.Element;

package/dist/features/pre-orders/components/PreOrderBottomActions.js

@@ -1,22 +1,6 @@
 "use client";
-import { useBottomActions } from "../../layout/hooks/useBottomActions";
-import { formatCurrency } from "../../../utils/number.formatter";
-import { ACTION_ID } from "../../products/constants/action-defs";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ListingBottomActions } from "../../products/components/ListingBottomActions";
 export function PreOrderBottomActions({ price, currency, }) {
-    useBottomActions({
-        actions: [
-            {
-                id: ACTION_ID.RESERVE_NOW,
-                label: "Reserve Now",
-                variant: "primary",
-                onClick: () => {
-                    document
-                        .getElementById("pre-order-buy-bar")
-                        ?.scrollIntoView({ behavior: "smooth" });
-                },
-            },
-        ],
-        infoLabel: price !== null ? formatCurrency(price, currency) : undefined,
-    });
-    return null;
+    return (_jsx(ListingBottomActions, { listingType: "preorder", anchorId: "pre-order-buy-bar", price: price, currency: currency }));
 }

package/dist/features/products/components/ArtStickersListView.js

@@ -4,9 +4,8 @@ import { AdSlot } from "../../homepage/components/AdSlot";
 import { ProductsIndexListing } from "./ProductsIndexListing";
 import { PRODUCT_FIELDS } from "../../../constants/field-names";
 import { sortBy } from "../../../constants/sort";
-import { ART_STICKERS_TYPE_FILTER_TABS } from "../constants/listing-tabs";
-import { listPublicProducts, parsePublicProductParams, } from "../../../_internal/server/features/products/list-public";
-const ART_STICKERS_LISTING_TYPES = ["art", "stickers"];
+import { ART_STICKERS_TYPE_FILTER_TABS, ART_STICKERS_LISTING_TYPES, } from "../constants/listing-tabs";
+import { listPublicProducts, parsePublicProductParams, defaultTogglesForListingTypes, } from "../../../_internal/server/features/products/list-public";
 const DEFAULT_PAGE_SIZE = 24;
 const DEFAULT_SORT = sortBy(PRODUCT_FIELDS.CREATED_AT);
 export async function ArtStickersListView({ searchParams = {} }) {
@@ -17,7 +16,9 @@ export async function ArtStickersListView({ searchParams = {} }) {
         listingTypes: ART_STICKERS_LISTING_TYPES,
         pageSize: DEFAULT_PAGE_SIZE,
         sorts: DEFAULT_SORT,
-        hideSoldByDefault: true,
+        // Derived, so this page and ProductsIndexListing can never disagree
+        // about the default view (Root Cause #30).
+        ...defaultTogglesForListingTypes(ART_STICKERS_LISTING_TYPES),
     }));
     return (_jsxs(Main, { children: [_jsx(Section, { border: "bottom-subtle", paddingY: "b-md", padding: "t-xl", children: _jsxs(Container, { size: "xl", children: [_jsx(Heading, { level: 1, size: "3xl", weight: "bold", color: "primary", children: "Art & Stickers" }), _jsx(Text, { className: "mt-1", color: "muted", size: "sm", children: "Original art prints and sticker packs from independent sellers" })] }) }), _jsxs(Container, { size: "xl", padding: "x-md", children: [_jsx(AdSlot, { id: "listing-sidebar-top", className: "mb-4 mt-4" }), _jsx(ProductsIndexListing, { initialData: result ?? null, listingTypes: ART_STICKERS_LISTING_TYPES, typeTabs: ART_STICKERS_TYPE_FILTER_TABS, searchPlaceholder: "Search art & stickers..." }), _jsx(AdSlot, { id: "listing-sidebar-bottom", className: "mt-8" })] })] }));
 }

package/dist/features/products/components/AuctionsIndexListing.js

@@ -24,7 +24,6 @@ const __O = {
     hidden: "overflow-hidden",
 };
 const DEFAULT_SORT = AUCTION_PUBLIC_SORT_OPTIONS[0].value;
-const AUCTION_SORT_OPTIONS = AUCTION_PUBLIC_SORT_OPTIONS;
 const FILTER_KEYS = [TABLE_KEYS.CATEGORY, TABLE_KEYS.BRAND, TABLE_KEYS.MIN_BID, TABLE_KEYS.MAX_BID, TABLE_KEYS.STORE_ID, TABLE_KEYS.DATE_FROM, TABLE_KEYS.DATE_TO];
 export function AuctionsIndexListing({ initialData, categorySlug, brandName }) {
     const table = useUrlTable({ defaults: { pageSize: "24", sort: DEFAULT_SORT } });
@@ -132,7 +131,7 @@ export function AuctionsIndexListing({ initialData, categorySlug, brandName }) {
                     },
                 },
             ] } } : {});
-    return (_jsxs(Div, { className: "min-h-screen", children: [_jsx(ListingToolbar, { filterCount: filterActiveCount, onFiltersClick: openFilters, searchValue: searchInput, searchPlaceholder: "Search auctions...", onSearchChange: setSearchInput, onSearchCommit: commitSearch, onSearchKeyDown: handleSearchKeyDown, sortValue: table.get(TABLE_KEYS.SORT) || DEFAULT_SORT, sortOptions: AUCTION_SORT_OPTIONS, onSortChange: (v) => { table.set(TABLE_KEYS.SORT, v); }, view: view, onViewChange: handleViewToggle, onResetAll: resetAll, hasActiveState: hasActiveState, bulkMode: selection.isSelecting, bulkSelectedCount: selection.selectedCount, bulkTotalCount: auctions.length, onBulkSelectAll: selection.toggleAll, onBulkClear: selection.clearSelection, toggles: [
+    return (_jsxs(Div, { className: "min-h-screen", children: [_jsx(ListingToolbar, { filterCount: filterActiveCount, onFiltersClick: openFilters, searchValue: searchInput, searchPlaceholder: "Search auctions...", onSearchChange: setSearchInput, onSearchCommit: commitSearch, onSearchKeyDown: handleSearchKeyDown, sortValue: table.get(TABLE_KEYS.SORT) || DEFAULT_SORT, sortOptions: AUCTION_PUBLIC_SORT_OPTIONS, onSortChange: (v) => { table.set(TABLE_KEYS.SORT, v); }, view: view, onViewChange: handleViewToggle, onResetAll: resetAll, hasActiveState: hasActiveState, bulkMode: selection.isSelecting, bulkSelectedCount: selection.selectedCount, bulkTotalCount: auctions.length, onBulkSelectAll: selection.toggleAll, onBulkClear: selection.clearSelection, toggles: [
                     { label: "Show ended", active: showEnded, onChange: (next) => table.set(TABLE_KEYS.SHOW_ENDED, next ? "true" : "") },
                 ] }), _jsx(BulkActionBar, { selectedCount: selection.selectedCount, onClearSelection: selection.clearSelection, actions: [
                     {

package/dist/features/products/components/ListingBottomActions.d.ts

@@ -0,0 +1,28 @@
+import { MOBILE_PRIMARY_ACTIONS } from "../constants/action-defs";
+/**
+ * The sticky-CTA registrar shared by every listing type whose bottom bar is just
+ * "primary CTA that scrolls to the buy/contact panel, plus a price label".
+ *
+ * Pre-order, prize-draw, classified, digital-code and live all fit that shape, which put
+ * it well past the Rule of Three for a per-type copy. Auction and standard product keep
+ * their own registrars — the auction ticks a live countdown into `secondaryLabel`, and
+ * the product bar carries three buttons whose labels track cart/wishlist state.
+ *
+ * Renders nothing; it exists purely to register into `BottomActionsContext`.
+ */
+export interface ListingBottomActionsProps {
+    /** Selects the CTA set from the ACTIONS registry (Rule #7 — never inline actions). */
+    listingType: keyof typeof MOBILE_PRIMARY_ACTIONS;
+    /** `id` of the element the CTA scrolls to. */
+    anchorId: string;
+    price: number | null;
+    currency: string;
+    /**
+     * Register nothing at all — for ended/closed/sold-out listings, matching how the
+     * auction and prize-draw registrars bail out.
+     */
+    unavailable?: boolean;
+    /** Appended after the formatted price, e.g. "per entry". */
+    infoSuffix?: string;
+}
+export declare function ListingBottomActions({ listingType, anchorId, price, currency, unavailable, infoSuffix, }: ListingBottomActionsProps): null;

package/dist/features/products/components/ListingBottomActions.js

@@ -0,0 +1,25 @@
+"use client";
+import { useBottomActions } from "../../layout/hooks/useBottomActions";
+import { formatCurrency } from "../../../utils/number.formatter";
+import { ACTION_META, MOBILE_PRIMARY_ACTIONS } from "../constants/action-defs";
+export function ListingBottomActions({ listingType, anchorId, price, currency, unavailable = false, infoSuffix, }) {
+    const actionIds = MOBILE_PRIMARY_ACTIONS[listingType] ?? [];
+    const infoLabel = price !== null
+        ? `${formatCurrency(price, currency)}${infoSuffix ? ` ${infoSuffix}` : ""}`
+        : undefined;
+    useBottomActions(unavailable
+        ? {}
+        : {
+            actions: actionIds.map((id) => ({
+                ...ACTION_META[id],
+                onClick: () => {
+                    document
+                        .getElementById(anchorId)
+                        ?.scrollIntoView({ behavior: "smooth" });
+                },
+            })),
+            infoLabel,
+            desktop: "after-scroll",
+        });
+    return null;
+}

package/dist/features/products/components/PrizeDrawBottomActions.d.ts

@@ -3,4 +3,4 @@ export interface PrizeDrawBottomActionsProps {
     currency: string;
     closed: boolean;
 }
-export declare function PrizeDrawBottomActions({ pricePerEntry, currency, closed, }: PrizeDrawBottomActionsProps): null;
+export declare function PrizeDrawBottomActions({ pricePerEntry, currency, closed, }: PrizeDrawBottomActionsProps): import("react").JSX.Element;

package/dist/features/products/components/PrizeDrawBottomActions.js

@@ -1,24 +1,6 @@
 "use client";
-import { useBottomActions } from "../../layout/hooks/useBottomActions";
-import { formatCurrency } from "../../../utils/number.formatter";
-import { ACTION_ID } from "../constants/action-defs";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ListingBottomActions } from "./ListingBottomActions";
 export function PrizeDrawBottomActions({ pricePerEntry, currency, closed, }) {
-    useBottomActions(closed
-        ? {}
-        : {
-            actions: [
-                {
-                    id: ACTION_ID.BUY_NOW,
-                    label: "Buy Now",
-                    variant: "primary",
-                    onClick: () => {
-                        document
-                            .getElementById("prize-draw-buy-bar")
-                            ?.scrollIntoView({ behavior: "smooth" });
-                    },
-                },
-            ],
-            infoLabel: `${formatCurrency(pricePerEntry, currency)} per entry`,
-        });
-    return null;
+    return (_jsx(ListingBottomActions, { listingType: "prize-draw", anchorId: "prize-draw-buy-bar", price: pricePerEntry, currency: currency, unavailable: closed, infoSuffix: "per entry" }));
 }

package/dist/features/products/components/PrizeDrawsListingView.js

@@ -1,33 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { sieveFilter, SIEVE_OP } from "@mohasinac/appkit";
-import { productRepository } from "../../../repositories";
 import { Container, Main, Heading, Section, Text } from "../../../ui";
 import { AdSlot } from "../../homepage/components/AdSlot";
-import { parseListingSearchParams } from "../../../utils/listing-params";
+import { PRODUCT_FIELDS } from "../../../constants/field-names";
+import { sortBy } from "../../../constants/sort";
+import { listPublicProducts, parsePublicProductParams, defaultTogglesForListingTypes, } from "../../../_internal/server/features/products/list-public";
 import { PrizeDrawsIndexListing } from "./PrizeDrawsIndexListing";
-const DEFAULT_PAGE = 1;
+const LISTING_TYPES = ["prize-draw"];
 const DEFAULT_PAGE_SIZE = 24;
-const DEFAULT_SORT = "-createdAt";
-function sp(params, key) {
-    const v = params[key];
-    return Array.isArray(v) ? v[0] ?? "" : v ?? "";
-}
-function buildPrizeDrawFilters(params) {
-    const parts = ["status==published", "listingType==prize-draw"];
-    const minPrice = sp(params, "minPrice");
-    const maxPrice = sp(params, "maxPrice");
-    if (minPrice)
-        parts.push(sieveFilter("pricePerEntry", SIEVE_OP.GTE, minPrice));
-    if (maxPrice)
-        parts.push(sieveFilter("pricePerEntry", SIEVE_OP.LTE, maxPrice));
-    const store = sp(params, "storeId");
-    if (store)
-        parts.push(sieveFilter("storeId", SIEVE_OP.EQ, store));
-    const status = sp(params, "prizeRevealStatus");
-    if (status)
-        parts.push(sieveFilter("prizeRevealStatus", SIEVE_OP.EQ, status));
-    return parts.join(",");
-}
+const DEFAULT_SORT = sortBy(PRODUCT_FIELDS.CREATED_AT);
 /**
  * Public listing page (SB4-F). Server-fetches published prize-draw products,
  * hydrates the client `PrizeDrawsIndexListing` which renders the filter
@@ -38,13 +18,18 @@ function buildPrizeDrawFilters(params) {
  * already gone (matches `PrizeDrawCollage`'s `hideWonState` prop).
  */
 export async function PrizeDrawsListingView({ searchParams = {}, }) {
-    const std = parseListingSearchParams(searchParams);
-    const sort = std.sorts ?? DEFAULT_SORT;
-    const page = std.page ?? DEFAULT_PAGE;
-    const pageSize = std.pageSize ?? DEFAULT_PAGE_SIZE;
-    const filters = buildPrizeDrawFilters(searchParams);
-    const result = await productRepository
-        .list({ filters, sorts: sort, page, pageSize })
-        .catch(() => null);
+    // Routed through the shared query (2026-08-21). The hand-rolled builder this
+    // replaces had its own Root Cause #30 divergence: it applied the price range
+    // to `pricePerEntry`, while the client's refetch sends minPrice/maxPrice,
+    // which the shared query applies to `price`. Both fields carry the same
+    // value today, so the split was invisible — until one of them drifted.
+    // `price` wins because it is also what PRIZE_DRAW_SORT_OPTIONS sorts by for
+    // "Entry: Low to High".
+    const result = await listPublicProducts(parsePublicProductParams(searchParams, {
+        listingTypes: LISTING_TYPES,
+        pageSize: DEFAULT_PAGE_SIZE,
+        sorts: DEFAULT_SORT,
+        ...defaultTogglesForListingTypes(LISTING_TYPES),
+    }));
     return (_jsx(Main, { children: _jsx(Section, { padding: "y-2xl", children: _jsxs(Container, { size: "xl", children: [_jsx(Heading, { level: 1, className: "mb-2", color: "primary", size: "3xl", weight: "semibold", children: "Prize Draws" }), _jsx(Text, { className: "mb-6 text-[var(--appkit-color-text-muted)]", size: "sm", children: "Fair-RNG draws for sealed Pok\u00E9mon, Hot Wheels Super Treasure Hunts, Gundam kits and more. Every winner picked by crypto.randomInt \u2014 proof on GitHub." }), _jsx(AdSlot, { id: "listing-sidebar-top", className: "mb-6" }), _jsx(PrizeDrawsIndexListing, { initialData: result ?? undefined }), _jsx(AdSlot, { id: "listing-sidebar-bottom", className: "mt-8" })] }) }) }));
 }

package/dist/features/products/components/ProductDetailActions.js

@@ -122,6 +122,10 @@ export function ProductDetailActions({ productId, productTitle, productImage, pr
             infoLabel: price != null && currency
                 ? formatCurrency(price, currency)
                 : undefined,
+            // The bar itself owns responsive visibility now, so this one registrar serves
+            // both breakpoints. The desktop branch below must NOT also register —
+            // useBottomActions is last-mounted-wins and the two would clobber each other.
+            desktop: "after-scroll",
         }
         : {});
     const authModal = (_jsx(LoginRequiredModal, { isOpen: modalOpen, onClose: closeModal, message: modalMessage }));

package/dist/features/products/components/ProductDetailPageView.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import Link from "next/link";
-import { productRepository, reviewRepository } from "../../../repositories";
+import { productRepository } from "../../../repositories";
 const __P = {
     p3: "p-[var(--appkit-space-3)]",
     p5: "p-[var(--appkit-space-5)]",
@@ -25,7 +25,7 @@ import { getDefaultCurrency } from "../../../core/baseline-resolver";
 import { Button, Container, Div, Heading, Main, Nav, PriceDisplay, RichText, Row, Section, Span, Stack, Text, Ul, Ol, Li, Dl, Dt, Dd, } from "../../../ui";
 import { normalizeRichTextHtml } from "../../../utils/string.formatter";
 import { safeDisplayName } from "../../../security";
-import { ReviewsList } from "../../reviews/components/ReviewsList";
+import { ReviewsListingPanel } from "../../reviews/components/ReviewsListingPanel";
 import { ProductDetailView } from "./ProductDetailView";
 import { ProductGalleryClient } from "./ProductGalleryClient";
 import { ProductTabsShell } from "./ProductTabsShell";
@@ -37,7 +37,7 @@ import { SublistingCarouselSection } from "./SublistingCarouselSection";
 import { ShowGroupSection } from "./ShowGroupSection";
 import { HistoryTracker } from "../../history/components/HistoryTracker";
 import { RelatedItemsSection } from "./RelatedItemsSection";
-import { computeRelatedItems, toReview } from "../../../_internal/server/features/products/data";
+import { computeRelatedItems, getReviewPageForProduct } from "../../../_internal/server/features/products/data";
 import { GroupedListingsCarousel } from "../../grouped/components/GroupedListingsCarousel";
 import { getGroupsWithItemsForProduct } from "../../../_internal/server/features/grouped/data";
 // ---------------------------------------------------------------------------
@@ -165,12 +165,12 @@ export async function ProductDetailPageView({ slug, initialProduct, renderOfferA
     const groupTitle = typeof p.groupTitle === "string" ? p.groupTitle : undefined;
     const storeId = typeof p.storeId === "string" ? p.storeId : null;
     // -- Fetch reviews + the shared 4-signal related-items computation + grouped listings in parallel --
-    const [reviewDocs, related, groups] = await Promise.all([
-        reviewRepository.findApprovedByProduct(product.id).catch(() => []),
+    // Only page 1 of reviews is fetched here; <ReviewsListingPanel> pages the rest client-side.
+    const [initialReviews, related, groups] = await Promise.all([
+        getReviewPageForProduct(product.id),
         computeRelatedItems(product),
         getGroupsWithItemsForProduct(product.id),
     ]);
-    const reviews = reviewDocs.map(toReview);
     const { relatedItems, relatedByBrand, relatedByTags, relatedByStore } = related;
     return (_jsxs(Main, { children: [_jsx(HistoryTracker, { productId: product.id, productType: "product", snapshot: {
                     title: product.title,
@@ -231,7 +231,7 @@ export async function ProductDetailPageView({ slug, initialProduct, renderOfferA
                             ? () => (_jsx(SublistingCarouselSection, { sublistingCategoryId: sublistingCategoryId, currentListingId: String(product.id) }))
                             : undefined, renderGroupSection: groupId
                             ? () => (_jsx(ShowGroupSection, { groupId: groupId, currentSlug: String(p.slug ?? product.id), isParent: isGroupParent, groupTitle: groupTitle }))
-                            : undefined, renderTabs: () => (_jsx(ProductTabsShell, { descriptionContent: descriptionHtml ? (_jsx(RichText, { html: descriptionHtml, proseClass: "prose prose-sm sm:prose max-w-none dark:prose-invert", className: "text-[var(--appkit-color-text-muted)]" })) : undefined, specsContent: allSpecs.length > 0 ? (_jsx(Dl, { divide: "subtle", rounded: "xl", border: "subtle", className: "overflow-hidden", children: allSpecs.map((s, i) => (_jsxs(Row, { gap: "md", oddEven: "zebra", surface: "default", padding: "inline", children: [_jsx(Dt, { className: "w-36 flex-shrink-0", color: "primary", weight: "medium", children: s.name }), _jsxs(Dd, { className: "flex-1", color: "muted", children: [s.value, s.unit ? ` ${s.unit}` : ""] })] }, i))) })) : undefined, ingredientsContent: ingredients.length > 0 ? (_jsx(Ul, { spacing: "comfortable", children: ingredients.map((item, i) => (_jsxs(Li, { layout: "flex-start", gap: "2", children: [_jsx(Span, { className: "mt-1 flex-shrink-0 h-1.5 w-1.5 bg-primary-400", rounded: "full" }), item] }, i))) })) : undefined, howToUseContent: howToUse.length > 0 ? (_jsx(Ol, { spacing: "loose", children: howToUse.map((step, i) => (_jsxs(Li, { layout: "flex-start", gap: "3", textSize: "sm", color: "muted", children: [_jsx(Span, { layout: "flex-center", size: "xs", weight: "bold", className: "flex-shrink-0 h-6 w-6 bg-primary-100 dark:bg-primary-900/30 text-primary-700 dark:text-primary-300", rounded: "full", children: i + 1 }), step] }, i))) })) : undefined, reviewsContent: _jsx(ReviewsList, { reviews: reviews, context: "listing", emptyLabel: "No reviews yet \u2014 be the first to review this product." }), customTabs: customSections.map((s) => ({
+                            : undefined, renderTabs: () => (_jsx(ProductTabsShell, { descriptionContent: descriptionHtml ? (_jsx(RichText, { html: descriptionHtml, proseClass: "prose prose-sm sm:prose max-w-none dark:prose-invert", className: "text-[var(--appkit-color-text-muted)]" })) : undefined, specsContent: allSpecs.length > 0 ? (_jsx(Dl, { divide: "subtle", rounded: "xl", border: "subtle", className: "overflow-hidden", children: allSpecs.map((s, i) => (_jsxs(Row, { gap: "md", oddEven: "zebra", surface: "default", padding: "inline", children: [_jsx(Dt, { className: "w-36 flex-shrink-0", color: "primary", weight: "medium", children: s.name }), _jsxs(Dd, { className: "flex-1", color: "muted", children: [s.value, s.unit ? ` ${s.unit}` : ""] })] }, i))) })) : undefined, ingredientsContent: ingredients.length > 0 ? (_jsx(Ul, { spacing: "comfortable", children: ingredients.map((item, i) => (_jsxs(Li, { layout: "flex-start", gap: "2", children: [_jsx(Span, { className: "mt-1 flex-shrink-0 h-1.5 w-1.5 bg-primary-400", rounded: "full" }), item] }, i))) })) : undefined, howToUseContent: howToUse.length > 0 ? (_jsx(Ol, { spacing: "loose", children: howToUse.map((step, i) => (_jsxs(Li, { layout: "flex-start", gap: "3", textSize: "sm", color: "muted", children: [_jsx(Span, { layout: "flex-center", size: "xs", weight: "bold", className: "flex-shrink-0 h-6 w-6 bg-primary-100 dark:bg-primary-900/30 text-primary-700 dark:text-primary-300", rounded: "full", children: i + 1 }), step] }, i))) })) : undefined, reviewsContent: _jsx(ReviewsListingPanel, { source: { kind: "product", productId: product.id }, stateMode: "local", context: "listing", initialData: initialReviews, emptyLabel: "No reviews yet \u2014 be the first to review this product." }), customTabs: customSections.map((s) => ({
                                 id: s.id,
                                 label: s.title,
                                 content: _jsx(CustomSectionTabContent, { section: s }),

package/dist/features/products/components/ProductsIndexListing.js

@@ -12,7 +12,7 @@ import { ACTION_ID, ACTION_META, COMPARE_MAX_ITEMS } from "../constants/action-d
 import { CompareOverlay } from "./CompareOverlay";
 import { ROUTES } from "../../../next";
 import { pluginFor } from "../../../_internal/shared/listing-types/_registry";
-import { ProductGrid, ProductFilters, PRODUCT_PUBLIC_SORT_OPTIONS } from ".";
+import { ProductGrid, ProductFilters } from ".";
 import { useGuestCart } from "../../cart/hooks/useGuestCart";
 import { getGuestCartItems } from "../../cart/utils/guest-cart";
 import { useGuestWishlist } from "../../wishlist/hooks/useGuestWishlist";
@@ -28,6 +28,9 @@ import { sortBy } from "../../../constants/sort";
 import { PRODUCT_FIELDS } from "../../../constants/field-names";
 import { useBottomActions } from "../../layout";
 import { GENERIC_PRODUCT_LISTING_TYPES, PRODUCT_TYPE_FILTER_TABS } from "../constants/listing-tabs";
+import { parseSelectedListingTypes } from "../utils/listing-type";
+import { commonSortOptionsFor, hideDefaultsFor } from "../../../_internal/shared/listing-types/_registry";
+import { TextLink } from "../../../ui";
 const __P = {
     p3: "p-[var(--appkit-space-3)]",
 };
@@ -46,7 +49,40 @@ export function ProductsIndexListing({ initialData, listingTypes = GENERIC_PRODU
     const [compareIds, setCompareIds] = useState([]);
     const showSold = table.get(TABLE_KEYS.SHOW_SOLD) === "true";
     const [view, setView] = useState(table.get(TABLE_KEYS.VIEW) || VIEW_MODE.GRID);
-    const productType = table.get(TABLE_KEYS.LISTING_TYPE) || "All";
+    // ── Type filter (multi-select) ───────────────────────────────────────────
+    // The URL value is a pipe-joined set; empty means "every type this page
+    // spans". Unknown tokens are dropped rather than passed through to a
+    // Firestore `==` that could never match (Root Cause #33).
+    const typeParam = table.get(TABLE_KEYS.LISTING_TYPE);
+    const selectedTypes = parseSelectedListingTypes(typeParam).filter((t) => listingTypes.includes(t));
+    const effectiveTypes = (selectedTypes.length > 0 ? selectedTypes : listingTypes);
+    // Sorts valid across every selected type. Pick Auctions alone and you get
+    // "Ending Soon"; pick Auctions + Products and you get only what both
+    // support, because a sort on `auctionEndDate` would order the products
+    // arbitrarily (and needs an index nobody declares for that shape).
+    const sortOptions = commonSortOptionsFor(effectiveTypes, "public");
+    const sortValue = table.get(TABLE_KEYS.SORT) || DEFAULT_SORT;
+    // Guard against a sort carried over from a previous selection that the new
+    // one can't satisfy — that combination throws FAILED_PRECONDITION in
+    // Firestore and surfaces as a bare empty page (Root Cause #2).
+    const effectiveSort = sortOptions.some((o) => o.value === sortValue)
+        ? sortValue
+        : DEFAULT_SORT;
+    // Which "Show X" toggles are meaningful for the current selection. A mixed
+    // set can need both (products sell out, auctions end).
+    const hideDefaults = hideDefaultsFor(effectiveTypes);
+    const showsSoldToggle = hideDefaults.includes("sold");
+    const showsEndedToggle = hideDefaults.includes("ended") || hideDefaults.includes("closed");
+    const showEnded = table.get(TABLE_KEYS.SHOW_ENDED) === "true";
+    // "Full <type> filters →" — a single selected type with a dedicated browse
+    // page gets a link to it, since that page carries facets this generic one
+    // can't (bid range, delivery-date window, reveal status).
+    const dedicatedPage = selectedTypes.length === 1 && pluginFor(selectedTypes[0]).browseRoute
+        ? {
+            href: pluginFor(selectedTypes[0]).browseRoute,
+            label: `Full ${pluginFor(selectedTypes[0]).pluralLabel} filters →`,
+        }
+        : null;
     const { pendingTable, filterActiveCount, onFilterApply, onFilterClear, onResetAll, onFilterReset } = usePendingTable(table, FILTER_KEYS);
     const openFilters = useCallback(() => {
         onFilterReset();
@@ -57,11 +93,19 @@ export function ProductsIndexListing({ initialData, listingTypes = GENERIC_PRODU
         setFilterOpen(false);
     }, [onFilterApply]);
     const resetAll = useCallback(() => {
-        onResetAll({ [TABLE_KEYS.QUERY]: "", [TABLE_KEYS.SORT]: "", [TABLE_KEYS.SHOW_SOLD]: "" });
+        onResetAll({
+            [TABLE_KEYS.QUERY]: "",
+            [TABLE_KEYS.SORT]: "",
+            [TABLE_KEYS.SHOW_SOLD]: "",
+            [TABLE_KEYS.SHOW_ENDED]: "",
+            [TABLE_KEYS.LISTING_TYPE]: "",
+        });
         setSearchInput("");
     }, [onResetAll]);
     const hasActiveState = !!table.get(TABLE_KEYS.QUERY) ||
         table.get(TABLE_KEYS.SHOW_SOLD) === "true" ||
+        table.get(TABLE_KEYS.SHOW_ENDED) === "true" ||
+        !!typeParam ||
         table.get(TABLE_KEYS.SORT) !== DEFAULT_SORT ||
         filterActiveCount > 0;
     const localCart = useGuestCart();
@@ -81,13 +125,27 @@ export function ProductsIndexListing({ initialData, listingTypes = GENERIC_PRODU
         brand: table.get(TABLE_KEYS.BRAND) || undefined,
         storeId: table.get(TABLE_KEYS.STORE_ID) || undefined,
         freeShipping: table.get(TABLE_KEYS.FREE_SHIPPING) === "true" ? true : undefined,
-        sort: table.get(TABLE_KEYS.SORT) || DEFAULT_SORT,
+        // These three are in FILTER_KEYS (so they count toward the filter badge)
+        // but were never put on the wire — the drawer sections were inert.
+        tags: table.get(TABLE_KEYS.TAGS) || undefined,
+        sublistingCategory: table.get(TABLE_KEYS.SUBLISTING_CATEGORY) || undefined,
+        features: table.get(TABLE_KEYS.FEATURES) || undefined,
+        sort: effectiveSort,
         page: table.getNumber(TABLE_KEYS.PAGE, 1),
         perPage: table.getNumber(TABLE_KEYS.PAGE_SIZE, 24),
-        listingType: productType === "All" ? listingTypes.join("|") : productType,
-        // Hide sold-out items by default. Uses stockQuantity>0 (always-present field)
-        // instead of status=="published" because sellers don't actively transition status.
-        inStock: showSold ? undefined : true,
+        // Pipe-joined OR-group — sievejs parses it as a same-field OR and the
+        // Firebase adapter upgrades it to a `.where(…, "in", …)` query.
+        listingType: effectiveTypes.join("|"),
+        // Hide sold-out items by default, but only when a sold-out-able type is in
+        // play — an auction has no meaningful stock, so applying it to an
+        // auctions-only view would hide every live auction.
+        inStock: showsSoldToggle && !showSold ? true : undefined,
+        // Same shape for time-boxed types. `dateFrom` only takes effect when
+        // exactly one type is selected (there is no single end-date field shared
+        // across types), which `dateFieldFor` already enforces server-side.
+        dateFrom: showsEndedToggle && !showEnded && selectedTypes.length === 1
+            ? new Date().toISOString()
+            : undefined,
     };
     const { products, totalPages, page, isLoading } = useProducts(params, { initialData });
     const selection = useBulkSelection({ items: products, keyExtractor: (p) => p.id });
@@ -200,14 +258,32 @@ export function ProductsIndexListing({ initialData, listingTypes = GENERIC_PRODU
                     },
                 },
             ] } } : {});
-    return (_jsxs(Div, { className: "min-h-screen", children: [_jsx(ListingToolbar, { filterCount: filterActiveCount, onFiltersClick: openFilters, searchValue: searchInput, searchPlaceholder: searchPlaceholder, onSearchChange: setSearchInput, onSearchCommit: commitSearch, onSearchKeyDown: handleSearchKeyDown, sortValue: table.get(TABLE_KEYS.SORT) || DEFAULT_SORT, sortOptions: PRODUCT_PUBLIC_SORT_OPTIONS, onSortChange: (v) => { table.set(TABLE_KEYS.SORT, v); }, view: view, onViewChange: handleViewToggle, onResetAll: resetAll, hasActiveState: hasActiveState, bulkMode: selection.isSelecting, bulkSelectedCount: selection.selectedCount, bulkTotalCount: products.length, onBulkSelectAll: selection.toggleAll, onBulkClear: selection.clearSelection, toggles: [
-                    { label: "Show sold", active: showSold, onChange: (next) => table.set(TABLE_KEYS.SHOW_SOLD, next ? "true" : "") },
+    return (_jsxs(Div, { className: "min-h-screen", children: [_jsx(ListingToolbar, { filterCount: filterActiveCount, onFiltersClick: openFilters, searchValue: searchInput, searchPlaceholder: searchPlaceholder, onSearchChange: setSearchInput, onSearchCommit: commitSearch, onSearchKeyDown: handleSearchKeyDown, sortValue: effectiveSort, sortOptions: sortOptions, onSortChange: (v) => { table.set(TABLE_KEYS.SORT, v); }, view: view, onViewChange: handleViewToggle, onResetAll: resetAll, hasActiveState: hasActiveState, bulkMode: selection.isSelecting, bulkSelectedCount: selection.selectedCount, bulkTotalCount: products.length, onBulkSelectAll: selection.toggleAll, onBulkClear: selection.clearSelection, toggles: [
+                    // Each toggle appears only when it means something for the selected
+                    // types — "Show ended" against a Products-only view would be noise,
+                    // and "Show sold" against an Auctions-only view is meaningless.
+                    ...(showsSoldToggle
+                        ? [{ label: "Show sold", active: showSold, onChange: (next) => table.set(TABLE_KEYS.SHOW_SOLD, next ? "true" : "") }]
+                        : []),
+                    ...(showsEndedToggle
+                        ? [{ label: "Show ended", active: showEnded, onChange: (next) => table.set(TABLE_KEYS.SHOW_ENDED, next ? "true" : "") }]
+                        : []),
                     // Inline quick-filter: the highest-frequency drawer-only facet promoted
                     // to the sticky toolbar so it doesn't require open-drawer → check → Apply
                     // → close for every toggle. The full facet set (category/price/brand/…)
                     // remains in <FilterDrawer> below.
                     { label: "Free shipping", active: table.get(TABLE_KEYS.FREE_SHIPPING) === "true", onChange: (next) => table.set(TABLE_KEYS.FREE_SHIPPING, next ? "true" : "") },
-                ] }), _jsx(Div, { padding: "y-sm", children: _jsx(FilterChipGroup, { label: "Type", tabs: typeTabs, value: productType, onChange: (v) => table.set(TABLE_KEYS.LISTING_TYPE, v === "All" ? "" : v) }) }), _jsx(BulkActionBar, { selectedCount: selection.selectedCount, onClearSelection: selection.clearSelection, actions: [
+                ] }), _jsx(Div, { padding: "y-sm", children: _jsxs(Row, { justify: "between", align: "center", wrap: true, gap: "sm", children: [_jsx(FilterChipGroup, { multiple: true, label: "Type", tabs: typeTabs, value: selectedTypes.join("|"), onChange: (next) => {
+                                // Clear `sort` alongside the type change: a sort valid for the
+                                // old selection (say -auctionEndDate) can be invalid for the new
+                                // one, and useUrlTable's single router.replace means we must set
+                                // both in ONE call — a follow-up setPage/set would read stale
+                                // searchParams and overwrite this update (Root Cause #13).
+                                table.setMany({
+                                    [TABLE_KEYS.LISTING_TYPE]: next,
+                                    [TABLE_KEYS.SORT]: "",
+                                });
+                            } }), dedicatedPage && (_jsx(TextLink, { href: dedicatedPage.href, size: "sm", weight: "medium", children: dedicatedPage.label }))] }) }), _jsx(BulkActionBar, { selectedCount: selection.selectedCount, onClearSelection: selection.clearSelection, actions: [
                     {
                         id: ACTION_ID.ADD_TO_CART,
                         label: ACTION_META[ACTION_ID.ADD_TO_CART].label,