From 5e2a3f76e94a0033a9a3a96907fb32bb72009589 Mon Sep 17 00:00:00 2001
From: Simo <simo@6529.io>
Date: Mon, 2 Mar 2026 12:06:15 -0400
Subject: [PATCH 1/7] wip

Signed-off-by: Simo <simo@6529.io>
---
 .../MyStreamWaveLeaderboard.test.tsx          | 106 +++++-
 .../WaveLeaderboardCurationDropModal.test.tsx | 108 ++++++
 .../header/WaveleaderboardHeader.test.tsx     | 279 ++++++++++++++
 .../header/WaveleaderboardSort.test.tsx       |  25 ++
 .../useWaveDropsLeaderboard.extra.test.ts     |  14 +-
 .../my-stream/MyStreamWaveLeaderboard.tsx     | 114 +++++-
 .../waves/CreateCurationDropContent.tsx       |  90 +++--
 .../waves/CreateCurationDropUrlInput.tsx      |   4 +-
 .../WaveLeaderboardCurationDropModal.tsx      | 103 +++++
 .../drops/WaveLeaderboardDrops.tsx            |   9 +
 .../gallery/WaveLeaderboardGallery.tsx        |   9 +
 .../leaderboard/grid/WaveLeaderboardGrid.tsx  |  13 +-
 .../header/WaveleaderboardHeader.tsx          | 267 ++++++++++++-
 .../header/WaveleaderboardSort.tsx            |  18 +-
 generated/models/ApiCicContributor.ts         |  45 +++
 generated/models/ApiCicContributorsPage.ts    |  52 +++
 generated/models/ApiCicOverview.ts            |  59 +++
 generated/models/ApiRepCategoriesPage.ts      |  52 +++
 generated/models/ApiRepCategory.ts            |  66 ++++
 generated/models/ApiRepContributor.ts         |  45 +++
 generated/models/ApiRepContributorsPage.ts    |  52 +++
 generated/models/ApiRepDirection.ts           |  19 +
 generated/models/ApiRepOverview.ts            |  59 +++
 generated/models/ObjectSerializer.ts          |  27 ++
 hooks/useWaveDropsLeaderboard.ts              |  55 ++-
 openapi.yaml                                  | 351 ++++++++++++++++++
 26 files changed, 1942 insertions(+), 99 deletions(-)
 create mode 100644 __tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
 create mode 100644 components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
 create mode 100644 generated/models/ApiCicContributor.ts
 create mode 100644 generated/models/ApiCicContributorsPage.ts
 create mode 100644 generated/models/ApiCicOverview.ts
 create mode 100644 generated/models/ApiRepCategoriesPage.ts
 create mode 100644 generated/models/ApiRepCategory.ts
 create mode 100644 generated/models/ApiRepContributor.ts
 create mode 100644 generated/models/ApiRepContributorsPage.ts
 create mode 100644 generated/models/ApiRepDirection.ts
 create mode 100644 generated/models/ApiRepOverview.ts

diff --git a/__tests__/components/brain/my-stream/MyStreamWaveLeaderboard.test.tsx b/__tests__/components/brain/my-stream/MyStreamWaveLeaderboard.test.tsx
index 752d5d9600..107669ee67 100644
--- a/__tests__/components/brain/my-stream/MyStreamWaveLeaderboard.test.tsx
+++ b/__tests__/components/brain/my-stream/MyStreamWaveLeaderboard.test.tsx
@@ -14,9 +14,15 @@ const replace = jest.fn();
 let searchParamsString = "";
 let dropsProps: any;
 let createDropProps: any[] = [];
+let curationModalProps: any;
 
 jest.mock("@/hooks/useWave", () => ({
   useWave: (...args: any[]) => useWave(...args),
+  SubmissionStatus: {
+    NOT_STARTED: "NOT_STARTED",
+    ACTIVE: "ACTIVE",
+    ENDED: "ENDED",
+  },
 }));
 jest.mock("@/components/brain/my-stream/layout/LayoutContext", () => ({
   useLayout: (...args: any[]) => useLayout(...args),
@@ -84,6 +90,17 @@ jest.mock(
   "@/components/waves/memes/MemesArtSubmissionModal",
   () => (props: any) => (props.isOpen ? <div data-testid="memes" /> : null)
 );
+jest.mock(
+  "@/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal",
+  () => ({
+    WaveLeaderboardCurationDropModal: (props: any) => {
+      curationModalProps = props;
+      return props.isOpen ? (
+        <button data-testid="curation-modal" onClick={props.onClose} />
+      ) : null;
+    },
+  })
+);
 
 const wave = {
   id: "1",
@@ -111,6 +128,7 @@ describe("MyStreamWaveLeaderboard", () => {
     searchParamsString = "";
     dropsProps = null;
     createDropProps = [];
+    curationModalProps = undefined;
     useLayout.mockReturnValue({ leaderboardViewStyle: {} });
     useWaveCurationGroups.mockReturnValue({
       data: [],
@@ -145,6 +163,7 @@ describe("MyStreamWaveLeaderboard", () => {
     expect(stickyHeader).toHaveClass("tw-sticky");
     expect(stickyHeader).toHaveClass("tw-z-30");
     expect(headerProps.viewMode).toBe("list");
+    expect(headerProps.onPriceRangeChange).toBeUndefined();
     expect(screen.queryByTestId("create-drop")).not.toBeInTheDocument();
     expect(headerProps.onCreateDrop).toEqual(expect.any(Function));
 
@@ -202,8 +221,8 @@ describe("MyStreamWaveLeaderboard", () => {
     );
   });
 
-  it("reads curation filter from URL and passes it to leaderboard data views", () => {
-    searchParamsString = "curated_by_group=group-1";
+  it("reads curation filters from URL and passes them to leaderboard data views", () => {
+    searchParamsString = "curated_by_group=group-1&min_price=1.5&max_price=4.2";
     useWave.mockReturnValue({
       isMemesWave: false,
       isCurationWave: true,
@@ -227,16 +246,40 @@ describe("MyStreamWaveLeaderboard", () => {
     renderLeaderboard();
 
     expect(headerProps.curatedByGroupId).toBe("group-1");
-    expect(headerProps.onCreateDrop).toBeUndefined();
+    expect(headerProps.minPrice).toBe(1.5);
+    expect(headerProps.maxPrice).toBe(4.2);
+    expect(headerProps.onCreateDrop).toEqual(expect.any(Function));
     expect(dropsProps.curatedByGroupId).toBe("group-1");
-    expect(dropsProps.onCreateDrop).toBeUndefined();
-    expect(screen.getByTestId("create-drop")).toBeInTheDocument();
-    expect(screen.getByTestId("create-drop").parentElement).toHaveClass(
-      "tw-mt-2"
-    );
-    expect(
-      createDropProps[createDropProps.length - 1]?.isCurationLeaderboard
-    ).toBe(true);
+    expect(dropsProps.minPrice).toBe(1.5);
+    expect(dropsProps.maxPrice).toBe(4.2);
+    expect(dropsProps.priceCurrency).toBe("ETH");
+    expect(dropsProps.onCreateDrop).toEqual(expect.any(Function));
+    expect(screen.queryByTestId("create-drop")).not.toBeInTheDocument();
+  });
+
+  it("opens curation drop modal from header create action", async () => {
+    const user = userEvent.setup();
+    useWave.mockReturnValue({
+      isMemesWave: false,
+      isCurationWave: true,
+      participation: {
+        isEligible: true,
+        canSubmitNow: true,
+        hasReachedLimit: false,
+      },
+    });
+    useLocalPreference.mockReturnValueOnce(["list", jest.fn()]);
+    useLocalPreference.mockReturnValueOnce([
+      WaveDropsLeaderboardSort.RANK,
+      jest.fn(),
+    ]);
+
+    renderLeaderboard();
+
+    expect(screen.queryByTestId("curation-modal")).not.toBeInTheDocument();
+    await user.click(screen.getByTestId("header"));
+    expect(screen.getByTestId("curation-modal")).toBeInTheDocument();
+    expect(curationModalProps.wave).toEqual(wave);
   });
 
   it("updates URL when curation filter changes", () => {
@@ -270,4 +313,45 @@ describe("MyStreamWaveLeaderboard", () => {
     headerProps.onCurationGroupChange(null);
     expect(replace).toHaveBeenCalledWith("/waves", { scroll: false });
   });
+
+  it("updates URL when price range changes", () => {
+    searchParamsString = "curated_by_group=group-1";
+    useWave.mockReturnValue({
+      isMemesWave: false,
+      isCurationWave: true,
+      participation: {
+        isEligible: true,
+        canSubmitNow: true,
+        hasReachedLimit: false,
+      },
+    });
+    useWaveCurationGroups.mockReturnValue({
+      data: [{ id: "group-1", name: "Curators", group_id: "g1" }],
+      isLoading: false,
+      isError: false,
+    });
+    useLocalPreference.mockReturnValueOnce(["list", jest.fn()]);
+    useLocalPreference.mockReturnValueOnce([
+      WaveDropsLeaderboardSort.RANK,
+      jest.fn(),
+    ]);
+
+    renderLeaderboard();
+
+    headerProps.onPriceRangeChange({ minPrice: 1.25, maxPrice: undefined });
+    expect(replace).toHaveBeenCalledWith(
+      "/waves?curated_by_group=group-1&min_price=1.25",
+      {
+        scroll: false,
+      }
+    );
+
+    headerProps.onPriceRangeChange({
+      minPrice: undefined,
+      maxPrice: undefined,
+    });
+    expect(replace).toHaveBeenCalledWith("/waves?curated_by_group=group-1", {
+      scroll: false,
+    });
+  });
 });
diff --git a/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx b/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
new file mode 100644
index 0000000000..bcde6fceb4
--- /dev/null
+++ b/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
@@ -0,0 +1,108 @@
+import React from "react";
+import { fireEvent, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { WaveLeaderboardCurationDropModal } from "@/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal";
+
+jest.mock("@/components/waves/leaderboard/create/WaveDropCreate", () => ({
+  WaveDropCreate: (props: any) => (
+    <button data-testid="modal-create-drop" onClick={props.onSuccess} />
+  ),
+}));
+
+const wave = { id: "wave-1" } as any;
+
+describe("WaveLeaderboardCurationDropModal", () => {
+  it("does not render when closed", () => {
+    render(
+      <WaveLeaderboardCurationDropModal
+        isOpen={false}
+        wave={wave}
+        onClose={jest.fn()}
+      />
+    );
+
+    expect(screen.queryByTestId("curation-drop-modal")).not.toBeInTheDocument();
+  });
+
+  it("renders and closes from backdrop and close button", async () => {
+    const user = userEvent.setup();
+    const onClose = jest.fn();
+
+    render(
+      <WaveLeaderboardCurationDropModal
+        isOpen={true}
+        wave={wave}
+        onClose={onClose}
+      />
+    );
+
+    expect(
+      await screen.findByTestId("curation-drop-modal")
+    ).toBeInTheDocument();
+    expect(screen.getByText("Drop Artwork")).toBeInTheDocument();
+
+    await user.click(screen.getByLabelText("Close drop artwork modal"));
+    expect(onClose).toHaveBeenCalledTimes(1);
+
+    await user.click(screen.getByLabelText("Close modal"));
+    expect(onClose).toHaveBeenCalledTimes(2);
+  });
+
+  it("closes on escape key", async () => {
+    const onClose = jest.fn();
+
+    render(
+      <WaveLeaderboardCurationDropModal
+        isOpen={true}
+        wave={wave}
+        onClose={onClose}
+      />
+    );
+
+    await screen.findByTestId("curation-drop-modal");
+    fireEvent.keyDown(document, { key: "Escape" });
+    expect(onClose).toHaveBeenCalled();
+  });
+
+  it("locks body scroll while open and restores it when closed", () => {
+    const onClose = jest.fn();
+    const originalOverflow = "scroll";
+    document.body.style.overflow = originalOverflow;
+
+    const { rerender } = render(
+      <WaveLeaderboardCurationDropModal
+        isOpen={true}
+        wave={wave}
+        onClose={onClose}
+      />
+    );
+
+    expect(document.body.style.overflow).toBe("hidden");
+
+    rerender(
+      <WaveLeaderboardCurationDropModal
+        isOpen={false}
+        wave={wave}
+        onClose={onClose}
+      />
+    );
+
+    expect(document.body.style.overflow).toBe(originalOverflow);
+  });
+
+  it("closes after successful submission", async () => {
+    const user = userEvent.setup();
+    const onClose = jest.fn();
+
+    render(
+      <WaveLeaderboardCurationDropModal
+        isOpen={true}
+        wave={wave}
+        onClose={onClose}
+      />
+    );
+
+    await user.click(await screen.findByTestId("modal-create-drop"));
+    expect(onClose).toHaveBeenCalled();
+  });
+});
diff --git a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
index fe7c2c1a1b..be5f0c198a 100644
--- a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
+++ b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
@@ -34,6 +34,17 @@ jest.mock("@/components/waves/leaderboard/header/WaveleaderboardSort", () => ({
     { key: "TREND", label: "Hot", value: "TREND" },
     { key: "CREATED_AT", label: "Newest", value: "CREATED_AT" },
   ],
+  WAVE_LEADERBOARD_CURATION_SORT_ITEMS: [
+    { key: "RANK", label: "Current Vote", value: "RANK" },
+    {
+      key: "RATING_PREDICTION",
+      label: "Projected Vote",
+      value: "RATING_PREDICTION",
+    },
+    { key: "TREND", label: "Hot", value: "TREND" },
+    { key: "CREATED_AT", label: "Newest", value: "CREATED_AT" },
+    { key: "PRICE", label: "Price", value: "PRICE" },
+  ],
   WaveleaderboardSort: (props: any) => sortComponentMock(props),
 }));
 
@@ -55,6 +66,11 @@ jest.mock(
 
 jest.mock("@/hooks/useWave", () => ({
   useWave: (...args: any[]) => useWave(...args),
+  SubmissionStatus: {
+    NOT_STARTED: "NOT_STARTED",
+    ACTIVE: "ACTIVE",
+    ENDED: "ENDED",
+  },
 }));
 
 jest.mock("@/components/utils/button/PrimaryButton", () => (props: any) => (
@@ -220,6 +236,269 @@ it("renders curation selector and handles curation filter changes", async () =>
   expect(onCurationGroupChange).toHaveBeenCalledWith("cg-1");
 });
 
+it("renders curation price controls and commits range updates", async () => {
+  const user = userEvent.setup();
+  const onPriceRangeChange = jest.fn();
+
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        onPriceRangeChange={onPriceRangeChange}
+      />
+    </AuthContext.Provider>
+  );
+
+  expect(
+    screen.queryByTestId("leaderboard-price-panel")
+  ).not.toBeInTheDocument();
+  await user.click(screen.getByTestId("leaderboard-price-toggle"));
+  const minInput = screen.getByTestId("leaderboard-price-min-input");
+  const maxInput = screen.getByTestId("leaderboard-price-max-input");
+  await user.clear(minInput);
+  await user.type(minInput, "1.5");
+  await user.clear(maxInput);
+  await user.type(maxInput, "3.25");
+  await user.tab();
+  expect(onPriceRangeChange).toHaveBeenLastCalledWith({
+    minPrice: 1.5,
+    maxPrice: 3.25,
+  });
+
+  const latestSortProps =
+    sortComponentMock.mock.calls[sortComponentMock.mock.calls.length - 1]?.[0];
+  expect(latestSortProps?.items).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({ value: "PRICE", label: "Price" }),
+    ])
+  );
+
+  await user.click(screen.getByTestId("leaderboard-price-clear"));
+  expect(onPriceRangeChange).toHaveBeenLastCalledWith({
+    minPrice: undefined,
+    maxPrice: undefined,
+  });
+});
+
+it("auto-expands price filters when min or max price is active", () => {
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        minPrice={1.25}
+        onPriceRangeChange={jest.fn()}
+      />
+    </AuthContext.Provider>
+  );
+
+  expect(screen.getByTestId("leaderboard-price-panel")).toBeInTheDocument();
+  expect(screen.getByTestId("leaderboard-price-toggle")).toHaveAttribute(
+    "aria-expanded",
+    "true"
+  );
+});
+
+it("allows collapsing and reopening filters while price filters are active", async () => {
+  const user = userEvent.setup();
+
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        minPrice={1.25}
+        onPriceRangeChange={jest.fn()}
+      />
+    </AuthContext.Provider>
+  );
+
+  const toggle = screen.getByTestId("leaderboard-price-toggle");
+  expect(screen.getByTestId("leaderboard-price-panel")).toBeInTheDocument();
+  expect(toggle).toHaveAttribute("aria-expanded", "true");
+
+  await user.click(toggle);
+  expect(
+    screen.queryByTestId("leaderboard-price-panel")
+  ).not.toBeInTheDocument();
+  expect(toggle).toHaveAttribute("aria-expanded", "false");
+
+  await user.click(toggle);
+  expect(screen.getByTestId("leaderboard-price-panel")).toBeInTheDocument();
+  expect(toggle).toHaveAttribute("aria-expanded", "true");
+});
+
+it("resets price input drafts when committed price props change", async () => {
+  const user = userEvent.setup();
+
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  const { rerender } = render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        minPrice={1}
+        maxPrice={2}
+        onPriceRangeChange={jest.fn()}
+      />
+    </AuthContext.Provider>
+  );
+
+  expect(screen.getByTestId("leaderboard-price-panel")).toBeInTheDocument();
+  const minInput = screen.getByTestId(
+    "leaderboard-price-min-input"
+  ) as HTMLInputElement;
+  const maxInput = screen.getByTestId(
+    "leaderboard-price-max-input"
+  ) as HTMLInputElement;
+
+  await user.clear(minInput);
+  await user.type(minInput, "9");
+  await user.clear(maxInput);
+  await user.type(maxInput, "10");
+  expect(minInput.value).toBe("9");
+  expect(maxInput.value).toBe("10");
+
+  rerender(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        minPrice={3}
+        maxPrice={4}
+        onPriceRangeChange={jest.fn()}
+      />
+    </AuthContext.Provider>
+  );
+
+  expect(
+    (screen.getByTestId("leaderboard-price-min-input") as HTMLInputElement)
+      .value
+  ).toBe("3");
+  expect(
+    (screen.getByTestId("leaderboard-price-max-input") as HTMLInputElement)
+      .value
+  ).toBe("4");
+});
+
+it("does not render price controls for non-curation waves", () => {
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: false,
+    participation: { isEligible: true },
+  });
+
+  render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        onPriceRangeChange={jest.fn()}
+      />
+    </AuthContext.Provider>
+  );
+
+  expect(
+    screen.queryByTestId("leaderboard-price-min-input")
+  ).not.toBeInTheDocument();
+  expect(
+    screen.queryByTestId("leaderboard-price-max-input")
+  ).not.toBeInTheDocument();
+  expect(
+    screen.queryByTestId("leaderboard-price-toggle")
+  ).not.toBeInTheDocument();
+});
+
 it("does not render curation selector when curation controls are unavailable", () => {
   render(
     <AuthContext.Provider
diff --git a/__tests__/components/waves/leaderboard/header/WaveleaderboardSort.test.tsx b/__tests__/components/waves/leaderboard/header/WaveleaderboardSort.test.tsx
index b2eec0c5c1..314f969159 100644
--- a/__tests__/components/waves/leaderboard/header/WaveleaderboardSort.test.tsx
+++ b/__tests__/components/waves/leaderboard/header/WaveleaderboardSort.test.tsx
@@ -93,4 +93,29 @@ describe("WaveleaderboardSort", () => {
       "Newest",
     ]);
   });
+
+  it("uses provided custom sort items", () => {
+    const customItems = [
+      {
+        key: WaveDropsLeaderboardSort.PRICE,
+        label: "Price",
+        value: WaveDropsLeaderboardSort.PRICE,
+      },
+    ] as const;
+
+    render(
+      <WaveleaderboardSort
+        sort={WaveDropsLeaderboardSort.PRICE}
+        onSortChange={jest.fn()}
+        items={customItems}
+      />
+    );
+
+    expect(commonDropdownMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        activeItem: WaveDropsLeaderboardSort.PRICE,
+        items: customItems,
+      })
+    );
+  });
 });
diff --git a/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts b/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
index 06ac8cd462..1678749dec 100644
--- a/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
+++ b/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
@@ -82,17 +82,24 @@ describe("useWaveDropsLeaderboard extra", () => {
     expect(call.queryKey[1].sort).toBe(WaveDropsLeaderboardSort.CREATED_AT);
   });
 
-  it("includes curated_by_group in query key and request params", async () => {
+  it("includes curation and price params in query key and request params", async () => {
     renderHook(() =>
       useWaveDropsLeaderboard({
         waveId: "2",
         curatedByGroupId: "curation-group-1",
+        minPrice: 0.5,
+        maxPrice: 2.75,
+        priceCurrency: "ETH",
+        sort: WaveDropsLeaderboardSort.PRICE,
       })
     );
 
     const call = (queryClientMock.prefetchInfiniteQuery as jest.Mock).mock
       .calls[0][0];
     expect(call.queryKey[1].curated_by_group).toBe("curation-group-1");
+    expect(call.queryKey[1].min_price).toBe(0.5);
+    expect(call.queryKey[1].max_price).toBe(2.75);
+    expect(call.queryKey[1].price_currency).toBe("ETH");
 
     await call.queryFn({ pageParam: null });
 
@@ -100,8 +107,11 @@ describe("useWaveDropsLeaderboard extra", () => {
       expect.objectContaining({
         endpoint: "waves/2/leaderboard",
         params: expect.objectContaining({
-          sort: WaveDropsLeaderboardSort.RANK,
+          sort: WaveDropsLeaderboardSort.PRICE,
           curated_by_group: "curation-group-1",
+          min_price: "0.5",
+          max_price: "2.75",
+          price_currency: "ETH",
         }),
       })
     );
diff --git a/components/brain/my-stream/MyStreamWaveLeaderboard.tsx b/components/brain/my-stream/MyStreamWaveLeaderboard.tsx
index e8b5b90c18..8cb72704f8 100644
--- a/components/brain/my-stream/MyStreamWaveLeaderboard.tsx
+++ b/components/brain/my-stream/MyStreamWaveLeaderboard.tsx
@@ -15,6 +15,7 @@ import { ApiWaveType } from "@/generated/models/ApiWaveType";
 import { WaveLeaderboardTime } from "@/components/waves/leaderboard/WaveLeaderboardTime";
 import { WaveLeaderboardHeader } from "@/components/waves/leaderboard/header/WaveleaderboardHeader";
 import { WaveDropCreate } from "@/components/waves/leaderboard/create/WaveDropCreate";
+import { WaveLeaderboardCurationDropModal } from "@/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal";
 import { WaveLeaderboardDrops } from "@/components/waves/leaderboard/drops/WaveLeaderboardDrops";
 import { WaveLeaderboardGallery } from "@/components/waves/leaderboard/gallery/WaveLeaderboardGallery";
 import { WaveLeaderboardGrid } from "@/components/waves/leaderboard/grid/WaveLeaderboardGrid";
@@ -37,6 +38,17 @@ interface MyStreamWaveLeaderboardProps {
   readonly onDropClick: (drop: ExtendedDrop) => void;
 }
 
+const parsePriceParam = (rawValue: string | null): number | undefined => {
+  if (!rawValue) {
+    return undefined;
+  }
+  const parsedValue = Number.parseFloat(rawValue);
+  if (!Number.isFinite(parsedValue) || parsedValue < 0) {
+    return undefined;
+  }
+  return parsedValue;
+};
+
 const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
   wave,
   onDropClick,
@@ -62,6 +74,7 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
 
   const [isCreateDropOpen, setIsCreateDropOpen] = useState(false);
   const [isMemesCreateOpen, setIsMemesCreateOpen] = useState(false);
+  const [isCurationDropModalOpen, setIsCurationDropModalOpen] = useState(false);
 
   const isLoggedIn = Boolean(connectedProfile?.handle);
   const { canCreateDrop } = useMemo(
@@ -74,8 +87,6 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
       }),
     [activeProfileProxy, isCurationWave, isLoggedIn, participation]
   );
-  const showPersistentDropInput =
-    !isMemesWave && isCurationWave && canCreateDrop;
   const showToggleableDropInput =
     !isMemesWave && !isCurationWave && isCreateDropOpen;
 
@@ -89,10 +100,18 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
       return;
     }
 
+    if (isCurationWave) {
+      if (!canCreateDrop) {
+        return;
+      }
+      setIsCurationDropModalOpen(true);
+      return;
+    }
+
     if (!isCurationWave) {
       setIsCreateDropOpen(true);
     }
-  }, [isCurationWave, isMemesWave]);
+  }, [canCreateDrop, isCurationWave, isMemesWave]);
 
   // Generate a unique preference key for this wave
   const viewPreferenceKey = `waveViewMode_${wave.id}`;
@@ -117,7 +136,8 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
       value === WaveDropsLeaderboardSort.RATING_PREDICTION ||
       value === WaveDropsLeaderboardSort.TREND ||
       value === WaveDropsLeaderboardSort.MY_REALTIME_VOTE ||
-      value === WaveDropsLeaderboardSort.CREATED_AT
+      value === WaveDropsLeaderboardSort.CREATED_AT ||
+      (isCurationWave && value === WaveDropsLeaderboardSort.PRICE)
   );
 
   const {
@@ -130,6 +150,8 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
   });
 
   const rawCuratedByGroupId = searchParams.get("curated_by_group");
+  const rawMinPrice = searchParams.get("min_price");
+  const rawMaxPrice = searchParams.get("max_price");
 
   const curationGroupIdSet = useMemo(
     () => new Set(curationGroups.map((group) => group.id)),
@@ -158,6 +180,25 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
     isLoadingCurationGroups,
     curationGroupIdSet,
   ]);
+  const minPrice = useMemo(
+    () => (isCurationWave ? parsePriceParam(rawMinPrice) : undefined),
+    [isCurationWave, rawMinPrice]
+  );
+  const maxPrice = useMemo(
+    () => (isCurationWave ? parsePriceParam(rawMaxPrice) : undefined),
+    [isCurationWave, rawMaxPrice]
+  );
+  const priceCurrency = useMemo(() => {
+    const hasPriceFilter =
+      typeof minPrice === "number" || typeof maxPrice === "number";
+    if (
+      isCurationWave &&
+      (hasPriceFilter || sort === WaveDropsLeaderboardSort.PRICE)
+    ) {
+      return "ETH";
+    }
+    return undefined;
+  }, [isCurationWave, maxPrice, minPrice, sort]);
 
   const updateCurationGroupInUrl = useCallback(
     (groupId: string | null) => {
@@ -175,6 +216,34 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
     },
     [pathname, router, searchParams]
   );
+  const updatePriceRangeInUrl = useCallback(
+    ({
+      minPrice: nextMinPrice,
+      maxPrice: nextMaxPrice,
+    }: {
+      readonly minPrice: number | undefined;
+      readonly maxPrice: number | undefined;
+    }) => {
+      const nextParams = new URLSearchParams(searchParams.toString());
+
+      if (typeof nextMinPrice === "number") {
+        nextParams.set("min_price", `${nextMinPrice}`);
+      } else {
+        nextParams.delete("min_price");
+      }
+
+      if (typeof nextMaxPrice === "number") {
+        nextParams.set("max_price", `${nextMaxPrice}`);
+      } else {
+        nextParams.delete("max_price");
+      }
+
+      const nextQuery = nextParams.toString();
+      const nextUrl = nextQuery ? `${pathname}?${nextQuery}` : pathname;
+      router.replace(nextUrl, { scroll: false });
+    },
+    [pathname, router, searchParams]
+  );
 
   const effectiveViewMode = useMemo<LeaderboardViewMode>(() => {
     if (!isMemesWave) {
@@ -194,7 +263,10 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
         wave={wave}
         sort={sort}
         curatedByGroupId={curatedByGroupId}
-        onCreateDrop={isMemesWave || !isCurationWave ? onCreateDrop : undefined}
+        minPrice={minPrice}
+        maxPrice={maxPrice}
+        priceCurrency={priceCurrency}
+        onCreateDrop={onCreateDrop}
       />
     );
   } else if (!isMemesWave) {
@@ -203,6 +275,9 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
         wave={wave}
         sort={sort}
         curatedByGroupId={curatedByGroupId}
+        minPrice={minPrice}
+        maxPrice={maxPrice}
+        priceCurrency={priceCurrency}
         mode={effectiveViewMode === "grid" ? "compact" : "content_only"}
         onDropClick={onDropClick}
       />
@@ -213,6 +288,9 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
         wave={wave}
         sort={sort}
         curatedByGroupId={curatedByGroupId}
+        minPrice={minPrice}
+        maxPrice={maxPrice}
+        priceCurrency={priceCurrency}
         onDropClick={onDropClick}
       />
     );
@@ -229,15 +307,18 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
           viewMode={effectiveViewMode}
           sort={sort}
           onViewModeChange={(mode) => setViewMode(mode)}
-          onCreateDrop={
-            isMemesWave || !isCurationWave ? onCreateDrop : undefined
-          }
+          onCreateDrop={onCreateDrop}
           onSortChange={(s) => setSort(s)}
           curationGroups={curationGroups}
           curatedByGroupId={curatedByGroupId ?? null}
           onCurationGroupChange={
             curationGroups.length > 0 ? updateCurationGroupInUrl : undefined
           }
+          minPrice={minPrice}
+          maxPrice={maxPrice}
+          onPriceRangeChange={
+            isCurationWave ? updatePriceRangeInUrl : undefined
+          }
         />
       </div>
 
@@ -268,16 +349,6 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
           )}
         </AnimatePresence>
 
-        {showPersistentDropInput && (
-          <div className="tw-mt-2">
-            <WaveDropCreate
-              wave={wave}
-              onSuccess={() => {}}
-              isCurationLeaderboard
-            />
-          </div>
-        )}
-
         {isMemesWave && isMemesCreateOpen && (
           <MemesArtSubmissionModal
             isOpen={isMemesCreateOpen}
@@ -285,6 +356,13 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
             onClose={() => setIsMemesCreateOpen(false)}
           />
         )}
+        {isCurationWave && isCurationDropModalOpen && (
+          <WaveLeaderboardCurationDropModal
+            isOpen={isCurationDropModalOpen}
+            wave={wave}
+            onClose={() => setIsCurationDropModalOpen(false)}
+          />
+        )}
 
         {leaderboardContent}
       </div>
diff --git a/components/waves/CreateCurationDropContent.tsx b/components/waves/CreateCurationDropContent.tsx
index a93cc37be3..ebe913d34e 100644
--- a/components/waves/CreateCurationDropContent.tsx
+++ b/components/waves/CreateCurationDropContent.tsx
@@ -30,6 +30,7 @@ import type { DropMutationBody } from "./CreateDrop";
 import CreateDropReplyingWrapper from "./CreateDropReplyingWrapper";
 import { CreateDropSubmit } from "./CreateDropSubmit";
 import CreateCurationDropUrlInput from "./CreateCurationDropUrlInput";
+import PrimaryButton from "../utils/button/PrimaryButton";
 import type { CurationComposerVariant } from "./PrivilegedDropCreator";
 import ModalLayout from "./memes/submission/layout/ModalLayout";
 import {
@@ -428,56 +429,53 @@ const CreateCurationDropContent: React.FC<CreateCurationDropContentProps> = ({
         dropId={dropId}
       />
       {isLeaderboardVariant ? (
-        <div className="tw-flex tw-w-full tw-items-start tw-gap-x-2 lg:tw-gap-x-3">
-          <div className="tw-min-w-0 tw-flex-grow">
-            <CreateCurationDropUrlInput
-              ref={inputRef}
-              value={urlValue}
-              disabled={submitting}
-              isInvalid={isInvalid}
-              showHelperText={false}
-              scrollMarginTopClassName="tw-scroll-mt-24"
-              canonicalUrl={null}
-              onChange={setUrlValue}
-              onBlur={() => setShowLiveValidation(true)}
-              onSubmit={onDrop}
-            />
-            <div className="tw-mt-2 tw-flex tw-flex-wrap tw-items-center tw-gap-x-3 tw-gap-y-2">
-              <button
-                type="button"
-                onClick={() => setIsSupportedUrlsModalOpen(true)}
-                className={`tw-border-0 tw-bg-transparent tw-p-0 tw-text-xs tw-font-medium tw-underline tw-transition desktop-hover:hover:tw-text-white ${
-                  showSupportedUrlAttention
-                    ? "tw-text-red-300 tw-animate-pulse"
-                    : "tw-text-iron-300"
-                }`}
+        <div className="tw-flex tw-w-full tw-flex-col tw-gap-4">
+          <CreateCurationDropUrlInput
+            ref={inputRef}
+            value={urlValue}
+            disabled={submitting}
+            isInvalid={isInvalid}
+            showHelperText={false}
+            scrollMarginTopClassName="tw-scroll-mt-24"
+            canonicalUrl={null}
+            placeholder="https://..."
+            onChange={setUrlValue}
+            onBlur={() => setShowLiveValidation(true)}
+            onSubmit={onDrop}
+          />
+          <div className="tw-flex tw-flex-col tw-gap-2">
+            <button
+              type="button"
+              onClick={() => setIsSupportedUrlsModalOpen(true)}
+              className={`desktop-hover:hover:tw-text-primary-200 tw-self-start tw-border-0 tw-bg-transparent tw-p-0 tw-text-lg tw-font-medium tw-text-primary-300 tw-transition ${
+                showSupportedUrlAttention ? "tw-animate-pulse" : ""
+              }`}
+            >
+              View Supported URLs
+            </button>
+            {showSupportedUrlAttention && (
+              <p
+                role="alert"
+                className="tw-text-red-300 tw-mb-0 tw-text-sm tw-font-semibold"
               >
-                Supported URLs
-              </button>
-              {showSupportedUrlAttention && (
-                <p
-                  role="alert"
-                  className="tw-text-red-300 tw-mb-0 tw-text-xs tw-font-semibold"
-                >
-                  Unsupported URL format. Open Supported URLs.
+                Unsupported URL format. Open Supported URLs.
+              </p>
+            )}
+            {normalizedCurationUrl &&
+              normalizedCurationUrl !== urlValue.trim() && (
+                <p className="tw-mb-0 tw-text-xs tw-text-iron-500">
+                  Will submit as: {normalizedCurationUrl}
                 </p>
               )}
-              {normalizedCurationUrl &&
-                normalizedCurationUrl !== urlValue.trim() && (
-                  <p className="tw-mb-0 tw-text-[11px] tw-text-iron-500">
-                    Will submit as: {normalizedCurationUrl}
-                  </p>
-                )}
-            </div>
-          </div>
-          <div className="tw-shrink-0 tw-self-start">
-            <CreateDropSubmit
-              submitting={submitting}
-              canSubmit={canSubmit}
-              onDrop={onDrop}
-              isDropMode={isDropMode}
-            />
           </div>
+          <PrimaryButton
+            onClicked={onDrop}
+            loading={submitting}
+            disabled={!canSubmit}
+            padding="tw-w-full tw-px-4 tw-py-3"
+          >
+            <span>Submit to Curation</span>
+          </PrimaryButton>
         </div>
       ) : (
         <div className="tw-flex tw-w-full tw-items-end">
diff --git a/components/waves/CreateCurationDropUrlInput.tsx b/components/waves/CreateCurationDropUrlInput.tsx
index 5a70777268..508ffd374e 100644
--- a/components/waves/CreateCurationDropUrlInput.tsx
+++ b/components/waves/CreateCurationDropUrlInput.tsx
@@ -10,6 +10,7 @@ interface CreateCurationDropUrlInputProps {
   readonly showHelperText?: boolean | undefined;
   readonly scrollMarginTopClassName?: string | undefined;
   readonly canonicalUrl: string | null;
+  readonly placeholder?: string | undefined;
   readonly onChange: (value: string) => void;
   readonly onBlur: () => void;
   readonly onSubmit: () => void;
@@ -28,6 +29,7 @@ const CreateCurationDropUrlInput = forwardRef<
       showHelperText = true,
       scrollMarginTopClassName,
       canonicalUrl,
+      placeholder = "Enter supported curation URL",
       onChange,
       onBlur,
       onSubmit,
@@ -60,7 +62,7 @@ const CreateCurationDropUrlInput = forwardRef<
             event.preventDefault();
             onSubmit();
           }}
-          placeholder="Enter supported curation URL"
+          placeholder={placeholder}
           className={`tw-form-input tw-block tw-w-full tw-rounded-lg tw-border-0 tw-bg-iron-900 tw-py-2.5 tw-pl-3 tw-pr-3 tw-text-base tw-font-normal tw-leading-6 tw-text-white tw-caret-primary-400 tw-shadow-sm tw-ring-1 tw-ring-inset tw-transition tw-duration-300 tw-ease-out placeholder:tw-text-iron-500 focus:tw-bg-iron-950 focus:tw-outline-none sm:tw-text-sm ${inputRingClasses} ${
             disabled ? "tw-cursor-default tw-opacity-50" : ""
           } ${scrollMarginTopClassName ?? ""}`}
diff --git a/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx b/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
new file mode 100644
index 0000000000..2b4b4ebb28
--- /dev/null
+++ b/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
@@ -0,0 +1,103 @@
+"use client";
+
+import type { ApiWave } from "@/generated/models/ApiWave";
+import { XMarkIcon } from "@heroicons/react/24/outline";
+import { motion } from "framer-motion";
+import { useEffect } from "react";
+import { createPortal } from "react-dom";
+import { WaveDropCreate } from "./WaveDropCreate";
+
+interface WaveLeaderboardCurationDropModalProps {
+  readonly isOpen: boolean;
+  readonly wave: ApiWave;
+  readonly onClose: () => void;
+}
+
+export function WaveLeaderboardCurationDropModal({
+  isOpen,
+  wave,
+  onClose,
+}: WaveLeaderboardCurationDropModalProps) {
+  const canUseDOM = typeof document !== "undefined";
+
+  useEffect(() => {
+    if (!isOpen) {
+      return;
+    }
+
+    const originalOverflow = document.body.style.overflow;
+    document.body.style.overflow = "hidden";
+
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "Escape") {
+        onClose();
+      }
+    };
+    document.addEventListener("keydown", onKeyDown);
+
+    return () => {
+      document.body.style.overflow = originalOverflow;
+      document.removeEventListener("keydown", onKeyDown);
+    };
+  }, [isOpen, onClose]);
+
+  if (!canUseDOM || !isOpen) {
+    return null;
+  }
+
+  return createPortal(
+    <dialog
+      open
+      aria-modal="true"
+      aria-labelledby="leaderboard-drop-art-title"
+      className="tailwind-scope tw-fixed tw-inset-0 tw-z-[1000] tw-m-0 tw-h-full tw-w-full tw-max-w-none tw-border-0 tw-bg-black/70 tw-p-0 tw-outline-none tw-backdrop-blur-sm"
+      data-testid="curation-drop-modal"
+    >
+      <button
+        type="button"
+        onClick={onClose}
+        className="tw-fixed tw-inset-0 tw-cursor-default tw-border-0 tw-bg-transparent tw-p-0"
+        aria-label="Close drop artwork modal"
+      />
+      <div className="tw-relative tw-z-10 tw-flex tw-h-full tw-items-center tw-justify-center tw-p-4">
+        <motion.div
+          initial={{ opacity: 0, y: 12, scale: 0.98 }}
+          animate={{ opacity: 1, y: 0, scale: 1 }}
+          transition={{ duration: 0.2, ease: "easeOut" }}
+          className="tw-w-full tw-max-w-2xl tw-rounded-3xl tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-p-6 sm:tw-p-8"
+          data-testid="curation-drop-modal-panel"
+        >
+          <div className="tw-mb-6 tw-flex tw-items-start tw-justify-between tw-gap-4">
+            <div>
+              <h2
+                id="leaderboard-drop-art-title"
+                className="tw-mb-2 tw-text-4xl tw-font-semibold tw-text-iron-50"
+              >
+                Drop Artwork
+              </h2>
+              <p className="tw-mb-0 tw-max-w-lg tw-text-base tw-text-iron-400">
+                Enter a supported curation URL to submit a new piece to the
+                leaderboard.
+              </p>
+            </div>
+            <button
+              type="button"
+              onClick={onClose}
+              className="tw-flex tw-size-10 tw-items-center tw-justify-center tw-rounded-xl tw-border tw-border-solid tw-border-transparent tw-bg-transparent tw-text-iron-500 tw-transition desktop-hover:hover:tw-border-white/10 desktop-hover:hover:tw-text-iron-200"
+              aria-label="Close modal"
+            >
+              <XMarkIcon className="tw-size-6 tw-flex-shrink-0" />
+            </button>
+          </div>
+
+          <WaveDropCreate
+            wave={wave}
+            onSuccess={onClose}
+            isCurationLeaderboard
+          />
+        </motion.div>
+      </div>
+    </dialog>,
+    document.body
+  );
+}
diff --git a/components/waves/leaderboard/drops/WaveLeaderboardDrops.tsx b/components/waves/leaderboard/drops/WaveLeaderboardDrops.tsx
index 300a19bcec..5188d437c2 100644
--- a/components/waves/leaderboard/drops/WaveLeaderboardDrops.tsx
+++ b/components/waves/leaderboard/drops/WaveLeaderboardDrops.tsx
@@ -17,6 +17,9 @@ interface WaveLeaderboardDropsProps {
   readonly sort: WaveDropsLeaderboardSort;
   readonly onCreateDrop?: (() => void) | undefined;
   readonly curatedByGroupId?: string | undefined;
+  readonly minPrice?: number | undefined;
+  readonly maxPrice?: number | undefined;
+  readonly priceCurrency?: string | undefined;
 }
 
 export const WaveLeaderboardDrops: React.FC<WaveLeaderboardDropsProps> = ({
@@ -24,6 +27,9 @@ export const WaveLeaderboardDrops: React.FC<WaveLeaderboardDropsProps> = ({
   sort,
   onCreateDrop,
   curatedByGroupId,
+  minPrice,
+  maxPrice,
+  priceCurrency,
 }) => {
   const router = useRouter();
   const pathname = usePathname();
@@ -33,6 +39,9 @@ export const WaveLeaderboardDrops: React.FC<WaveLeaderboardDropsProps> = ({
       waveId: wave.id,
       sort,
       curatedByGroupId,
+      minPrice,
+      maxPrice,
+      priceCurrency,
     });
 
   const intersectionElementRef = useIntersectionObserver(async () => {
diff --git a/components/waves/leaderboard/gallery/WaveLeaderboardGallery.tsx b/components/waves/leaderboard/gallery/WaveLeaderboardGallery.tsx
index d5e26934a7..a88ab0851b 100644
--- a/components/waves/leaderboard/gallery/WaveLeaderboardGallery.tsx
+++ b/components/waves/leaderboard/gallery/WaveLeaderboardGallery.tsx
@@ -12,6 +12,9 @@ interface WaveLeaderboardGalleryProps {
   readonly sort: WaveDropsLeaderboardSort;
   readonly onDropClick: (drop: ExtendedDrop) => void;
   readonly curatedByGroupId?: string | undefined;
+  readonly minPrice?: number | undefined;
+  readonly maxPrice?: number | undefined;
+  readonly priceCurrency?: string | undefined;
 }
 
 export const WaveLeaderboardGallery: React.FC<WaveLeaderboardGalleryProps> = ({
@@ -19,12 +22,18 @@ export const WaveLeaderboardGallery: React.FC<WaveLeaderboardGalleryProps> = ({
   sort,
   onDropClick,
   curatedByGroupId,
+  minPrice,
+  maxPrice,
+  priceCurrency,
 }) => {
   const { drops, fetchNextPage, hasNextPage, isFetching, isFetchingNextPage } =
     useWaveDropsLeaderboard({
       waveId: wave.id,
       sort,
       curatedByGroupId,
+      minPrice,
+      maxPrice,
+      priceCurrency,
     });
 
   // Track when sort changes to signal animation
diff --git a/components/waves/leaderboard/grid/WaveLeaderboardGrid.tsx b/components/waves/leaderboard/grid/WaveLeaderboardGrid.tsx
index 02db8898b1..0e1c35a9c5 100644
--- a/components/waves/leaderboard/grid/WaveLeaderboardGrid.tsx
+++ b/components/waves/leaderboard/grid/WaveLeaderboardGrid.tsx
@@ -15,6 +15,9 @@ interface WaveLeaderboardGridProps {
   readonly mode: WaveLeaderboardGridMode;
   readonly onDropClick: (drop: ExtendedDrop) => void;
   readonly curatedByGroupId?: string | undefined;
+  readonly minPrice?: number | undefined;
+  readonly maxPrice?: number | undefined;
+  readonly priceCurrency?: string | undefined;
 }
 
 export const WaveLeaderboardGrid: React.FC<WaveLeaderboardGridProps> = ({
@@ -23,12 +26,18 @@ export const WaveLeaderboardGrid: React.FC<WaveLeaderboardGridProps> = ({
   mode,
   onDropClick,
   curatedByGroupId,
+  minPrice,
+  maxPrice,
+  priceCurrency,
 }) => {
   const { drops, fetchNextPage, hasNextPage, isFetching, isFetchingNextPage } =
     useWaveDropsLeaderboard({
       waveId: wave.id,
       sort,
       curatedByGroupId,
+      minPrice,
+      maxPrice,
+      priceCurrency,
     });
 
   if (isFetching && drops.length === 0) {
@@ -42,8 +51,8 @@ export const WaveLeaderboardGrid: React.FC<WaveLeaderboardGridProps> = ({
             >
               <div className="tw-aspect-[16/9] tw-min-h-[14rem] tw-animate-pulse tw-bg-iron-900/80 md:tw-min-h-[15rem]" />
               <div className="tw-space-y-2 tw-px-3 tw-py-3">
-                <div className="tw-h-4 tw-w-3/4 tw-rounded tw-animate-pulse tw-bg-iron-800/50" />
-                <div className="tw-h-3 tw-w-1/3 tw-rounded tw-animate-pulse tw-bg-iron-800/40" />
+                <div className="tw-h-4 tw-w-3/4 tw-animate-pulse tw-rounded tw-bg-iron-800/50" />
+                <div className="tw-h-3 tw-w-1/3 tw-animate-pulse tw-rounded tw-bg-iron-800/40" />
               </div>
             </div>
           ))}
diff --git a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
index a50bc0f81f..673f9db416 100644
--- a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
+++ b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
@@ -6,14 +6,17 @@ import type { ApiWave } from "@/generated/models/ApiWave";
 import type { ApiWaveCurationGroup } from "@/generated/models/ApiWaveCurationGroup";
 import { useWave } from "@/hooks/useWave";
 import type { WaveDropsLeaderboardSort } from "@/hooks/useWaveDropsLeaderboard";
+import { AnimatePresence, motion } from "framer-motion";
+import { AdjustmentsHorizontalIcon } from "@heroicons/react/24/outline";
 import { PlusIcon } from "@heroicons/react/24/solid";
-import React, { useContext, useMemo } from "react";
+import React, { useContext, useMemo, useState } from "react";
 import { Tooltip } from "react-tooltip";
 import { getWaveDropEligibility } from "../dropEligibility";
 import type { LeaderboardViewMode } from "../types";
 import { WaveLeaderboardCurationGroupSelect } from "./WaveLeaderboardCurationGroupSelect";
 import { useLeaderboardHeaderControlMeasurements } from "./useLeaderboardHeaderControlMeasurements";
 import {
+  WAVE_LEADERBOARD_CURATION_SORT_ITEMS,
   WAVE_LEADERBOARD_SORT_ITEMS,
   WaveleaderboardSort,
 } from "./WaveleaderboardSort";
@@ -31,8 +34,155 @@ interface WaveLeaderboardHeaderProps {
   readonly onCurationGroupChange?:
     | ((groupId: string | null) => void)
     | undefined;
+  readonly minPrice?: number | undefined;
+  readonly maxPrice?: number | undefined;
+  readonly onPriceRangeChange?:
+    | ((values: {
+        readonly minPrice: number | undefined;
+        readonly maxPrice: number | undefined;
+      }) => void)
+    | undefined;
+}
+
+interface WaveLeaderboardPriceFiltersProps {
+  readonly waveId: string;
+  readonly minPrice?: number | undefined;
+  readonly maxPrice?: number | undefined;
+  readonly onPriceRangeChange?:
+    | ((values: {
+        readonly minPrice: number | undefined;
+        readonly maxPrice: number | undefined;
+      }) => void)
+    | undefined;
+  readonly onFiltersActivated: () => void;
+  readonly onFiltersCleared: () => void;
 }
 
+const toPriceInputValue = (value?: number): string =>
+  typeof value === "number" ? value.toString() : "";
+
+const parsePriceInput = (rawValue: string): number | undefined => {
+  if (!rawValue.trim()) {
+    return undefined;
+  }
+  const numericValue = Number.parseFloat(rawValue);
+  if (!Number.isFinite(numericValue) || numericValue < 0) {
+    return undefined;
+  }
+  return numericValue;
+};
+
+const WaveLeaderboardPriceFilters: React.FC<
+  WaveLeaderboardPriceFiltersProps
+> = ({
+  waveId,
+  minPrice,
+  maxPrice,
+  onPriceRangeChange,
+  onFiltersActivated,
+  onFiltersCleared,
+}) => {
+  const [minPriceInput, setMinPriceInput] = useState(() =>
+    toPriceInputValue(minPrice)
+  );
+  const [maxPriceInput, setMaxPriceInput] = useState(() =>
+    toPriceInputValue(maxPrice)
+  );
+
+  const commitPriceRange = () => {
+    if (!onPriceRangeChange) {
+      return;
+    }
+
+    const nextMinPrice = parsePriceInput(minPriceInput);
+    const nextMaxPrice = parsePriceInput(maxPriceInput);
+    const hasActivePriceFilters =
+      typeof nextMinPrice === "number" || typeof nextMaxPrice === "number";
+
+    if (hasActivePriceFilters) {
+      onFiltersActivated();
+    }
+
+    onPriceRangeChange({
+      minPrice: nextMinPrice,
+      maxPrice: nextMaxPrice,
+    });
+  };
+
+  return (
+    <div className="tw-flex tw-flex-wrap tw-items-end tw-gap-3 tw-rounded-2xl tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-p-5">
+      <div className="tw-flex tw-min-w-[10rem] tw-flex-col tw-gap-y-1.5">
+        <label
+          htmlFor={`leaderboard-min-price-${waveId}`}
+          className="tw-text-sm tw-font-semibold tw-uppercase tw-tracking-wide tw-text-iron-500"
+        >
+          Min (ETH)
+        </label>
+        <input
+          id={`leaderboard-min-price-${waveId}`}
+          data-testid="leaderboard-price-min-input"
+          type="number"
+          min={0}
+          step="any"
+          inputMode="decimal"
+          placeholder="0"
+          value={minPriceInput}
+          onChange={(event) => setMinPriceInput(event.target.value)}
+          onBlur={commitPriceRange}
+          onKeyDown={(event) => {
+            if (event.key === "Enter") {
+              commitPriceRange();
+            }
+          }}
+          className="tw-rounded-xl tw-border-0 tw-bg-black tw-px-4 tw-py-3 tw-text-xl tw-font-medium tw-text-iron-100 tw-ring-1 tw-ring-inset tw-ring-iron-700 placeholder:tw-text-iron-500 focus:tw-outline-none focus:tw-ring-primary-400"
+        />
+      </div>
+      <div className="tw-flex tw-min-w-[10rem] tw-flex-col tw-gap-y-1.5">
+        <label
+          htmlFor={`leaderboard-max-price-${waveId}`}
+          className="tw-text-sm tw-font-semibold tw-uppercase tw-tracking-wide tw-text-iron-500"
+        >
+          Max (ETH)
+        </label>
+        <input
+          id={`leaderboard-max-price-${waveId}`}
+          data-testid="leaderboard-price-max-input"
+          type="number"
+          min={0}
+          step="any"
+          inputMode="decimal"
+          placeholder="No max"
+          value={maxPriceInput}
+          onChange={(event) => setMaxPriceInput(event.target.value)}
+          onBlur={commitPriceRange}
+          onKeyDown={(event) => {
+            if (event.key === "Enter") {
+              commitPriceRange();
+            }
+          }}
+          className="tw-rounded-xl tw-border-0 tw-bg-black tw-px-4 tw-py-3 tw-text-xl tw-font-medium tw-text-iron-100 tw-ring-1 tw-ring-inset tw-ring-iron-700 placeholder:tw-text-iron-500 focus:tw-outline-none focus:tw-ring-primary-400"
+        />
+      </div>
+      <button
+        type="button"
+        data-testid="leaderboard-price-clear"
+        onClick={() => {
+          setMinPriceInput("");
+          setMaxPriceInput("");
+          onFiltersCleared();
+          onPriceRangeChange?.({
+            minPrice: undefined,
+            maxPrice: undefined,
+          });
+        }}
+        className="tw-h-[3.25rem] tw-rounded-xl tw-border tw-border-solid tw-border-white/10 tw-bg-white/5 tw-px-6 tw-text-sm tw-font-semibold tw-text-iron-200 tw-transition desktop-hover:hover:tw-border-white/20 desktop-hover:hover:tw-bg-white/10 desktop-hover:hover:tw-text-iron-100"
+      >
+        Clear Filters
+      </button>
+    </div>
+  );
+};
+
 export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
   wave,
   onCreateDrop,
@@ -43,6 +193,9 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
   curationGroups = [],
   curatedByGroupId = null,
   onCurationGroupChange,
+  minPrice,
+  maxPrice,
+  onPriceRangeChange,
 }) => {
   const { connectedProfile, activeProfileProxy } = useContext(AuthContext);
   const { isMemesWave, isCurationWave, participation } = useWave(wave);
@@ -56,16 +209,29 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
   const showCurationGroupSelect = Boolean(
     onCurationGroupChange && curationGroups.length > 0
   );
+  const showPriceControls = Boolean(isCurationWave && onPriceRangeChange);
+  const sortItems = useMemo(
+    () =>
+      isCurationWave
+        ? WAVE_LEADERBOARD_CURATION_SORT_ITEMS
+        : WAVE_LEADERBOARD_SORT_ITEMS,
+    [isCurationWave]
+  );
   const viewModes: LeaderboardViewMode[] = isMemesWave
     ? ["list", "grid"]
     : ["list", "grid", "grid_content_only"];
+  const hasActivePriceFilters =
+    typeof minPrice === "number" || typeof maxPrice === "number";
+  const [isManualFiltersOpen, setIsManualFiltersOpen] = useState(false);
+  const [isActiveFiltersCollapsed, setIsActiveFiltersCollapsed] =
+    useState(false);
+  const isPriceFiltersOpen = hasActivePriceFilters
+    ? !isActiveFiltersCollapsed
+    : isManualFiltersOpen;
 
   const sortLabelByValue = useMemo(
-    () =>
-      new Map(
-        WAVE_LEADERBOARD_SORT_ITEMS.map((item) => [item.value, item.label])
-      ),
-    []
+    () => new Map(sortItems.map((item) => [item.value, item.label])),
+    [sortItems]
   );
   const activeSortLabel = sortLabelByValue.get(sort) ?? "Current Vote";
 
@@ -196,6 +362,16 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
     );
   };
 
+  const onTogglePriceFilters = () => {
+    if (hasActivePriceFilters) {
+      setIsActiveFiltersCollapsed((current) => !current);
+      return;
+    }
+    setIsManualFiltersOpen((current) => !current);
+  };
+
+  const showCurationActions = showPriceControls;
+
   return (
     <div className="tw-relative tw-flex tw-flex-col tw-gap-y-4 tw-bg-black tw-@container">
       <div className="tw-flex tw-items-start tw-gap-2">
@@ -256,6 +432,7 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
               sort={sort}
               onSortChange={onSortChange}
               mode={controlModes.sortMode}
+              items={sortItems}
             />
           </div>
           {showCurationGroupSelect && onCurationGroupChange && (
@@ -269,25 +446,85 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
             </div>
           )}
         </div>
-        {isLoggedIn && (
-          <div
-            className={`tw-flex tw-flex-col tw-items-end ${isMemesWave ? "lg:tw-hidden" : ""}`}
-          >
-            {canCreateDrop && onCreateDrop && (
+        {showCurationActions ? (
+          <div className="tw-ml-auto tw-flex tw-flex-shrink-0 tw-items-center tw-gap-2">
+            <button
+              type="button"
+              data-testid="leaderboard-price-toggle"
+              aria-expanded={isPriceFiltersOpen}
+              aria-controls={`leaderboard-price-panel-${wave.id}`}
+              onClick={onTogglePriceFilters}
+              className={`tw-inline-flex tw-h-10 tw-items-center tw-gap-2 tw-rounded-xl tw-border tw-border-solid tw-px-5 tw-text-sm tw-font-semibold tw-transition ${
+                isPriceFiltersOpen || hasActivePriceFilters
+                  ? "tw-border-white/15 tw-bg-white/10 tw-text-iron-100"
+                  : "tw-border-white/10 tw-bg-iron-950 tw-text-iron-200 desktop-hover:hover:tw-border-white/15 desktop-hover:hover:tw-bg-white/5"
+              }`}
+            >
+              <AdjustmentsHorizontalIcon className="tw-size-5 tw-flex-shrink-0" />
+              <span>Filters</span>
+            </button>
+            {isLoggedIn && canCreateDrop && onCreateDrop && (
               <PrimaryButton
                 loading={false}
                 disabled={false}
                 onClicked={onCreateDrop}
-                padding="tw-px-3 tw-py-2"
+                padding="tw-px-5 tw-py-2.5"
               >
-                <PlusIcon className="-tw-ml-1 tw-h-4 tw-w-4 tw-flex-shrink-0" />
-                <span>Drop</span>
+                <PlusIcon className="tw-h-5 tw-w-5 tw-flex-shrink-0" />
+                <span>Drop Art</span>
               </PrimaryButton>
             )}
           </div>
+        ) : (
+          isLoggedIn && (
+            <div
+              className={`tw-flex tw-flex-col tw-items-end ${isMemesWave ? "lg:tw-hidden" : ""}`}
+            >
+              {canCreateDrop && onCreateDrop && (
+                <PrimaryButton
+                  loading={false}
+                  disabled={false}
+                  onClicked={onCreateDrop}
+                  padding="tw-px-3 tw-py-2"
+                >
+                  <PlusIcon className="-tw-ml-1 tw-h-4 tw-w-4 tw-flex-shrink-0" />
+                  <span>Drop</span>
+                </PrimaryButton>
+              )}
+            </div>
+          )
         )}
       </div>
 
+      {showPriceControls && (
+        <AnimatePresence initial={false}>
+          {isPriceFiltersOpen && (
+            <motion.div
+              id={`leaderboard-price-panel-${wave.id}`}
+              data-testid="leaderboard-price-panel"
+              initial={{ opacity: 0, height: 0, y: -8 }}
+              animate={{ opacity: 1, height: "auto", y: 0 }}
+              exit={{ opacity: 0, height: 0, y: -8 }}
+              transition={{ duration: 0.2, ease: "easeInOut" }}
+              className="tw-overflow-hidden"
+            >
+              <WaveLeaderboardPriceFilters
+                key={`${minPrice ?? ""}|${maxPrice ?? ""}`}
+                waveId={wave.id}
+                minPrice={minPrice}
+                maxPrice={maxPrice}
+                onPriceRangeChange={onPriceRangeChange}
+                onFiltersActivated={() => setIsActiveFiltersCollapsed(false)}
+                onFiltersCleared={() => {
+                  setIsManualFiltersOpen(false);
+                  setIsActiveFiltersCollapsed(false);
+                }}
+              />
+            </motion.div>
+          )}
+        </AnimatePresence>
+      )}
+
       <div
         aria-hidden="true"
         className="tw-pointer-events-none tw-absolute tw-left-0 tw-top-0 tw-h-0 tw-overflow-hidden tw-whitespace-nowrap tw-opacity-0"
@@ -296,7 +533,7 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
           ref={sortTabsProbeRef}
           className="tw-inline-flex tw-items-center tw-gap-x-1 tw-rounded-lg tw-bg-iron-950 tw-p-1 tw-ring-1 tw-ring-inset tw-ring-iron-700"
         >
-          {WAVE_LEADERBOARD_SORT_ITEMS.map((item) => (
+          {sortItems.map((item) => (
             <div
               key={item.key}
               className="tw-flex tw-items-center tw-justify-center tw-whitespace-nowrap tw-rounded-lg tw-border-0 tw-px-3 tw-py-2.5 tw-text-xs tw-font-semibold"
diff --git a/components/waves/leaderboard/header/WaveleaderboardSort.tsx b/components/waves/leaderboard/header/WaveleaderboardSort.tsx
index fc58e3d5a8..b7fdc5f86c 100644
--- a/components/waves/leaderboard/header/WaveleaderboardSort.tsx
+++ b/components/waves/leaderboard/header/WaveleaderboardSort.tsx
@@ -9,6 +9,9 @@ interface WaveleaderboardSortProps {
   readonly sort: WaveDropsLeaderboardSort;
   readonly onSortChange: (sort: WaveDropsLeaderboardSort) => void;
   readonly mode?: WaveleaderboardSortMode;
+  readonly items?:
+    | readonly CommonSelectItem<WaveDropsLeaderboardSort>[]
+    | undefined;
 }
 
 type WaveleaderboardSortMode = "tabs" | "dropdown";
@@ -37,10 +40,21 @@ export const WAVE_LEADERBOARD_SORT_ITEMS: readonly CommonSelectItem<WaveDropsLea
     },
   ];
 
+export const WAVE_LEADERBOARD_CURATION_SORT_ITEMS: readonly CommonSelectItem<WaveDropsLeaderboardSort>[] =
+  [
+    ...WAVE_LEADERBOARD_SORT_ITEMS,
+    {
+      key: WaveDropsLeaderboardSort.PRICE,
+      label: "Price",
+      value: WaveDropsLeaderboardSort.PRICE,
+    },
+  ];
+
 export const WaveleaderboardSort: React.FC<WaveleaderboardSortProps> = ({
   sort,
   onSortChange,
   mode = "dropdown",
+  items = WAVE_LEADERBOARD_SORT_ITEMS,
 }) => {
   const getTabClassName = (value: WaveDropsLeaderboardSort): string => {
     const baseClass =
@@ -60,7 +74,7 @@ export const WaveleaderboardSort: React.FC<WaveleaderboardSortProps> = ({
         aria-label="Sort options"
         className="tw-flex tw-items-center tw-gap-x-1 tw-rounded-lg tw-bg-iron-950 tw-p-1 tw-ring-1 tw-ring-inset tw-ring-iron-700"
       >
-        {WAVE_LEADERBOARD_SORT_ITEMS.map((item) => (
+        {items.map((item) => (
           <button
             key={item.key}
             type="button"
@@ -81,7 +95,7 @@ export const WaveleaderboardSort: React.FC<WaveleaderboardSortProps> = ({
   return (
     <div className="tw-min-w-0 tw-flex-shrink-0">
       <CommonDropdown<WaveDropsLeaderboardSort>
-        items={WAVE_LEADERBOARD_SORT_ITEMS}
+        items={items}
         activeItem={sort}
         filterLabel="Sort"
         setSelected={onSortChange}
diff --git a/generated/models/ApiCicContributor.ts b/generated/models/ApiCicContributor.ts
new file mode 100644
index 0000000000..17ebccf5aa
--- /dev/null
+++ b/generated/models/ApiCicContributor.ts
@@ -0,0 +1,45 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ApiProfileMin } from '../models/ApiProfileMin';
+import { HttpFile } from '../http/http';
+
+export class ApiCicContributor {
+    'contribution': number;
+    'profile': ApiProfileMin;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "contribution",
+            "baseName": "contribution",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "profile",
+            "baseName": "profile",
+            "type": "ApiProfileMin",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiCicContributor.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ApiCicContributorsPage.ts b/generated/models/ApiCicContributorsPage.ts
new file mode 100644
index 0000000000..fc7fca88d0
--- /dev/null
+++ b/generated/models/ApiCicContributorsPage.ts
@@ -0,0 +1,52 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ApiCicContributor } from '../models/ApiCicContributor';
+import { HttpFile } from '../http/http';
+
+export class ApiCicContributorsPage {
+    'data': Array<ApiCicContributor>;
+    'page': number;
+    'next': boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "data",
+            "baseName": "data",
+            "type": "Array<ApiCicContributor>",
+            "format": ""
+        },
+        {
+            "name": "page",
+            "baseName": "page",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "next",
+            "baseName": "next",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiCicContributorsPage.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ApiCicOverview.ts b/generated/models/ApiCicOverview.ts
new file mode 100644
index 0000000000..98f9bbadd7
--- /dev/null
+++ b/generated/models/ApiCicOverview.ts
@@ -0,0 +1,59 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ApiCicContributorsPage } from '../models/ApiCicContributorsPage';
+import { HttpFile } from '../http/http';
+
+export class ApiCicOverview {
+    'total_cic': number;
+    'authenticated_user_contribution': number | null;
+    'contributor_count': number;
+    'contributors': ApiCicContributorsPage;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "total_cic",
+            "baseName": "total_cic",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "authenticated_user_contribution",
+            "baseName": "authenticated_user_contribution",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "contributor_count",
+            "baseName": "contributor_count",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "contributors",
+            "baseName": "contributors",
+            "type": "ApiCicContributorsPage",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiCicOverview.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ApiRepCategoriesPage.ts b/generated/models/ApiRepCategoriesPage.ts
new file mode 100644
index 0000000000..10695d46b3
--- /dev/null
+++ b/generated/models/ApiRepCategoriesPage.ts
@@ -0,0 +1,52 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ApiRepCategory } from '../models/ApiRepCategory';
+import { HttpFile } from '../http/http';
+
+export class ApiRepCategoriesPage {
+    'data': Array<ApiRepCategory>;
+    'page': number;
+    'next': boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "data",
+            "baseName": "data",
+            "type": "Array<ApiRepCategory>",
+            "format": ""
+        },
+        {
+            "name": "page",
+            "baseName": "page",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "next",
+            "baseName": "next",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiRepCategoriesPage.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ApiRepCategory.ts b/generated/models/ApiRepCategory.ts
new file mode 100644
index 0000000000..3d0afdc352
--- /dev/null
+++ b/generated/models/ApiRepCategory.ts
@@ -0,0 +1,66 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ApiRepContributor } from '../models/ApiRepContributor';
+import { HttpFile } from '../http/http';
+
+export class ApiRepCategory {
+    'category': string;
+    'total_rep': number;
+    'contributor_count': number;
+    'authenticated_user_contribution': number | null;
+    'top_contributors': Array<ApiRepContributor>;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "category",
+            "baseName": "category",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "total_rep",
+            "baseName": "total_rep",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "contributor_count",
+            "baseName": "contributor_count",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "authenticated_user_contribution",
+            "baseName": "authenticated_user_contribution",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "top_contributors",
+            "baseName": "top_contributors",
+            "type": "Array<ApiRepContributor>",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiRepCategory.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ApiRepContributor.ts b/generated/models/ApiRepContributor.ts
new file mode 100644
index 0000000000..3e992a8c6b
--- /dev/null
+++ b/generated/models/ApiRepContributor.ts
@@ -0,0 +1,45 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ApiProfileMin } from '../models/ApiProfileMin';
+import { HttpFile } from '../http/http';
+
+export class ApiRepContributor {
+    'contribution': number;
+    'profile': ApiProfileMin;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "contribution",
+            "baseName": "contribution",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "profile",
+            "baseName": "profile",
+            "type": "ApiProfileMin",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiRepContributor.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ApiRepContributorsPage.ts b/generated/models/ApiRepContributorsPage.ts
new file mode 100644
index 0000000000..baea5ab4d5
--- /dev/null
+++ b/generated/models/ApiRepContributorsPage.ts
@@ -0,0 +1,52 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ApiRepContributor } from '../models/ApiRepContributor';
+import { HttpFile } from '../http/http';
+
+export class ApiRepContributorsPage {
+    'data': Array<ApiRepContributor>;
+    'page': number;
+    'next': boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "data",
+            "baseName": "data",
+            "type": "Array<ApiRepContributor>",
+            "format": ""
+        },
+        {
+            "name": "page",
+            "baseName": "page",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "next",
+            "baseName": "next",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiRepContributorsPage.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ApiRepDirection.ts b/generated/models/ApiRepDirection.ts
new file mode 100644
index 0000000000..d6d87b3834
--- /dev/null
+++ b/generated/models/ApiRepDirection.ts
@@ -0,0 +1,19 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export enum ApiRepDirection {
+    Incoming = 'incoming',
+    Outgoing = 'outgoing'
+}
diff --git a/generated/models/ApiRepOverview.ts b/generated/models/ApiRepOverview.ts
new file mode 100644
index 0000000000..0817b44ed3
--- /dev/null
+++ b/generated/models/ApiRepOverview.ts
@@ -0,0 +1,59 @@
+// @ts-nocheck
+/**
+ * 6529.io API
+ * This is the API interface description. Brief terminology overview and an authentication example can be found at <a href=\"https://6529.io/about/api\">https://6529.io/about/api</a>.
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ApiRepContributorsPage } from '../models/ApiRepContributorsPage';
+import { HttpFile } from '../http/http';
+
+export class ApiRepOverview {
+    'total_rep': number;
+    'authenticated_user_contribution': number | null;
+    'contributor_count': number;
+    'contributors': ApiRepContributorsPage;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly mapping: {[index: string]: string} | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "total_rep",
+            "baseName": "total_rep",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "authenticated_user_contribution",
+            "baseName": "authenticated_user_contribution",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "contributor_count",
+            "baseName": "contributor_count",
+            "type": "number",
+            "format": "int64"
+        },
+        {
+            "name": "contributors",
+            "baseName": "contributors",
+            "type": "ApiRepContributorsPage",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ApiRepOverview.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
diff --git a/generated/models/ObjectSerializer.ts b/generated/models/ObjectSerializer.ts
index b59001ccfd..c74ab6f13d 100644
--- a/generated/models/ObjectSerializer.ts
+++ b/generated/models/ObjectSerializer.ts
@@ -20,6 +20,9 @@ export * from '../models/ApiBulkRepTarget';
 export * from '../models/ApiChangeGroupVisibility';
 export * from '../models/ApiChangeProfileCicRating';
 export * from '../models/ApiChangeProfileRepRating';
+export * from '../models/ApiCicContributor';
+export * from '../models/ApiCicContributorsPage';
+export * from '../models/ApiCicOverview';
 export * from '../models/ApiCommunityMemberMinimal';
 export * from '../models/ApiCommunityMemberOverview';
 export * from '../models/ApiCommunityMembersPage';
@@ -150,6 +153,12 @@ export * from '../models/ApiRatingWithProfileInfoAndLevelPage';
 export * from '../models/ApiRedeemRefreshTokenRequest';
 export * from '../models/ApiRedeemRefreshTokenResponse';
 export * from '../models/ApiRegisterPushNotificationTokenRequest';
+export * from '../models/ApiRepCategoriesPage';
+export * from '../models/ApiRepCategory';
+export * from '../models/ApiRepContributor';
+export * from '../models/ApiRepContributorsPage';
+export * from '../models/ApiRepDirection';
+export * from '../models/ApiRepOverview';
 export * from '../models/ApiRepRating';
 export * from '../models/ApiReplyToDrop';
 export * from '../models/ApiReplyToDropResponse';
@@ -284,6 +293,9 @@ import { ApiBulkRepTarget } from '../models/ApiBulkRepTarget';
 import { ApiChangeGroupVisibility } from '../models/ApiChangeGroupVisibility';
 import { ApiChangeProfileCicRating } from '../models/ApiChangeProfileCicRating';
 import { ApiChangeProfileRepRating } from '../models/ApiChangeProfileRepRating';
+import { ApiCicContributor } from '../models/ApiCicContributor';
+import { ApiCicContributorsPage } from '../models/ApiCicContributorsPage';
+import { ApiCicOverview } from '../models/ApiCicOverview';
 import { ApiCommunityMemberMinimal } from '../models/ApiCommunityMemberMinimal';
 import { ApiCommunityMemberOverview } from '../models/ApiCommunityMemberOverview';
 import { ApiCommunityMembersPage } from '../models/ApiCommunityMembersPage';
@@ -414,6 +426,12 @@ import { ApiRatingWithProfileInfoAndLevelPage } from '../models/ApiRatingWithPro
 import { ApiRedeemRefreshTokenRequest } from '../models/ApiRedeemRefreshTokenRequest';
 import { ApiRedeemRefreshTokenResponse } from '../models/ApiRedeemRefreshTokenResponse';
 import { ApiRegisterPushNotificationTokenRequest } from '../models/ApiRegisterPushNotificationTokenRequest';
+import { ApiRepCategoriesPage } from '../models/ApiRepCategoriesPage';
+import { ApiRepCategory } from '../models/ApiRepCategory';
+import { ApiRepContributor } from '../models/ApiRepContributor';
+import { ApiRepContributorsPage } from '../models/ApiRepContributorsPage';
+import { ApiRepDirection } from '../models/ApiRepDirection';
+import { ApiRepOverview } from '../models/ApiRepOverview';
 import { ApiRepRating } from '../models/ApiRepRating';
 import { ApiReplyToDrop } from '../models/ApiReplyToDrop';
 import { ApiReplyToDropResponse } from '../models/ApiReplyToDropResponse';
@@ -558,6 +576,7 @@ let enumsMap: Set<string> = new Set<string>([
     "ApiProfileClassification",
     "ApiProfileProxyActionType",
     "ApiRateMatter",
+    "ApiRepDirection",
     "ApiUpcomingMemeSubscriptionStatusSourceEnum",
     "ApiWaveCreditScope",
     "ApiWaveCreditType",
@@ -596,6 +615,9 @@ let typeMap: {[index: string]: any} = {
     "ApiChangeGroupVisibility": ApiChangeGroupVisibility,
     "ApiChangeProfileCicRating": ApiChangeProfileCicRating,
     "ApiChangeProfileRepRating": ApiChangeProfileRepRating,
+    "ApiCicContributor": ApiCicContributor,
+    "ApiCicContributorsPage": ApiCicContributorsPage,
+    "ApiCicOverview": ApiCicOverview,
     "ApiCommunityMemberMinimal": ApiCommunityMemberMinimal,
     "ApiCommunityMemberOverview": ApiCommunityMemberOverview,
     "ApiCommunityMembersPage": ApiCommunityMembersPage,
@@ -712,6 +734,11 @@ let typeMap: {[index: string]: any} = {
     "ApiRedeemRefreshTokenRequest": ApiRedeemRefreshTokenRequest,
     "ApiRedeemRefreshTokenResponse": ApiRedeemRefreshTokenResponse,
     "ApiRegisterPushNotificationTokenRequest": ApiRegisterPushNotificationTokenRequest,
+    "ApiRepCategoriesPage": ApiRepCategoriesPage,
+    "ApiRepCategory": ApiRepCategory,
+    "ApiRepContributor": ApiRepContributor,
+    "ApiRepContributorsPage": ApiRepContributorsPage,
+    "ApiRepOverview": ApiRepOverview,
     "ApiRepRating": ApiRepRating,
     "ApiReplyToDrop": ApiReplyToDrop,
     "ApiReplyToDropResponse": ApiReplyToDropResponse,
diff --git a/hooks/useWaveDropsLeaderboard.ts b/hooks/useWaveDropsLeaderboard.ts
index 9508cc2131..da61baba71 100644
--- a/hooks/useWaveDropsLeaderboard.ts
+++ b/hooks/useWaveDropsLeaderboard.ts
@@ -22,6 +22,7 @@ import useCapacitor from "./useCapacitor";
 
 export enum WaveDropsLeaderboardSort {
   RANK = "RANK",
+  PRICE = "PRICE",
   RATING_PREDICTION = "RATING_PREDICTION",
   TREND = "TREND",
   MY_REALTIME_VOTE = "MY_REALTIME_VOTE",
@@ -33,6 +34,9 @@ interface UseWaveDropsLeaderboardProps {
   readonly sort?: WaveDropsLeaderboardSort | undefined;
   readonly pausePolling?: boolean | undefined;
   readonly curatedByGroupId?: string | undefined;
+  readonly minPrice?: number | undefined;
+  readonly maxPrice?: number | undefined;
+  readonly priceCurrency?: string | undefined;
 }
 
 const SORT_DIRECTION_MAP: Record<
@@ -40,6 +44,7 @@ const SORT_DIRECTION_MAP: Record<
   "ASC" | "DESC" | undefined
 > = {
   [WaveDropsLeaderboardSort.RANK]: undefined,
+  [WaveDropsLeaderboardSort.PRICE]: undefined,
   [WaveDropsLeaderboardSort.RATING_PREDICTION]: "DESC",
   [WaveDropsLeaderboardSort.TREND]: "DESC",
   [WaveDropsLeaderboardSort.MY_REALTIME_VOTE]: undefined,
@@ -68,6 +73,9 @@ export function useWaveDropsLeaderboard({
   sort = WaveDropsLeaderboardSort.RANK,
   pausePolling = false,
   curatedByGroupId,
+  minPrice,
+  maxPrice,
+  priceCurrency,
 }: UseWaveDropsLeaderboardProps) {
   const { isCapacitor } = useCapacitor();
   const queryClient = useQueryClient();
@@ -82,6 +90,24 @@ export function useWaveDropsLeaderboard({
     () => curatedByGroupId?.trim() ?? undefined,
     [curatedByGroupId]
   );
+  const normalizedMinPrice = useMemo(
+    () =>
+      typeof minPrice === "number" && Number.isFinite(minPrice) && minPrice >= 0
+        ? minPrice
+        : undefined,
+    [minPrice]
+  );
+  const normalizedMaxPrice = useMemo(
+    () =>
+      typeof maxPrice === "number" && Number.isFinite(maxPrice) && maxPrice >= 0
+        ? maxPrice
+        : undefined,
+    [maxPrice]
+  );
+  const normalizedPriceCurrency = useMemo(
+    () => priceCurrency?.trim() ?? undefined,
+    [priceCurrency]
+  );
 
   const queryKey = useMemo(
     () =>
@@ -93,9 +119,20 @@ export function useWaveDropsLeaderboard({
           sort,
           sort_direction: sortDirection,
           curated_by_group: normalizedCuratedByGroupId ?? null,
+          min_price: normalizedMinPrice ?? null,
+          max_price: normalizedMaxPrice ?? null,
+          price_currency: normalizedPriceCurrency ?? null,
         },
       ] as const,
-    [waveId, sort, sortDirection, normalizedCuratedByGroupId]
+    [
+      waveId,
+      sort,
+      sortDirection,
+      normalizedCuratedByGroupId,
+      normalizedMinPrice,
+      normalizedMaxPrice,
+      normalizedPriceCurrency,
+    ]
   );
 
   const buildLeaderboardParams = useCallback(
@@ -126,10 +163,24 @@ export function useWaveDropsLeaderboard({
       if (normalizedCuratedByGroupId) {
         params["curated_by_group"] = normalizedCuratedByGroupId;
       }
+      if (typeof normalizedMinPrice === "number") {
+        params["min_price"] = normalizedMinPrice.toString();
+      }
+      if (typeof normalizedMaxPrice === "number") {
+        params["max_price"] = normalizedMaxPrice.toString();
+      }
+      if (normalizedPriceCurrency) {
+        params["price_currency"] = normalizedPriceCurrency;
+      }
 
       return params;
     },
-    [normalizedCuratedByGroupId]
+    [
+      normalizedCuratedByGroupId,
+      normalizedMaxPrice,
+      normalizedMinPrice,
+      normalizedPriceCurrency,
+    ]
   );
 
   const fetchLeaderboardPage = useCallback(
diff --git a/openapi.yaml b/openapi.yaml
index 547d4f0aa6..1fada4a708 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -2705,6 +2705,84 @@ paths:
                 $ref: "#/components/schemas/ApiRatingWithProfileInfoAndLevelPage"
         "404":
           description: Profile not found
+  /profiles/{identity}/cic/overview:
+    get:
+      tags:
+        - ProfileCIC
+      summary: Get profile CIC overview
+      operationId: getProfileCicOverview
+      parameters:
+        - name: identity
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: direction
+          in: query
+          required: false
+          schema:
+            $ref: "#/components/schemas/ApiRepDirection"
+        - name: page
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+        - name: page_size
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 200
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiCicOverview"
+        "404":
+          description: Profile not found
+  /profiles/{identity}/cic/contributors:
+    get:
+      tags:
+        - ProfileCIC
+      summary: Get profile CIC contributors
+      operationId: getProfileCicContributors
+      parameters:
+        - name: identity
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: direction
+          in: query
+          required: false
+          schema:
+            $ref: "#/components/schemas/ApiRepDirection"
+        - name: page
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+        - name: page_size
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 200
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiCicContributorsPage"
+        "404":
+          description: Profile not found
   /profiles/{identity}/rep/rating:
     post:
       tags:
@@ -2820,6 +2898,138 @@ paths:
                 $ref: "#/components/schemas/ApiRatingWithProfileInfoAndLevelPage"
         "404":
           description: Profile not found
+  /profiles/{identity}/rep/overview:
+    get:
+      tags:
+        - ProfileREP
+      summary: Get profile REP overview
+      operationId: getProfileRepOverview
+      parameters:
+        - name: identity
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: direction
+          in: query
+          required: false
+          schema:
+            $ref: "#/components/schemas/ApiRepDirection"
+        - name: page
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+        - name: page_size
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 200
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiRepOverview"
+        "404":
+          description: Profile not found
+  /profiles/{identity}/rep/categories:
+    get:
+      tags:
+        - ProfileREP
+      summary: Get profile REP categories
+      operationId: getProfileRepCategories
+      parameters:
+        - name: identity
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: direction
+          in: query
+          required: false
+          schema:
+            $ref: "#/components/schemas/ApiRepDirection"
+        - name: page
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+        - name: page_size
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 100
+        - name: top_contributors_limit
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 10
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiRepCategoriesPage"
+        "404":
+          description: Profile not found
+  /profiles/{identity}/rep/categories/{category}/contributors:
+    get:
+      tags:
+        - ProfileREP
+      summary: Get profile REP contributors for category
+      operationId: getProfileRepCategoryContributors
+      parameters:
+        - name: identity
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: category
+          in: path
+          required: true
+          schema:
+            type: string
+            minLength: 1
+            maxLength: 100
+            pattern: ^[a-zA-Z0-9?!,."() ]{1,100}$
+        - name: direction
+          in: query
+          required: false
+          schema:
+            $ref: "#/components/schemas/ApiRepDirection"
+        - name: page
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+        - name: page_size
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 200
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiRepContributorsPage"
+        "404":
+          description: Profile not found
   /profiles:
     post:
       tags:
@@ -4843,6 +5053,22 @@ paths:
           required: false
           schema:
             type: string
+        - name: min_price
+          in: query
+          description: Optional minimum price filter used when sorting by PRICE
+          required: false
+          schema:
+            type: number
+            format: double
+            minimum: 0
+        - name: max_price
+          in: query
+          description: Optional maximum price filter used when sorting by PRICE
+          required: false
+          schema:
+            type: number
+            format: double
+            minimum: 0
         - name: curated_by_group
           in: query
           required: false
@@ -6130,6 +6356,48 @@ components:
           maxLength: 100
           minLength: 1
           pattern: ^[a-zA-Z0-9?!,."() ]{1,100}$
+    ApiCicContributor:
+      type: object
+      required:
+        - contribution
+        - profile
+      properties:
+        contribution:
+          type: number
+          format: int64
+        profile:
+          $ref: "#/components/schemas/ApiProfileMin"
+    ApiCicContributorsPage:
+      type: object
+      required:
+        - data
+      allOf:
+        - $ref: "#/components/schemas/ApiPageWithoutCount"
+      properties:
+        data:
+          type: array
+          items:
+            $ref: "#/components/schemas/ApiCicContributor"
+    ApiCicOverview:
+      type: object
+      required:
+        - total_cic
+        - authenticated_user_contribution
+        - contributor_count
+        - contributors
+      properties:
+        total_cic:
+          type: number
+          format: int64
+        authenticated_user_contribution:
+          type: number
+          format: int64
+          nullable: true
+        contributor_count:
+          type: number
+          format: int64
+        contributors:
+          $ref: "#/components/schemas/ApiCicContributorsPage"
     ApiCommunityMemberMinimal:
       type: object
       required:
@@ -9288,6 +9556,69 @@ components:
         platform:
           type: string
           description: Optional platform (ios, android, web)
+    ApiRepCategoriesPage:
+      type: object
+      required:
+        - data
+      allOf:
+        - $ref: "#/components/schemas/ApiPageWithoutCount"
+      properties:
+        data:
+          type: array
+          items:
+            $ref: "#/components/schemas/ApiRepCategory"
+    ApiRepCategory:
+      type: object
+      required:
+        - category
+        - total_rep
+        - contributor_count
+        - authenticated_user_contribution
+        - top_contributors
+      properties:
+        category:
+          type: string
+        total_rep:
+          type: number
+          format: int64
+        contributor_count:
+          type: number
+          format: int64
+        authenticated_user_contribution:
+          type: number
+          format: int64
+          nullable: true
+        top_contributors:
+          type: array
+          items:
+            $ref: "#/components/schemas/ApiRepContributor"
+    ApiRepContributor:
+      type: object
+      required:
+        - contribution
+        - profile
+      properties:
+        contribution:
+          type: number
+          format: int64
+        profile:
+          $ref: "#/components/schemas/ApiProfileMin"
+    ApiRepContributorsPage:
+      type: object
+      required:
+        - data
+      allOf:
+        - $ref: "#/components/schemas/ApiPageWithoutCount"
+      properties:
+        data:
+          type: array
+          items:
+            $ref: "#/components/schemas/ApiRepContributor"
+    ApiRepDirection:
+      type: string
+      enum:
+        - incoming
+        - outgoing
     ApiReplyToDrop:
       type: object
       required:
@@ -9315,6 +9646,26 @@ components:
           type: boolean
         drop:
           $ref: "#/components/schemas/ApiDropWithoutWave"
+    ApiRepOverview:
+      type: object
+      required:
+        - total_rep
+        - authenticated_user_contribution
+        - contributor_count
+        - contributors
+      properties:
+        total_rep:
+          type: number
+          format: int64
+        authenticated_user_contribution:
+          type: number
+          format: int64
+          nullable: true
+        contributor_count:
+          type: number
+          format: int64
+        contributors:
+          $ref: "#/components/schemas/ApiRepContributorsPage"
     ApiRepRating:
       type: object
       required:

From 2692f7b99928337f79a602f5664beaf263a4fed4 Mon Sep 17 00:00:00 2001
From: Simo <simo@6529.io>
Date: Mon, 2 Mar 2026 13:45:01 -0400
Subject: [PATCH 2/7] wip

Signed-off-by: Simo <simo@6529.io>
---
 .../brain/my-stream/MyStreamWave.test.tsx     |  96 ++++++++++-------
 .../MyStreamWaveLeaderboard.test.tsx          | 101 ++++++++++++++----
 components/brain/BrainMobile.tsx              |   6 +-
 components/brain/my-stream/MyStreamWave.tsx   |   6 +-
 .../my-stream/MyStreamWaveLeaderboard.tsx     |  50 ++-------
 .../header/WaveleaderboardHeader.tsx          |  20 ++--
 6 files changed, 168 insertions(+), 111 deletions(-)

diff --git a/__tests__/components/brain/my-stream/MyStreamWave.test.tsx b/__tests__/components/brain/my-stream/MyStreamWave.test.tsx
index 7409f7b728..612f719d32 100644
--- a/__tests__/components/brain/my-stream/MyStreamWave.test.tsx
+++ b/__tests__/components/brain/my-stream/MyStreamWave.test.tsx
@@ -1,78 +1,92 @@
-import { render, screen, fireEvent } from '@testing-library/react';
-import React from 'react';
-import MyStreamWave from '@/components/brain/my-stream/MyStreamWave';
-import { MyStreamWaveTab } from '@/types/waves.types';
+import { render, screen, fireEvent } from "@testing-library/react";
+import React from "react";
+import MyStreamWave from "@/components/brain/my-stream/MyStreamWave";
+import { MyStreamWaveTab } from "@/types/waves.types";
+
+const mockSetQueryData = jest.fn();
+jest.mock("@tanstack/react-query", () => ({
+  useQueryClient: () => ({
+    setQueryData: mockSetQueryData,
+  }),
+}));
+
+const useWave = jest.fn();
+jest.mock("@/hooks/useWave", () => ({
+  useWave: (...args: any[]) => useWave(...args),
+}));
 
-jest.mock('@/components/brain/my-stream/MyStreamWaveChat', () => ({
+jest.mock("@/components/brain/my-stream/MyStreamWaveChat", () => ({
   __esModule: true,
   default: () => <div data-testid="chat" />,
 }));
 
-jest.mock('@/components/brain/my-stream/MyStreamWaveLeaderboard', () => ({
+jest.mock("@/components/brain/my-stream/MyStreamWaveLeaderboard", () => ({
   __esModule: true,
   default: ({ onDropClick }: any) => (
-    <button data-testid="leaderboard" onClick={() => onDropClick({ id: 'd1' })}>
+    <button data-testid="leaderboard" onClick={() => onDropClick({ id: "d1" })}>
       leaderboard
     </button>
   ),
 }));
 
-jest.mock('@/components/brain/my-stream/MyStreamWaveOutcome', () => ({
+jest.mock("@/components/brain/my-stream/MyStreamWaveOutcome", () => ({
   __esModule: true,
   default: () => <div data-testid="outcome" />,
 }));
 
-jest.mock('@/components/waves/winners/WaveWinners', () => ({
+jest.mock("@/components/waves/winners/WaveWinners", () => ({
   __esModule: true,
   WaveWinners: ({ onDropClick }: any) => (
-    <button data-testid="winners" onClick={() => onDropClick({ id: 'd1' })}>
+    <button data-testid="winners" onClick={() => onDropClick({ id: "d1" })}>
       winners
     </button>
   ),
 }));
 
-jest.mock('@/components/brain/my-stream/votes/MyStreamWaveMyVotes', () => ({
+jest.mock("@/components/brain/my-stream/votes/MyStreamWaveMyVotes", () => ({
   __esModule: true,
   default: () => <div data-testid="myvotes" />,
 }));
 
-jest.mock('@/components/brain/my-stream/MyStreamWaveFAQ', () => ({
+jest.mock("@/components/brain/my-stream/MyStreamWaveFAQ", () => ({
   __esModule: true,
   default: () => <div data-testid="faq" />,
 }));
 
-jest.mock('@/components/brain/my-stream/tabs/MyStreamWaveTabs', () => ({
+jest.mock("@/components/brain/my-stream/tabs/MyStreamWaveTabs", () => ({
   __esModule: true,
   MyStreamWaveTabs: ({ wave }: any) => <div data-testid="tabs">{wave.id}</div>,
 }));
 
 const useContentTab = jest.fn();
-jest.mock('@/components/brain/ContentTabContext', () => ({
+jest.mock("@/components/brain/ContentTabContext", () => ({
   useContentTab: (...args: any[]) => useContentTab(...args),
 }));
 
 const useWaveData = jest.fn();
-jest.mock('@/hooks/useWaveData', () => ({
+jest.mock("@/hooks/useWaveData", () => ({
   useWaveData: (...args: any[]) => useWaveData(...args),
 }));
 
 const mockRouterPush = jest.fn();
-const mockSearchParams = new URLSearchParams('wave=1');
-const mockPathname = '/path';
+const mockSearchParams = new URLSearchParams("wave=1");
+const mockPathname = "/path";
 
-jest.mock('next/navigation', () => ({
+jest.mock("next/navigation", () => ({
   useRouter: () => ({ push: mockRouterPush }),
   useSearchParams: () => mockSearchParams,
   usePathname: () => mockPathname,
 }));
 
-let mockBreakpoint = 'LG';
-jest.mock('react-use', () => ({ createBreakpoint: () => () => mockBreakpoint }));
+let mockBreakpoint = "LG";
+jest.mock("react-use", () => ({
+  createBreakpoint: () => () => mockBreakpoint,
+}));
 
 // Mock TitleContext
-jest.mock('@/contexts/TitleContext', () => ({
+jest.mock("@/contexts/TitleContext", () => ({
   useTitle: () => ({
-    title: 'Test Title',
+    title: "Test Title",
     setTitle: jest.fn(),
     notificationCount: 0,
     setNotificationCount: jest.fn(),
@@ -85,7 +99,7 @@ jest.mock('@/contexts/TitleContext', () => ({
 }));
 
 // Mock MyStreamContext if needed
-jest.mock('@/contexts/wave/MyStreamContext', () => ({
+jest.mock("@/contexts/wave/MyStreamContext", () => ({
   useMyStream: () => ({
     waveId: null,
     setWaveId: jest.fn(),
@@ -97,38 +111,46 @@ jest.mock('@/contexts/wave/MyStreamContext', () => ({
   MyStreamProvider: ({ children }) => children,
 }));
 
+const wave = { id: "1", wave: {} } as any;
 
-const wave = { id: '1', wave: {} } as any;
-
-describe('MyStreamWave', () => {
+describe("MyStreamWave", () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockRouterPush.mockClear();
-    mockSearchParams.set('wave', '1');
-    mockBreakpoint = 'LG';
+    mockSearchParams.set("wave", "1");
+    mockBreakpoint = "LG";
+    useWave.mockReturnValue({
+      isRankWave: true,
+      isMemesWave: false,
+      isDm: false,
+    });
   });
 
-  it('returns null when no wave data', () => {
+  it("returns null when no wave data", () => {
     useWaveData.mockReturnValue({ data: undefined });
     useContentTab.mockReturnValue({ activeContentTab: MyStreamWaveTab.CHAT });
     const { container } = render(<MyStreamWave waveId="1" />);
     expect(container.firstChild).toBeNull();
   });
 
-  it('renders leaderboard tab and handles drop click', () => {
+  it("renders leaderboard tab and handles drop click", () => {
     useWaveData.mockReturnValue({ data: wave });
-    useContentTab.mockReturnValue({ activeContentTab: MyStreamWaveTab.LEADERBOARD });
+    useContentTab.mockReturnValue({
+      activeContentTab: MyStreamWaveTab.LEADERBOARD,
+    });
     render(<MyStreamWave waveId="1" />);
-    expect(screen.getByTestId('tabs')).toHaveTextContent('1');
-    fireEvent.click(screen.getByTestId('leaderboard'));
-    expect(mockRouterPush).toHaveBeenCalledWith('/path?wave=1&drop=d1', { scroll: false });
+    expect(screen.getByTestId("tabs")).toHaveTextContent("1");
+    fireEvent.click(screen.getByTestId("leaderboard"));
+    expect(mockRouterPush).toHaveBeenCalledWith("/path?wave=1&drop=d1", {
+      scroll: false,
+    });
   });
 
-  it('still renders tabs when breakpoint is small', () => {
-    mockBreakpoint = 'S';
+  it("still renders tabs when breakpoint is small", () => {
+    mockBreakpoint = "S";
     useWaveData.mockReturnValue({ data: wave });
     useContentTab.mockReturnValue({ activeContentTab: MyStreamWaveTab.CHAT });
     render(<MyStreamWave waveId="1" />);
-    expect(screen.getByTestId('tabs')).toHaveTextContent('1');
+    expect(screen.getByTestId("tabs")).toHaveTextContent("1");
   });
 });
diff --git a/__tests__/components/brain/my-stream/MyStreamWaveLeaderboard.test.tsx b/__tests__/components/brain/my-stream/MyStreamWaveLeaderboard.test.tsx
index 107669ee67..558d132406 100644
--- a/__tests__/components/brain/my-stream/MyStreamWaveLeaderboard.test.tsx
+++ b/__tests__/components/brain/my-stream/MyStreamWaveLeaderboard.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from "@testing-library/react";
+import { act, render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import React from "react";
 import { AuthContext } from "@/components/auth/Auth";
@@ -221,7 +221,7 @@ describe("MyStreamWaveLeaderboard", () => {
     );
   });
 
-  it("reads curation filters from URL and passes them to leaderboard data views", () => {
+  it("reads curation group from URL and keeps price filters local", () => {
     searchParamsString = "curated_by_group=group-1&min_price=1.5&max_price=4.2";
     useWave.mockReturnValue({
       isMemesWave: false,
@@ -246,13 +246,13 @@ describe("MyStreamWaveLeaderboard", () => {
     renderLeaderboard();
 
     expect(headerProps.curatedByGroupId).toBe("group-1");
-    expect(headerProps.minPrice).toBe(1.5);
-    expect(headerProps.maxPrice).toBe(4.2);
+    expect(headerProps.minPrice).toBeUndefined();
+    expect(headerProps.maxPrice).toBeUndefined();
     expect(headerProps.onCreateDrop).toEqual(expect.any(Function));
     expect(dropsProps.curatedByGroupId).toBe("group-1");
-    expect(dropsProps.minPrice).toBe(1.5);
-    expect(dropsProps.maxPrice).toBe(4.2);
-    expect(dropsProps.priceCurrency).toBe("ETH");
+    expect(dropsProps.minPrice).toBeUndefined();
+    expect(dropsProps.maxPrice).toBeUndefined();
+    expect(dropsProps.priceCurrency).toBeUndefined();
     expect(dropsProps.onCreateDrop).toEqual(expect.any(Function));
     expect(screen.queryByTestId("create-drop")).not.toBeInTheDocument();
   });
@@ -314,7 +314,7 @@ describe("MyStreamWaveLeaderboard", () => {
     expect(replace).toHaveBeenCalledWith("/waves", { scroll: false });
   });
 
-  it("updates URL when price range changes", () => {
+  it("updates local price filters without touching URL", () => {
     searchParamsString = "curated_by_group=group-1";
     useWave.mockReturnValue({
       isMemesWave: false,
@@ -338,20 +338,83 @@ describe("MyStreamWaveLeaderboard", () => {
 
     renderLeaderboard();
 
-    headerProps.onPriceRangeChange({ minPrice: 1.25, maxPrice: undefined });
-    expect(replace).toHaveBeenCalledWith(
-      "/waves?curated_by_group=group-1&min_price=1.25",
-      {
-        scroll: false,
-      }
+    act(() => {
+      headerProps.onPriceRangeChange({ minPrice: 1.25, maxPrice: undefined });
+    });
+    expect(replace).not.toHaveBeenCalled();
+    expect(dropsProps.minPrice).toBe(1.25);
+    expect(dropsProps.maxPrice).toBeUndefined();
+    expect(dropsProps.priceCurrency).toBe("ETH");
+
+    act(() => {
+      headerProps.onPriceRangeChange({
+        minPrice: undefined,
+        maxPrice: undefined,
+      });
+    });
+    expect(replace).not.toHaveBeenCalled();
+    expect(dropsProps.minPrice).toBeUndefined();
+    expect(dropsProps.maxPrice).toBeUndefined();
+    expect(dropsProps.priceCurrency).toBeUndefined();
+  });
+
+  it("resets local price filters when wave changes", async () => {
+    useWave.mockReturnValue({
+      isMemesWave: false,
+      isCurationWave: true,
+      participation: {
+        isEligible: true,
+        canSubmitNow: true,
+        hasReachedLimit: false,
+      },
+    });
+
+    useLocalPreference.mockReturnValueOnce(["list", jest.fn()]);
+    useLocalPreference.mockReturnValueOnce([
+      WaveDropsLeaderboardSort.RANK,
+      jest.fn(),
+    ]);
+
+    const authContextValue = {
+      connectedProfile: { handle: "tester" },
+      activeProfileProxy: null,
+    } as any;
+
+    const waveA = { ...wave, id: "1" } as ApiWave;
+    const waveB = { ...wave, id: "2" } as ApiWave;
+    const onDropClick = jest.fn();
+
+    const { rerender } = render(
+      <AuthContext.Provider value={authContextValue}>
+        <MyStreamWaveLeaderboard
+          key={waveA.id}
+          wave={waveA}
+          onDropClick={onDropClick}
+        />
+      </AuthContext.Provider>
     );
 
-    headerProps.onPriceRangeChange({
-      minPrice: undefined,
-      maxPrice: undefined,
+    act(() => {
+      headerProps.onPriceRangeChange({ minPrice: 2, maxPrice: 5 });
     });
-    expect(replace).toHaveBeenCalledWith("/waves?curated_by_group=group-1", {
-      scroll: false,
+
+    expect(dropsProps.minPrice).toBe(2);
+    expect(dropsProps.maxPrice).toBe(5);
+
+    rerender(
+      <AuthContext.Provider value={authContextValue}>
+        <MyStreamWaveLeaderboard
+          key={waveB.id}
+          wave={waveB}
+          onDropClick={onDropClick}
+        />
+      </AuthContext.Provider>
+    );
+
+    await waitFor(() => {
+      expect(dropsProps.minPrice).toBeUndefined();
+      expect(dropsProps.maxPrice).toBeUndefined();
+      expect(dropsProps.priceCurrency).toBeUndefined();
     });
   });
 });
diff --git a/components/brain/BrainMobile.tsx b/components/brain/BrainMobile.tsx
index d0e8207877..4d118c9145 100644
--- a/components/brain/BrainMobile.tsx
+++ b/components/brain/BrainMobile.tsx
@@ -279,7 +279,11 @@ const BrainMobile: React.FC<Props> = ({ children }) => {
     [BrainView.DEFAULT]: children,
     [BrainView.LEADERBOARD]:
       isRankWave && !!wave ? (
-        <MyStreamWaveLeaderboard wave={wave} onDropClick={onDropClick} />
+        <MyStreamWaveLeaderboard
+          key={wave.id}
+          wave={wave}
+          onDropClick={onDropClick}
+        />
       ) : null,
     [BrainView.WINNERS]:
       isRankWave && !!wave ? (
diff --git a/components/brain/my-stream/MyStreamWave.tsx b/components/brain/my-stream/MyStreamWave.tsx
index fabb909ed2..4718d1e54a 100644
--- a/components/brain/my-stream/MyStreamWave.tsx
+++ b/components/brain/my-stream/MyStreamWave.tsx
@@ -117,7 +117,11 @@ const MyStreamWave: React.FC<MyStreamWaveProps> = ({ waveId }) => {
       />
     ),
     [MyStreamWaveTab.LEADERBOARD]: (
-      <MyStreamWaveLeaderboard wave={wave} onDropClick={onDropClick} />
+      <MyStreamWaveLeaderboard
+        key={wave.id}
+        wave={wave}
+        onDropClick={onDropClick}
+      />
     ),
     [MyStreamWaveTab.WINNERS]: (
       <WaveWinners wave={wave} onDropClick={onDropClick} />
diff --git a/components/brain/my-stream/MyStreamWaveLeaderboard.tsx b/components/brain/my-stream/MyStreamWaveLeaderboard.tsx
index 8cb72704f8..28dfb3bbba 100644
--- a/components/brain/my-stream/MyStreamWaveLeaderboard.tsx
+++ b/components/brain/my-stream/MyStreamWaveLeaderboard.tsx
@@ -38,17 +38,6 @@ interface MyStreamWaveLeaderboardProps {
   readonly onDropClick: (drop: ExtendedDrop) => void;
 }
 
-const parsePriceParam = (rawValue: string | null): number | undefined => {
-  if (!rawValue) {
-    return undefined;
-  }
-  const parsedValue = Number.parseFloat(rawValue);
-  if (!Number.isFinite(parsedValue) || parsedValue < 0) {
-    return undefined;
-  }
-  return parsedValue;
-};
-
 const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
   wave,
   onDropClick,
@@ -75,6 +64,8 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
   const [isCreateDropOpen, setIsCreateDropOpen] = useState(false);
   const [isMemesCreateOpen, setIsMemesCreateOpen] = useState(false);
   const [isCurationDropModalOpen, setIsCurationDropModalOpen] = useState(false);
+  const [minPrice, setMinPrice] = useState<number | undefined>(undefined);
+  const [maxPrice, setMaxPrice] = useState<number | undefined>(undefined);
 
   const isLoggedIn = Boolean(connectedProfile?.handle);
   const { canCreateDrop } = useMemo(
@@ -150,8 +141,6 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
   });
 
   const rawCuratedByGroupId = searchParams.get("curated_by_group");
-  const rawMinPrice = searchParams.get("min_price");
-  const rawMaxPrice = searchParams.get("max_price");
 
   const curationGroupIdSet = useMemo(
     () => new Set(curationGroups.map((group) => group.id)),
@@ -180,14 +169,6 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
     isLoadingCurationGroups,
     curationGroupIdSet,
   ]);
-  const minPrice = useMemo(
-    () => (isCurationWave ? parsePriceParam(rawMinPrice) : undefined),
-    [isCurationWave, rawMinPrice]
-  );
-  const maxPrice = useMemo(
-    () => (isCurationWave ? parsePriceParam(rawMaxPrice) : undefined),
-    [isCurationWave, rawMaxPrice]
-  );
   const priceCurrency = useMemo(() => {
     const hasPriceFilter =
       typeof minPrice === "number" || typeof maxPrice === "number";
@@ -216,7 +197,7 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
     },
     [pathname, router, searchParams]
   );
-  const updatePriceRangeInUrl = useCallback(
+  const updatePriceRange = useCallback(
     ({
       minPrice: nextMinPrice,
       maxPrice: nextMaxPrice,
@@ -224,25 +205,10 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
       readonly minPrice: number | undefined;
       readonly maxPrice: number | undefined;
     }) => {
-      const nextParams = new URLSearchParams(searchParams.toString());
-
-      if (typeof nextMinPrice === "number") {
-        nextParams.set("min_price", `${nextMinPrice}`);
-      } else {
-        nextParams.delete("min_price");
-      }
-
-      if (typeof nextMaxPrice === "number") {
-        nextParams.set("max_price", `${nextMaxPrice}`);
-      } else {
-        nextParams.delete("max_price");
-      }
-
-      const nextQuery = nextParams.toString();
-      const nextUrl = nextQuery ? `${pathname}?${nextQuery}` : pathname;
-      router.replace(nextUrl, { scroll: false });
+      setMinPrice(nextMinPrice);
+      setMaxPrice(nextMaxPrice);
     },
-    [pathname, router, searchParams]
+    []
   );
 
   const effectiveViewMode = useMemo<LeaderboardViewMode>(() => {
@@ -316,9 +282,7 @@ const MyStreamWaveLeaderboard: React.FC<MyStreamWaveLeaderboardProps> = ({
           }
           minPrice={minPrice}
           maxPrice={maxPrice}
-          onPriceRangeChange={
-            isCurationWave ? updatePriceRangeInUrl : undefined
-          }
+          onPriceRangeChange={isCurationWave ? updatePriceRange : undefined}
         />
       </div>
 
diff --git a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
index 673f9db416..b20c8d69f7 100644
--- a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
+++ b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
@@ -110,11 +110,11 @@ const WaveLeaderboardPriceFilters: React.FC<
   };
 
   return (
-    <div className="tw-flex tw-flex-wrap tw-items-end tw-gap-3 tw-rounded-2xl tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-p-5">
-      <div className="tw-flex tw-min-w-[10rem] tw-flex-col tw-gap-y-1.5">
+    <div className="tw-flex tw-flex-wrap tw-items-end tw-gap-2.5 tw-rounded-xl tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-p-4">
+      <div className="tw-flex tw-min-w-[9rem] tw-flex-col tw-gap-y-1">
         <label
           htmlFor={`leaderboard-min-price-${waveId}`}
-          className="tw-text-sm tw-font-semibold tw-uppercase tw-tracking-wide tw-text-iron-500"
+          className="tw-text-xs tw-font-semibold tw-uppercase tw-tracking-wide tw-text-iron-500"
         >
           Min (ETH)
         </label>
@@ -134,13 +134,13 @@ const WaveLeaderboardPriceFilters: React.FC<
               commitPriceRange();
             }
           }}
-          className="tw-rounded-xl tw-border-0 tw-bg-black tw-px-4 tw-py-3 tw-text-xl tw-font-medium tw-text-iron-100 tw-ring-1 tw-ring-inset tw-ring-iron-700 placeholder:tw-text-iron-500 focus:tw-outline-none focus:tw-ring-primary-400"
+          className="tw-h-10 tw-rounded-lg tw-border-0 tw-bg-black tw-px-3 tw-text-sm tw-font-semibold tw-text-iron-100 tw-ring-1 tw-ring-inset tw-ring-iron-700 placeholder:tw-text-iron-500 focus:tw-outline-none focus:tw-ring-primary-400"
         />
       </div>
-      <div className="tw-flex tw-min-w-[10rem] tw-flex-col tw-gap-y-1.5">
+      <div className="tw-flex tw-min-w-[9rem] tw-flex-col tw-gap-y-1">
         <label
           htmlFor={`leaderboard-max-price-${waveId}`}
-          className="tw-text-sm tw-font-semibold tw-uppercase tw-tracking-wide tw-text-iron-500"
+          className="tw-text-xs tw-font-semibold tw-uppercase tw-tracking-wide tw-text-iron-500"
         >
           Max (ETH)
         </label>
@@ -160,7 +160,7 @@ const WaveLeaderboardPriceFilters: React.FC<
               commitPriceRange();
             }
           }}
-          className="tw-rounded-xl tw-border-0 tw-bg-black tw-px-4 tw-py-3 tw-text-xl tw-font-medium tw-text-iron-100 tw-ring-1 tw-ring-inset tw-ring-iron-700 placeholder:tw-text-iron-500 focus:tw-outline-none focus:tw-ring-primary-400"
+          className="tw-h-10 tw-rounded-lg tw-border-0 tw-bg-black tw-px-3 tw-text-sm tw-font-semibold tw-text-iron-100 tw-ring-1 tw-ring-inset tw-ring-iron-700 placeholder:tw-text-iron-500 focus:tw-outline-none focus:tw-ring-primary-400"
         />
       </div>
       <button
@@ -175,7 +175,7 @@ const WaveLeaderboardPriceFilters: React.FC<
             maxPrice: undefined,
           });
         }}
-        className="tw-h-[3.25rem] tw-rounded-xl tw-border tw-border-solid tw-border-white/10 tw-bg-white/5 tw-px-6 tw-text-sm tw-font-semibold tw-text-iron-200 tw-transition desktop-hover:hover:tw-border-white/20 desktop-hover:hover:tw-bg-white/10 desktop-hover:hover:tw-text-iron-100"
+        className="tw-h-10 tw-rounded-lg tw-border tw-border-solid tw-border-white/10 tw-bg-white/5 tw-px-4 tw-text-xs tw-font-semibold tw-text-iron-200 tw-transition desktop-hover:hover:tw-border-white/20 desktop-hover:hover:tw-bg-white/10 desktop-hover:hover:tw-text-iron-100"
       >
         Clear Filters
       </button>
@@ -454,13 +454,13 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
               aria-expanded={isPriceFiltersOpen}
               aria-controls={`leaderboard-price-panel-${wave.id}`}
               onClick={onTogglePriceFilters}
-              className={`tw-inline-flex tw-h-10 tw-items-center tw-gap-2 tw-rounded-xl tw-border tw-border-solid tw-px-5 tw-text-sm tw-font-semibold tw-transition ${
+              className={`tw-inline-flex tw-h-9 tw-items-center tw-gap-2 tw-rounded-lg tw-border tw-border-solid tw-px-3.5 tw-text-xs tw-font-semibold tw-transition ${
                 isPriceFiltersOpen || hasActivePriceFilters
                   ? "tw-border-white/15 tw-bg-white/10 tw-text-iron-100"
                   : "tw-border-white/10 tw-bg-iron-950 tw-text-iron-200 desktop-hover:hover:tw-border-white/15 desktop-hover:hover:tw-bg-white/5"
               }`}
             >
-              <AdjustmentsHorizontalIcon className="tw-size-5 tw-flex-shrink-0" />
+              <AdjustmentsHorizontalIcon className="tw-size-4 tw-flex-shrink-0" />
               <span>Filters</span>
             </button>
             {isLoggedIn && canCreateDrop && onCreateDrop && (

From 2d9a526262a7ce26f72f33c37888803f560e460d Mon Sep 17 00:00:00 2001
From: Simo <simo@6529.io>
Date: Mon, 2 Mar 2026 15:00:34 -0400
Subject: [PATCH 3/7] price filters/sort

Signed-off-by: Simo <simo@6529.io>
---
 ...CurationDropContent.supportedUrls.test.tsx | 124 ++++++++++
 .../components/waves/CreateDrop.test.tsx      |  56 ++++-
 .../WaveLeaderboardCurationDropModal.test.tsx |   7 +-
 .../header/WaveleaderboardHeader.test.tsx     | 221 +++++++++++++++++-
 .../waves/CreateCurationDropContent.tsx       | 171 +++-----------
 components/waves/CreateDrop.tsx               |  35 +--
 .../WaveLeaderboardCurationDropModal.tsx      |  46 ++--
 .../header/WaveleaderboardHeader.tsx          |  51 +++-
 hooks/useProgressiveDebounce.ts               |  35 ---
 9 files changed, 506 insertions(+), 240 deletions(-)
 create mode 100644 __tests__/components/waves/CreateCurationDropContent.supportedUrls.test.tsx
 delete mode 100644 hooks/useProgressiveDebounce.ts

diff --git a/__tests__/components/waves/CreateCurationDropContent.supportedUrls.test.tsx b/__tests__/components/waves/CreateCurationDropContent.supportedUrls.test.tsx
new file mode 100644
index 0000000000..655f43494d
--- /dev/null
+++ b/__tests__/components/waves/CreateCurationDropContent.supportedUrls.test.tsx
@@ -0,0 +1,124 @@
+import { AuthContext } from "@/components/auth/Auth";
+import { ReactQueryWrapperContext } from "@/components/react-query-wrapper/ReactQueryWrapper";
+import CreateCurationDropContent from "@/components/waves/CreateCurationDropContent";
+import userEvent from "@testing-library/user-event";
+import { render, screen } from "@testing-library/react";
+
+jest.mock("next/dynamic", () => ({
+  __esModule: true,
+  default: () => () => null,
+}));
+
+jest.mock("@/hooks/useDeviceInfo", () => ({
+  __esModule: true,
+  default: jest.fn(() => ({ isApp: false })),
+}));
+
+jest.mock("@/components/auth/SeizeConnectContext", () => ({
+  useSeizeConnectContext: jest.fn(() => ({
+    isSafeWallet: false,
+    address: null,
+  })),
+}));
+
+jest.mock("@/hooks/drops/useDropSignature", () => ({
+  useDropSignature: jest.fn(() => ({
+    signDrop: jest.fn(async () => ({ success: true, signature: "0xabc" })),
+  })),
+}));
+
+jest.mock("@/contexts/wave/MyStreamContext", () => ({
+  useMyStream: jest.fn(() => ({
+    processIncomingDrop: jest.fn(),
+  })),
+}));
+
+jest.mock("react-redux", () => ({
+  useSelector: jest.fn(() => null),
+}));
+
+jest.mock("@/components/waves/CreateDropReplyingWrapper", () => ({
+  __esModule: true,
+  default: () => null,
+}));
+
+const wave = {
+  id: "wave-1",
+  wave: { type: "CHAT" },
+  chat: { enabled: true },
+  participation: {
+    signature_required: false,
+    terms: null,
+  },
+  metrics: {},
+} as any;
+
+describe("CreateCurationDropContent supported URLs", () => {
+  it("toggles supported URLs inline in leaderboard variant without opening a new modal", async () => {
+    const user = userEvent.setup();
+
+    render(
+      <AuthContext.Provider
+        value={
+          {
+            requestAuth: async () => ({ success: true }),
+            setToast: jest.fn(),
+            connectedProfile: null,
+          } as any
+        }
+      >
+        <ReactQueryWrapperContext.Provider
+          value={{ addOptimisticDrop: jest.fn(async () => {}) } as any}
+        >
+          <CreateCurationDropContent
+            activeDrop={null}
+            onCancelReplyQuote={jest.fn()}
+            wave={wave}
+            dropId={null}
+            isDropMode={true}
+            submitDrop={jest.fn()}
+            curationComposerVariant="leaderboard"
+          />
+        </ReactQueryWrapperContext.Provider>
+      </AuthContext.Provider>
+    );
+
+    const toggleButton = screen.getByRole("button", {
+      name: "View Supported URLs",
+    });
+    expect(toggleButton).toHaveAttribute("aria-expanded", "false");
+    expect(
+      screen.queryByText(
+        "Submit one URL only. It must match one of these formats:"
+      )
+    ).not.toBeInTheDocument();
+
+    await user.click(toggleButton);
+
+    expect(
+      screen.getByRole("button", { name: "Hide Supported URLs" })
+    ).toHaveAttribute("aria-expanded", "true");
+    expect(
+      screen.getByText(
+        "Submit one URL only. It must match one of these formats:"
+      )
+    ).toBeInTheDocument();
+    expect(screen.getByText("SuperRare artwork")).toBeInTheDocument();
+    expect(
+      screen.queryByRole("dialog", { name: /supported urls/i })
+    ).not.toBeInTheDocument();
+
+    await user.click(
+      screen.getByRole("button", { name: "Hide Supported URLs" })
+    );
+
+    expect(
+      screen.getByRole("button", { name: "View Supported URLs" })
+    ).toHaveAttribute("aria-expanded", "false");
+    expect(
+      screen.queryByText(
+        "Submit one URL only. It must match one of these formats:"
+      )
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/__tests__/components/waves/CreateDrop.test.tsx b/__tests__/components/waves/CreateDrop.test.tsx
index 8290805353..04e092ae1a 100644
--- a/__tests__/components/waves/CreateDrop.test.tsx
+++ b/__tests__/components/waves/CreateDrop.test.tsx
@@ -22,11 +22,6 @@ jest.mock("@tanstack/react-query", () => ({
     }),
   }),
 }));
-jest.mock("@/hooks/useProgressiveDebounce", () => ({
-  useProgressiveDebounce: (cb: any) => {
-    setTimeout(cb, 0);
-  },
-}));
 jest.mock("@/hooks/useWave", () => ({ useWave: jest.fn() }));
 jest.mock("@/services/api/common-api", () => ({ commonApiPost: jest.fn() }));
 jest.mock("@/contexts/wave/MyStreamContext", () => ({
@@ -110,6 +105,7 @@ describe("CreateDrop", () => {
 
   it("shows success toast for leaderboard curation submissions", async () => {
     const setToast = jest.fn();
+    const onAllDropsAdded = jest.fn();
     useWaveMock.mockReturnValue({ isCurationWave: true } as any);
 
     render(
@@ -126,6 +122,7 @@ describe("CreateDrop", () => {
             fixedDropMode={"PARTICIPATION" as any}
             privileges={{} as any}
             curationComposerVariant="leaderboard"
+            onAllDropsAdded={onAllDropsAdded}
           />
         </ReactQueryWrapperContext.Provider>
       </AuthContext.Provider>
@@ -139,6 +136,8 @@ describe("CreateDrop", () => {
         type: "success",
       });
     });
+
+    await waitFor(() => expect(onAllDropsAdded).toHaveBeenCalledTimes(1));
   });
 
   it("does not show success toast for non-leaderboard curation submissions", async () => {
@@ -172,4 +171,51 @@ describe("CreateDrop", () => {
       type: "success",
     });
   });
+
+  it("does not call onAllDropsAdded when submission fails", async () => {
+    const setToast = jest.fn();
+    const onAllDropsAdded = jest.fn();
+    const waitAndInvalidateDrops = jest.fn();
+    useWaveMock.mockReturnValue({ isCurationWave: true } as any);
+    commonApiPostMock.mockRejectedValueOnce(new Error("boom"));
+    const consoleErrorSpy = jest
+      .spyOn(console, "error")
+      .mockImplementation(() => {});
+
+    try {
+      render(
+        <AuthContext.Provider value={{ setToast } as any}>
+          <ReactQueryWrapperContext.Provider
+            value={{ waitAndInvalidateDrops } as any}
+          >
+            <CreateDrop
+              activeDrop={null}
+              onCancelReplyQuote={() => {}}
+              onDropAddedToQueue={jest.fn()}
+              onAllDropsAdded={onAllDropsAdded}
+              wave={wave}
+              dropId={null}
+              fixedDropMode={"PARTICIPATION" as any}
+              privileges={{} as any}
+              curationComposerVariant="leaderboard"
+            />
+          </ReactQueryWrapperContext.Provider>
+        </AuthContext.Provider>
+      );
+
+      await userEvent.click(screen.getByText("submit curation"));
+
+      await waitFor(() => expect(commonApiPostMock).toHaveBeenCalled());
+      await waitFor(() =>
+        expect(setToast).toHaveBeenCalledWith({
+          message: "boom",
+          type: "error",
+        })
+      );
+      expect(waitAndInvalidateDrops).toHaveBeenCalled();
+      expect(onAllDropsAdded).not.toHaveBeenCalled();
+    } finally {
+      consoleErrorSpy.mockRestore();
+    }
+  });
 });
diff --git a/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx b/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
index bcde6fceb4..9ec44d67b7 100644
--- a/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
+++ b/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
@@ -39,7 +39,12 @@ describe("WaveLeaderboardCurationDropModal", () => {
     expect(
       await screen.findByTestId("curation-drop-modal")
     ).toBeInTheDocument();
-    expect(screen.getByText("Drop Artwork")).toBeInTheDocument();
+    const panel = screen.getByTestId("curation-drop-modal-panel");
+    expect(panel.className).toContain("tw-rounded-xl");
+    expect(panel.className).toContain("tw-border-iron-800");
+
+    const heading = screen.getByRole("heading", { name: "Drop Artwork" });
+    expect(heading).toHaveClass("tw-text-2xl");
 
     await user.click(screen.getByLabelText("Close drop artwork modal"));
     expect(onClose).toHaveBeenCalledTimes(1);
diff --git a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
index be5f0c198a..fb26e861d4 100644
--- a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
+++ b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
@@ -1,7 +1,13 @@
 import { AuthContext } from "@/components/auth/Auth";
 import { WaveLeaderboardHeader } from "@/components/waves/leaderboard/header/WaveleaderboardHeader";
 import { WaveDropsLeaderboardSort } from "@/hooks/useWaveDropsLeaderboard";
-import { render, screen, waitFor } from "@testing-library/react";
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 
 const useWave = jest.fn();
@@ -76,6 +82,7 @@ jest.mock("@/hooks/useWave", () => ({
 jest.mock("@/components/utils/button/PrimaryButton", () => (props: any) => (
   <button
     data-testid="create"
+    data-padding={props.padding}
     onClick={props.onClicked}
     disabled={props.disabled}
   >
@@ -83,9 +90,21 @@ jest.mock("@/components/utils/button/PrimaryButton", () => (props: any) => (
   </button>
 ));
 
-jest.mock("react-use", () => ({
-  createBreakpoint: jest.fn(() => () => "MD"),
-}));
+jest.mock("react-use", () => {
+  const React = require("react");
+
+  return {
+    createBreakpoint: jest.fn(() => () => "MD"),
+    useDebounce: (fn: () => void, ms: number, deps: readonly unknown[]) => {
+      React.useEffect(() => {
+        const timeoutId = setTimeout(() => {
+          fn();
+        }, ms);
+        return () => clearTimeout(timeoutId);
+      }, deps);
+    },
+  };
+});
 
 const wave = { id: "w" } as any;
 
@@ -239,6 +258,7 @@ it("renders curation selector and handles curation filter changes", async () =>
 it("renders curation price controls and commits range updates", async () => {
   const user = userEvent.setup();
   const onPriceRangeChange = jest.fn();
+  const onCreateDrop = jest.fn();
 
   useWave.mockReturnValue({
     isMemesWave: false,
@@ -257,7 +277,7 @@ it("renders curation price controls and commits range updates", async () => {
     >
       <WaveLeaderboardHeader
         wave={wave}
-        onCreateDrop={jest.fn()}
+        onCreateDrop={onCreateDrop}
         viewMode="list"
         onViewModeChange={jest.fn()}
         sort={WaveDropsLeaderboardSort.RANK}
@@ -270,6 +290,15 @@ it("renders curation price controls and commits range updates", async () => {
   expect(
     screen.queryByTestId("leaderboard-price-panel")
   ).not.toBeInTheDocument();
+  const createButton = screen.getByTestId("create");
+  expect(createButton).toHaveAttribute("data-padding", "tw-px-3.5 tw-py-2");
+  expect(screen.getByText("Drop Art")).toBeInTheDocument();
+  const createIcon = createButton.querySelector("svg");
+  expect(createIcon).toHaveClass("tw-h-4", "tw-w-4");
+
+  await user.click(createButton);
+  expect(onCreateDrop).toHaveBeenCalledTimes(1);
+
   await user.click(screen.getByTestId("leaderboard-price-toggle"));
   const minInput = screen.getByTestId("leaderboard-price-min-input");
   const maxInput = screen.getByTestId("leaderboard-price-max-input");
@@ -298,6 +327,176 @@ it("renders curation price controls and commits range updates", async () => {
   });
 });
 
+it("auto-applies price range updates after debounce while typing", () => {
+  jest.useFakeTimers();
+
+  try {
+    const onPriceRangeChange = jest.fn();
+
+    useWave.mockReturnValue({
+      isMemesWave: false,
+      isCurationWave: true,
+      participation: { isEligible: true },
+    });
+
+    render(
+      <AuthContext.Provider
+        value={
+          {
+            connectedProfile: { handle: "tester" },
+            activeProfileProxy: null,
+          } as any
+        }
+      >
+        <WaveLeaderboardHeader
+          wave={wave}
+          onCreateDrop={jest.fn()}
+          viewMode="list"
+          onViewModeChange={jest.fn()}
+          sort={WaveDropsLeaderboardSort.RANK}
+          onSortChange={jest.fn()}
+          onPriceRangeChange={onPriceRangeChange}
+        />
+      </AuthContext.Provider>
+    );
+
+    fireEvent.click(screen.getByTestId("leaderboard-price-toggle"));
+    const minInput = screen.getByTestId("leaderboard-price-min-input");
+    const maxInput = screen.getByTestId("leaderboard-price-max-input");
+    fireEvent.change(minInput, { target: { value: "1.5" } });
+    fireEvent.change(maxInput, { target: { value: "3.25" } });
+
+    expect(onPriceRangeChange).not.toHaveBeenCalled();
+
+    act(() => {
+      jest.advanceTimersByTime(349);
+    });
+    expect(onPriceRangeChange).not.toHaveBeenCalled();
+
+    act(() => {
+      jest.advanceTimersByTime(1);
+    });
+    expect(onPriceRangeChange).toHaveBeenLastCalledWith({
+      minPrice: 1.5,
+      maxPrice: 3.25,
+    });
+
+    fireEvent.click(screen.getByTestId("leaderboard-price-clear"));
+    expect(onPriceRangeChange).toHaveBeenLastCalledWith({
+      minPrice: undefined,
+      maxPrice: undefined,
+    });
+  } finally {
+    jest.useRealTimers();
+  }
+});
+
+it("does not auto-apply zero draft values during debounce", () => {
+  jest.useFakeTimers();
+
+  try {
+    const onPriceRangeChange = jest.fn();
+
+    useWave.mockReturnValue({
+      isMemesWave: false,
+      isCurationWave: true,
+      participation: { isEligible: true },
+    });
+
+    render(
+      <AuthContext.Provider
+        value={
+          {
+            connectedProfile: { handle: "tester" },
+            activeProfileProxy: null,
+          } as any
+        }
+      >
+        <WaveLeaderboardHeader
+          wave={wave}
+          onCreateDrop={jest.fn()}
+          viewMode="list"
+          onViewModeChange={jest.fn()}
+          sort={WaveDropsLeaderboardSort.RANK}
+          onSortChange={jest.fn()}
+          onPriceRangeChange={onPriceRangeChange}
+        />
+      </AuthContext.Provider>
+    );
+
+    fireEvent.click(screen.getByTestId("leaderboard-price-toggle"));
+    const minInput = screen.getByTestId("leaderboard-price-min-input");
+
+    fireEvent.change(minInput, { target: { value: "0" } });
+    act(() => {
+      jest.advanceTimersByTime(350);
+    });
+    expect(onPriceRangeChange).not.toHaveBeenCalled();
+
+    fireEvent.change(minInput, { target: { value: "0." } });
+    act(() => {
+      jest.advanceTimersByTime(350);
+    });
+    expect(onPriceRangeChange).not.toHaveBeenCalled();
+
+    fireEvent.change(minInput, { target: { value: "0.125" } });
+    act(() => {
+      jest.advanceTimersByTime(350);
+    });
+    expect(onPriceRangeChange).toHaveBeenLastCalledWith({
+      minPrice: 0.125,
+      maxPrice: undefined,
+    });
+  } finally {
+    jest.useRealTimers();
+  }
+});
+
+it("commits zero value on blur", async () => {
+  const onPriceRangeChange = jest.fn();
+
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        onPriceRangeChange={onPriceRangeChange}
+      />
+    </AuthContext.Provider>
+  );
+
+  fireEvent.click(screen.getByTestId("leaderboard-price-toggle"));
+  const minInput = screen.getByTestId("leaderboard-price-min-input");
+
+  fireEvent.focus(minInput);
+  fireEvent.change(minInput, { target: { value: "0" } });
+  fireEvent.blur(minInput);
+
+  await waitFor(() =>
+    expect(onPriceRangeChange).toHaveBeenLastCalledWith({
+      minPrice: 0,
+      maxPrice: undefined,
+    })
+  );
+});
+
 it("auto-expands price filters when min or max price is active", () => {
   useWave.mockReturnValue({
     isMemesWave: false,
@@ -370,13 +569,17 @@ it("allows collapsing and reopening filters while price filters are active", asy
   expect(toggle).toHaveAttribute("aria-expanded", "true");
 
   await user.click(toggle);
-  expect(
-    screen.queryByTestId("leaderboard-price-panel")
-  ).not.toBeInTheDocument();
+  await waitFor(() =>
+    expect(
+      screen.queryByTestId("leaderboard-price-panel")
+    ).not.toBeInTheDocument()
+  );
   expect(toggle).toHaveAttribute("aria-expanded", "false");
 
   await user.click(toggle);
-  expect(screen.getByTestId("leaderboard-price-panel")).toBeInTheDocument();
+  await waitFor(() =>
+    expect(screen.getByTestId("leaderboard-price-panel")).toBeInTheDocument()
+  );
   expect(toggle).toHaveAttribute("aria-expanded", "true");
 });
 
diff --git a/components/waves/CreateCurationDropContent.tsx b/components/waves/CreateCurationDropContent.tsx
index ebe913d34e..c6494aa383 100644
--- a/components/waves/CreateCurationDropContent.tsx
+++ b/components/waves/CreateCurationDropContent.tsx
@@ -11,7 +11,6 @@ import type { ActiveDropState } from "@/types/dropInteractionTypes";
 import { ActiveDropAction } from "@/types/dropInteractionTypes";
 import dynamic from "next/dynamic";
 import React, {
-  type ReactNode,
   useCallback,
   useContext,
   useEffect,
@@ -19,7 +18,6 @@ import React, {
   useRef,
   useState,
 } from "react";
-import { createPortal } from "react-dom";
 import { useSelector } from "react-redux";
 import { AuthContext } from "../auth/Auth";
 import { useSeizeConnectContext } from "../auth/SeizeConnectContext";
@@ -32,7 +30,6 @@ import { CreateDropSubmit } from "./CreateDropSubmit";
 import CreateCurationDropUrlInput from "./CreateCurationDropUrlInput";
 import PrimaryButton from "../utils/button/PrimaryButton";
 import type { CurationComposerVariant } from "./PrivilegedDropCreator";
-import ModalLayout from "./memes/submission/layout/ModalLayout";
 import {
   normalizeCurationDropInput,
   SUPPORTED_CURATION_URL_EXAMPLES,
@@ -59,90 +56,6 @@ interface CreateCurationDropContentProps {
 const DEFAULT_HELPER_TEXT =
   "Use one supported HTTPS URL only, without extra text.";
 
-interface CurationInfoModalProps {
-  readonly isOpen: boolean;
-  readonly isApp: boolean;
-  readonly title: string;
-  readonly onClose: () => void;
-  readonly children: ReactNode;
-}
-
-const CurationInfoModal: React.FC<CurationInfoModalProps> = ({
-  isOpen,
-  isApp,
-  title,
-  onClose,
-  children,
-}) => {
-  const modalRef = useRef<HTMLDivElement | null>(null);
-  const previousActiveElementRef = useRef<HTMLElement | null>(null);
-
-  useEffect(() => {
-    if (!isOpen) {
-      return;
-    }
-
-    previousActiveElementRef.current = document.activeElement as HTMLElement;
-    modalRef.current?.focus();
-
-    const originalOverflow = document.body.style.overflow;
-    if (!isApp) {
-      document.body.style.overflow = "hidden";
-    }
-
-    const onKeyDown = (event: KeyboardEvent) => {
-      if (event.key === "Escape") {
-        onClose();
-      }
-    };
-
-    document.addEventListener("keydown", onKeyDown);
-
-    return () => {
-      if (!isApp) {
-        document.body.style.overflow = originalOverflow;
-      }
-      document.removeEventListener("keydown", onKeyDown);
-      previousActiveElementRef.current?.focus();
-    };
-  }, [isApp, isOpen, onClose]);
-
-  if (!isOpen) {
-    return null;
-  }
-
-  const modalContent = (
-    <dialog
-      className="tailwind-scope tw-fixed tw-inset-0 tw-z-50 tw-m-0 tw-h-full tw-w-full tw-max-w-none tw-border-0 tw-bg-iron-600/60 tw-p-0 tw-outline-none"
-      open
-      aria-modal="true"
-      aria-label={title}
-    >
-      <button
-        type="button"
-        className="tw-fixed tw-inset-0 tw-cursor-default tw-border-0 tw-bg-transparent tw-p-0"
-        aria-label={`Close ${title}`}
-        onClick={onClose}
-      />
-      <div
-        ref={modalRef}
-        className="tw-relative tw-z-10 tw-w-full tw-max-w-2xl tw-px-4"
-        tabIndex={-1}
-      >
-        <ModalLayout title={title} onCancel={onClose}>
-          {children}
-        </ModalLayout>
-      </div>
-    </dialog>
-  );
-
-  if (isApp) {
-    return modalContent;
-  }
-
-  return createPortal(modalContent, document.body);
-};
-
 const CreateCurationDropContent: React.FC<CreateCurationDropContentProps> = ({
   activeDrop,
   onCancelReplyQuote,
@@ -163,14 +76,10 @@ const CreateCurationDropContent: React.FC<CreateCurationDropContentProps> = ({
   const [urlValue, setUrlValue] = useState("");
   const [submitting, setSubmitting] = useState(false);
   const [showLiveValidation, setShowLiveValidation] = useState(false);
-  const [isSupportedUrlsModalOpen, setIsSupportedUrlsModalOpen] =
-    useState(false);
+  const [isSupportedUrlsExpanded, setIsSupportedUrlsExpanded] = useState(false);
   const inputRef = useRef<HTMLInputElement | null>(null);
   const isInitialMountRef = useRef(true);
   const isLeaderboardVariant = curationComposerVariant === "leaderboard";
-  const handleSupportedUrlsModalClose = useCallback(() => {
-    setIsSupportedUrlsModalOpen(false);
-  }, []);
 
   const curationValidation = useMemo(() => {
     return validateCurationDropInput(urlValue);
@@ -185,8 +94,6 @@ const CreateCurationDropContent: React.FC<CreateCurationDropContentProps> = ({
   const invalidHelperText =
     curationValidation?.helperText ?? DEFAULT_HELPER_TEXT;
   const helperText = isInvalid ? invalidHelperText : DEFAULT_HELPER_TEXT;
-  const showSupportedUrlAttention =
-    isLeaderboardVariant && isInvalid && urlValue.trim().length > 0;
 
   const getUpdatedDropRequest = useCallback(
     async (
@@ -429,15 +336,15 @@ const CreateCurationDropContent: React.FC<CreateCurationDropContentProps> = ({
         dropId={dropId}
       />
       {isLeaderboardVariant ? (
-        <div className="tw-flex tw-w-full tw-flex-col tw-gap-4">
+        <div className="tw-flex tw-w-full tw-flex-col tw-gap-3.5">
           <CreateCurationDropUrlInput
             ref={inputRef}
             value={urlValue}
             disabled={submitting}
             isInvalid={isInvalid}
-            showHelperText={false}
+            helperText={helperText}
             scrollMarginTopClassName="tw-scroll-mt-24"
-            canonicalUrl={null}
+            canonicalUrl={normalizedCurationUrl}
             placeholder="https://..."
             onChange={setUrlValue}
             onBlur={() => setShowLiveValidation(true)}
@@ -446,33 +353,43 @@ const CreateCurationDropContent: React.FC<CreateCurationDropContentProps> = ({
           <div className="tw-flex tw-flex-col tw-gap-2">
             <button
               type="button"
-              onClick={() => setIsSupportedUrlsModalOpen(true)}
-              className={`desktop-hover:hover:tw-text-primary-200 tw-self-start tw-border-0 tw-bg-transparent tw-p-0 tw-text-lg tw-font-medium tw-text-primary-300 tw-transition ${
-                showSupportedUrlAttention ? "tw-animate-pulse" : ""
-              }`}
+              onClick={() => setIsSupportedUrlsExpanded((current) => !current)}
+              aria-expanded={isSupportedUrlsExpanded}
+              aria-controls="leaderboard-supported-urls-panel"
+              className="desktop-hover:hover:tw-text-primary-200 tw-self-start tw-border-0 tw-bg-transparent tw-p-0 tw-text-sm tw-font-semibold tw-text-primary-300 tw-transition"
             >
-              View Supported URLs
+              {isSupportedUrlsExpanded
+                ? "Hide Supported URLs"
+                : "View Supported URLs"}
             </button>
-            {showSupportedUrlAttention && (
-              <p
-                role="alert"
-                className="tw-text-red-300 tw-mb-0 tw-text-sm tw-font-semibold"
+            {isSupportedUrlsExpanded && (
+              <div
+                id="leaderboard-supported-urls-panel"
+                className="tw-rounded-lg tw-border tw-border-solid tw-border-iron-800 tw-bg-iron-900/60 tw-p-3"
               >
-                Unsupported URL format. Open Supported URLs.
-              </p>
-            )}
-            {normalizedCurationUrl &&
-              normalizedCurationUrl !== urlValue.trim() && (
-                <p className="tw-mb-0 tw-text-xs tw-text-iron-500">
-                  Will submit as: {normalizedCurationUrl}
+                <p className="tw-mb-3 tw-text-sm tw-text-iron-300">
+                  Submit one URL only. It must match one of these formats:
                 </p>
-              )}
+                <ul className="tw-m-0 tw-list-none tw-space-y-2 tw-p-0">
+                  {SUPPORTED_CURATION_URL_EXAMPLES.map(({ label, example }) => (
+                    <li key={`${label}-${example}`} className="tw-space-y-1">
+                      <p className="tw-mb-0 tw-text-xs tw-font-semibold tw-text-iron-100">
+                        {label}
+                      </p>
+                      <code className="tw-block tw-overflow-x-auto tw-rounded-md tw-bg-iron-950 tw-px-2 tw-py-1 tw-text-[11px] tw-text-iron-300">
+                        {example}
+                      </code>
+                    </li>
+                  ))}
+                </ul>
+              </div>
+            )}
           </div>
           <PrimaryButton
             onClicked={onDrop}
             loading={submitting}
             disabled={!canSubmit}
-            padding="tw-w-full tw-px-4 tw-py-3"
+            padding="tw-w-full tw-px-4 tw-py-2.5"
           >
             <span>Submit to Curation</span>
           </PrimaryButton>
@@ -506,30 +423,6 @@ const CreateCurationDropContent: React.FC<CreateCurationDropContentProps> = ({
           </div>
         </div>
       )}
-      {isLeaderboardVariant && (
-        <CurationInfoModal
-          isOpen={isSupportedUrlsModalOpen}
-          onClose={handleSupportedUrlsModalClose}
-          title="Supported URLs"
-          isApp={isApp}
-        >
-          <p className="tw-mb-3 tw-text-sm tw-text-iron-300">
-            Submit one URL only. It must match one of these formats:
-          </p>
-          <ul className="tw-m-0 tw-list-none tw-space-y-2 tw-p-0">
-            {SUPPORTED_CURATION_URL_EXAMPLES.map(({ label, example }) => (
-              <li key={`${label}-${example}`} className="tw-space-y-1">
-                <p className="tw-mb-0 tw-text-xs tw-font-semibold tw-text-iron-100">
-                  {label}
-                </p>
-                <code className="tw-block tw-overflow-x-auto tw-rounded-md tw-bg-iron-900 tw-px-2 tw-py-1 tw-text-[11px] tw-text-iron-300">
-                  {example}
-                </code>
-              </li>
-            ))}
-          </ul>
-        </CurationInfoModal>
-      )}
       <TermsSignatureFlow />
     </div>
   );
diff --git a/components/waves/CreateDrop.tsx b/components/waves/CreateDrop.tsx
index de4bc66d99..09b4923823 100644
--- a/components/waves/CreateDrop.tsx
+++ b/components/waves/CreateDrop.tsx
@@ -20,7 +20,6 @@ import { commonApiPost } from "@/services/api/common-api";
 import type { ApiCreateDropRequest } from "@/generated/models/ApiCreateDropRequest";
 import type { ApiDrop } from "@/generated/models/ApiDrop";
 import { AuthContext } from "../auth/Auth";
-import { useProgressiveDebounce } from "@/hooks/useProgressiveDebounce";
 import { useKeyPressEvent } from "react-use";
 import type { ActiveDropState } from "@/types/dropInteractionTypes";
 import type { CurationComposerVariant } from "./PrivilegedDropCreator";
@@ -172,27 +171,7 @@ export default function CreateDrop({
   // Use refs to avoid stale closures - fixes the stream unmounting issue
   const queueRef = useRef<DropMutationBody[]>([]);
   const isProcessingRef = useRef(false);
-  const [hasQueueChanged, setHasQueueChanged] = useState(false);
-
-  useProgressiveDebounce(
-    () => {
-      if (
-        queueRef.current.length === 0 &&
-        !isProcessingRef.current &&
-        hasQueueChanged
-      ) {
-        waitAndInvalidateDrops();
-        onAllDropsAdded?.();
-      }
-    },
-    [hasQueueChanged],
-    {
-      minDelay: 1000,
-      maxDelay: 4000,
-      increaseFactor: 1.5,
-      decreaseFactor: 1.2,
-    }
-  );
+  const hasBatchErrorsRef = useRef(false);
 
   const processNextDrop = useCallback(async () => {
     if (isProcessingRef.current || queueRef.current.length === 0) {
@@ -206,6 +185,7 @@ export default function CreateDrop({
       try {
         await addDropMutation.mutateAsync(dropRequest);
       } catch (error) {
+        hasBatchErrorsRef.current = true;
         console.error("Error processing drop:", error);
       }
     }
@@ -215,14 +195,21 @@ export default function CreateDrop({
     // Process next item if queue has more
     if (queueRef.current.length > 0) {
       processNextDrop();
+      return;
+    }
+
+    const shouldNotifyAllDropsAdded = !hasBatchErrorsRef.current;
+    hasBatchErrorsRef.current = false;
+    void waitAndInvalidateDrops();
+    if (shouldNotifyAllDropsAdded) {
+      onAllDropsAdded?.();
     }
-  }, [addDropMutation]);
+  }, [addDropMutation, onAllDropsAdded, waitAndInvalidateDrops]);
 
   const submitDrop = useCallback(
     (dropRequest: DropMutationBody) => {
       // Add to queue
       queueRef.current.push(dropRequest);
-      setHasQueueChanged(true);
 
       // Process immediately - avoids state update timing issues
       processNextDrop();
diff --git a/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx b/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
index 2b4b4ebb28..43457cd99f 100644
--- a/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
+++ b/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
@@ -50,7 +50,7 @@ export function WaveLeaderboardCurationDropModal({
       open
       aria-modal="true"
       aria-labelledby="leaderboard-drop-art-title"
-      className="tailwind-scope tw-fixed tw-inset-0 tw-z-[1000] tw-m-0 tw-h-full tw-w-full tw-max-w-none tw-border-0 tw-bg-black/70 tw-p-0 tw-outline-none tw-backdrop-blur-sm"
+      className="tailwind-scope tw-fixed tw-inset-0 tw-z-[1000] tw-m-0 tw-h-full tw-w-full tw-max-w-none tw-border-0 tw-bg-gray-600/50 tw-p-0 tw-outline-none tw-backdrop-blur-[1px]"
       data-testid="curation-drop-modal"
     >
       <button
@@ -59,42 +59,44 @@ export function WaveLeaderboardCurationDropModal({
         className="tw-fixed tw-inset-0 tw-cursor-default tw-border-0 tw-bg-transparent tw-p-0"
         aria-label="Close drop artwork modal"
       />
-      <div className="tw-relative tw-z-10 tw-flex tw-h-full tw-items-center tw-justify-center tw-p-4">
+      <div className="tw-relative tw-z-10 tw-flex tw-h-full tw-items-start tw-justify-center tw-px-4 tw-pb-4 tw-pt-[calc(env(safe-area-inset-top,0px)+1rem)] lg:tw-items-center">
         <motion.div
           initial={{ opacity: 0, y: 12, scale: 0.98 }}
           animate={{ opacity: 1, y: 0, scale: 1 }}
           transition={{ duration: 0.2, ease: "easeOut" }}
-          className="tw-w-full tw-max-w-2xl tw-rounded-3xl tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-p-6 sm:tw-p-8"
+          className="tw-max-h-[90vh] tw-w-full tw-max-w-3xl tw-overflow-hidden tw-rounded-xl tw-border tw-border-solid tw-border-iron-800 tw-bg-iron-950 tw-shadow-2xl"
           data-testid="curation-drop-modal-panel"
         >
-          <div className="tw-mb-6 tw-flex tw-items-start tw-justify-between tw-gap-4">
-            <div>
-              <h2
-                id="leaderboard-drop-art-title"
-                className="tw-mb-2 tw-text-4xl tw-font-semibold tw-text-iron-50"
-              >
-                Drop Artwork
-              </h2>
-              <p className="tw-mb-0 tw-max-w-lg tw-text-base tw-text-iron-400">
-                Enter a supported curation URL to submit a new piece to the
-                leaderboard.
-              </p>
-            </div>
+          <div className="tw-flex tw-items-center tw-justify-between tw-gap-4 tw-border-b tw-border-solid tw-border-iron-800 tw-p-6">
+            <h2
+              id="leaderboard-drop-art-title"
+              className="tw-mb-0 tw-text-2xl tw-font-bold tw-text-white"
+            >
+              Drop Artwork
+            </h2>
             <button
               type="button"
               onClick={onClose}
-              className="tw-flex tw-size-10 tw-items-center tw-justify-center tw-rounded-xl tw-border tw-border-solid tw-border-transparent tw-bg-transparent tw-text-iron-500 tw-transition desktop-hover:hover:tw-border-white/10 desktop-hover:hover:tw-text-iron-200"
+              className="tw-flex tw-size-9 tw-flex-shrink-0 tw-items-center tw-justify-center tw-rounded-full tw-border-0 tw-bg-transparent tw-text-iron-300 tw-ring-1 tw-ring-inset tw-ring-iron-700 tw-transition tw-duration-300 tw-ease-out desktop-hover:hover:tw-text-iron-100"
               aria-label="Close modal"
             >
               <XMarkIcon className="tw-size-6 tw-flex-shrink-0" />
             </button>
           </div>
 
-          <WaveDropCreate
-            wave={wave}
-            onSuccess={onClose}
-            isCurationLeaderboard
-          />
+          <div className="tw-max-h-[calc(90vh-88px)] tw-overflow-y-auto tw-scrollbar-thin tw-scrollbar-track-iron-800 tw-scrollbar-thumb-iron-500 hover:tw-scrollbar-thumb-iron-300">
+            <div className="tw-px-6 tw-pb-6 tw-pt-5">
+              <p className="tw-mb-5 tw-max-w-lg tw-text-base tw-text-iron-400">
+                Enter a supported curation URL to submit a new piece to the
+                leaderboard.
+              </p>
+              <WaveDropCreate
+                wave={wave}
+                onSuccess={onClose}
+                isCurationLeaderboard
+              />
+            </div>
+          </div>
         </motion.div>
       </div>
     </dialog>,
diff --git a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
index b20c8d69f7..e49f4ac846 100644
--- a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
+++ b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
@@ -9,8 +9,9 @@ import type { WaveDropsLeaderboardSort } from "@/hooks/useWaveDropsLeaderboard";
 import { AnimatePresence, motion } from "framer-motion";
 import { AdjustmentsHorizontalIcon } from "@heroicons/react/24/outline";
 import { PlusIcon } from "@heroicons/react/24/solid";
-import React, { useContext, useMemo, useState } from "react";
+import React, { useContext, useMemo, useRef, useState } from "react";
 import { Tooltip } from "react-tooltip";
+import { useDebounce } from "react-use";
 import { getWaveDropEligibility } from "../dropEligibility";
 import type { LeaderboardViewMode } from "../types";
 import { WaveLeaderboardCurationGroupSelect } from "./WaveLeaderboardCurationGroupSelect";
@@ -72,6 +73,11 @@ const parsePriceInput = (rawValue: string): number | undefined => {
   return numericValue;
 };
 
+const isZeroDraftInput = (rawValue: string): boolean => {
+  const trimmedValue = rawValue.trim();
+  return trimmedValue === "0" || trimmedValue === "0.";
+};
+
 const WaveLeaderboardPriceFilters: React.FC<
   WaveLeaderboardPriceFiltersProps
 > = ({
@@ -88,6 +94,7 @@ const WaveLeaderboardPriceFilters: React.FC<
   const [maxPriceInput, setMaxPriceInput] = useState(() =>
     toPriceInputValue(maxPrice)
   );
+  const hasDraftInputEditsRef = useRef(false);
 
   const commitPriceRange = () => {
     if (!onPriceRangeChange) {
@@ -96,6 +103,13 @@ const WaveLeaderboardPriceFilters: React.FC<
 
     const nextMinPrice = parsePriceInput(minPriceInput);
     const nextMaxPrice = parsePriceInput(maxPriceInput);
+    const hasSameCommittedRange =
+      nextMinPrice === minPrice && nextMaxPrice === maxPrice;
+
+    if (hasSameCommittedRange) {
+      return;
+    }
+
     const hasActivePriceFilters =
       typeof nextMinPrice === "number" || typeof nextMaxPrice === "number";
 
@@ -109,6 +123,27 @@ const WaveLeaderboardPriceFilters: React.FC<
     });
   };
 
+  useDebounce(
+    () => {
+      if (!hasDraftInputEditsRef.current) {
+        return;
+      }
+      if (isZeroDraftInput(minPriceInput) || isZeroDraftInput(maxPriceInput)) {
+        return;
+      }
+      commitPriceRange();
+    },
+    350,
+    [
+      minPriceInput,
+      maxPriceInput,
+      minPrice,
+      maxPrice,
+      onPriceRangeChange,
+      onFiltersActivated,
+    ]
+  );
+
   return (
     <div className="tw-flex tw-flex-wrap tw-items-end tw-gap-2.5 tw-rounded-xl tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-p-4">
       <div className="tw-flex tw-min-w-[9rem] tw-flex-col tw-gap-y-1">
@@ -127,7 +162,10 @@ const WaveLeaderboardPriceFilters: React.FC<
           inputMode="decimal"
           placeholder="0"
           value={minPriceInput}
-          onChange={(event) => setMinPriceInput(event.target.value)}
+          onChange={(event) => {
+            hasDraftInputEditsRef.current = true;
+            setMinPriceInput(event.target.value);
+          }}
           onBlur={commitPriceRange}
           onKeyDown={(event) => {
             if (event.key === "Enter") {
@@ -153,7 +191,10 @@ const WaveLeaderboardPriceFilters: React.FC<
           inputMode="decimal"
           placeholder="No max"
           value={maxPriceInput}
-          onChange={(event) => setMaxPriceInput(event.target.value)}
+          onChange={(event) => {
+            hasDraftInputEditsRef.current = true;
+            setMaxPriceInput(event.target.value);
+          }}
           onBlur={commitPriceRange}
           onKeyDown={(event) => {
             if (event.key === "Enter") {
@@ -468,9 +509,9 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
                 loading={false}
                 disabled={false}
                 onClicked={onCreateDrop}
-                padding="tw-px-5 tw-py-2.5"
+                padding="tw-px-3.5 tw-py-2"
               >
-                <PlusIcon className="tw-h-5 tw-w-5 tw-flex-shrink-0" />
+                <PlusIcon className="tw-h-4 tw-w-4 tw-flex-shrink-0" />
                 <span>Drop Art</span>
               </PrimaryButton>
             )}
diff --git a/hooks/useProgressiveDebounce.ts b/hooks/useProgressiveDebounce.ts
deleted file mode 100644
index 892fa7bb02..0000000000
--- a/hooks/useProgressiveDebounce.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-"use client";
-
-import { useEffect, useRef } from "react";
-
-interface DebounceOptions {
-  minDelay: number;
-  maxDelay: number;
-  increaseFactor: number;
-  decreaseFactor: number;
-}
-
-export const useProgressiveDebounce = (
-  callback: () => void,
-  dependencies: any[],
-  options: DebounceOptions
-) => {
-  const { minDelay, maxDelay, increaseFactor, decreaseFactor } = options;
-  const delayRef = useRef(minDelay);
-
-  useEffect(() => {
-    const handler = setTimeout(() => {
-      callback();
-      delayRef.current = minDelay; // Reset delay after execution
-    }, delayRef.current);
-
-    // Adjust delay for next call
-    delayRef.current = Math.min(maxDelay, delayRef.current * increaseFactor);
-
-    return () => {
-      clearTimeout(handler);
-      // Optionally adjust delay on cleanup
-      delayRef.current = Math.max(minDelay, delayRef.current / decreaseFactor);
-    };
-  }, dependencies);
-};

From 8f90adf20cad186f0033e1c4b5dc24439bc79c34 Mon Sep 17 00:00:00 2001
From: Simo <simo@6529.io>
Date: Mon, 2 Mar 2026 15:46:12 -0400
Subject: [PATCH 4/7] price filters/sort

Signed-off-by: Simo <simo@6529.io>
---
 .../header/WaveleaderboardHeader.test.tsx     | 120 +++++++++++-
 .../waveLeaderboardHeaderLayout.test.ts       |  96 ++++++++++
 .../header/WaveleaderboardHeader.tsx          | 146 +++++++++++++--
 ...useLeaderboardHeaderControlMeasurements.ts |  30 ++-
 .../header/waveLeaderboardHeaderLayout.ts     | 177 ++++++++++++++++++
 5 files changed, 536 insertions(+), 33 deletions(-)
 create mode 100644 __tests__/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.test.ts
 create mode 100644 components/waves/leaderboard/header/waveLeaderboardHeaderLayout.ts

diff --git a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
index fb26e861d4..a4381ebe54 100644
--- a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
+++ b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
@@ -27,7 +27,7 @@ const curationComponentMock = jest.fn((props: any) => (
     Curation
   </button>
 ));
-const resolveControlModesMock = jest.fn();
+const resolveHeaderLayoutMock = jest.fn();
 
 jest.mock("@/components/waves/leaderboard/header/WaveleaderboardSort", () => ({
   WAVE_LEADERBOARD_SORT_ITEMS: [
@@ -63,10 +63,10 @@ jest.mock(
 );
 
 jest.mock(
-  "@/components/waves/leaderboard/header/waveLeaderboardHeaderControls",
+  "@/components/waves/leaderboard/header/waveLeaderboardHeaderLayout",
   () => ({
-    resolveWaveLeaderboardHeaderControlModes: (...args: any[]) =>
-      resolveControlModesMock(...args),
+    resolveWaveLeaderboardHeaderLayout: (...args: any[]) =>
+      resolveHeaderLayoutMock(...args),
   })
 );
 
@@ -111,11 +111,13 @@ const wave = { id: "w" } as any;
 beforeEach(() => {
   sortComponentMock.mockClear();
   curationComponentMock.mockClear();
-  resolveControlModesMock.mockReset();
-  resolveControlModesMock.mockReturnValue({
+  resolveHeaderLayoutMock.mockReset();
+  resolveHeaderLayoutMock.mockReturnValue({
     sortMode: "dropdown",
     curationMode: "tabs",
     enableControlsScroll: false,
+    actionMode: "full",
+    wrapActions: false,
   });
 
   useWave.mockReturnValue({
@@ -290,9 +292,17 @@ it("renders curation price controls and commits range updates", async () => {
   expect(
     screen.queryByTestId("leaderboard-price-panel")
   ).not.toBeInTheDocument();
+  expect(screen.getByTestId("leaderboard-header-actions-row")).toHaveAttribute(
+    "data-action-mode",
+    "full"
+  );
+  expect(screen.getByTestId("leaderboard-header-actions-row")).toHaveAttribute(
+    "data-wrap",
+    "no"
+  );
   const createButton = screen.getByTestId("create");
   expect(createButton).toHaveAttribute("data-padding", "tw-px-3.5 tw-py-2");
-  expect(screen.getByText("Drop Art")).toBeInTheDocument();
+  expect(screen.getAllByText("Drop Art").length).toBeGreaterThan(0);
   const createIcon = createButton.querySelector("svg");
   expect(createIcon).toHaveClass("tw-h-4", "tw-w-4");
 
@@ -738,10 +748,12 @@ it("does not render curation selector when curation controls are unavailable", (
 });
 
 it("applies resolved modes and enables scroll fallback styling when requested", async () => {
-  resolveControlModesMock.mockReturnValue({
+  resolveHeaderLayoutMock.mockReturnValue({
     sortMode: "dropdown",
     curationMode: "dropdown",
     enableControlsScroll: true,
+    actionMode: "icon",
+    wrapActions: true,
   });
 
   render(
@@ -778,5 +790,95 @@ it("applies resolved modes and enables scroll fallback styling when requested",
   expect(
     screen.getByTestId("leaderboard-header-controls-row").className
   ).toContain("tw-overflow-x-auto");
-  expect(resolveControlModesMock).toHaveBeenCalled();
+  expect(resolveHeaderLayoutMock).toHaveBeenCalled();
+});
+
+it("renders icon-only curation actions with drop glyph when layout requests compact mode", () => {
+  resolveHeaderLayoutMock.mockReturnValue({
+    sortMode: "dropdown",
+    curationMode: "tabs",
+    enableControlsScroll: false,
+    actionMode: "icon",
+    wrapActions: false,
+  });
+
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        onPriceRangeChange={jest.fn()}
+      />
+    </AuthContext.Provider>
+  );
+
+  const actionsRow = screen.getByTestId("leaderboard-header-actions-row");
+  expect(actionsRow).toHaveAttribute("data-action-mode", "icon");
+  expect(actionsRow).toHaveAttribute("data-wrap", "no");
+
+  const createButton = screen.getByTestId("create");
+  expect(createButton).toHaveAttribute("data-padding", "tw-px-2.5 tw-py-2");
+  expect(createButton.querySelector('path[d^="M8.62826"]')).not.toBeNull();
+});
+
+it("marks the actions row as wrapped when layout requests wrapping", () => {
+  resolveHeaderLayoutMock.mockReturnValue({
+    sortMode: "dropdown",
+    curationMode: "dropdown",
+    enableControlsScroll: false,
+    actionMode: "icon",
+    wrapActions: true,
+  });
+
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        onPriceRangeChange={jest.fn()}
+      />
+    </AuthContext.Provider>
+  );
+
+  expect(screen.getByTestId("leaderboard-header-actions-row")).toHaveAttribute(
+    "data-wrap",
+    "yes"
+  );
+  expect(
+    screen.getByTestId("leaderboard-header-controls-row").className
+  ).toContain("tw-basis-full");
 });
diff --git a/__tests__/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.test.ts b/__tests__/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.test.ts
new file mode 100644
index 0000000000..109544caa4
--- /dev/null
+++ b/__tests__/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.test.ts
@@ -0,0 +1,96 @@
+import { resolveWaveLeaderboardHeaderLayout } from "@/components/waves/leaderboard/header/waveLeaderboardHeaderLayout";
+
+describe("resolveWaveLeaderboardHeaderLayout", () => {
+  const baseInput = {
+    viewModesWidth: 120,
+    sortTabsWidth: 260,
+    sortDropdownWidth: 140,
+    hasCurationControl: true,
+    curationTabsWidth: 280,
+    curationDropdownWidth: 170,
+    hasActions: true,
+    actionsFullWidth: 260,
+    actionsIconWidth: 90,
+  } as const;
+
+  it("keeps full action buttons on one row when everything fits", () => {
+    const result = resolveWaveLeaderboardHeaderLayout({
+      ...baseInput,
+      rowWidth: 730,
+    });
+
+    expect(result).toEqual({
+      sortMode: "dropdown",
+      curationMode: "dropdown",
+      enableControlsScroll: false,
+      actionMode: "full",
+      wrapActions: false,
+    });
+  });
+
+  it("uses icon-only actions before wrapping", () => {
+    const result = resolveWaveLeaderboardHeaderLayout({
+      ...baseInput,
+      rowWidth: 560,
+    });
+
+    expect(result).toEqual({
+      sortMode: "dropdown",
+      curationMode: "dropdown",
+      enableControlsScroll: false,
+      actionMode: "icon",
+      wrapActions: false,
+    });
+  });
+
+  it("wraps actions when even icon actions cannot stay on the first row", () => {
+    const result = resolveWaveLeaderboardHeaderLayout({
+      ...baseInput,
+      rowWidth: 450,
+    });
+
+    expect(result).toEqual({
+      sortMode: "dropdown",
+      curationMode: "dropdown",
+      enableControlsScroll: false,
+      actionMode: "icon",
+      wrapActions: true,
+    });
+  });
+
+  it("keeps control scroll fallback when wrapped controls still cannot fit", () => {
+    const result = resolveWaveLeaderboardHeaderLayout({
+      ...baseInput,
+      rowWidth: 300,
+    });
+
+    expect(result).toEqual({
+      sortMode: "dropdown",
+      curationMode: "dropdown",
+      enableControlsScroll: true,
+      actionMode: "icon",
+      wrapActions: true,
+    });
+  });
+
+  it("uses full controls width when actions are disabled", () => {
+    const result = resolveWaveLeaderboardHeaderLayout({
+      rowWidth: 570,
+      viewModesWidth: 120,
+      sortTabsWidth: 260,
+      sortDropdownWidth: 140,
+      hasCurationControl: true,
+      curationTabsWidth: 280,
+      curationDropdownWidth: 170,
+      hasActions: false,
+    });
+
+    expect(result).toEqual({
+      sortMode: "dropdown",
+      curationMode: "tabs",
+      enableControlsScroll: false,
+      actionMode: "full",
+      wrapActions: false,
+    });
+  });
+});
diff --git a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
index e49f4ac846..9bfc57ccab 100644
--- a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
+++ b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
@@ -21,7 +21,7 @@ import {
   WAVE_LEADERBOARD_SORT_ITEMS,
   WaveleaderboardSort,
 } from "./WaveleaderboardSort";
-import { resolveWaveLeaderboardHeaderControlModes } from "./waveLeaderboardHeaderControls";
+import { resolveWaveLeaderboardHeaderLayout } from "./waveLeaderboardHeaderLayout";
 
 interface WaveLeaderboardHeaderProps {
   readonly wave: ApiWave;
@@ -224,6 +224,31 @@ const WaveLeaderboardPriceFilters: React.FC<
   );
 };
 
+const DropModeGlyphIcon: React.FC<{
+  readonly className?: string | undefined;
+}> = ({ className = "tw-size-4 tw-flex-shrink-0" }) => (
+  <svg
+    className={className}
+    viewBox="0 0 24 24"
+    fill="none"
+    aria-hidden="true"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M8.62826 7.89684C8.62826 7.60735 8.62826 6.72633 7.11906 4.34441C6.41025 3.22565 5.71213 2.3144 5.68274 2.27615L5.12514 1.55005L4.56755 2.27615C4.53816 2.3144 3.84008 3.2257 3.13123 4.34441C1.62207 6.72633 1.62207 7.60735 1.62207 7.89684C1.62207 9.82846 3.19352 11.3999 5.12514 11.3999C7.05676 11.3999 8.62826 9.82846 8.62826 7.89684Z"
+      fill="currentColor"
+    />
+    <path
+      d="M21.2502 2.24459C20.7301 1.42366 20.2173 0.754227 20.1956 0.726104L19.638 0L19.0805 0.726104C19.0589 0.754227 18.546 1.42366 18.0259 2.24459C17.5419 3.00847 16.8984 4.11804 16.8984 4.931C16.8984 6.44166 18.1274 7.67061 19.638 7.67061C21.1487 7.67061 22.3777 6.44161 22.3777 4.931C22.3777 4.11799 21.7342 3.00847 21.2502 2.24459Z"
+      fill="currentColor"
+    />
+    <path
+      d="M13.6806 7.0994L13.1231 6.37329L12.5655 7.0994C12.5083 7.17388 11.1491 8.94805 9.76692 11.1295C7.8616 14.1367 6.89551 16.3717 6.89551 17.7724C6.89551 21.2063 9.68921 24 13.1231 24C16.557 24 19.3506 21.2063 19.3506 17.7724C19.3506 16.3717 18.3845 14.1367 16.4792 11.1295C15.097 8.94805 13.7379 7.17388 13.6806 7.0994Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
 export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
   wave,
   onCreateDrop,
@@ -291,32 +316,49 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
     () => curationGroups.map((group) => `${group.id}:${group.name}`).join("|"),
     [curationGroups]
   );
+  const showCurationActions = showPriceControls;
+  const showCreateAction = Boolean(isLoggedIn && canCreateDrop && onCreateDrop);
+  let actionsRemeasureVariant = "none";
+
+  if (showCurationActions && showCreateAction) {
+    actionsRemeasureVariant = "with-drop";
+  } else if (showCurationActions) {
+    actionsRemeasureVariant = "filter-only";
+  }
+
+  const remeasureKey = `${activeSortLabel}|${activeCurationLabel}|${curationProbeKey}|actions:${actionsRemeasureVariant}`;
 
   const {
+    headerRowRef,
     controlsRowRef,
     viewModeTabsRef,
     sortTabsProbeRef,
     sortDropdownProbeRef,
     curationTabsProbeRef,
     curationDropdownProbeRef,
+    actionsFullProbeRef,
+    actionsIconProbeRef,
     measurements,
   } = useLeaderboardHeaderControlMeasurements({
     showCurationGroupSelect,
-    remeasureKey: `${activeSortLabel}|${activeCurationLabel}|${curationProbeKey}`,
+    remeasureKey,
   });
 
-  const controlModes = useMemo(
+  const layout = useMemo(
     () =>
-      resolveWaveLeaderboardHeaderControlModes({
-        availableWidth: measurements.availableWidth,
+      resolveWaveLeaderboardHeaderLayout({
+        rowWidth: measurements.rowWidth,
         viewModesWidth: measurements.viewModesWidth,
         sortTabsWidth: measurements.sortTabsWidth,
         sortDropdownWidth: measurements.sortDropdownWidth,
         hasCurationControl: showCurationGroupSelect,
         curationTabsWidth: measurements.curationTabsWidth,
         curationDropdownWidth: measurements.curationDropdownWidth,
+        hasActions: showCurationActions,
+        actionsFullWidth: measurements.actionsFullWidth,
+        actionsIconWidth: measurements.actionsIconWidth,
       }),
-    [measurements, showCurationGroupSelect]
+    [measurements, showCurationActions, showCurationGroupSelect]
   );
 
   const getViewModeLabel = (mode: LeaderboardViewMode) => {
@@ -411,16 +453,21 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
     setIsManualFiltersOpen((current) => !current);
   };
 
-  const showCurationActions = showPriceControls;
+  const isCompactActions = layout.actionMode === "icon";
 
   return (
     <div className="tw-relative tw-flex tw-flex-col tw-gap-y-4 tw-bg-black tw-@container">
-      <div className="tw-flex tw-items-start tw-gap-2">
+      <div
+        ref={headerRowRef}
+        className="tw-flex tw-flex-wrap tw-items-start tw-gap-2"
+      >
         <div
           ref={controlsRowRef}
           data-testid="leaderboard-header-controls-row"
           className={`tw-flex tw-min-w-0 tw-flex-1 tw-flex-nowrap tw-items-center tw-gap-2 ${
-            controlModes.enableControlsScroll
+            layout.wrapActions ? "tw-basis-full" : ""
+          } ${
+            layout.enableControlsScroll
               ? "horizontal-menu-hide-scrollbar tw-overflow-x-auto tw-scrollbar-thin tw-scrollbar-track-transparent tw-scrollbar-thumb-iron-700/60"
               : "tw-overflow-x-hidden"
           }`}
@@ -472,7 +519,7 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
             <WaveleaderboardSort
               sort={sort}
               onSortChange={onSortChange}
-              mode={controlModes.sortMode}
+              mode={layout.sortMode}
               items={sortItems}
             />
           </div>
@@ -482,37 +529,64 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
                 groups={curationGroups}
                 selectedGroupId={curatedByGroupId}
                 onChange={onCurationGroupChange}
-                mode={controlModes.curationMode}
+                mode={layout.curationMode}
               />
             </div>
           )}
         </div>
         {showCurationActions ? (
-          <div className="tw-ml-auto tw-flex tw-flex-shrink-0 tw-items-center tw-gap-2">
+          <div
+            data-testid="leaderboard-header-actions-row"
+            data-action-mode={layout.actionMode}
+            data-wrap={layout.wrapActions ? "yes" : "no"}
+            className={`tw-ml-auto tw-flex tw-flex-shrink-0 tw-items-center tw-gap-2 ${
+              layout.wrapActions ? "tw-basis-auto" : ""
+            }`}
+          >
             <button
               type="button"
               data-testid="leaderboard-price-toggle"
+              aria-label="Toggle filters"
               aria-expanded={isPriceFiltersOpen}
               aria-controls={`leaderboard-price-panel-${wave.id}`}
               onClick={onTogglePriceFilters}
-              className={`tw-inline-flex tw-h-9 tw-items-center tw-gap-2 tw-rounded-lg tw-border tw-border-solid tw-px-3.5 tw-text-xs tw-font-semibold tw-transition ${
+              className={`tw-inline-flex tw-h-9 tw-items-center tw-rounded-lg tw-border tw-border-solid tw-text-xs tw-font-semibold tw-transition ${
+                isCompactActions
+                  ? "tw-w-9 tw-justify-center tw-px-0"
+                  : "tw-gap-2 tw-px-3.5"
+              } ${
                 isPriceFiltersOpen || hasActivePriceFilters
                   ? "tw-border-white/15 tw-bg-white/10 tw-text-iron-100"
                   : "tw-border-white/10 tw-bg-iron-950 tw-text-iron-200 desktop-hover:hover:tw-border-white/15 desktop-hover:hover:tw-bg-white/5"
               }`}
             >
               <AdjustmentsHorizontalIcon className="tw-size-4 tw-flex-shrink-0" />
-              <span>Filters</span>
+              {isCompactActions ? (
+                <span className="tw-sr-only">Filters</span>
+              ) : (
+                <span>Filters</span>
+              )}
             </button>
-            {isLoggedIn && canCreateDrop && onCreateDrop && (
+            {showCreateAction && (
               <PrimaryButton
                 loading={false}
                 disabled={false}
-                onClicked={onCreateDrop}
-                padding="tw-px-3.5 tw-py-2"
+                onClicked={() => onCreateDrop?.()}
+                padding={
+                  isCompactActions ? "tw-px-2.5 tw-py-2" : "tw-px-3.5 tw-py-2"
+                }
               >
-                <PlusIcon className="tw-h-4 tw-w-4 tw-flex-shrink-0" />
-                <span>Drop Art</span>
+                {isCompactActions ? (
+                  <>
+                    <DropModeGlyphIcon />
+                    <span className="tw-sr-only">Drop Art</span>
+                  </>
+                ) : (
+                  <>
+                    <PlusIcon className="tw-h-4 tw-w-4 tw-flex-shrink-0" />
+                    <span>Drop Art</span>
+                  </>
+                )}
               </PrimaryButton>
             )}
           </div>
@@ -620,6 +694,40 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
             </div>
           </>
         )}
+
+        {showCurationActions && (
+          <>
+            <div
+              ref={actionsFullProbeRef}
+              className="tw-inline-flex tw-items-center tw-gap-2"
+            >
+              <div className="tw-inline-flex tw-h-9 tw-items-center tw-gap-2 tw-rounded-lg tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-px-3.5 tw-text-xs tw-font-semibold tw-text-iron-200">
+                <AdjustmentsHorizontalIcon className="tw-size-4 tw-flex-shrink-0" />
+                <span>Filters</span>
+              </div>
+              {showCreateAction && (
+                <div className="tw-inline-flex tw-items-center tw-justify-center tw-gap-x-1.5 tw-whitespace-nowrap tw-rounded-lg tw-border-0 tw-bg-iron-200 tw-px-3.5 tw-py-2 tw-text-sm tw-font-semibold tw-text-iron-950 tw-ring-1 tw-ring-inset tw-ring-white">
+                  <PlusIcon className="tw-h-4 tw-w-4 tw-flex-shrink-0" />
+                  <span>Drop Art</span>
+                </div>
+              )}
+            </div>
+
+            <div
+              ref={actionsIconProbeRef}
+              className="tw-inline-flex tw-items-center tw-gap-2"
+            >
+              <div className="tw-inline-flex tw-h-9 tw-w-9 tw-items-center tw-justify-center tw-rounded-lg tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-text-xs tw-font-semibold tw-text-iron-200">
+                <AdjustmentsHorizontalIcon className="tw-size-4 tw-flex-shrink-0" />
+              </div>
+              {showCreateAction && (
+                <div className="tw-inline-flex tw-items-center tw-justify-center tw-gap-x-1.5 tw-whitespace-nowrap tw-rounded-lg tw-border-0 tw-bg-iron-200 tw-px-2.5 tw-py-2 tw-text-sm tw-font-semibold tw-text-iron-950 tw-ring-1 tw-ring-inset tw-ring-white">
+                  <DropModeGlyphIcon />
+                </div>
+              )}
+            </div>
+          </>
+        )}
       </div>
     </div>
   );
diff --git a/components/waves/leaderboard/header/useLeaderboardHeaderControlMeasurements.ts b/components/waves/leaderboard/header/useLeaderboardHeaderControlMeasurements.ts
index 3dbecf8403..8e9005ebba 100644
--- a/components/waves/leaderboard/header/useLeaderboardHeaderControlMeasurements.ts
+++ b/components/waves/leaderboard/header/useLeaderboardHeaderControlMeasurements.ts
@@ -9,12 +9,14 @@ import {
 } from "react";
 
 interface LeaderboardHeaderControlMeasurements {
-  readonly availableWidth: number;
+  readonly rowWidth: number;
   readonly viewModesWidth: number;
   readonly sortTabsWidth: number;
   readonly sortDropdownWidth: number;
   readonly curationTabsWidth: number;
   readonly curationDropdownWidth: number;
+  readonly actionsFullWidth: number;
+  readonly actionsIconWidth: number;
 }
 
 interface UseLeaderboardHeaderControlMeasurementsInput {
@@ -23,51 +25,61 @@ interface UseLeaderboardHeaderControlMeasurementsInput {
 }
 
 interface UseLeaderboardHeaderControlMeasurementsResult {
+  readonly headerRowRef: RefObject<HTMLDivElement | null>;
   readonly controlsRowRef: RefObject<HTMLDivElement | null>;
   readonly viewModeTabsRef: RefObject<HTMLDivElement | null>;
   readonly sortTabsProbeRef: RefObject<HTMLDivElement | null>;
   readonly sortDropdownProbeRef: RefObject<HTMLDivElement | null>;
   readonly curationTabsProbeRef: RefObject<HTMLDivElement | null>;
   readonly curationDropdownProbeRef: RefObject<HTMLDivElement | null>;
+  readonly actionsFullProbeRef: RefObject<HTMLDivElement | null>;
+  readonly actionsIconProbeRef: RefObject<HTMLDivElement | null>;
   readonly measurements: LeaderboardHeaderControlMeasurements;
 }
 
 const INITIAL_MEASUREMENTS: LeaderboardHeaderControlMeasurements = {
-  availableWidth: 0,
+  rowWidth: 0,
   viewModesWidth: 0,
   sortTabsWidth: 0,
   sortDropdownWidth: 0,
   curationTabsWidth: 0,
   curationDropdownWidth: 0,
+  actionsFullWidth: 0,
+  actionsIconWidth: 0,
 };
 
 const areMeasurementsEqual = (
   current: LeaderboardHeaderControlMeasurements,
   next: LeaderboardHeaderControlMeasurements
 ): boolean =>
-  current.availableWidth === next.availableWidth &&
+  current.rowWidth === next.rowWidth &&
   current.viewModesWidth === next.viewModesWidth &&
   current.sortTabsWidth === next.sortTabsWidth &&
   current.sortDropdownWidth === next.sortDropdownWidth &&
   current.curationTabsWidth === next.curationTabsWidth &&
-  current.curationDropdownWidth === next.curationDropdownWidth;
+  current.curationDropdownWidth === next.curationDropdownWidth &&
+  current.actionsFullWidth === next.actionsFullWidth &&
+  current.actionsIconWidth === next.actionsIconWidth;
 
 export function useLeaderboardHeaderControlMeasurements({
   showCurationGroupSelect,
   remeasureKey,
 }: UseLeaderboardHeaderControlMeasurementsInput): UseLeaderboardHeaderControlMeasurementsResult {
+  const headerRowRef = useRef<HTMLDivElement | null>(null);
   const controlsRowRef = useRef<HTMLDivElement | null>(null);
   const viewModeTabsRef = useRef<HTMLDivElement | null>(null);
   const sortTabsProbeRef = useRef<HTMLDivElement | null>(null);
   const sortDropdownProbeRef = useRef<HTMLDivElement | null>(null);
   const curationTabsProbeRef = useRef<HTMLDivElement | null>(null);
   const curationDropdownProbeRef = useRef<HTMLDivElement | null>(null);
+  const actionsFullProbeRef = useRef<HTMLDivElement | null>(null);
+  const actionsIconProbeRef = useRef<HTMLDivElement | null>(null);
   const [measurements, setMeasurements] =
     useState<LeaderboardHeaderControlMeasurements>(INITIAL_MEASUREMENTS);
 
   const measureNow = useCallback(() => {
     const nextMeasurements: LeaderboardHeaderControlMeasurements = {
-      availableWidth: controlsRowRef.current?.clientWidth ?? 0,
+      rowWidth: headerRowRef.current?.clientWidth ?? 0,
       viewModesWidth: viewModeTabsRef.current?.offsetWidth ?? 0,
       sortTabsWidth: sortTabsProbeRef.current?.offsetWidth ?? 0,
       sortDropdownWidth: sortDropdownProbeRef.current?.offsetWidth ?? 0,
@@ -77,6 +89,8 @@ export function useLeaderboardHeaderControlMeasurements({
       curationDropdownWidth: showCurationGroupSelect
         ? (curationDropdownProbeRef.current?.offsetWidth ?? 0)
         : 0,
+      actionsFullWidth: actionsFullProbeRef.current?.offsetWidth ?? 0,
+      actionsIconWidth: actionsIconProbeRef.current?.offsetWidth ?? 0,
     };
 
     setMeasurements((currentMeasurements) =>
@@ -130,12 +144,15 @@ export function useLeaderboardHeaderControlMeasurements({
     scheduleMeasure();
 
     const observedElements = [
+      headerRowRef.current,
       controlsRowRef.current,
       viewModeTabsRef.current,
       sortTabsProbeRef.current,
       sortDropdownProbeRef.current,
       showCurationGroupSelect ? curationTabsProbeRef.current : null,
       showCurationGroupSelect ? curationDropdownProbeRef.current : null,
+      actionsFullProbeRef.current,
+      actionsIconProbeRef.current,
     ].filter((element): element is HTMLDivElement => Boolean(element));
 
     if (typeof ResizeObserver === "undefined") {
@@ -161,12 +178,15 @@ export function useLeaderboardHeaderControlMeasurements({
   }, [measureNow, remeasureKey, showCurationGroupSelect]);
 
   return {
+    headerRowRef,
     controlsRowRef,
     viewModeTabsRef,
     sortTabsProbeRef,
     sortDropdownProbeRef,
     curationTabsProbeRef,
     curationDropdownProbeRef,
+    actionsFullProbeRef,
+    actionsIconProbeRef,
     measurements,
   };
 }
diff --git a/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.ts b/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.ts
new file mode 100644
index 0000000000..68419293b6
--- /dev/null
+++ b/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.ts
@@ -0,0 +1,177 @@
+import { resolveWaveLeaderboardHeaderControlModes } from "./waveLeaderboardHeaderControls";
+
+type WaveLeaderboardHeaderActionMode = "full" | "icon";
+
+interface ResolveWaveLeaderboardHeaderLayoutInput {
+  readonly rowWidth: number;
+  readonly viewModesWidth: number;
+  readonly sortTabsWidth: number;
+  readonly sortDropdownWidth: number;
+  readonly hasCurationControl: boolean;
+  readonly curationTabsWidth?: number | undefined;
+  readonly curationDropdownWidth?: number | undefined;
+  readonly hasActions: boolean;
+  readonly actionsFullWidth?: number | undefined;
+  readonly actionsIconWidth?: number | undefined;
+  readonly controlsGapWidth?: number | undefined;
+  readonly actionsGapWidth?: number | undefined;
+}
+
+interface WaveLeaderboardHeaderLayout {
+  readonly sortMode: "tabs" | "dropdown";
+  readonly curationMode: "tabs" | "dropdown";
+  readonly enableControlsScroll: boolean;
+  readonly actionMode: WaveLeaderboardHeaderActionMode;
+  readonly wrapActions: boolean;
+}
+
+const DEFAULT_GAP_WIDTH = 8; // tw-gap-2
+const WIDTH_TOLERANCE_PX = 1;
+
+const isValidWidth = (value: number): boolean =>
+  Number.isFinite(value) && value > 0;
+
+const normalizeGapWidth = (value: number | undefined): number => {
+  if (value === undefined || !Number.isFinite(value)) {
+    return DEFAULT_GAP_WIDTH;
+  }
+
+  return Math.max(0, value);
+};
+
+const getDropdownControlsWidth = ({
+  viewModesWidth,
+  sortDropdownWidth,
+  hasCurationControl,
+  curationDropdownWidth,
+  gapWidth,
+}: {
+  readonly viewModesWidth: number;
+  readonly sortDropdownWidth: number;
+  readonly hasCurationControl: boolean;
+  readonly curationDropdownWidth: number;
+  readonly gapWidth: number;
+}): number | null => {
+  if (!isValidWidth(viewModesWidth) || !isValidWidth(sortDropdownWidth)) {
+    return null;
+  }
+
+  if (!hasCurationControl) {
+    return viewModesWidth + gapWidth + sortDropdownWidth;
+  }
+
+  if (!isValidWidth(curationDropdownWidth)) {
+    return null;
+  }
+
+  return (
+    viewModesWidth +
+    gapWidth +
+    sortDropdownWidth +
+    gapWidth +
+    curationDropdownWidth
+  );
+};
+
+const fits = (availableWidth: number, requiredWidth: number): boolean =>
+  requiredWidth <= availableWidth + WIDTH_TOLERANCE_PX;
+
+export function resolveWaveLeaderboardHeaderLayout({
+  rowWidth,
+  viewModesWidth,
+  sortTabsWidth,
+  sortDropdownWidth,
+  hasCurationControl,
+  curationTabsWidth = 0,
+  curationDropdownWidth = 0,
+  hasActions,
+  actionsFullWidth = 0,
+  actionsIconWidth = 0,
+  controlsGapWidth,
+  actionsGapWidth,
+}: ResolveWaveLeaderboardHeaderLayoutInput): WaveLeaderboardHeaderLayout {
+  const safeControlsGapWidth = normalizeGapWidth(controlsGapWidth);
+  const safeActionsGapWidth = normalizeGapWidth(actionsGapWidth);
+
+  const defaultControls = resolveWaveLeaderboardHeaderControlModes({
+    availableWidth: rowWidth,
+    viewModesWidth,
+    sortTabsWidth,
+    sortDropdownWidth,
+    hasCurationControl,
+    curationTabsWidth,
+    curationDropdownWidth,
+    gapWidth: safeControlsGapWidth,
+  });
+
+  if (!hasActions) {
+    return {
+      ...defaultControls,
+      actionMode: "full",
+      wrapActions: false,
+    };
+  }
+
+  const minimumControlsWidth = getDropdownControlsWidth({
+    viewModesWidth,
+    sortDropdownWidth,
+    hasCurationControl,
+    curationDropdownWidth,
+    gapWidth: safeControlsGapWidth,
+  });
+
+  if (
+    !isValidWidth(rowWidth) ||
+    minimumControlsWidth === null ||
+    !isValidWidth(actionsFullWidth) ||
+    !isValidWidth(actionsIconWidth)
+  ) {
+    return {
+      ...defaultControls,
+      actionMode: "full",
+      wrapActions: false,
+    };
+  }
+
+  let actionMode: WaveLeaderboardHeaderActionMode = "full";
+  let wrapActions = false;
+
+  const requiredWidthWithFullActions =
+    minimumControlsWidth + safeActionsGapWidth + actionsFullWidth;
+  const requiredWidthWithIconActions =
+    minimumControlsWidth + safeActionsGapWidth + actionsIconWidth;
+
+  if (fits(rowWidth, requiredWidthWithFullActions)) {
+    actionMode = "full";
+    wrapActions = false;
+  } else if (fits(rowWidth, requiredWidthWithIconActions)) {
+    actionMode = "icon";
+    wrapActions = false;
+  } else {
+    actionMode = "icon";
+    wrapActions = true;
+  }
+
+  const actionWidth =
+    actionMode === "full" ? actionsFullWidth : actionsIconWidth;
+  const reservedActionsWidth = wrapActions
+    ? 0
+    : actionWidth + safeActionsGapWidth;
+
+  const controls = resolveWaveLeaderboardHeaderControlModes({
+    availableWidth: Math.max(0, rowWidth - reservedActionsWidth),
+    viewModesWidth,
+    sortTabsWidth,
+    sortDropdownWidth,
+    hasCurationControl,
+    curationTabsWidth,
+    curationDropdownWidth,
+    gapWidth: safeControlsGapWidth,
+  });
+
+  return {
+    ...controls,
+    actionMode,
+    wrapActions,
+  };
+}

From 0ea0049bc592c0fca88c463cb5e9ddb3f7e3af57 Mon Sep 17 00:00:00 2001
From: Simo <simo@6529.io>
Date: Tue, 3 Mar 2026 08:23:09 -0400
Subject: [PATCH 5/7] wip

Signed-off-by: Simo <simo@6529.io>
---
 .../WaveLeaderboardCurationDropModal.test.tsx | 103 ++++++++++++++-
 .../header/WaveleaderboardHeader.test.tsx     | 113 ++++++++++++++++
 .../useWaveDropsLeaderboard.extra.test.ts     |  28 ++++
 .../WaveLeaderboardCurationDropModal.tsx      | 122 +++++++++++++++++-
 .../header/WaveleaderboardHeader.tsx          |   1 +
 ...useLeaderboardHeaderControlMeasurements.ts |  10 +-
 hooks/useWaveDropsLeaderboard.ts              |  20 ++-
 7 files changed, 387 insertions(+), 10 deletions(-)

diff --git a/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx b/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
index 9ec44d67b7..20fc99eff1 100644
--- a/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
+++ b/__tests__/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { fireEvent, render, screen } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { WaveLeaderboardCurationDropModal } from "@/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal";
 
@@ -69,6 +69,107 @@ describe("WaveLeaderboardCurationDropModal", () => {
     expect(onClose).toHaveBeenCalled();
   });
 
+  it("moves initial focus to the close button when opened", async () => {
+    render(
+      <WaveLeaderboardCurationDropModal
+        isOpen={true}
+        wave={wave}
+        onClose={jest.fn()}
+      />
+    );
+
+    const closeButton = await screen.findByLabelText("Close modal");
+    await waitFor(() => {
+      expect(closeButton).toHaveFocus();
+    });
+  });
+
+  it("traps tab navigation inside the modal panel", async () => {
+    const user = userEvent.setup();
+
+    render(
+      <WaveLeaderboardCurationDropModal
+        isOpen={true}
+        wave={wave}
+        onClose={jest.fn()}
+      />
+    );
+
+    const panel = await screen.findByTestId("curation-drop-modal-panel");
+    const closeButton = screen.getByLabelText("Close modal");
+    const createButton = screen.getByTestId("modal-create-drop");
+
+    await waitFor(() => {
+      expect(closeButton).toHaveFocus();
+    });
+
+    await user.tab();
+    expect(createButton).toHaveFocus();
+    expect(panel.contains(document.activeElement)).toBe(true);
+
+    await user.tab();
+    expect(closeButton).toHaveFocus();
+    expect(panel.contains(document.activeElement)).toBe(true);
+
+    await user.tab({ shift: true });
+    expect(createButton).toHaveFocus();
+    expect(panel.contains(document.activeElement)).toBe(true);
+  });
+
+  it("restores focus to the previously focused element when closed", async () => {
+    const onClose = jest.fn();
+    const { rerender } = render(
+      <>
+        <button type="button" data-testid="opener">
+          Open modal
+        </button>
+        <WaveLeaderboardCurationDropModal
+          isOpen={false}
+          wave={wave}
+          onClose={onClose}
+        />
+      </>
+    );
+
+    const opener = screen.getByTestId("opener");
+    opener.focus();
+    expect(opener).toHaveFocus();
+
+    rerender(
+      <>
+        <button type="button" data-testid="opener">
+          Open modal
+        </button>
+        <WaveLeaderboardCurationDropModal
+          isOpen={true}
+          wave={wave}
+          onClose={onClose}
+        />
+      </>
+    );
+
+    await waitFor(() => {
+      expect(screen.getByLabelText("Close modal")).toHaveFocus();
+    });
+
+    rerender(
+      <>
+        <button type="button" data-testid="opener">
+          Open modal
+        </button>
+        <WaveLeaderboardCurationDropModal
+          isOpen={false}
+          wave={wave}
+          onClose={onClose}
+        />
+      </>
+    );
+
+    await waitFor(() => {
+      expect(opener).toHaveFocus();
+    });
+  });
+
   it("locks body scroll while open and restores it when closed", () => {
     const onClose = jest.fn();
     const originalOverflow = "scroll";
diff --git a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
index a4381ebe54..fc9a4e4662 100644
--- a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
+++ b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
@@ -793,6 +793,119 @@ it("applies resolved modes and enables scroll fallback styling when requested",
   expect(resolveHeaderLayoutMock).toHaveBeenCalled();
 });
 
+it("uses controls row width for non-curation layout measurements", async () => {
+  const clientWidthGetter = jest
+    .spyOn(HTMLElement.prototype, "clientWidth", "get")
+    .mockImplementation(function (this: HTMLElement) {
+      if (
+        this.getAttribute("data-testid") === "leaderboard-header-controls-row"
+      ) {
+        return 320;
+      }
+
+      if (
+        this.className.includes("tw-flex-wrap") &&
+        this.className.includes("tw-items-start")
+      ) {
+        return 480;
+      }
+
+      return 0;
+    });
+
+  try {
+    render(
+      <AuthContext.Provider
+        value={
+          {
+            connectedProfile: { handle: "tester" },
+            activeProfileProxy: null,
+          } as any
+        }
+      >
+        <WaveLeaderboardHeader
+          wave={wave}
+          onCreateDrop={jest.fn()}
+          viewMode="list"
+          onViewModeChange={jest.fn()}
+          sort={WaveDropsLeaderboardSort.RANK}
+          onSortChange={jest.fn()}
+        />
+      </AuthContext.Provider>
+    );
+
+    await waitFor(() =>
+      expect(resolveHeaderLayoutMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          rowWidth: 320,
+        })
+      )
+    );
+  } finally {
+    clientWidthGetter.mockRestore();
+  }
+});
+
+it("uses full header row width when curation actions are inline", async () => {
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  const clientWidthGetter = jest
+    .spyOn(HTMLElement.prototype, "clientWidth", "get")
+    .mockImplementation(function (this: HTMLElement) {
+      if (
+        this.getAttribute("data-testid") === "leaderboard-header-controls-row"
+      ) {
+        return 320;
+      }
+
+      if (
+        this.className.includes("tw-flex-wrap") &&
+        this.className.includes("tw-items-start")
+      ) {
+        return 480;
+      }
+
+      return 0;
+    });
+
+  try {
+    render(
+      <AuthContext.Provider
+        value={
+          {
+            connectedProfile: { handle: "tester" },
+            activeProfileProxy: null,
+          } as any
+        }
+      >
+        <WaveLeaderboardHeader
+          wave={wave}
+          onCreateDrop={jest.fn()}
+          viewMode="list"
+          onViewModeChange={jest.fn()}
+          sort={WaveDropsLeaderboardSort.RANK}
+          onSortChange={jest.fn()}
+          onPriceRangeChange={jest.fn()}
+        />
+      </AuthContext.Provider>
+    );
+
+    await waitFor(() =>
+      expect(resolveHeaderLayoutMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          rowWidth: 480,
+        })
+      )
+    );
+  } finally {
+    clientWidthGetter.mockRestore();
+  }
+});
+
 it("renders icon-only curation actions with drop glyph when layout requests compact mode", () => {
   resolveHeaderLayoutMock.mockReturnValue({
     sortMode: "dropdown",
diff --git a/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts b/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
index 1678749dec..4a8bfcc499 100644
--- a/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
+++ b/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
@@ -116,4 +116,32 @@ describe("useWaveDropsLeaderboard extra", () => {
       })
     );
   });
+
+  it("swaps inverted min and max price bounds before request params", async () => {
+    renderHook(() =>
+      useWaveDropsLeaderboard({
+        waveId: "2",
+        minPrice: 2.75,
+        maxPrice: 0.5,
+        priceCurrency: "ETH",
+        sort: WaveDropsLeaderboardSort.PRICE,
+      })
+    );
+
+    const call = (queryClientMock.prefetchInfiniteQuery as jest.Mock).mock
+      .calls[0][0];
+    await call.queryFn({ pageParam: null });
+
+    expect(commonApiFetch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        endpoint: "waves/2/leaderboard",
+        params: expect.objectContaining({
+          sort: WaveDropsLeaderboardSort.PRICE,
+          min_price: "0.5",
+          max_price: "2.75",
+          price_currency: "ETH",
+        }),
+      })
+    );
+  });
 });
diff --git a/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx b/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
index 43457cd99f..18722f275e 100644
--- a/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
+++ b/components/waves/leaderboard/create/WaveLeaderboardCurationDropModal.tsx
@@ -3,7 +3,7 @@
 import type { ApiWave } from "@/generated/models/ApiWave";
 import { XMarkIcon } from "@heroicons/react/24/outline";
 import { motion } from "framer-motion";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { createPortal } from "react-dom";
 import { WaveDropCreate } from "./WaveDropCreate";
 
@@ -13,24 +13,128 @@ interface WaveLeaderboardCurationDropModalProps {
   readonly onClose: () => void;
 }
 
+const FOCUSABLE_SELECTOR =
+  "a[href],button:not([disabled]),input:not([disabled]),select:not([disabled]),textarea:not([disabled]),[tabindex]:not([tabindex='-1']),[contenteditable='true']";
+
+const getFocusableElements = (container: HTMLElement): HTMLElement[] =>
+  Array.from(
+    container.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR)
+  ).filter((element) => {
+    if (!element.isConnected) {
+      return false;
+    }
+
+    if (element.getAttribute("aria-hidden") === "true") {
+      return false;
+    }
+
+    if (element instanceof HTMLInputElement && element.type === "hidden") {
+      return false;
+    }
+
+    return !element.hasAttribute("disabled");
+  });
+
 export function WaveLeaderboardCurationDropModal({
   isOpen,
   wave,
   onClose,
 }: WaveLeaderboardCurationDropModalProps) {
   const canUseDOM = typeof document !== "undefined";
+  const panelRef = useRef<HTMLDivElement | null>(null);
+  const closeButtonRef = useRef<HTMLButtonElement | null>(null);
+  const titleRef = useRef<HTMLHeadingElement | null>(null);
+  const onCloseRef = useRef(onClose);
+  const previouslyFocusedElementRef = useRef<HTMLElement | null>(null);
+
+  useEffect(() => {
+    onCloseRef.current = onClose;
+  }, [onClose]);
 
   useEffect(() => {
     if (!isOpen) {
       return;
     }
 
+    const activeElement = document.activeElement;
+    previouslyFocusedElementRef.current =
+      activeElement instanceof HTMLElement ? activeElement : null;
+
     const originalOverflow = document.body.style.overflow;
     document.body.style.overflow = "hidden";
 
+    const focusInitialTarget = () => {
+      const initialTarget =
+        closeButtonRef.current ?? titleRef.current ?? panelRef.current;
+      initialTarget?.focus();
+    };
+    focusInitialTarget();
+
     const onKeyDown = (event: KeyboardEvent) => {
       if (event.key === "Escape") {
-        onClose();
+        event.preventDefault();
+        onCloseRef.current();
+        return;
+      }
+
+      if (event.key !== "Tab") {
+        return;
+      }
+
+      const panel = panelRef.current;
+      if (!panel) {
+        return;
+      }
+
+      const focusableElements = getFocusableElements(panel);
+      if (focusableElements.length === 0) {
+        event.preventDefault();
+        panel.focus();
+        return;
+      }
+
+      const firstFocusableElement = focusableElements[0];
+      const lastFocusableElement =
+        focusableElements[focusableElements.length - 1];
+      if (!firstFocusableElement || !lastFocusableElement) {
+        event.preventDefault();
+        panel.focus();
+        return;
+      }
+      const activeFocusableElement =
+        document.activeElement instanceof HTMLElement
+          ? document.activeElement
+          : null;
+
+      if (activeFocusableElement === panel) {
+        event.preventDefault();
+        if (event.shiftKey) {
+          lastFocusableElement.focus();
+        } else {
+          firstFocusableElement.focus();
+        }
+        return;
+      }
+
+      if (!activeFocusableElement || !panel.contains(activeFocusableElement)) {
+        event.preventDefault();
+        if (event.shiftKey) {
+          lastFocusableElement.focus();
+        } else {
+          firstFocusableElement.focus();
+        }
+        return;
+      }
+
+      if (event.shiftKey && activeFocusableElement === firstFocusableElement) {
+        event.preventDefault();
+        lastFocusableElement.focus();
+        return;
+      }
+
+      if (!event.shiftKey && activeFocusableElement === lastFocusableElement) {
+        event.preventDefault();
+        firstFocusableElement.focus();
       }
     };
     document.addEventListener("keydown", onKeyDown);
@@ -38,8 +142,14 @@ export function WaveLeaderboardCurationDropModal({
     return () => {
       document.body.style.overflow = originalOverflow;
       document.removeEventListener("keydown", onKeyDown);
+
+      const previouslyFocusedElement = previouslyFocusedElementRef.current;
+      if (previouslyFocusedElement?.isConnected) {
+        previouslyFocusedElement.focus();
+      }
+      previouslyFocusedElementRef.current = null;
     };
-  }, [isOpen, onClose]);
+  }, [isOpen]);
 
   if (!canUseDOM || !isOpen) {
     return null;
@@ -58,23 +168,29 @@ export function WaveLeaderboardCurationDropModal({
         onClick={onClose}
         className="tw-fixed tw-inset-0 tw-cursor-default tw-border-0 tw-bg-transparent tw-p-0"
         aria-label="Close drop artwork modal"
+        tabIndex={-1}
       />
       <div className="tw-relative tw-z-10 tw-flex tw-h-full tw-items-start tw-justify-center tw-px-4 tw-pb-4 tw-pt-[calc(env(safe-area-inset-top,0px)+1rem)] lg:tw-items-center">
         <motion.div
+          ref={panelRef}
           initial={{ opacity: 0, y: 12, scale: 0.98 }}
           animate={{ opacity: 1, y: 0, scale: 1 }}
           transition={{ duration: 0.2, ease: "easeOut" }}
           className="tw-max-h-[90vh] tw-w-full tw-max-w-3xl tw-overflow-hidden tw-rounded-xl tw-border tw-border-solid tw-border-iron-800 tw-bg-iron-950 tw-shadow-2xl"
           data-testid="curation-drop-modal-panel"
+          tabIndex={-1}
         >
           <div className="tw-flex tw-items-center tw-justify-between tw-gap-4 tw-border-b tw-border-solid tw-border-iron-800 tw-p-6">
             <h2
               id="leaderboard-drop-art-title"
+              ref={titleRef}
               className="tw-mb-0 tw-text-2xl tw-font-bold tw-text-white"
+              tabIndex={-1}
             >
               Drop Artwork
             </h2>
             <button
+              ref={closeButtonRef}
               type="button"
               onClick={onClose}
               className="tw-flex tw-size-9 tw-flex-shrink-0 tw-items-center tw-justify-center tw-rounded-full tw-border-0 tw-bg-transparent tw-text-iron-300 tw-ring-1 tw-ring-inset tw-ring-iron-700 tw-transition tw-duration-300 tw-ease-out desktop-hover:hover:tw-text-iron-100"
diff --git a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
index 9bfc57ccab..3190c64359 100644
--- a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
+++ b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
@@ -341,6 +341,7 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
     measurements,
   } = useLeaderboardHeaderControlMeasurements({
     showCurationGroupSelect,
+    measureAgainstHeaderRow: showCurationActions,
     remeasureKey,
   });
 
diff --git a/components/waves/leaderboard/header/useLeaderboardHeaderControlMeasurements.ts b/components/waves/leaderboard/header/useLeaderboardHeaderControlMeasurements.ts
index 8e9005ebba..b7ac377192 100644
--- a/components/waves/leaderboard/header/useLeaderboardHeaderControlMeasurements.ts
+++ b/components/waves/leaderboard/header/useLeaderboardHeaderControlMeasurements.ts
@@ -21,6 +21,7 @@ interface LeaderboardHeaderControlMeasurements {
 
 interface UseLeaderboardHeaderControlMeasurementsInput {
   readonly showCurationGroupSelect: boolean;
+  readonly measureAgainstHeaderRow: boolean;
   readonly remeasureKey: string;
 }
 
@@ -63,6 +64,7 @@ const areMeasurementsEqual = (
 
 export function useLeaderboardHeaderControlMeasurements({
   showCurationGroupSelect,
+  measureAgainstHeaderRow,
   remeasureKey,
 }: UseLeaderboardHeaderControlMeasurementsInput): UseLeaderboardHeaderControlMeasurementsResult {
   const headerRowRef = useRef<HTMLDivElement | null>(null);
@@ -78,8 +80,12 @@ export function useLeaderboardHeaderControlMeasurements({
     useState<LeaderboardHeaderControlMeasurements>(INITIAL_MEASUREMENTS);
 
   const measureNow = useCallback(() => {
+    const rowWidth = measureAgainstHeaderRow
+      ? (headerRowRef.current?.clientWidth ?? 0)
+      : (controlsRowRef.current?.clientWidth ?? 0);
+
     const nextMeasurements: LeaderboardHeaderControlMeasurements = {
-      rowWidth: headerRowRef.current?.clientWidth ?? 0,
+      rowWidth,
       viewModesWidth: viewModeTabsRef.current?.offsetWidth ?? 0,
       sortTabsWidth: sortTabsProbeRef.current?.offsetWidth ?? 0,
       sortDropdownWidth: sortDropdownProbeRef.current?.offsetWidth ?? 0,
@@ -98,7 +104,7 @@ export function useLeaderboardHeaderControlMeasurements({
         ? currentMeasurements
         : nextMeasurements
     );
-  }, [showCurationGroupSelect]);
+  }, [measureAgainstHeaderRow, showCurationGroupSelect]);
 
   useEffect(() => {
     let frameId: number | null = null;
diff --git a/hooks/useWaveDropsLeaderboard.ts b/hooks/useWaveDropsLeaderboard.ts
index da61baba71..e32fe0c6cc 100644
--- a/hooks/useWaveDropsLeaderboard.ts
+++ b/hooks/useWaveDropsLeaderboard.ts
@@ -163,11 +163,23 @@ export function useWaveDropsLeaderboard({
       if (normalizedCuratedByGroupId) {
         params["curated_by_group"] = normalizedCuratedByGroupId;
       }
-      if (typeof normalizedMinPrice === "number") {
-        params["min_price"] = normalizedMinPrice.toString();
+      let effectiveMinPrice = normalizedMinPrice;
+      let effectiveMaxPrice = normalizedMaxPrice;
+
+      if (
+        typeof normalizedMinPrice === "number" &&
+        typeof normalizedMaxPrice === "number" &&
+        normalizedMinPrice > normalizedMaxPrice
+      ) {
+        effectiveMinPrice = normalizedMaxPrice;
+        effectiveMaxPrice = normalizedMinPrice;
       }
-      if (typeof normalizedMaxPrice === "number") {
-        params["max_price"] = normalizedMaxPrice.toString();
+
+      if (typeof effectiveMinPrice === "number") {
+        params["min_price"] = effectiveMinPrice.toString();
+      }
+      if (typeof effectiveMaxPrice === "number") {
+        params["max_price"] = effectiveMaxPrice.toString();
       }
       if (normalizedPriceCurrency) {
         params["price_currency"] = normalizedPriceCurrency;

From fea67913b208540e93d5fb9b22f58578dd9bf89b Mon Sep 17 00:00:00 2001
From: Simo <simo@6529.io>
Date: Tue, 3 Mar 2026 14:35:10 -0400
Subject: [PATCH 6/7] wip

Signed-off-by: Simo <simo@6529.io>
---
 .../header/WaveleaderboardHeader.test.tsx     | 185 +++++++++++-
 .../waveLeaderboardHeaderLayout.test.ts       |  29 +-
 .../header/WaveleaderboardHeader.tsx          | 281 ++++++++++++------
 .../header/waveLeaderboardHeaderLayout.ts     |  45 ++-
 4 files changed, 414 insertions(+), 126 deletions(-)

diff --git a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
index fc9a4e4662..93661a7afb 100644
--- a/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
+++ b/__tests__/components/waves/leaderboard/header/WaveleaderboardHeader.test.tsx
@@ -312,6 +312,23 @@ it("renders curation price controls and commits range updates", async () => {
   await user.click(screen.getByTestId("leaderboard-price-toggle"));
   const minInput = screen.getByTestId("leaderboard-price-min-input");
   const maxInput = screen.getByTestId("leaderboard-price-max-input");
+  const priceFiltersContainer = minInput.parentElement?.parentElement;
+
+  expect(minInput).toHaveClass("tw-h-9", "tw-text-sm");
+  expect(maxInput).toHaveClass("tw-h-9", "tw-text-sm");
+  expect(priceFiltersContainer).not.toBeNull();
+  expect(priceFiltersContainer).not.toHaveClass("tw-bg-iron-950");
+  expect(priceFiltersContainer).not.toHaveClass("tw-border");
+  expect(priceFiltersContainer).not.toHaveClass("tw-rounded-lg");
+  expect(priceFiltersContainer).not.toHaveClass("tw-p-2");
+  expect(minInput).toHaveAttribute("placeholder", "Min");
+  expect(maxInput).toHaveAttribute("placeholder", "Max");
+  expect(screen.getByLabelText("Minimum ETH")).toBe(minInput);
+  expect(screen.getByLabelText("Maximum ETH")).toBe(maxInput);
+  expect(
+    screen.queryByRole("button", { name: "Clear filters" })
+  ).not.toBeInTheDocument();
+  expect(screen.queryByText("Clear Filters")).not.toBeInTheDocument();
   await user.clear(minInput);
   await user.type(minInput, "1.5");
   await user.clear(maxInput);
@@ -330,13 +347,103 @@ it("renders curation price controls and commits range updates", async () => {
     ])
   );
 
-  await user.click(screen.getByTestId("leaderboard-price-clear"));
+  const clearButton = screen.getByRole("button", { name: "Clear filters" });
+  expect(clearButton).toHaveClass("tw-h-9", "tw-w-9", "tw-rounded-lg");
+  await user.click(clearButton);
   expect(onPriceRangeChange).toHaveBeenLastCalledWith({
     minPrice: undefined,
     maxPrice: undefined,
   });
 });
 
+it("uses long placeholders when the price filter container is wide", async () => {
+  const originalResizeObserver = globalThis.ResizeObserver;
+  const getBoundingClientRectSpy = jest
+    .spyOn(HTMLElement.prototype, "getBoundingClientRect")
+    .mockImplementation(function () {
+      return {
+        x: 0,
+        y: 0,
+        top: 0,
+        left: 0,
+        bottom: 40,
+        right: 600,
+        width: 600,
+        height: 40,
+        toJSON: () => ({}),
+      } as DOMRect;
+    });
+
+  const observeMock = jest.fn();
+  const disconnectMock = jest.fn();
+  let resizeObserverCallback: ResizeObserverCallback | null = null;
+
+  globalThis.ResizeObserver = jest
+    .fn()
+    .mockImplementation((callback: ResizeObserverCallback) => {
+      resizeObserverCallback = callback;
+      return {
+        observe: observeMock,
+        unobserve: jest.fn(),
+        disconnect: disconnectMock,
+      };
+    }) as unknown as typeof ResizeObserver;
+
+  try {
+    useWave.mockReturnValue({
+      isMemesWave: false,
+      isCurationWave: true,
+      participation: { isEligible: true },
+    });
+
+    const { unmount } = render(
+      <AuthContext.Provider
+        value={
+          {
+            connectedProfile: { handle: "tester" },
+            activeProfileProxy: null,
+          } as any
+        }
+      >
+        <WaveLeaderboardHeader
+          wave={wave}
+          onCreateDrop={jest.fn()}
+          viewMode="list"
+          onViewModeChange={jest.fn()}
+          sort={WaveDropsLeaderboardSort.RANK}
+          onSortChange={jest.fn()}
+          onPriceRangeChange={jest.fn()}
+        />
+      </AuthContext.Provider>
+    );
+
+    fireEvent.click(screen.getByTestId("leaderboard-price-toggle"));
+    const minInput = screen.getByTestId("leaderboard-price-min-input");
+    const maxInput = screen.getByTestId("leaderboard-price-max-input");
+
+    expect(minInput).toHaveAttribute("placeholder", "Minimum ETH");
+    expect(maxInput).toHaveAttribute("placeholder", "Maximum ETH");
+
+    expect(observeMock).toHaveBeenCalled();
+    expect(resizeObserverCallback).toBeTruthy();
+
+    act(() => {
+      resizeObserverCallback?.([], {} as ResizeObserver);
+    });
+
+    await waitFor(() =>
+      expect(minInput).toHaveAttribute("placeholder", "Minimum ETH")
+    );
+    expect(maxInput).toHaveAttribute("placeholder", "Maximum ETH");
+
+    unmount();
+    expect(disconnectMock).toHaveBeenCalled();
+  } finally {
+    getBoundingClientRectSpy.mockRestore();
+    globalThis.ResizeObserver = originalResizeObserver;
+  }
+});
+
 it("auto-applies price range updates after debounce while typing", () => {
   jest.useFakeTimers();
 
@@ -391,6 +498,7 @@ it("auto-applies price range updates after debounce while typing", () => {
       maxPrice: 3.25,
     });
 
+    expect(screen.getByTestId("leaderboard-price-clear")).toBeInTheDocument();
     fireEvent.click(screen.getByTestId("leaderboard-price-clear"));
     expect(onPriceRangeChange).toHaveBeenLastCalledWith({
       minPrice: undefined,
@@ -541,6 +649,7 @@ it("auto-expands price filters when min or max price is active", () => {
     "aria-expanded",
     "true"
   );
+  expect(screen.getByTestId("leaderboard-price-clear")).toBeInTheDocument();
 });
 
 it("allows collapsing and reopening filters while price filters are active", async () => {
@@ -753,7 +862,7 @@ it("applies resolved modes and enables scroll fallback styling when requested",
     curationMode: "dropdown",
     enableControlsScroll: true,
     actionMode: "icon",
-    wrapActions: true,
+    wrapActions: false,
   });
 
   render(
@@ -803,10 +912,7 @@ it("uses controls row width for non-curation layout measurements", async () => {
         return 320;
       }
 
-      if (
-        this.className.includes("tw-flex-wrap") &&
-        this.className.includes("tw-items-start")
-      ) {
+      if (this.getAttribute("data-testid") === "leaderboard-header-row") {
         return 480;
       }
 
@@ -862,10 +968,7 @@ it("uses full header row width when curation actions are inline", async () => {
         return 320;
       }
 
-      if (
-        this.className.includes("tw-flex-wrap") &&
-        this.className.includes("tw-items-start")
-      ) {
+      if (this.getAttribute("data-testid") === "leaderboard-header-row") {
         return 480;
       }
 
@@ -987,11 +1090,73 @@ it("marks the actions row as wrapped when layout requests wrapping", () => {
     </AuthContext.Provider>
   );
 
+  expect(screen.getByTestId("leaderboard-header-actions-row")).toHaveAttribute(
+    "data-action-mode",
+    "icon"
+  );
   expect(screen.getByTestId("leaderboard-header-actions-row")).toHaveAttribute(
     "data-wrap",
     "yes"
   );
+  expect(screen.getByTestId("leaderboard-header-row").className).toContain(
+    "tw-flex-wrap"
+  );
   expect(
     screen.getByTestId("leaderboard-header-controls-row").className
   ).toContain("tw-basis-full");
 });
+
+it("moves actions to the price row when filters are open on wrapped layouts", () => {
+  resolveHeaderLayoutMock.mockReturnValue({
+    sortMode: "dropdown",
+    curationMode: "dropdown",
+    enableControlsScroll: false,
+    actionMode: "icon",
+    wrapActions: true,
+  });
+
+  useWave.mockReturnValue({
+    isMemesWave: false,
+    isCurationWave: true,
+    participation: { isEligible: true },
+  });
+
+  render(
+    <AuthContext.Provider
+      value={
+        {
+          connectedProfile: { handle: "tester" },
+          activeProfileProxy: null,
+        } as any
+      }
+    >
+      <WaveLeaderboardHeader
+        wave={wave}
+        onCreateDrop={jest.fn()}
+        viewMode="list"
+        onViewModeChange={jest.fn()}
+        sort={WaveDropsLeaderboardSort.RANK}
+        onSortChange={jest.fn()}
+        minPrice={1.25}
+        onPriceRangeChange={jest.fn()}
+      />
+    </AuthContext.Provider>
+  );
+
+  expect(screen.getByTestId("leaderboard-price-panel")).toBeInTheDocument();
+  expect(
+    screen.queryByTestId("leaderboard-header-actions-row")
+  ).not.toBeInTheDocument();
+  const priceActionsRow = screen.getByTestId("leaderboard-price-actions-row");
+  expect(priceActionsRow).toBeInTheDocument();
+  expect(priceActionsRow.className).toContain("tw-ml-auto");
+  expect(priceActionsRow).toContainElement(
+    screen.getByTestId("leaderboard-price-toggle")
+  );
+  expect(screen.getByTestId("leaderboard-header-row").className).toContain(
+    "tw-flex-nowrap"
+  );
+  expect(
+    screen.getByTestId("leaderboard-header-controls-row").className
+  ).not.toContain("tw-basis-full");
+});
diff --git a/__tests__/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.test.ts b/__tests__/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.test.ts
index 109544caa4..40a0cbd488 100644
--- a/__tests__/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.test.ts
+++ b/__tests__/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.test.ts
@@ -16,7 +16,7 @@ describe("resolveWaveLeaderboardHeaderLayout", () => {
   it("keeps full action buttons on one row when everything fits", () => {
     const result = resolveWaveLeaderboardHeaderLayout({
       ...baseInput,
-      rowWidth: 730,
+      rowWidth: 760,
     });
 
     expect(result).toEqual({
@@ -28,10 +28,10 @@ describe("resolveWaveLeaderboardHeaderLayout", () => {
     });
   });
 
-  it("uses icon-only actions before wrapping", () => {
+  it("uses icon-only actions before controls need scroll fallback", () => {
     const result = resolveWaveLeaderboardHeaderLayout({
       ...baseInput,
-      rowWidth: 560,
+      rowWidth: 590,
     });
 
     expect(result).toEqual({
@@ -43,7 +43,7 @@ describe("resolveWaveLeaderboardHeaderLayout", () => {
     });
   });
 
-  it("wraps actions when even icon actions cannot stay on the first row", () => {
+  it("wraps actions early when space gets tight", () => {
     const result = resolveWaveLeaderboardHeaderLayout({
       ...baseInput,
       rowWidth: 450,
@@ -58,10 +58,27 @@ describe("resolveWaveLeaderboardHeaderLayout", () => {
     });
   });
 
-  it("keeps control scroll fallback when wrapped controls still cannot fit", () => {
+  it("keeps actions inline when wrapping is disabled and falls back to scroll", () => {
+    const result = resolveWaveLeaderboardHeaderLayout({
+      ...baseInput,
+      rowWidth: 450,
+      allowActionWrap: false,
+    });
+
+    expect(result).toEqual({
+      sortMode: "dropdown",
+      curationMode: "dropdown",
+      enableControlsScroll: true,
+      actionMode: "icon",
+      wrapActions: false,
+    });
+  });
+
+  it("keeps control scroll fallback when controls still cannot fit", () => {
     const result = resolveWaveLeaderboardHeaderLayout({
       ...baseInput,
       rowWidth: 300,
+      allowActionWrap: false,
     });
 
     expect(result).toEqual({
@@ -69,7 +86,7 @@ describe("resolveWaveLeaderboardHeaderLayout", () => {
       curationMode: "dropdown",
       enableControlsScroll: true,
       actionMode: "icon",
-      wrapActions: true,
+      wrapActions: false,
     });
   });
 
diff --git a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
index 3190c64359..eb8c100a91 100644
--- a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
+++ b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
@@ -7,9 +7,19 @@ import type { ApiWaveCurationGroup } from "@/generated/models/ApiWaveCurationGro
 import { useWave } from "@/hooks/useWave";
 import type { WaveDropsLeaderboardSort } from "@/hooks/useWaveDropsLeaderboard";
 import { AnimatePresence, motion } from "framer-motion";
-import { AdjustmentsHorizontalIcon } from "@heroicons/react/24/outline";
+import {
+  AdjustmentsHorizontalIcon,
+  XMarkIcon,
+} from "@heroicons/react/24/outline";
 import { PlusIcon } from "@heroicons/react/24/solid";
-import React, { useContext, useMemo, useRef, useState } from "react";
+import React, {
+  useCallback,
+  useContext,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
 import { Tooltip } from "react-tooltip";
 import { useDebounce } from "react-use";
 import { getWaveDropEligibility } from "../dropEligibility";
@@ -57,6 +67,7 @@ interface WaveLeaderboardPriceFiltersProps {
     | undefined;
   readonly onFiltersActivated: () => void;
   readonly onFiltersCleared: () => void;
+  readonly trailingActions?: React.ReactNode | undefined;
 }
 
 const toPriceInputValue = (value?: number): string =>
@@ -78,6 +89,8 @@ const isZeroDraftInput = (rawValue: string): boolean => {
   return trimmedValue === "0" || trimmedValue === "0.";
 };
 
+const PRICE_FILTER_LONG_PLACEHOLDER_WIDTH = 576;
+
 const WaveLeaderboardPriceFilters: React.FC<
   WaveLeaderboardPriceFiltersProps
 > = ({
@@ -87,6 +100,7 @@ const WaveLeaderboardPriceFilters: React.FC<
   onPriceRangeChange,
   onFiltersActivated,
   onFiltersCleared,
+  trailingActions,
 }) => {
   const [minPriceInput, setMinPriceInput] = useState(() =>
     toPriceInputValue(minPrice)
@@ -95,6 +109,43 @@ const WaveLeaderboardPriceFilters: React.FC<
     toPriceInputValue(maxPrice)
   );
   const hasDraftInputEditsRef = useRef(false);
+  const priceFiltersContainerRef = useRef<HTMLDivElement | null>(null);
+  const subscribePlaceholderMode = useCallback((onStoreChange: () => void) => {
+    const container = priceFiltersContainerRef.current;
+    const notify = () => onStoreChange();
+
+    notify();
+
+    if (typeof ResizeObserver !== "undefined" && container) {
+      const resizeObserver = new ResizeObserver(() => {
+        notify();
+      });
+      resizeObserver.observe(container);
+      return () => resizeObserver.disconnect();
+    }
+
+    if (typeof window === "undefined") {
+      return () => undefined;
+    }
+
+    window.addEventListener("resize", notify);
+    return () => window.removeEventListener("resize", notify);
+  }, []);
+  const getPlaceholderSnapshot = useCallback(() => {
+    const container = priceFiltersContainerRef.current;
+    if (!container) {
+      return false;
+    }
+    return (
+      container.getBoundingClientRect().width >=
+      PRICE_FILTER_LONG_PLACEHOLDER_WIDTH
+    );
+  }, []);
+  const useLongPlaceholders = useSyncExternalStore(
+    subscribePlaceholderMode,
+    getPlaceholderSnapshot,
+    () => false
+  );
 
   const commitPriceRange = () => {
     if (!onPriceRangeChange) {
@@ -144,15 +195,15 @@ const WaveLeaderboardPriceFilters: React.FC<
     ]
   );
 
+  const hasAnyPriceInput =
+    minPriceInput.trim().length > 0 || maxPriceInput.trim().length > 0;
+
   return (
-    <div className="tw-flex tw-flex-wrap tw-items-end tw-gap-2.5 tw-rounded-xl tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-p-4">
-      <div className="tw-flex tw-min-w-[9rem] tw-flex-col tw-gap-y-1">
-        <label
-          htmlFor={`leaderboard-min-price-${waveId}`}
-          className="tw-text-xs tw-font-semibold tw-uppercase tw-tracking-wide tw-text-iron-500"
-        >
-          Min (ETH)
-        </label>
+    <div
+      ref={priceFiltersContainerRef}
+      className="tw-flex tw-flex-nowrap tw-items-center tw-gap-2 tw-overflow-x-auto tw-@container/price"
+    >
+      <div className="tw-min-w-[6.5rem] tw-flex-1 @[28rem]/price:tw-min-w-[8rem] @[36rem]/price:tw-min-w-[9.5rem]">
         <input
           id={`leaderboard-min-price-${waveId}`}
           data-testid="leaderboard-price-min-input"
@@ -160,7 +211,9 @@ const WaveLeaderboardPriceFilters: React.FC<
           min={0}
           step="any"
           inputMode="decimal"
-          placeholder="0"
+          aria-label="Minimum ETH"
+          title="Minimum ETH"
+          placeholder={useLongPlaceholders ? "Minimum ETH" : "Min"}
           value={minPriceInput}
           onChange={(event) => {
             hasDraftInputEditsRef.current = true;
@@ -172,16 +225,10 @@ const WaveLeaderboardPriceFilters: React.FC<
               commitPriceRange();
             }
           }}
-          className="tw-h-10 tw-rounded-lg tw-border-0 tw-bg-black tw-px-3 tw-text-sm tw-font-semibold tw-text-iron-100 tw-ring-1 tw-ring-inset tw-ring-iron-700 placeholder:tw-text-iron-500 focus:tw-outline-none focus:tw-ring-primary-400"
+          className="tw-form-input tw-block tw-h-9 tw-w-full tw-appearance-none tw-rounded-lg tw-border-0 tw-bg-iron-900 tw-px-3 tw-text-sm tw-font-normal tw-text-iron-50 tw-caret-primary-400 tw-shadow-sm tw-ring-1 tw-ring-inset tw-ring-iron-700 tw-transition tw-duration-300 tw-ease-out [appearance:textfield] placeholder:tw-text-iron-400 hover:tw-ring-iron-600 focus:tw-bg-transparent focus:tw-outline-none focus:tw-ring-1 focus:tw-ring-inset focus:tw-ring-primary-400 [&::-webkit-inner-spin-button]:tw-appearance-none [&::-webkit-outer-spin-button]:tw-appearance-none"
         />
       </div>
-      <div className="tw-flex tw-min-w-[9rem] tw-flex-col tw-gap-y-1">
-        <label
-          htmlFor={`leaderboard-max-price-${waveId}`}
-          className="tw-text-xs tw-font-semibold tw-uppercase tw-tracking-wide tw-text-iron-500"
-        >
-          Max (ETH)
-        </label>
+      <div className="tw-min-w-[6.5rem] tw-flex-1 @[28rem]/price:tw-min-w-[8rem] @[36rem]/price:tw-min-w-[9.5rem]">
         <input
           id={`leaderboard-max-price-${waveId}`}
           data-testid="leaderboard-price-max-input"
@@ -189,7 +236,9 @@ const WaveLeaderboardPriceFilters: React.FC<
           min={0}
           step="any"
           inputMode="decimal"
-          placeholder="No max"
+          aria-label="Maximum ETH"
+          title="Maximum ETH"
+          placeholder={useLongPlaceholders ? "Maximum ETH" : "Max"}
           value={maxPriceInput}
           onChange={(event) => {
             hasDraftInputEditsRef.current = true;
@@ -201,25 +250,30 @@ const WaveLeaderboardPriceFilters: React.FC<
               commitPriceRange();
             }
           }}
-          className="tw-h-10 tw-rounded-lg tw-border-0 tw-bg-black tw-px-3 tw-text-sm tw-font-semibold tw-text-iron-100 tw-ring-1 tw-ring-inset tw-ring-iron-700 placeholder:tw-text-iron-500 focus:tw-outline-none focus:tw-ring-primary-400"
+          className="tw-form-input tw-block tw-h-9 tw-w-full tw-appearance-none tw-rounded-lg tw-border-0 tw-bg-iron-900 tw-px-3 tw-text-sm tw-font-normal tw-text-iron-50 tw-caret-primary-400 tw-shadow-sm tw-ring-1 tw-ring-inset tw-ring-iron-700 tw-transition tw-duration-300 tw-ease-out [appearance:textfield] placeholder:tw-text-iron-400 hover:tw-ring-iron-600 focus:tw-bg-transparent focus:tw-outline-none focus:tw-ring-1 focus:tw-ring-inset focus:tw-ring-primary-400 [&::-webkit-inner-spin-button]:tw-appearance-none [&::-webkit-outer-spin-button]:tw-appearance-none"
         />
       </div>
-      <button
-        type="button"
-        data-testid="leaderboard-price-clear"
-        onClick={() => {
-          setMinPriceInput("");
-          setMaxPriceInput("");
-          onFiltersCleared();
-          onPriceRangeChange?.({
-            minPrice: undefined,
-            maxPrice: undefined,
-          });
-        }}
-        className="tw-h-10 tw-rounded-lg tw-border tw-border-solid tw-border-white/10 tw-bg-white/5 tw-px-4 tw-text-xs tw-font-semibold tw-text-iron-200 tw-transition desktop-hover:hover:tw-border-white/20 desktop-hover:hover:tw-bg-white/10 desktop-hover:hover:tw-text-iron-100"
-      >
-        Clear Filters
-      </button>
+      {hasAnyPriceInput && (
+        <button
+          type="button"
+          data-testid="leaderboard-price-clear"
+          aria-label="Clear filters"
+          title="Clear filters"
+          onClick={() => {
+            setMinPriceInput("");
+            setMaxPriceInput("");
+            onFiltersCleared();
+            onPriceRangeChange?.({
+              minPrice: undefined,
+              maxPrice: undefined,
+            });
+          }}
+          className="tw-inline-flex tw-h-9 tw-w-9 tw-flex-shrink-0 tw-items-center tw-justify-center tw-rounded-lg tw-bg-transparent tw-text-iron-500 tw-transition focus:tw-outline-none focus:tw-ring-1 focus:tw-ring-inset focus:tw-ring-primary-400 desktop-hover:hover:tw-text-iron-200"
+        >
+          <XMarkIcon className="tw-h-4 tw-w-4" aria-hidden="true" />
+        </button>
+      )}
+      {trailingActions}
     </div>
   );
 };
@@ -358,6 +412,7 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
         hasActions: showCurationActions,
         actionsFullWidth: measurements.actionsFullWidth,
         actionsIconWidth: measurements.actionsIconWidth,
+        wrapEarlyThresholdPx: 20,
       }),
     [measurements, showCurationActions, showCurationGroupSelect]
   );
@@ -455,18 +510,84 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
   };
 
   const isCompactActions = layout.actionMode === "icon";
+  const shouldRenderActionsInPriceRow =
+    showCurationActions && isPriceFiltersOpen && layout.wrapActions;
+  let headerRowFlexClass = "tw-flex-wrap";
+  if (showCurationActions) {
+    if (shouldRenderActionsInPriceRow) {
+      headerRowFlexClass = "tw-flex-nowrap";
+    } else {
+      headerRowFlexClass = layout.wrapActions
+        ? "tw-flex-wrap"
+        : "tw-flex-nowrap";
+    }
+  }
+  const controlsRowBasisClass =
+    layout.wrapActions && !shouldRenderActionsInPriceRow ? "tw-basis-full" : "";
+  const showHeaderActions =
+    showCurationActions && !shouldRenderActionsInPriceRow;
+  const showDefaultCreateRow = !showCurationActions && isLoggedIn;
+  const curationActionControls = (
+    <>
+      <button
+        type="button"
+        data-testid="leaderboard-price-toggle"
+        aria-label="Toggle filters"
+        aria-expanded={isPriceFiltersOpen}
+        aria-controls={`leaderboard-price-panel-${wave.id}`}
+        onClick={onTogglePriceFilters}
+        className={`tw-inline-flex tw-h-9 tw-items-center tw-rounded-lg tw-border tw-border-solid tw-text-xs tw-font-semibold tw-transition ${
+          isCompactActions
+            ? "tw-w-9 tw-justify-center tw-px-0"
+            : "tw-gap-2 tw-px-3.5"
+        } ${
+          isPriceFiltersOpen || hasActivePriceFilters
+            ? "tw-border-white/15 tw-bg-white/10 tw-text-iron-100"
+            : "tw-border-white/10 tw-bg-iron-950 tw-text-iron-200 desktop-hover:hover:tw-border-white/15 desktop-hover:hover:tw-bg-white/5"
+        }`}
+      >
+        <AdjustmentsHorizontalIcon className="tw-size-4 tw-flex-shrink-0" />
+        {isCompactActions ? (
+          <span className="tw-sr-only">Filters</span>
+        ) : (
+          <span>Filters</span>
+        )}
+      </button>
+      {showCreateAction && (
+        <PrimaryButton
+          loading={false}
+          disabled={false}
+          onClicked={() => onCreateDrop?.()}
+          padding={isCompactActions ? "tw-px-2.5 tw-py-2" : "tw-px-3.5 tw-py-2"}
+        >
+          {isCompactActions ? (
+            <>
+              <DropModeGlyphIcon />
+              <span className="tw-sr-only">Drop Art</span>
+            </>
+          ) : (
+            <>
+              <PlusIcon className="tw-h-4 tw-w-4 tw-flex-shrink-0" />
+              <span>Drop Art</span>
+            </>
+          )}
+        </PrimaryButton>
+      )}
+    </>
+  );
 
   return (
     <div className="tw-relative tw-flex tw-flex-col tw-gap-y-4 tw-bg-black tw-@container">
       <div
         ref={headerRowRef}
-        className="tw-flex tw-flex-wrap tw-items-start tw-gap-2"
+        data-testid="leaderboard-header-row"
+        className={`tw-flex tw-items-start tw-gap-2 ${headerRowFlexClass}`}
       >
         <div
           ref={controlsRowRef}
           data-testid="leaderboard-header-controls-row"
           className={`tw-flex tw-min-w-0 tw-flex-1 tw-flex-nowrap tw-items-center tw-gap-2 ${
-            layout.wrapActions ? "tw-basis-full" : ""
+            controlsRowBasisClass
           } ${
             layout.enableControlsScroll
               ? "horizontal-menu-hide-scrollbar tw-overflow-x-auto tw-scrollbar-thin tw-scrollbar-track-transparent tw-scrollbar-thumb-iron-700/60"
@@ -535,7 +656,7 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
             </div>
           )}
         </div>
-        {showCurationActions ? (
+        {showHeaderActions && (
           <div
             data-testid="leaderboard-header-actions-row"
             data-action-mode={layout.actionMode}
@@ -544,71 +665,25 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
               layout.wrapActions ? "tw-basis-auto" : ""
             }`}
           >
-            <button
-              type="button"
-              data-testid="leaderboard-price-toggle"
-              aria-label="Toggle filters"
-              aria-expanded={isPriceFiltersOpen}
-              aria-controls={`leaderboard-price-panel-${wave.id}`}
-              onClick={onTogglePriceFilters}
-              className={`tw-inline-flex tw-h-9 tw-items-center tw-rounded-lg tw-border tw-border-solid tw-text-xs tw-font-semibold tw-transition ${
-                isCompactActions
-                  ? "tw-w-9 tw-justify-center tw-px-0"
-                  : "tw-gap-2 tw-px-3.5"
-              } ${
-                isPriceFiltersOpen || hasActivePriceFilters
-                  ? "tw-border-white/15 tw-bg-white/10 tw-text-iron-100"
-                  : "tw-border-white/10 tw-bg-iron-950 tw-text-iron-200 desktop-hover:hover:tw-border-white/15 desktop-hover:hover:tw-bg-white/5"
-              }`}
-            >
-              <AdjustmentsHorizontalIcon className="tw-size-4 tw-flex-shrink-0" />
-              {isCompactActions ? (
-                <span className="tw-sr-only">Filters</span>
-              ) : (
-                <span>Filters</span>
-              )}
-            </button>
-            {showCreateAction && (
+            {curationActionControls}
+          </div>
+        )}
+        {showDefaultCreateRow && (
+          <div
+            className={`tw-flex tw-flex-col tw-items-end ${isMemesWave ? "lg:tw-hidden" : ""}`}
+          >
+            {canCreateDrop && onCreateDrop && (
               <PrimaryButton
                 loading={false}
                 disabled={false}
-                onClicked={() => onCreateDrop?.()}
-                padding={
-                  isCompactActions ? "tw-px-2.5 tw-py-2" : "tw-px-3.5 tw-py-2"
-                }
+                onClicked={onCreateDrop}
+                padding="tw-px-3 tw-py-2"
               >
-                {isCompactActions ? (
-                  <>
-                    <DropModeGlyphIcon />
-                    <span className="tw-sr-only">Drop Art</span>
-                  </>
-                ) : (
-                  <>
-                    <PlusIcon className="tw-h-4 tw-w-4 tw-flex-shrink-0" />
-                    <span>Drop Art</span>
-                  </>
-                )}
+                <PlusIcon className="-tw-ml-1 tw-h-4 tw-w-4 tw-flex-shrink-0" />
+                <span>Drop</span>
               </PrimaryButton>
             )}
           </div>
-        ) : (
-          isLoggedIn && (
-            <div
-              className={`tw-flex tw-flex-col tw-items-end ${isMemesWave ? "lg:tw-hidden" : ""}`}
-            >
-              {canCreateDrop && onCreateDrop && (
-                <PrimaryButton
-                  loading={false}
-                  disabled={false}
-                  onClicked={onCreateDrop}
-                  padding="tw-px-3 tw-py-2"
-                >
-                  <PlusIcon className="-tw-ml-1 tw-h-4 tw-w-4 tw-flex-shrink-0" />
-                  <span>Drop</span>
-                </PrimaryButton>
-              )}
-            </div>
-          )
         )}
       </div>
 
@@ -635,6 +710,16 @@ export const WaveLeaderboardHeader: React.FC<WaveLeaderboardHeaderProps> = ({
                   setIsManualFiltersOpen(false);
                   setIsActiveFiltersCollapsed(false);
                 }}
+                trailingActions={
+                  shouldRenderActionsInPriceRow ? (
+                    <div
+                      data-testid="leaderboard-price-actions-row"
+                      className="tw-ml-auto tw-flex tw-flex-shrink-0 tw-items-center tw-gap-2"
+                    >
+                      {curationActionControls}
+                    </div>
+                  ) : undefined
+                }
               />
             </motion.div>
           )}
diff --git a/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.ts b/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.ts
index 68419293b6..bc39eb3c14 100644
--- a/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.ts
+++ b/components/waves/leaderboard/header/waveLeaderboardHeaderLayout.ts
@@ -11,10 +11,12 @@ interface ResolveWaveLeaderboardHeaderLayoutInput {
   readonly curationTabsWidth?: number | undefined;
   readonly curationDropdownWidth?: number | undefined;
   readonly hasActions: boolean;
+  readonly allowActionWrap?: boolean | undefined;
   readonly actionsFullWidth?: number | undefined;
   readonly actionsIconWidth?: number | undefined;
   readonly controlsGapWidth?: number | undefined;
   readonly actionsGapWidth?: number | undefined;
+  readonly wrapEarlyThresholdPx?: number | undefined;
 }
 
 interface WaveLeaderboardHeaderLayout {
@@ -27,6 +29,7 @@ interface WaveLeaderboardHeaderLayout {
 
 const DEFAULT_GAP_WIDTH = 8; // tw-gap-2
 const WIDTH_TOLERANCE_PX = 1;
+const DEFAULT_WRAP_EARLY_THRESHOLD_PX = 20;
 
 const isValidWidth = (value: number): boolean =>
   Number.isFinite(value) && value > 0;
@@ -39,6 +42,14 @@ const normalizeGapWidth = (value: number | undefined): number => {
   return Math.max(0, value);
 };
 
+const normalizeWrapEarlyThreshold = (value: number | undefined): number => {
+  if (value === undefined || !Number.isFinite(value)) {
+    return DEFAULT_WRAP_EARLY_THRESHOLD_PX;
+  }
+
+  return Math.max(0, value);
+};
+
 const getDropdownControlsWidth = ({
   viewModesWidth,
   sortDropdownWidth,
@@ -73,8 +84,12 @@ const getDropdownControlsWidth = ({
   );
 };
 
-const fits = (availableWidth: number, requiredWidth: number): boolean =>
-  requiredWidth <= availableWidth + WIDTH_TOLERANCE_PX;
+const fits = (
+  availableWidth: number,
+  requiredWidth: number,
+  wrapEarlyThresholdPx: number
+): boolean =>
+  requiredWidth + wrapEarlyThresholdPx <= availableWidth + WIDTH_TOLERANCE_PX;
 
 export function resolveWaveLeaderboardHeaderLayout({
   rowWidth,
@@ -85,13 +100,17 @@ export function resolveWaveLeaderboardHeaderLayout({
   curationTabsWidth = 0,
   curationDropdownWidth = 0,
   hasActions,
+  allowActionWrap = true,
   actionsFullWidth = 0,
   actionsIconWidth = 0,
   controlsGapWidth,
   actionsGapWidth,
+  wrapEarlyThresholdPx,
 }: ResolveWaveLeaderboardHeaderLayoutInput): WaveLeaderboardHeaderLayout {
   const safeControlsGapWidth = normalizeGapWidth(controlsGapWidth);
   const safeActionsGapWidth = normalizeGapWidth(actionsGapWidth);
+  const safeWrapEarlyThresholdPx =
+    normalizeWrapEarlyThreshold(wrapEarlyThresholdPx);
 
   const defaultControls = resolveWaveLeaderboardHeaderControlModes({
     availableWidth: rowWidth,
@@ -140,17 +159,19 @@ export function resolveWaveLeaderboardHeaderLayout({
     minimumControlsWidth + safeActionsGapWidth + actionsFullWidth;
   const requiredWidthWithIconActions =
     minimumControlsWidth + safeActionsGapWidth + actionsIconWidth;
+  const fitsFull = fits(
+    rowWidth,
+    requiredWidthWithFullActions,
+    safeWrapEarlyThresholdPx
+  );
+  const fitsIcon = fits(
+    rowWidth,
+    requiredWidthWithIconActions,
+    safeWrapEarlyThresholdPx
+  );
 
-  if (fits(rowWidth, requiredWidthWithFullActions)) {
-    actionMode = "full";
-    wrapActions = false;
-  } else if (fits(rowWidth, requiredWidthWithIconActions)) {
-    actionMode = "icon";
-    wrapActions = false;
-  } else {
-    actionMode = "icon";
-    wrapActions = true;
-  }
+  actionMode = fitsFull ? "full" : "icon";
+  wrapActions = !fitsFull && !fitsIcon && allowActionWrap;
 
   const actionWidth =
     actionMode === "full" ? actionsFullWidth : actionsIconWidth;

From ec74d8569013556ed695114689acfb8a7d057db7 Mon Sep 17 00:00:00 2001
From: Simo <simo@6529.io>
Date: Tue, 3 Mar 2026 15:14:09 -0400
Subject: [PATCH 7/7] wip

Signed-off-by: Simo <simo@6529.io>
---
 .../useWaveDropsLeaderboard.extra.test.ts     | 36 +++++++-
 .../header/WaveleaderboardHeader.tsx          |  2 +-
 hooks/useWaveDropsLeaderboard.ts              | 89 ++++++++++---------
 3 files changed, 79 insertions(+), 48 deletions(-)

diff --git a/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts b/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
index 4a8bfcc499..00fc9d85b1 100644
--- a/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
+++ b/__tests__/hooks/useWaveDropsLeaderboard.extra.test.ts
@@ -97,8 +97,8 @@ describe("useWaveDropsLeaderboard extra", () => {
     const call = (queryClientMock.prefetchInfiniteQuery as jest.Mock).mock
       .calls[0][0];
     expect(call.queryKey[1].curated_by_group).toBe("curation-group-1");
-    expect(call.queryKey[1].min_price).toBe(0.5);
-    expect(call.queryKey[1].max_price).toBe(2.75);
+    expect(call.queryKey[1].min_price).toBe("0.5");
+    expect(call.queryKey[1].max_price).toBe("2.75");
     expect(call.queryKey[1].price_currency).toBe("ETH");
 
     await call.queryFn({ pageParam: null });
@@ -117,7 +117,7 @@ describe("useWaveDropsLeaderboard extra", () => {
     );
   });
 
-  it("swaps inverted min and max price bounds before request params", async () => {
+  it("swaps inverted min and max price bounds for query key and request params", async () => {
     renderHook(() =>
       useWaveDropsLeaderboard({
         waveId: "2",
@@ -130,6 +130,9 @@ describe("useWaveDropsLeaderboard extra", () => {
 
     const call = (queryClientMock.prefetchInfiniteQuery as jest.Mock).mock
       .calls[0][0];
+    expect(call.queryKey[1].min_price).toBe("0.5");
+    expect(call.queryKey[1].max_price).toBe("2.75");
+
     await call.queryFn({ pageParam: null });
 
     expect(commonApiFetch).toHaveBeenCalledWith(
@@ -144,4 +147,31 @@ describe("useWaveDropsLeaderboard extra", () => {
       })
     );
   });
+
+  it("normalizes whitespace-only currency to null in key and omits request param", async () => {
+    renderHook(() =>
+      useWaveDropsLeaderboard({
+        waveId: "2",
+        minPrice: 0.5,
+        maxPrice: 2.75,
+        priceCurrency: "   ",
+        sort: WaveDropsLeaderboardSort.PRICE,
+      })
+    );
+
+    const call = (queryClientMock.prefetchInfiniteQuery as jest.Mock).mock
+      .calls[0][0];
+    expect(call.queryKey[1].price_currency).toBeNull();
+
+    await call.queryFn({ pageParam: null });
+
+    expect(commonApiFetch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        endpoint: "waves/2/leaderboard",
+        params: expect.not.objectContaining({
+          price_currency: expect.any(String),
+        }),
+      })
+    );
+  });
 });
diff --git a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
index eb8c100a91..c967581f84 100644
--- a/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
+++ b/components/waves/leaderboard/header/WaveleaderboardHeader.tsx
@@ -268,7 +268,7 @@ const WaveLeaderboardPriceFilters: React.FC<
               maxPrice: undefined,
             });
           }}
-          className="tw-inline-flex tw-h-9 tw-w-9 tw-flex-shrink-0 tw-items-center tw-justify-center tw-rounded-lg tw-bg-transparent tw-text-iron-500 tw-transition focus:tw-outline-none focus:tw-ring-1 focus:tw-ring-inset focus:tw-ring-primary-400 desktop-hover:hover:tw-text-iron-200"
+          className="tw-inline-flex tw-h-9 tw-w-9 tw-flex-shrink-0 tw-items-center tw-justify-center tw-rounded-lg tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950 tw-text-iron-300 tw-transition tw-duration-300 tw-ease-out focus-visible:tw-outline focus-visible:tw-outline-2 focus-visible:tw-outline-offset-2 focus-visible:tw-outline-primary-400 desktop-hover:hover:tw-border-white/15 desktop-hover:hover:tw-bg-white/5 desktop-hover:hover:tw-text-iron-100"
         >
           <XMarkIcon className="tw-h-4 tw-w-4" aria-hidden="true" />
         </button>
diff --git a/hooks/useWaveDropsLeaderboard.ts b/hooks/useWaveDropsLeaderboard.ts
index e32fe0c6cc..9145eea6ce 100644
--- a/hooks/useWaveDropsLeaderboard.ts
+++ b/hooks/useWaveDropsLeaderboard.ts
@@ -90,24 +90,41 @@ export function useWaveDropsLeaderboard({
     () => curatedByGroupId?.trim() ?? undefined,
     [curatedByGroupId]
   );
-  const normalizedMinPrice = useMemo(
-    () =>
+  const canonicalPriceFilters = useMemo(() => {
+    const normalizedPriceCurrency = priceCurrency?.trim() ?? undefined;
+    const normalizedMinPrice =
       typeof minPrice === "number" && Number.isFinite(minPrice) && minPrice >= 0
         ? minPrice
-        : undefined,
-    [minPrice]
-  );
-  const normalizedMaxPrice = useMemo(
-    () =>
+        : undefined;
+    const normalizedMaxPrice =
       typeof maxPrice === "number" && Number.isFinite(maxPrice) && maxPrice >= 0
         ? maxPrice
-        : undefined,
-    [maxPrice]
-  );
-  const normalizedPriceCurrency = useMemo(
-    () => priceCurrency?.trim() ?? undefined,
-    [priceCurrency]
-  );
+        : undefined;
+
+    let normalizedPriceLower = normalizedMinPrice;
+    let normalizedPriceUpper = normalizedMaxPrice;
+
+    if (
+      typeof normalizedPriceLower === "number" &&
+      typeof normalizedPriceUpper === "number" &&
+      normalizedPriceLower > normalizedPriceUpper
+    ) {
+      normalizedPriceLower = normalizedMaxPrice;
+      normalizedPriceUpper = normalizedMinPrice;
+    }
+
+    return {
+      normalizedPriceCurrency,
+      normalizedPriceLower:
+        typeof normalizedPriceLower === "number"
+          ? normalizedPriceLower.toString()
+          : undefined,
+      normalizedPriceUpper:
+        typeof normalizedPriceUpper === "number"
+          ? normalizedPriceUpper.toString()
+          : undefined,
+    };
+  }, [maxPrice, minPrice, priceCurrency]);
 
   const queryKey = useMemo(
     () =>
@@ -119,9 +136,9 @@ export function useWaveDropsLeaderboard({
           sort,
           sort_direction: sortDirection,
           curated_by_group: normalizedCuratedByGroupId ?? null,
-          min_price: normalizedMinPrice ?? null,
-          max_price: normalizedMaxPrice ?? null,
-          price_currency: normalizedPriceCurrency ?? null,
+          min_price: canonicalPriceFilters.normalizedPriceLower ?? null,
+          max_price: canonicalPriceFilters.normalizedPriceUpper ?? null,
+          price_currency: canonicalPriceFilters.normalizedPriceCurrency ?? null,
         },
       ] as const,
     [
@@ -129,9 +146,9 @@ export function useWaveDropsLeaderboard({
       sort,
       sortDirection,
       normalizedCuratedByGroupId,
-      normalizedMinPrice,
-      normalizedMaxPrice,
-      normalizedPriceCurrency,
+      canonicalPriceFilters.normalizedPriceLower,
+      canonicalPriceFilters.normalizedPriceUpper,
+      canonicalPriceFilters.normalizedPriceCurrency,
     ]
   );
 
@@ -163,36 +180,20 @@ export function useWaveDropsLeaderboard({
       if (normalizedCuratedByGroupId) {
         params["curated_by_group"] = normalizedCuratedByGroupId;
       }
-      let effectiveMinPrice = normalizedMinPrice;
-      let effectiveMaxPrice = normalizedMaxPrice;
-
-      if (
-        typeof normalizedMinPrice === "number" &&
-        typeof normalizedMaxPrice === "number" &&
-        normalizedMinPrice > normalizedMaxPrice
-      ) {
-        effectiveMinPrice = normalizedMaxPrice;
-        effectiveMaxPrice = normalizedMinPrice;
-      }
-
-      if (typeof effectiveMinPrice === "number") {
-        params["min_price"] = effectiveMinPrice.toString();
+      if (canonicalPriceFilters.normalizedPriceLower) {
+        params["min_price"] = canonicalPriceFilters.normalizedPriceLower;
       }
-      if (typeof effectiveMaxPrice === "number") {
-        params["max_price"] = effectiveMaxPrice.toString();
+      if (canonicalPriceFilters.normalizedPriceUpper) {
+        params["max_price"] = canonicalPriceFilters.normalizedPriceUpper;
       }
-      if (normalizedPriceCurrency) {
-        params["price_currency"] = normalizedPriceCurrency;
+      if (canonicalPriceFilters.normalizedPriceCurrency) {
+        params["price_currency"] =
+          canonicalPriceFilters.normalizedPriceCurrency;
       }
 
       return params;
     },
-    [
-      normalizedCuratedByGroupId,
-      normalizedMaxPrice,
-      normalizedMinPrice,
-      normalizedPriceCurrency,
-    ]
+    [normalizedCuratedByGroupId, canonicalPriceFilters]
   );
 
   const fetchLeaderboardPage = useCallback(