diff --git a/__tests__/components/shared/WavesMessagesWrapper.test.tsx b/__tests__/components/shared/WavesMessagesWrapper.test.tsx
new file mode 100644
index 0000000000..4a89749890
--- /dev/null
+++ b/__tests__/components/shared/WavesMessagesWrapper.test.tsx
@@ -0,0 +1,143 @@
+import WavesMessagesWrapper from "@/components/shared/WavesMessagesWrapper";
+import { render, screen } from "@testing-library/react";
+import React from "react";
+
+let mockBreakpoint = "LG";
+let mockWaveId: string | null = null;
+
+const mockChildMounted = jest.fn();
+const mockCloseRightSidebar = jest.fn();
+const mockRouterReplace = jest.fn();
+const mockUseQuery = jest.fn();
+
+jest.mock("react-use", () => ({
+  createBreakpoint: () => () => mockBreakpoint,
+}));
+
+jest.mock("next/navigation", () => ({
+  usePathname: () => "/waves",
+  useRouter: () => ({ replace: mockRouterReplace }),
+  useSearchParams: () => new URLSearchParams(),
+}));
+
+jest.mock("@/helpers/navigation.helpers", () => ({
+  getActiveWaveIdFromUrl: () => mockWaveId,
+}));
+
+jest.mock("@tanstack/react-query", () => ({
+  keepPreviousData: (value: unknown) => value,
+  useQuery: (options: unknown) => mockUseQuery(options),
+}));
+
+jest.mock("@/hooks/useSidebarState", () => ({
+  useSidebarState: () => ({
+    closeRightSidebar: mockCloseRightSidebar,
+    isRightSidebarOpen: false,
+  }),
+}));
+
+jest.mock("@/hooks/useCreateModalState", () => ({
+  __esModule: true,
+  default: () => ({
+    close: jest.fn(),
+    isWaveModalOpen: false,
+  }),
+}));
+
+jest.mock("@/hooks/useClosingDropId", () => ({
+  useClosingDropId: () => ({
+    beginClosingDrop: jest.fn(),
+    effectiveDropId: undefined,
+  }),
+}));
+
+jest.mock("@/components/auth/Auth", () => ({
+  useAuth: () => ({ connectedProfile: null }),
+}));
+
+jest.mock("@/components/brain/my-stream/layout/LayoutContext", () => ({
+  useLayout: () => ({ contentContainerStyle: {} }),
+}));
+
+jest.mock("@/contexts/wave/WaveChatScrollContext", () => ({
+  WaveChatScrollProvider: ({
+    children,
+  }: {
+    readonly children: React.ReactNode;
+  }) => <>{children}</>,
+}));
+
+jest.mock("@/components/brain/left-sidebar/web/WebLeftSidebar", () => ({
+  __esModule: true,
+  default: () => <div data-testid="left-sidebar" />,
+}));
+
+jest.mock("@/components/brain/right-sidebar/BrainRightSidebar", () => ({
+  __esModule: true,
+  SidebarTab: { ABOUT: "ABOUT" },
+  default: () => <div data-testid="right-sidebar" />,
+}));
+
+jest.mock("@/components/brain/BrainDesktopDrop", () => ({
+  __esModule: true,
+  default: () => <div data-testid="drop-overlay" />,
+}));
+
+jest.mock("@/components/waves/create-wave/CreateWaveModal", () => ({
+  __esModule: true,
+  default: () => <div data-testid="create-wave-modal" />,
+}));
+
+function MainContentProbe() {
+  mockChildMounted();
+  return <div data-testid="main-content">Main content</div>;
+}
+
+function renderWrapper() {
+  return render(
+    <WavesMessagesWrapper>
+      <MainContentProbe />
+    </WavesMessagesWrapper>
+  );
+}
+
+describe("WavesMessagesWrapper", () => {
+  beforeEach(() => {
+    mockBreakpoint = "LG";
+    mockWaveId = null;
+    jest.clearAllMocks();
+    mockUseQuery.mockReturnValue({ data: undefined, error: null });
+  });
+
+  it("renders no-wave main content on desktop", () => {
+    mockBreakpoint = "LG";
+    mockWaveId = null;
+
+    renderWrapper();
+
+    expect(screen.getByTestId("main-content")).toBeInTheDocument();
+    expect(mockChildMounted).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not mount no-wave main content on small screens", () => {
+    mockBreakpoint = "S";
+    mockWaveId = null;
+
+    renderWrapper();
+
+    expect(screen.queryByTestId("main-content")).not.toBeInTheDocument();
+    expect(screen.getByTestId("left-sidebar")).toBeInTheDocument();
+    expect(mockChildMounted).not.toHaveBeenCalled();
+  });
+
+  it("renders selected wave main content on small screens", () => {
+    mockBreakpoint = "S";
+    mockWaveId = "wave-1";
+
+    renderWrapper();
+
+    expect(screen.getByTestId("main-content")).toBeInTheDocument();
+    expect(screen.queryByTestId("left-sidebar")).not.toBeInTheDocument();
+    expect(mockChildMounted).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/__tests__/components/waves/WavesLayout.test.tsx b/__tests__/components/waves/WavesLayout.test.tsx
index 5dd7f9a342..c1890481dd 100644
--- a/__tests__/components/waves/WavesLayout.test.tsx
+++ b/__tests__/components/waves/WavesLayout.test.tsx
@@ -4,9 +4,6 @@ import React from "react";
 
 const mockUseAuthenticatedContent = jest.fn();
 const mockUseDeviceInfo = jest.fn();
-const mockGetActiveWaveIdFromUrl = jest.fn();
-const mockUsePathname = jest.fn();
-const mockUseSearchParams = jest.fn();
 
 jest.mock("../../../hooks/useAuthenticatedContent", () => ({
   useAuthenticatedContent: () => mockUseAuthenticatedContent(),
@@ -17,16 +14,6 @@ jest.mock("../../../hooks/useDeviceInfo", () => ({
   default: () => mockUseDeviceInfo(),
 }));
 
-jest.mock("next/navigation", () => ({
-  usePathname: () => mockUsePathname(),
-  useSearchParams: () => mockUseSearchParams(),
-}));
-
-jest.mock("../../../helpers/navigation.helpers", () => ({
-  getActiveWaveIdFromUrl: (...args: unknown[]) =>
-    mockGetActiveWaveIdFromUrl(...args),
-}));
-
 jest.mock("@/components/waves/WavesDesktop", () => ({
   __esModule: true,
   default: ({
@@ -57,51 +44,20 @@ jest.mock("@/components/common/ConnectWallet", () => ({
   default: () => <div data-testid="connect-wallet">Connect Wallet</div>,
 }));
 
-jest.mock("@/components/header/user/HeaderUserConnect", () => ({
-  __esModule: true,
-  default: ({ label }: { readonly label?: string }) => (
-    <button type="button">{label ?? "Connect Wallet"}</button>
-  ),
-}));
-
 jest.mock("@/components/user/utils/set-up-profile/UserSetUpProfileCta", () => ({
   __esModule: true,
   default: () => <div data-testid="setup-profile">Set up profile</div>,
 }));
 
-jest.mock("@/components/waves/WaveScreenMessage", () => ({
-  __esModule: true,
-  default: ({
-    action,
-    description,
-    title,
-  }: {
-    readonly action?: React.ReactNode;
-    readonly description?: string;
-    readonly title: string;
-  }) => (
-    <div data-testid="wave-screen-message">
-      <h1>{title}</h1>
-      {description ? <p>{description}</p> : null}
-      {action}
-    </div>
-  ),
-}));
-
 describe("WavesLayout", () => {
   beforeEach(() => {
     mockUseAuthenticatedContent.mockReturnValue({
       contentState: "not-authenticated",
     });
     mockUseDeviceInfo.mockReturnValue({ isApp: false, isMobileDevice: false });
-    mockUsePathname.mockReturnValue("/waves/test-wave");
-    mockUseSearchParams.mockReturnValue(new URLSearchParams("wave=test-wave"));
-    mockGetActiveWaveIdFromUrl.mockReturnValue(null);
   });
 
   it("renders the selected wave content for logged-out users", () => {
-    mockGetActiveWaveIdFromUrl.mockReturnValue("test-wave");
-
     render(
       <WavesLayout>
         <div data-testid="wave-content">Real wave content</div>
@@ -110,32 +66,19 @@ describe("WavesLayout", () => {
 
     expect(screen.getByTestId("wave-content")).toBeInTheDocument();
     expect(screen.getByTestId("waves-desktop")).toHaveAttribute(
-      "data-allow-drop-overlay",
-      "false"
+      "data-show-left-sidebar",
+      "true"
     );
-    expect(screen.getByTestId("waves-desktop")).toHaveAttribute(
-      "data-allow-right-sidebar",
-      "false"
-    );
-    expect(screen.queryByTestId("wave-screen-message")).not.toBeInTheDocument();
   });
 
-  it("keeps the select-wave prompt when no wave is selected", () => {
+  it("renders the default waves content for logged-out web users when no wave is selected", () => {
     render(
       <WavesLayout>
         <div data-testid="wave-content">Real wave content</div>
       </WavesLayout>
     );
 
-    expect(screen.getByText("Select a Wave")).toBeInTheDocument();
-    expect(
-      screen.getByText(
-        "Connect your wallet to access waves and join the conversation."
-      )
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole("button", { name: "Connect Wallet" })
-    ).toBeInTheDocument();
-    expect(screen.queryByTestId("wave-content")).not.toBeInTheDocument();
+    expect(screen.getByTestId("wave-content")).toBeInTheDocument();
+    expect(screen.queryByTestId("connect-wallet")).not.toBeInTheDocument();
   });
 });
diff --git a/__tests__/hooks/useCommunityCurationsDrops.test.ts b/__tests__/hooks/useCommunityCurationsDrops.test.ts
new file mode 100644
index 0000000000..81e653d57d
--- /dev/null
+++ b/__tests__/hooks/useCommunityCurationsDrops.test.ts
@@ -0,0 +1,141 @@
+import { renderHook } from "@testing-library/react";
+import type { ApiCuratedProfileWaveDropsPage } from "@/generated/models/ApiCuratedProfileWaveDropsPage";
+import type { ApiDrop } from "@/generated/models/ApiDrop";
+import { useCommunityCurationsDrops } from "@/hooks/useCommunityCurationsDrops";
+import { commonApiFetch } from "@/services/api/common-api";
+
+type InfiniteQueryOptions = {
+  readonly queryFn: (context: {
+    readonly pageParam: number;
+  }) => Promise<unknown>;
+  readonly getNextPageParam: (
+    lastPage: ApiCuratedProfileWaveDropsPage
+  ) => number | undefined;
+  readonly enabled?: boolean;
+  readonly initialPageParam?: number;
+  readonly queryKey?: unknown;
+};
+
+const mockUseInfiniteQuery = jest.fn();
+
+jest.mock("@tanstack/react-query", () => ({
+  useInfiniteQuery: (options: InfiniteQueryOptions) =>
+    mockUseInfiniteQuery(options),
+}));
+
+jest.mock("@/services/api/common-api", () => ({
+  commonApiFetch: jest.fn(),
+}));
+
+const commonApiFetchMock = commonApiFetch as jest.MockedFunction<
+  typeof commonApiFetch
+>;
+
+const getDefaultQueryResult = (
+  pages: ApiCuratedProfileWaveDropsPage[] | undefined = undefined
+) => ({
+  data: pages ? { pages } : undefined,
+  fetchNextPage: jest.fn(),
+  hasNextPage: false,
+  isError: false,
+  isFetchingNextPage: false,
+  isLoading: false,
+});
+
+const buildDrop = ({
+  id,
+  mimeType,
+}: {
+  readonly id: string;
+  readonly mimeType?: string | undefined;
+}): ApiDrop =>
+  ({
+    id,
+    metadata: [],
+    nft_links: [],
+    parts: mimeType
+      ? [
+          {
+            media: [{ mime_type: mimeType }],
+          },
+        ]
+      : [],
+  }) as unknown as ApiDrop;
+
+describe("useCommunityCurationsDrops", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseInfiniteQuery.mockReturnValue(getDefaultQueryResult());
+  });
+
+  it("fetches curated profile wave drops with page pagination", async () => {
+    let queryOptions: InfiniteQueryOptions | null = null;
+    mockUseInfiniteQuery.mockImplementation((options: InfiniteQueryOptions) => {
+      queryOptions = options;
+      return getDefaultQueryResult();
+    });
+
+    renderHook(() => useCommunityCurationsDrops({ limit: 12 }));
+
+    expect(queryOptions).not.toBeNull();
+    expect(queryOptions?.initialPageParam).toBe(1);
+
+    await queryOptions?.queryFn({ pageParam: 2 });
+
+    expect(commonApiFetchMock).toHaveBeenCalledWith({
+      endpoint: "curated-profile-wave-drops",
+      params: {
+        page: "2",
+        page_size: "12",
+      },
+    });
+    expect(
+      queryOptions?.getNextPageParam({
+        data: [],
+        page: 2,
+        next: true,
+      })
+    ).toBe(3);
+    expect(
+      queryOptions?.getNextPageParam({
+        data: [],
+        page: 2,
+        next: false,
+      })
+    ).toBeUndefined();
+  });
+
+  it("dedupes loaded drops and keeps existing media filtering", () => {
+    const imageDrop = buildDrop({ id: "image-drop", mimeType: "image/png" });
+    const videoDrop = buildDrop({ id: "video-drop", mimeType: "video/mp4" });
+    const duplicateVideoDrop = buildDrop({
+      id: "video-drop",
+      mimeType: "video/mp4",
+    });
+
+    mockUseInfiniteQuery.mockReturnValue(
+      getDefaultQueryResult([
+        {
+          data: [imageDrop, videoDrop],
+          page: 1,
+          next: true,
+        },
+        {
+          data: [duplicateVideoDrop],
+          page: 2,
+          next: false,
+        },
+      ])
+    );
+
+    const { result } = renderHook(() =>
+      useCommunityCurationsDrops({ limit: 12, mediaFilter: "video" })
+    );
+
+    expect(result.current.allDrops.map((drop) => drop.id)).toEqual([
+      "image-drop",
+      "video-drop",
+    ]);
+    expect(result.current.drops.map((drop) => drop.id)).toEqual(["video-drop"]);
+  });
+});
diff --git a/app/[user]/_lib/userTabPageFactory.tsx b/app/[user]/_lib/userTabPageFactory.tsx
index 28624f5617..64c3f92fc0 100644
--- a/app/[user]/_lib/userTabPageFactory.tsx
+++ b/app/[user]/_lib/userTabPageFactory.tsx
@@ -1,7 +1,7 @@
 import { TransferProvider } from "@/components/nft-transfer/TransferState";
 import { getAppMetadata } from "@/components/providers/metadata";
 import UserPageLayout from "@/components/user/layout/UserPageLayout";
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 import { getMetadataForUserPage } from "@/helpers/Helpers";
 import { getAppCommonHeaders } from "@/helpers/server.app.helpers";
 import {
diff --git a/components/brain/content/BrainContent.tsx b/components/brain/content/BrainContent.tsx
index 6cc10c944c..48f5fe0072 100644
--- a/components/brain/content/BrainContent.tsx
+++ b/components/brain/content/BrainContent.tsx
@@ -59,18 +59,17 @@ const BrainContent: React.FC<BrainContentProps> = ({
   const shouldShowPinnedWaves = showPinnedWaves && breakpoint === "S" && isApp;
 
   return (
-    <div className="tw-relative tw-flex tw-flex-col tw-h-full">
+    <div className="tw-relative tw-flex tw-h-full tw-min-h-0 tw-flex-col">
       {showPinnedWaves && (
         <div
           ref={setPinnedRef}
-          className="tw-sticky tw-top-0 tw-z-10 tw-bg-iron-950 tw-px-2 sm:tw-px-4 md:tw-px-6 lg:tw-px-0 lg:tw-hidden">
+          className="tw-sticky tw-top-0 tw-z-10 tw-bg-iron-950 tw-px-2 sm:tw-px-4 md:tw-px-6 lg:tw-hidden lg:tw-px-0"
+        >
           {shouldShowPinnedWaves && <BrainContentPinnedWaves />}
         </div>
       )}
-      <div className="tw-flex-1 tw-overflow-hidden">
-        <div className="tw-h-full">
-          {children}
-        </div>
+      <div className="tw-min-h-0 tw-flex-1 tw-overflow-hidden">
+        <div className="tw-h-full tw-min-h-0">{children}</div>
       </div>
       {activeDrop && (
         <div className="tw-sticky tw-bottom-0 tw-z-[80] tw-bg-black tw-px-2 sm:tw-px-4 md:tw-px-6 lg:tw-px-0">
diff --git a/components/brain/left-sidebar/waves/MemesWaveFooter.tsx b/components/brain/left-sidebar/waves/MemesWaveFooter.tsx
index cdb0f079d3..14ced1e782 100644
--- a/components/brain/left-sidebar/waves/MemesWaveFooter.tsx
+++ b/components/brain/left-sidebar/waves/MemesWaveFooter.tsx
@@ -43,7 +43,7 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
           leftThisRoundCount
         )}, ${formatMemesQuickVoteUnratedText(unratedCount)}`
       : "Quick vote";
-  const buttonTitle = isReady ? "Uncast votes" : "Quick vote";
+  const buttonTitle = isReady ? "Uncast Power" : "Quick vote";
   const votingPowerLabel = votingLabel ? ` ${votingLabel}` : " votes";
   const buttonValue =
     isReady && typeof uncastPower === "number"
@@ -76,7 +76,7 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
           transition={revealTransition}
           className={
             collapsed
-              ? "tw-z-10 tw-flex tw-flex-shrink-0 tw-justify-center tw-px-2 tw-pb-2 tw-pt-1"
+              ? "tw-z-10 tw-flex tw-flex-shrink-0 tw-justify-center tw-gap-2 tw-px-2 tw-pb-2 tw-pt-1"
               : "tw-relative tw-z-20 tw-mt-auto tw-flex-shrink-0"
           }
         >
@@ -89,46 +89,50 @@ const MemesWaveFooter: React.FC<MemesWaveFooterProps> = ({
               unratedCount={unratedCount}
             />
           ) : (
-            <button
-              type="button"
-              aria-label={buttonAriaLabel}
-              onClick={handleOpenQuickVote}
-              onFocus={handlePrefetchQuickVote}
-              onMouseEnter={handlePrefetchQuickVote}
-              className="tw-group tw-mt-auto tw-w-full tw-flex-shrink-0 tw-cursor-pointer tw-border-0 tw-border-t tw-border-solid tw-border-iron-800/60 tw-bg-black tw-p-4 tw-text-left tw-transition-colors desktop-hover:hover:tw-bg-iron-900/40"
-            >
-              <div className="tw-relative tw-flex tw-items-center tw-justify-between tw-gap-4 tw-overflow-hidden tw-rounded-xl tw-border tw-border-solid tw-border-[#2d3753] tw-bg-[#0c1018] tw-px-4 tw-py-2.5 tw-shadow-lg tw-transition-all tw-duration-200 desktop-hover:group-hover:tw-border-[#3a4670] desktop-hover:group-hover:tw-bg-[#0f1420]">
-                <span
-                  aria-hidden="true"
-                  className="tw-pointer-events-none tw-absolute tw-inset-0 -tw-translate-x-full tw-bg-gradient-to-r tw-from-white/0 tw-via-white/[0.08] tw-to-white/0 tw-opacity-50 tw-transition-transform tw-duration-1000 tw-ease-out desktop-hover:group-hover:tw-translate-x-full"
-                />
-                <div className="tw-relative tw-z-10 tw-flex tw-min-w-0 tw-flex-col tw-gap-1.5">
-                  <span className="tw-text-[10px] tw-font-bold tw-uppercase tw-tracking-widest tw-text-[#6b7c93]">
-                    {buttonTitle}
-                  </span>
+            <div className="tw-mt-auto tw-w-full tw-flex-shrink-0 tw-border-0 tw-border-t tw-border-solid tw-border-iron-800/60 tw-bg-black tw-p-4">
+              <div className="tw-flex tw-items-stretch tw-gap-2">
+                <button
+                  type="button"
+                  aria-label={buttonAriaLabel}
+                  onClick={handleOpenQuickVote}
+                  onFocus={handlePrefetchQuickVote}
+                  onMouseEnter={handlePrefetchQuickVote}
+                  className="tw-group tw-min-w-0 tw-flex-1 tw-cursor-pointer tw-border-0 tw-bg-transparent tw-p-0 tw-text-left"
+                >
+                  <div className="tw-relative tw-flex tw-h-full tw-items-center tw-justify-between tw-gap-4 tw-overflow-hidden tw-rounded-xl tw-border tw-border-solid tw-border-[#2d3753] tw-bg-[#0c1018] tw-px-4 tw-py-2.5 tw-shadow-lg tw-transition-all tw-duration-200 desktop-hover:group-hover:tw-border-[#3a4670] desktop-hover:group-hover:tw-bg-[#0f1420]">
+                    <span
+                      aria-hidden="true"
+                      className="tw-pointer-events-none tw-absolute tw-inset-0 -tw-translate-x-full tw-bg-gradient-to-r tw-from-white/0 tw-via-white/[0.08] tw-to-white/0 tw-opacity-50 tw-transition-transform tw-duration-1000 tw-ease-out desktop-hover:group-hover:tw-translate-x-full"
+                    />
+                    <div className="tw-relative tw-z-10 tw-flex tw-min-w-0 tw-flex-col tw-gap-1.5">
+                      <span className="tw-whitespace-nowrap tw-text-[10px] tw-font-bold tw-uppercase tw-tracking-widest tw-text-[#6b7c93]">
+                        {buttonTitle}
+                      </span>
 
-                  <div className="tw-flex tw-items-center tw-gap-2">
-                    <MemesWaveZapIcon className="tw-size-4 tw-flex-shrink-0 tw-fill-primary-400/20 tw-text-primary-400" />
-                    <span className="tw-truncate tw-text-sm tw-font-semibold tw-tracking-tight tw-text-white">
-                      {buttonValue}
-                    </span>
-                  </div>
-                </div>
+                      <div className="tw-flex tw-items-center tw-gap-2">
+                        <MemesWaveZapIcon className="tw-size-4 tw-flex-shrink-0 tw-fill-primary-400/20 tw-text-primary-400" />
+                        <span className="tw-truncate tw-text-sm tw-font-semibold tw-tracking-tight tw-text-white">
+                          {buttonValue}
+                        </span>
+                      </div>
+                    </div>
 
-                {isReady && (
-                  <div className="tw-relative tw-z-10 tw-flex tw-flex-col tw-items-end tw-gap-0.5 tw-text-right">
-                    <span className="tw-text-xs tw-font-semibold tw-text-[#8199ea] tw-shadow-sm">
-                      {formatMemesQuickVoteLeftThisRoundText(
-                        leftThisRoundCount
-                      )}
-                    </span>
-                    <span className="tw-text-[11px] tw-font-medium tw-text-[#6b7c93]">
-                      {formatMemesQuickVoteUnratedText(unratedCount)}
-                    </span>
+                    {isReady && (
+                      <div className="tw-relative tw-z-10 tw-flex tw-flex-col tw-items-end tw-gap-0.5 tw-text-right">
+                        <span className="tw-text-xs tw-font-semibold tw-text-[#8199ea] tw-shadow-sm">
+                          {formatMemesQuickVoteLeftThisRoundText(
+                            leftThisRoundCount
+                          )}
+                        </span>
+                        <span className="tw-text-[11px] tw-font-medium tw-text-[#6b7c93]">
+                          {formatMemesQuickVoteUnratedText(unratedCount)}
+                        </span>
+                      </div>
+                    )}
                   </div>
-                )}
+                </button>
               </div>
-            </button>
+            </div>
           )}
         </motion.div>
       )}
diff --git a/components/brain/my-stream/MyStreamWaveContent.tsx b/components/brain/my-stream/MyStreamWaveContent.tsx
index c69a436714..6240a61939 100644
--- a/components/brain/my-stream/MyStreamWaveContent.tsx
+++ b/components/brain/my-stream/MyStreamWaveContent.tsx
@@ -181,7 +181,7 @@ const MyStreamWaveContent: React.FC<MyStreamWaveProps> = ({ waveId }) => {
 
   return (
     <div
-      className="tailwind-scope tw-relative tw-flex tw-h-full tw-min-w-0 tw-flex-col"
+      className="tailwind-scope tw-relative tw-flex tw-h-full tw-min-h-0 tw-min-w-0 tw-flex-col"
       key={stableWaveKey}
     >
       {/* Always render tab container (hidden on app inside MyStreamWaveTabs) */}
@@ -195,7 +195,7 @@ const MyStreamWaveContent: React.FC<MyStreamWaveProps> = ({ waveId }) => {
       />
 
       <div
-        className="tw-relative tw-min-w-0 tw-flex-grow tw-overflow-hidden"
+        className="tw-relative tw-min-h-0 tw-min-w-0 tw-flex-grow tw-overflow-hidden"
         role="tabpanel"
         id={
           activeCurationId
diff --git a/components/brain/right-sidebar/WaveContent.tsx b/components/brain/right-sidebar/WaveContent.tsx
index 05683a01f2..d1cfb4147d 100644
--- a/components/brain/right-sidebar/WaveContent.tsx
+++ b/components/brain/right-sidebar/WaveContent.tsx
@@ -3,7 +3,7 @@
 import React, { useMemo, useEffect, useCallback, type JSX } from "react";
 import { usePathname, useSearchParams, useRouter } from "next/navigation";
 import type { ApiWave } from "@/generated/models/ApiWave";
-import { ApiWaveType } from "@/generated/models/ObjectSerializer";
+import { ApiWaveType } from "@/generated/models/ApiWaveType";
 import { TabToggleWithOverflow } from "@/components/common/TabToggleWithOverflow";
 import WaveHeader, {
   WaveHeaderPinnedSide,
diff --git a/components/community-curations/CommunityCurations.tsx b/components/community-curations/CommunityCurations.tsx
new file mode 100644
index 0000000000..acf08cda06
--- /dev/null
+++ b/components/community-curations/CommunityCurations.tsx
@@ -0,0 +1,208 @@
+"use client";
+
+import { COMMUNITY_CURATIONS_LIMIT } from "@/components/community-curations/communityCurations.constants";
+import CommunityCurationsMasonry from "@/components/community-curations/CommunityCurationsMasonry";
+import { useLayout } from "@/components/brain/my-stream/layout/LayoutContext";
+import type { CommonSelectItem } from "@/components/utils/select/CommonSelect";
+import CommonTabs from "@/components/utils/select/tabs/CommonTabs";
+import {
+  useCommunityCurationsDrops,
+  type CommunityCurationsMediaFilter,
+} from "@/hooks/useCommunityCurationsDrops";
+import { useCallback, useState } from "react";
+
+const MEDIA_FILTER_OPTIONS: CommonSelectItem<CommunityCurationsMediaFilter>[] =
+  [
+    { key: "all", label: "All", value: "all" },
+    { key: "image", label: "Images", value: "image" },
+    { key: "video", label: "Video", value: "video" },
+  ];
+
+const COMMUNITY_CURATIONS_SKELETON_CARDS = [
+  { id: "compact", mediaHeight: 210, lines: 2 },
+  { id: "tall", mediaHeight: 320, lines: 4 },
+  { id: "mid", mediaHeight: 250, lines: 3 },
+  { id: "feature", mediaHeight: 390, lines: 2 },
+  { id: "balanced", mediaHeight: 280, lines: 4 },
+  { id: "short", mediaHeight: 220, lines: 3 },
+  { id: "portrait", mediaHeight: 350, lines: 3 },
+  { id: "wide", mediaHeight: 260, lines: 2 },
+] as const;
+
+const COMMUNITY_CURATIONS_SKELETON_LINE_IDS = [
+  "headline",
+  "summary",
+  "detail",
+  "caption",
+] as const;
+
+function CommunityCurationsSkeletonCard({
+  lines,
+  mediaHeight,
+}: {
+  readonly lines: number;
+  readonly mediaHeight: number;
+}) {
+  return (
+    <div className="tw-mb-4 tw-break-inside-avoid tw-overflow-hidden tw-rounded-lg tw-border tw-border-solid tw-border-white/10 tw-bg-iron-950/75">
+      <div
+        className="tw-animate-pulse tw-bg-iron-900"
+        style={{ height: mediaHeight }}
+      />
+      <div className="tw-p-4">
+        <div className="tw-flex tw-items-center tw-gap-3">
+          <div className="tw-size-8 tw-animate-pulse tw-rounded-full tw-bg-iron-800" />
+          <div className="tw-flex-1 tw-space-y-2">
+            <div className="tw-h-3 tw-w-28 tw-animate-pulse tw-rounded tw-bg-iron-800" />
+            <div className="tw-h-3 tw-w-40 tw-animate-pulse tw-rounded tw-bg-iron-900" />
+          </div>
+        </div>
+        <div className="tw-mt-5 tw-h-5 tw-w-3/4 tw-animate-pulse tw-rounded tw-bg-iron-800" />
+        <div className="tw-mt-3 tw-space-y-2">
+          {COMMUNITY_CURATIONS_SKELETON_LINE_IDS.slice(0, lines).map(
+            (lineId, index) => (
+              <div
+                key={`community-curations-skeleton-line-${lineId}`}
+                className={`tw-h-3 tw-animate-pulse tw-rounded tw-bg-iron-900 ${
+                  index === lines - 1 ? "tw-w-2/3" : "tw-w-full"
+                }`}
+              />
+            )
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function CommunityCurationsSkeletonGrid() {
+  return (
+    <div className="tw-[column-gap:1rem] tw-[column-width:300px]">
+      {COMMUNITY_CURATIONS_SKELETON_CARDS.map((card) => (
+        <CommunityCurationsSkeletonCard
+          key={`community-curations-skeleton-${card.id}`}
+          lines={card.lines}
+          mediaHeight={card.mediaHeight}
+        />
+      ))}
+    </div>
+  );
+}
+
+function CommunityCurationsEmptyState({
+  title,
+  description,
+}: {
+  readonly title: string;
+  readonly description: string;
+}) {
+  return (
+    <div className="tw-rounded-lg tw-border tw-border-dashed tw-border-iron-700 tw-bg-iron-950/70 tw-px-6 tw-py-10 tw-text-center">
+      <p className="tw-mb-2 tw-text-base tw-font-semibold tw-text-iron-100">
+        {title}
+      </p>
+      <p className="tw-mb-0 tw-text-sm tw-text-iron-400">{description}</p>
+    </div>
+  );
+}
+
+export default function CommunityCurations() {
+  const { waveViewStyle } = useLayout();
+  const [scrollContainer, setScrollContainer] = useState<HTMLElement | null>(
+    null
+  );
+  const [mediaFilter, setMediaFilter] =
+    useState<CommunityCurationsMediaFilter>("all");
+  const {
+    allDrops,
+    drops,
+    fetchNextPage,
+    hasNextPage,
+    isError,
+    isFetchingNextPage,
+    isLoading,
+  } = useCommunityCurationsDrops({
+    mediaFilter,
+    limit: COMMUNITY_CURATIONS_LIMIT,
+  });
+
+  const isInitialLoading = isLoading && allDrops.length === 0;
+  const hasMorePages = Boolean(hasNextPage) || isFetchingNextPage;
+  const shouldShowEmptyState =
+    !isInitialLoading && !isError && drops.length === 0 && !hasMorePages;
+  const shouldShowMasonry =
+    !isInitialLoading && !isError && (drops.length > 0 || hasMorePages);
+  const emptyStateTitle =
+    mediaFilter === "all"
+      ? "No curated drops yet"
+      : `No ${mediaFilter} drops found`;
+  const emptyStateDescription =
+    mediaFilter === "all"
+      ? "Community-curated drops will appear here when visible curations have activity."
+      : "Try All to see every community-curated drop.";
+  const handleFetchNextPage = useCallback(async () => {
+    await fetchNextPage();
+  }, [fetchNextPage]);
+
+  return (
+    <section
+      ref={setScrollContainer}
+      className="tw-flex tw-min-h-0 tw-w-full tw-flex-grow tw-flex-col tw-overflow-y-auto tw-overflow-x-hidden tw-overscroll-contain tw-px-4 tw-py-8 tw-scrollbar-thin tw-scrollbar-track-iron-900 tw-scrollbar-thumb-iron-600 desktop-hover:hover:tw-scrollbar-thumb-iron-500 sm:tw-px-6 lg:tw-px-8"
+      style={waveViewStyle}
+    >
+      <div className="tw-mx-auto tw-w-full tw-max-w-6xl">
+        <div className="tw-flex tw-flex-col tw-gap-4 md:tw-flex-row md:tw-items-end md:tw-justify-between">
+          <div className="tw-max-w-2xl">
+            <h1 className="tw-mb-0 tw-text-2xl tw-font-bold tw-text-white">
+              Community Curations
+            </h1>
+            <p className="tw-mb-0 tw-mt-1 tw-text-sm tw-text-iron-400">
+              Community-curated drops from across 6529 Waves.
+            </p>
+          </div>
+
+          <div className="tw-flex tw-flex-wrap tw-items-center tw-gap-2">
+            <div className="tw-flex-shrink-0">
+              <CommonTabs
+                items={MEDIA_FILTER_OPTIONS}
+                activeItem={mediaFilter}
+                filterLabel="Community curation media filter"
+                setSelected={setMediaFilter}
+                size="sm"
+                fill={false}
+              />
+            </div>
+          </div>
+        </div>
+
+        <div className="tw-mt-6">
+          {isInitialLoading && <CommunityCurationsSkeletonGrid />}
+
+          {!isInitialLoading && isError && (
+            <CommunityCurationsEmptyState
+              title="Could not load curations"
+              description="Try refreshing this view in a moment."
+            />
+          )}
+
+          {shouldShowEmptyState && (
+            <CommunityCurationsEmptyState
+              title={emptyStateTitle}
+              description={emptyStateDescription}
+            />
+          )}
+
+          {shouldShowMasonry && (
+            <CommunityCurationsMasonry
+              drops={drops}
+              fetchNextPage={handleFetchNextPage}
+              hasNextPage={hasNextPage}
+              isFetchingNextPage={isFetchingNextPage}
+              scrollContainer={scrollContainer}
+            />
+          )}
+        </div>
+      </div>
+    </section>
+  );
+}
diff --git a/components/community-curations/CommunityCurationsMasonry.tsx b/components/community-curations/CommunityCurationsMasonry.tsx
new file mode 100644
index 0000000000..da8810bbff
--- /dev/null
+++ b/components/community-curations/CommunityCurationsMasonry.tsx
@@ -0,0 +1,355 @@
+"use client";
+
+import CircleLoader, {
+  CircleLoaderSize,
+} from "@/components/distribution-plan-tool/common/CircleLoader";
+import { TweetPreviewModeProvider } from "@/components/tweets/TweetPreviewModeContext";
+import Drop, { DropLocation } from "@/components/waves/drops/Drop";
+import type { ExtendedDrop } from "@/helpers/waves/drop.helpers";
+import { useIntersectionObserver } from "@/hooks/scroll/useIntersectionObserver";
+import {
+  type RenderComponentProps,
+  useMasonry,
+  usePositioner,
+  useResizeObserver,
+} from "masonic";
+import {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type Dispatch,
+  type ReactElement,
+  type SetStateAction,
+} from "react";
+
+const MASONRY_COLUMN_WIDTH = 300;
+const MASONRY_GUTTER = 16;
+const INFINITE_SCROLL_ROOT_MARGIN = "1200px 0px";
+const SCROLL_IDLE_DELAY_MS = 120;
+
+type PanelViewport = {
+  readonly height: number;
+  readonly isScrolling: boolean;
+  readonly scrollTop: number;
+};
+
+interface CommunityCurationsMasonryProps {
+  readonly drops: readonly ExtendedDrop[];
+  readonly fetchNextPage: () => Promise<void>;
+  readonly hasNextPage: boolean | undefined;
+  readonly isFetchingNextPage: boolean;
+  readonly scrollContainer: HTMLElement | null;
+}
+
+const EMPTY_VIEWPORT: PanelViewport = {
+  height: 0,
+  isScrolling: false,
+  scrollTop: 0,
+};
+
+const noop = () => {};
+
+const getDropKey = (drop: ExtendedDrop) => drop.stableKey;
+
+const getGridScrollTop = (
+  scrollContainer: HTMLElement,
+  gridElement: HTMLElement | null
+) => {
+  if (!gridElement) {
+    return 0;
+  }
+
+  const scrollRect = scrollContainer.getBoundingClientRect();
+  const gridRect = gridElement.getBoundingClientRect();
+  const gridOffsetTop =
+    gridRect.top - scrollRect.top + scrollContainer.scrollTop;
+
+  return Math.max(0, scrollContainer.scrollTop - gridOffsetTop);
+};
+
+const areViewportsEqual = (left: PanelViewport, right: PanelViewport) =>
+  left.height === right.height &&
+  left.isScrolling === right.isScrolling &&
+  left.scrollTop === right.scrollTop;
+
+const readPanelViewport = (
+  scrollContainer: HTMLElement,
+  gridElement: HTMLElement | null,
+  isScrolling: boolean
+): PanelViewport => ({
+  height: scrollContainer.clientHeight,
+  isScrolling,
+  scrollTop: getGridScrollTop(scrollContainer, gridElement),
+});
+
+const setPanelViewport = (
+  setViewport: Dispatch<SetStateAction<PanelViewport>>,
+  nextViewport: PanelViewport
+) => {
+  setViewport((currentViewport) =>
+    areViewportsEqual(currentViewport, nextViewport)
+      ? currentViewport
+      : nextViewport
+  );
+};
+
+const schedulePanelViewportUpdate = ({
+  frameId,
+  gridElement,
+  isScrolling,
+  scrollContainer,
+  setViewport,
+}: {
+  readonly frameId: number | null;
+  readonly gridElement: HTMLElement | null;
+  readonly isScrolling: boolean;
+  readonly scrollContainer: HTMLElement;
+  readonly setViewport: Dispatch<SetStateAction<PanelViewport>>;
+}): number => {
+  if (frameId !== null) {
+    cancelAnimationFrame(frameId);
+  }
+
+  return requestAnimationFrame(() => {
+    const nextViewport = readPanelViewport(
+      scrollContainer,
+      gridElement,
+      isScrolling
+    );
+    setPanelViewport(setViewport, nextViewport);
+  });
+};
+
+function useElementWidth(element: HTMLElement | null) {
+  const [width, setWidth] = useState(0);
+
+  useEffect(() => {
+    if (!element || typeof ResizeObserver === "undefined") {
+      return;
+    }
+
+    const observer = new ResizeObserver(([entry]) => {
+      const nextWidth = Math.floor(entry?.contentRect.width ?? 0);
+      setWidth((currentWidth) =>
+        currentWidth === nextWidth ? currentWidth : nextWidth
+      );
+    });
+
+    observer.observe(element);
+    return () => observer.disconnect();
+  }, [element]);
+
+  return { setWidth, width };
+}
+
+function usePanelViewport(
+  scrollContainer: HTMLElement | null,
+  gridElement: HTMLElement | null
+) {
+  const [viewport, setViewport] = useState<PanelViewport>(EMPTY_VIEWPORT);
+
+  useEffect(() => {
+    if (!scrollContainer) {
+      return;
+    }
+
+    let idleTimeout: ReturnType<typeof setTimeout> | null = null;
+    let frameId: number | null = null;
+
+    const scheduleViewportUpdate = (isScrolling: boolean) => {
+      frameId = schedulePanelViewportUpdate({
+        frameId,
+        gridElement,
+        isScrolling,
+        scrollContainer,
+        setViewport,
+      });
+    };
+
+    const onScroll = () => {
+      scheduleViewportUpdate(true);
+
+      if (idleTimeout) {
+        clearTimeout(idleTimeout);
+      }
+
+      idleTimeout = setTimeout(
+        () => scheduleViewportUpdate(false),
+        SCROLL_IDLE_DELAY_MS
+      );
+    };
+
+    scheduleViewportUpdate(false);
+    scrollContainer.addEventListener("scroll", onScroll, { passive: true });
+
+    const observer =
+      typeof ResizeObserver === "undefined"
+        ? null
+        : new ResizeObserver(() => scheduleViewportUpdate(false));
+
+    observer?.observe(scrollContainer);
+    if (gridElement) {
+      observer?.observe(gridElement);
+    }
+
+    return () => {
+      scrollContainer.removeEventListener("scroll", onScroll);
+      observer?.disconnect();
+      if (idleTimeout) {
+        clearTimeout(idleTimeout);
+      }
+      if (frameId !== null) {
+        cancelAnimationFrame(frameId);
+      }
+    };
+  }, [gridElement, scrollContainer]);
+
+  return scrollContainer ? viewport : EMPTY_VIEWPORT;
+}
+
+function CommunityCurationsInfiniteScrollTrigger({
+  onIntersection,
+  scrollContainer,
+}: {
+  readonly onIntersection: (isIntersecting: boolean) => void;
+  readonly scrollContainer: HTMLElement | null;
+}) {
+  const triggerRef = useRef<HTMLDivElement>(null);
+  const handleIntersection = useCallback(
+    (entry: IntersectionObserverEntry) => onIntersection(entry.isIntersecting),
+    [onIntersection]
+  );
+
+  useIntersectionObserver(
+    triggerRef,
+    {
+      root: scrollContainer,
+      rootMargin: INFINITE_SCROLL_ROOT_MARGIN,
+      threshold: 0,
+    },
+    handleIntersection,
+    Boolean(scrollContainer)
+  );
+
+  return <div ref={triggerRef} aria-hidden="true" className="tw-h-px" />;
+}
+
+function CommunityCurationsMasonryItem({
+  data: drop,
+}: RenderComponentProps<ExtendedDrop>) {
+  return (
+    <article className="tw-group tw-relative tw-isolate">
+      <Drop
+        drop={drop}
+        previousDrop={null}
+        nextDrop={null}
+        showWaveInfo={false}
+        activeDrop={null}
+        showReplyAndQuote={false}
+        location={DropLocation.MY_STREAM}
+        dropViewDropId={null}
+        onReply={noop}
+        onReplyClick={noop}
+        onQuoteClick={noop}
+        identityMode="default"
+        showInteractions={false}
+      />
+    </article>
+  );
+}
+
+function CommunityCurationsVirtualMasonry({
+  drops,
+  scrollContainer,
+}: {
+  readonly drops: readonly ExtendedDrop[];
+  readonly scrollContainer: HTMLElement | null;
+}): ReactElement {
+  const [gridElement, setGridElement] = useState<HTMLElement | null>(null);
+  const { setWidth, width } = useElementWidth(gridElement);
+  const viewport = usePanelViewport(scrollContainer, gridElement);
+  const items = useMemo(() => [...drops], [drops]);
+  const resetKey = useMemo(
+    () => items.slice(0, 8).map(getDropKey).join("|"),
+    [items]
+  );
+  const positioner = usePositioner(
+    {
+      columnGutter: MASONRY_GUTTER,
+      columnWidth: MASONRY_COLUMN_WIDTH,
+      rowGutter: MASONRY_GUTTER,
+      width: Math.max(width, 1),
+    },
+    [resetKey, items.length]
+  );
+  const resizeObserver = useResizeObserver(positioner);
+  const setContainerRef = useCallback(
+    (element: HTMLElement | null) => {
+      setGridElement(element);
+      setWidth(element?.offsetWidth ?? 0);
+    },
+    [setWidth]
+  );
+
+  return useMasonry<ExtendedDrop>({
+    containerRef: setContainerRef,
+    height: Math.max(viewport.height, 1),
+    isScrolling: viewport.isScrolling,
+    itemHeightEstimate: 420,
+    itemKey: getDropKey,
+    items,
+    overscanBy: 2,
+    positioner,
+    render: CommunityCurationsMasonryItem,
+    resizeObserver,
+    scrollTop: viewport.scrollTop,
+  }) as ReactElement;
+}
+
+export default function CommunityCurationsMasonry({
+  drops,
+  fetchNextPage,
+  hasNextPage,
+  isFetchingNextPage,
+  scrollContainer,
+}: CommunityCurationsMasonryProps) {
+  const shouldShowPaginationFooter = Boolean(hasNextPage) || isFetchingNextPage;
+  const shouldShowLoader = isFetchingNextPage || drops.length === 0;
+  const handleIntersection = useCallback(
+    (isIntersecting: boolean) => {
+      if (!isIntersecting || !hasNextPage || isFetchingNextPage) {
+        return;
+      }
+
+      fetchNextPage().catch(() => undefined);
+    },
+    [fetchNextPage, hasNextPage, isFetchingNextPage]
+  );
+
+  return (
+    <TweetPreviewModeProvider mode="never">
+      <div className="tw-overflow-hidden tw-rounded-2xl">
+        <CommunityCurationsVirtualMasonry
+          drops={drops}
+          scrollContainer={scrollContainer}
+        />
+
+        {shouldShowPaginationFooter && (
+          <div className="tw-flex tw-justify-center tw-py-6">
+            {!isFetchingNextPage && (
+              <CommunityCurationsInfiniteScrollTrigger
+                onIntersection={handleIntersection}
+                scrollContainer={scrollContainer}
+              />
+            )}
+            {shouldShowLoader && (
+              <CircleLoader size={CircleLoaderSize.MEDIUM} />
+            )}
+          </div>
+        )}
+      </div>
+    </TweetPreviewModeProvider>
+  );
+}
diff --git a/components/community-curations/communityCurations.constants.ts b/components/community-curations/communityCurations.constants.ts
new file mode 100644
index 0000000000..e287e5247f
--- /dev/null
+++ b/components/community-curations/communityCurations.constants.ts
@@ -0,0 +1 @@
+export const COMMUNITY_CURATIONS_LIMIT = 12;
diff --git a/components/community-curations/communityCurations.helpers.ts b/components/community-curations/communityCurations.helpers.ts
new file mode 100644
index 0000000000..4a6ba6f0a1
--- /dev/null
+++ b/components/community-curations/communityCurations.helpers.ts
@@ -0,0 +1,103 @@
+import type { ApiDrop } from "@/generated/models/ApiDrop";
+import { ApiNftLinkMediaPreviewStatusEnum } from "@/generated/models/ApiNftLinkMediaPreview";
+import { getDropPreviewImageUrl } from "@/helpers/waves/drop.helpers";
+
+export type CommunityCurationsMediaType = "image" | "video" | "audio" | "other";
+
+const toNonEmptyString = (value: string | null | undefined): string | null => {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return null;
+  }
+
+  return trimmed;
+};
+
+const getMediaTypeFromMimeType = (
+  mimeType: string | null | undefined
+): CommunityCurationsMediaType | null => {
+  const normalized = mimeType?.toLowerCase();
+  if (!normalized) {
+    return null;
+  }
+
+  if (normalized.startsWith("image/")) {
+    return "image";
+  }
+
+  if (normalized.startsWith("video/")) {
+    return "video";
+  }
+
+  if (normalized.startsWith("audio/")) {
+    return "audio";
+  }
+
+  return null;
+};
+
+const getMediaTypeFromUrl = (
+  url: string | null | undefined
+): CommunityCurationsMediaType | null => {
+  const normalized = url?.split(/[?#]/)[0]?.toLowerCase();
+  if (!normalized) {
+    return null;
+  }
+
+  if (/\.(avif|gif|jpe?g|png|webp|svg)$/.test(normalized)) {
+    return "image";
+  }
+
+  if (/\.(m3u8|mov|mp4|webm)$/.test(normalized)) {
+    return "video";
+  }
+
+  if (/\.(aac|flac|m4a|mp3|ogg|wav)$/.test(normalized)) {
+    return "audio";
+  }
+
+  return null;
+};
+
+const getNftLinkMediaType = (
+  drop: ApiDrop
+): CommunityCurationsMediaType | null => {
+  for (const nftLink of drop.nft_links ?? []) {
+    const preview = nftLink.data?.media_preview;
+    const previewUrl =
+      preview?.status === ApiNftLinkMediaPreviewStatusEnum.Ready
+        ? (toNonEmptyString(preview.card_url) ??
+          toNonEmptyString(preview.small_url) ??
+          toNonEmptyString(preview.thumb_url))
+        : null;
+    const previewMediaType =
+      getMediaTypeFromMimeType(preview?.mime_type) ??
+      getMediaTypeFromUrl(previewUrl);
+    if (previewMediaType) {
+      return previewMediaType;
+    }
+
+    const mediaUri = toNonEmptyString(nftLink.data?.media_uri);
+    const mediaUriType = getMediaTypeFromUrl(mediaUri);
+    if (mediaUriType) {
+      return mediaUriType;
+    }
+  }
+
+  return null;
+};
+
+export const getCommunityCurationsMediaType = (
+  drop: ApiDrop
+): CommunityCurationsMediaType => {
+  if (getDropPreviewImageUrl(drop.metadata)) {
+    return "image";
+  }
+
+  const media = drop.parts.flatMap((part) => part.media).at(0);
+  if (!media) {
+    return getNftLinkMediaType(drop) ?? "other";
+  }
+
+  return getMediaTypeFromMimeType(media.mime_type) ?? "other";
+};
diff --git a/components/drops/view/BoostedDropCard.tsx b/components/drops/view/BoostedDropCard.tsx
index 77b663e168..8bdc8acf19 100644
--- a/components/drops/view/BoostedDropCard.tsx
+++ b/components/drops/view/BoostedDropCard.tsx
@@ -44,8 +44,8 @@ const BoostedDropCard = memo(
     const rankClasses =
       {
         1: "tw-text-yellow-400",
-        2: "tw-text-iron-300",
-        3: "tw-text-amber-500",
+        2: "tw-text-iron-400",
+        3: "tw-text-iron-400",
       }[rank] ?? "tw-text-iron-400";
 
     const isBoosted = drop.context_profile_context?.boosted ?? false;
@@ -64,8 +64,8 @@ const BoostedDropCard = memo(
     const isTopRank = rank === 1;
     const cardThemeClasses =
       highlightTopOnly && !isTopRank
-        ? "tw-bg-iron-900/40 tw-ring-iron-800/60 hover:tw-ring-iron-700/70"
-        : "tw-bg-gradient-to-r tw-from-amber-950/30 tw-to-iron-900/50 tw-ring-amber-700/30 hover:tw-ring-amber-600/50";
+        ? "tw-bg-iron-900/65 tw-ring-iron-800/80 hover:tw-bg-iron-900/85 hover:tw-ring-iron-700/90"
+        : "tw-bg-amber-950/10 tw-ring-amber-700/30 hover:tw-bg-amber-950/15 hover:tw-ring-amber-600/40";
 
     return (
       <div
@@ -92,7 +92,7 @@ const BoostedDropCard = memo(
               <span className="tw-leading-none">#{rank}</span>
             </div>
 
-            <div className="tw-relative tw-size-8 @[360px]:tw-size-10 tw-flex-shrink-0 tw-overflow-hidden tw-rounded-lg tw-bg-iron-900">
+            <div className="tw-relative tw-size-8 tw-flex-shrink-0 tw-overflow-hidden tw-rounded-lg tw-bg-iron-900 @[360px]:tw-size-10">
               {resolvedPfp ? (
                 <Image
                   src={resolvedPfp}
@@ -109,13 +109,13 @@ const BoostedDropCard = memo(
 
           <div className="tw-min-w-0 tw-flex-1">
             <div className="tw-flex tw-items-start tw-justify-between tw-gap-x-2">
-              <div className="tw-flex tw-min-w-0 tw-items-start tw-gap-x-1.5">
+              <div className="tw-flex tw-min-w-0 tw-items-center tw-gap-x-1.5">
                 <span className="tw-truncate tw-text-sm tw-font-semibold tw-text-iron-200">
                   {drop.author.handle}
                 </span>
                 <UserCICAndLevel
                   level={drop.author.level}
-                  size={UserCICAndLevelSize.SMALL}
+                  size={UserCICAndLevelSize.COMPACT}
                 />
               </div>
 
@@ -128,31 +128,32 @@ const BoostedDropCard = memo(
                   }
                 }}
                 disabled={!canBoost || isPending}
-                className={`tw-flex tw-h-6 tw-flex-shrink-0 tw-items-center tw-gap-x-1.5 tw-rounded-full tw-border-0 tw-px-2.5 tw-transition-colors tw-duration-200 ${
+                className={`tw-flex tw-h-5 tw-flex-shrink-0 tw-items-center tw-justify-center tw-gap-x-1 tw-rounded-full tw-border-0 tw-px-2 tw-leading-none tw-transition-colors tw-duration-200 ${
                   canBoost
                     ? "tw-cursor-pointer tw-ring-1 tw-ring-amber-500/20 hover:tw-bg-amber-600/20"
                     : "tw-cursor-default"
                 } ${isBoosted ? "tw-bg-amber-600/20" : "tw-bg-amber-600/10"}`}
                 aria-label={isBoosted ? "Remove boost" : "Boost"}
               >
-                <span className="tw-font-mono tw-text-xs tw-font-bold tw-text-amber-400">
+                <span className="tw-font-mono tw-text-[11px] tw-font-bold tw-leading-none tw-text-amber-400">
                   {drop.boosts}
                 </span>
                 <BoostIcon
-                  className="tw-size-3 tw-text-amber-500"
+                  className="tw-size-2.5 tw-flex-shrink-0 tw-text-amber-500"
                   variant={isBoosted ? "filled" : "outlined"}
                 />
               </button>
             </div>
             <ContentDisplay
               content={previewContent}
-              className="tw-mt-1.5 @[360px]:tw-pr-12 tw-pr-0 tw-w-full tw-text-xs tw-text-white/70"
+              className="tw-mt-1.5 tw-w-full tw-pr-0 tw-text-xs tw-text-white/60 @[360px]:tw-pr-12"
+              linkClassName="tw-text-white/60 tw-underline tw-decoration-white/15 tw-underline-offset-2 tw-transition-colors tw-duration-300 hover:tw-text-white/75 hover:tw-decoration-white/30"
               shouldClamp={false}
               textClassName="tw-line-clamp-2 @[360px]:tw-line-clamp-1"
             />
           </div>
 
-          <ChevronRightIcon className="tw-size-3 tw-mt-1 tw-flex-shrink-0 tw-text-iron-500 tw-transition-colors group-hover:tw-text-white" />
+          <ChevronRightIcon className="tw-mt-1 tw-size-3 tw-flex-shrink-0 tw-text-iron-500 tw-transition-colors group-hover:tw-text-white" />
         </div>
       </div>
     );
diff --git a/components/react-query-wrapper/ReactQueryWrapper.tsx b/components/react-query-wrapper/ReactQueryWrapper.tsx
index 314dc763a2..33b09530de 100644
--- a/components/react-query-wrapper/ReactQueryWrapper.tsx
+++ b/components/react-query-wrapper/ReactQueryWrapper.tsx
@@ -10,7 +10,7 @@ import type { ApiDrop } from "@/generated/models/ApiDrop";
 import type { ApiProfileProxy } from "@/generated/models/ApiProfileProxy";
 import type { ApiWave } from "@/generated/models/ApiWave";
 import type { ApiWaveDropsFeed } from "@/generated/models/ApiWaveDropsFeed";
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 import { wait } from "@/helpers/Helpers";
 import { convertActivityLogParams } from "@/helpers/profile-logs.helpers";
 import { Time } from "@/helpers/time";
diff --git a/components/shared/WavesMessagesWrapper.tsx b/components/shared/WavesMessagesWrapper.tsx
index f997138e6e..55c0990053 100644
--- a/components/shared/WavesMessagesWrapper.tsx
+++ b/components/shared/WavesMessagesWrapper.tsx
@@ -110,8 +110,11 @@ const WavesMessagesWrapper: React.FC<WavesMessagesWrapperProps> = ({
   );
 
   // Clear logic for when to show each part
-  const shouldShowLeftSidebar = showLeftSidebar && (!isMobile || !waveId);
-  const shouldShowMainContent = !isMobile || waveId !== undefined;
+  const hasWave = waveId !== undefined;
+  const canShowMainContent = !isMobile || hasWave;
+  const shouldShowLeftSidebar =
+    showLeftSidebar && (!isMobile || (!hasWave && !canShowMainContent));
+  const shouldShowMainContent = canShowMainContent;
   const shouldShowDropOverlay =
     isDropOpen && drop !== undefined && shouldShowMainContent;
   const shouldShowRightSidebar = Boolean(
@@ -130,18 +133,18 @@ const WavesMessagesWrapper: React.FC<WavesMessagesWrapperProps> = ({
 
   return (
     <WaveChatScrollProvider>
-      <div className="tw-relative tw-flex tw-flex-col">
-        <div className="tw-relative tw-flex tw-flex-grow">
-          <div className="tw-relative tw-mx-auto tw-flex tw-w-full tw-max-w-full tw-flex-grow">
+      <div className="tw-relative tw-flex tw-min-h-0 tw-flex-col">
+        <div className="tw-relative tw-flex tw-min-h-0 tw-flex-grow">
+          <div className="tw-relative tw-mx-auto tw-flex tw-min-h-0 tw-w-full tw-max-w-full tw-flex-grow">
             <div
-              className="tw-relative tw-flex tw-w-full tw-overflow-hidden"
+              className="tw-relative tw-flex tw-min-h-0 tw-w-full tw-overflow-hidden"
               style={contentContainerStyle}
             >
               {shouldShowLeftSidebar && (
                 <WebBrainLeftSidebar isCollapsed={rightVariant === "inline"} />
               )}
               {shouldShowMainContent && (
-                <div className="tw-flex tw-h-full tw-min-w-0 tw-flex-grow tw-flex-col tw-border-y-0 tw-border-l-0 tw-border-r tw-border-solid tw-border-iron-800">
+                <div className="tw-flex tw-h-full tw-min-h-0 tw-min-w-0 tw-flex-grow tw-flex-col tw-border-y-0 tw-border-l-0 tw-border-r tw-border-solid tw-border-iron-800">
                   {children}
                   {shouldShowDropOverlay && (
                     <div className="tw-fixed tw-inset-y-0 tw-left-[var(--left-rail,0px)] tw-right-0 tw-z-[1010] lg:tw-absolute lg:tw-inset-0 lg:tw-z-[1010]">
diff --git a/components/user/collected/UserPageCollected.tsx b/components/user/collected/UserPageCollected.tsx
index 1a65997e09..016b27bb5a 100644
--- a/components/user/collected/UserPageCollected.tsx
+++ b/components/user/collected/UserPageCollected.tsx
@@ -17,7 +17,7 @@ import {
 } from "@/entities/IProfile";
 import type { MemeSeason } from "@/entities/ISeason";
 import { SortDirection } from "@/entities/ISort";
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 import { areEqualAddresses } from "@/helpers/Helpers";
 import type { Page } from "@/helpers/Types";
 import useIsMobileScreen from "@/hooks/isMobileScreen";
@@ -290,7 +290,9 @@ const applyQueryUpdateItemsToState = ({
       }
       case "subcollection":
         nextState.subcollection =
-          nextState.collection === CollectedCollectionType.NETWORK ? value : null;
+          nextState.collection === CollectedCollectionType.NETWORK
+            ? value
+            : null;
         break;
       case "seized":
         nextState.seized = convertSeized({
@@ -375,9 +377,7 @@ export default function UserPageCollected({
         szn: sznParam ?? null,
         collection: convertedCollection,
       }),
-      page: normalizePageNumber(
-        pageParam ? Number.parseInt(pageParam, 10) : 1
-      ),
+      page: normalizePageNumber(pageParam ? Number.parseInt(pageParam, 10) : 1),
       pageSize: PAGE_SIZE,
       sortBy: convertSortedBy({
         sortBy: sortByParam ?? null,
diff --git a/components/user/collected/UserPageCollectedStats.tsx b/components/user/collected/UserPageCollectedStats.tsx
index 60e82f317b..bf3946435a 100644
--- a/components/user/collected/UserPageCollectedStats.tsx
+++ b/components/user/collected/UserPageCollectedStats.tsx
@@ -3,7 +3,7 @@
 import type { UserPageStatsInitialData } from "@/components/user/stats/userPageStats.types";
 import { SEARCH_PARAM_ACTIVITY } from "@/components/user/stats/activity/activity.helpers";
 import type { CollectedCollectionType } from "@/entities/IProfile";
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 import useDeviceInfo from "@/hooks/useDeviceInfo";
 import { useSearchParams } from "next/navigation";
 import { useId, useMemo, useState } from "react";
diff --git a/components/user/collected/stats/helpers.ts b/components/user/collected/stats/helpers.ts
index a6fcdf8f19..fc9061003b 100644
--- a/components/user/collected/stats/helpers.ts
+++ b/components/user/collected/stats/helpers.ts
@@ -5,7 +5,7 @@ import {
 import { CollectedCollectionType } from "@/entities/IProfile";
 import type { ApiCollectedStats } from "@/generated/models/ApiCollectedStats";
 import type { ApiCollectedStatsSeason } from "@/generated/models/ApiCollectedStatsSeason";
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 import { formatNumberWithCommasOrDash } from "@/helpers/Helpers";
 import type {
   CollectedHeaderMetric,
diff --git a/components/user/collected/stats/subcomponents/CollectedStatsDetailsPanel.tsx b/components/user/collected/stats/subcomponents/CollectedStatsDetailsPanel.tsx
index 159fa2e482..6c97840bc8 100644
--- a/components/user/collected/stats/subcomponents/CollectedStatsDetailsPanel.tsx
+++ b/components/user/collected/stats/subcomponents/CollectedStatsDetailsPanel.tsx
@@ -3,7 +3,7 @@ import CommonAnimationHeight from "@/components/utils/animation/CommonAnimationH
 import type { OwnerBalance, OwnerBalanceMemes } from "@/entities/IBalances";
 import type { MemeSeason } from "@/entities/ISeason";
 import type { ConsolidatedTDH, TDH } from "@/entities/ITDH";
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 
 interface CollectedStatsDetailsPanelProps {
   readonly isOpen: boolean;
diff --git a/components/user/collected/stats/types.ts b/components/user/collected/stats/types.ts
index 578615a8aa..20fb56b14a 100644
--- a/components/user/collected/stats/types.ts
+++ b/components/user/collected/stats/types.ts
@@ -4,7 +4,7 @@ import type { CollectedCollectionType } from "@/entities/IProfile";
 import type { MemeSeason } from "@/entities/ISeason";
 import type { ConsolidatedTDH, TDH } from "@/entities/ITDH";
 import type { ApiCollectedStats } from "@/generated/models/ApiCollectedStats";
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 
 export type CollectedHeaderMetric = {
   readonly id: string;
diff --git a/components/waves/WaveScreenMessage.tsx b/components/waves/WaveScreenMessage.tsx
deleted file mode 100644
index c6d64dad2d..0000000000
--- a/components/waves/WaveScreenMessage.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { ReactNode } from "react";
-
-interface WaveScreenMessageProps {
-  readonly title: ReactNode;
-  readonly description: ReactNode;
-  readonly action?: ReactNode;
-}
-
-export default function WaveScreenMessage({
-  title,
-  description,
-  action,
-}: WaveScreenMessageProps) {
-  return (
-    <div className="tw-flex tw-h-full tw-flex-col tw-items-center tw-justify-center tw-p-8 tw-text-center">
-      <h2 className="tw-mb-4 tw-text-xl tw-font-bold tw-text-iron-50">
-        {title}
-      </h2>
-      <p className="tw-mb-6 tw-max-w-md tw-text-sm tw-text-iron-400 sm:tw-text-base">
-        {description}
-      </p>
-      {action !== undefined && action !== null ? (
-        <div className="tw-flex tw-justify-center">{action}</div>
-      ) : null}
-    </div>
-  );
-}
diff --git a/components/waves/WavesView.tsx b/components/waves/WavesView.tsx
index 4353a5ae8f..2064e6b304 100644
--- a/components/waves/WavesView.tsx
+++ b/components/waves/WavesView.tsx
@@ -1,21 +1,15 @@
 "use client";
 
 import React from "react";
-import { PlusIcon } from "@heroicons/react/24/outline";
+import CommunityCurations from "@/components/community-curations/CommunityCurations";
 import MyStreamWave from "../brain/my-stream/MyStreamWave";
 import BrainContent from "../brain/content/BrainContent";
-import { useAuth } from "../auth/Auth";
 import useDeviceInfo from "../../hooks/useDeviceInfo";
-import PrimaryButton from "../utils/button/PrimaryButton";
-import useCreateModalState from "@/hooks/useCreateModalState";
 import { useMyStreamOptional } from "@/contexts/wave/MyStreamContext";
-import WaveScreenMessage from "./WaveScreenMessage";
 
 const WavesView: React.FC = () => {
   const myStream = useMyStreamOptional();
-  const { connectedProfile } = useAuth();
   const { isApp } = useDeviceInfo();
-  const { openWave } = useCreateModalState();
 
   const serialisedWaveId = myStream?.activeWave.id ?? null;
 
@@ -31,31 +25,18 @@ const WavesView: React.FC = () => {
       />
     );
   } else if (showPlaceholder) {
-    content = (
-      <WaveScreenMessage
-        title="Select a Wave"
-        description="Choose a wave to view its content and participate in the discussion."
-        action={
-          connectedProfile ? (
-            <PrimaryButton
-              onClicked={openWave}
-              disabled={false}
-              loading={false}
-            >
-              <PlusIcon className="-tw-ml-1 tw-h-5 tw-w-5" />
-              Create Wave
-            </PrimaryButton>
-          ) : null
-        }
-      />
-    );
+    content = <CommunityCurations />;
   }
 
   // Note: Wave views (MyStreamWave) manage their own activeDrop state
   // internally via MyStreamWaveChat. We pass null to BrainContent because
   // the wave's internal state controls the reply/quote input box.
   return (
-    <BrainContent activeDrop={null} onCancelReplyQuote={() => {}}>
+    <BrainContent
+      activeDrop={null}
+      onCancelReplyQuote={() => {}}
+      showPinnedWaves={Boolean(serialisedWaveId)}
+    >
       {content}
     </BrainContent>
   );
diff --git a/components/waves/drop/SingleWaveDropAuthor.tsx b/components/waves/drop/SingleWaveDropAuthor.tsx
index d775de528b..74559d8985 100644
--- a/components/waves/drop/SingleWaveDropAuthor.tsx
+++ b/components/waves/drop/SingleWaveDropAuthor.tsx
@@ -2,7 +2,7 @@
 
 import React from "react";
 import ProfileNameWithAiMarker from "@/components/common/profile/ProfileNameWithAiMarker";
-import type { ApiDrop } from "@/generated/models/ObjectSerializer";
+import type { ApiDrop } from "@/generated/models/ApiDrop";
 import { resolveIpfsUrlSync } from "@/components/ipfs/IPFSContext";
 import Link from "next/link";
 import Image from "next/image";
diff --git a/components/waves/drop/SingleWaveDropChat.tsx b/components/waves/drop/SingleWaveDropChat.tsx
index 76cd99e555..b8a1074b99 100644
--- a/components/waves/drop/SingleWaveDropChat.tsx
+++ b/components/waves/drop/SingleWaveDropChat.tsx
@@ -1,7 +1,8 @@
 "use client";
 
 import React, { useMemo, useState } from "react";
-import type { ApiDrop, ApiWave } from "@/generated/models/ObjectSerializer";
+import type { ApiDrop } from "@/generated/models/ApiDrop";
+import type { ApiWave } from "@/generated/models/ApiWave";
 import useDeviceInfo from "@/hooks/useDeviceInfo";
 import WaveDropsAll from "../drops/wave-drops-all";
 import {
diff --git a/components/waves/drop/SingleWaveDropVote.tsx b/components/waves/drop/SingleWaveDropVote.tsx
index 89ae1f44a9..8be04f3653 100644
--- a/components/waves/drop/SingleWaveDropVote.tsx
+++ b/components/waves/drop/SingleWaveDropVote.tsx
@@ -1,5 +1,5 @@
 import dynamic from "next/dynamic";
-import type { ApiDrop } from "@/generated/models/ObjectSerializer";
+import type { ApiDrop } from "@/generated/models/ApiDrop";
 
 export enum SingleWaveDropVoteSize {
   NORMAL = "NORMAL",
diff --git a/components/waves/drop/SingleWaveDropVotes.tsx b/components/waves/drop/SingleWaveDropVotes.tsx
index 6be9198d1a..b14479a570 100644
--- a/components/waves/drop/SingleWaveDropVotes.tsx
+++ b/components/waves/drop/SingleWaveDropVotes.tsx
@@ -1,11 +1,11 @@
 "use client";
 
 import DropVoteProgressing from "@/components/drops/view/utils/DropVoteProgressing";
-import type { ApiDrop } from "@/generated/models/ObjectSerializer";
+import type { ApiDrop } from "@/generated/models/ApiDrop";
 import { formatNumberWithCommas } from "@/helpers/Helpers";
 import {
-    WAVE_VOTE_STATS_LABELS,
-    WAVE_VOTING_LABELS,
+  WAVE_VOTE_STATS_LABELS,
+  WAVE_VOTING_LABELS,
 } from "@/helpers/waves/waves.constants";
 import { useDropInteractionRules } from "@/hooks/drops/useDropInteractionRules";
 import React from "react";
@@ -29,7 +29,7 @@ export const SingleWaveDropVotes: React.FC<SingleWaveDropVotesProps> = ({
   const shouldShowUserVote = (isVotingEnded || isWinner) && hasUserVoted;
 
   return (
-    <div className="tw-flex tw-flex-col tw-gap-3 tw-mt-1">
+    <div className="tw-mt-1 tw-flex tw-flex-col tw-gap-3">
       <div className="tw-flex tw-flex-wrap tw-items-baseline tw-gap-x-2">
         <span
           className={`tw-text-sm tw-font-bold tw-tabular-nums tw-tracking-tight ${
@@ -42,7 +42,7 @@ export const SingleWaveDropVotes: React.FC<SingleWaveDropVotesProps> = ({
           current={drop.rating}
           projected={drop.rating_prediction}
         />
-        <span className="tw-text-sm tw-text-iron-500 tw-font-normal">
+        <span className="tw-text-sm tw-font-normal tw-text-iron-500">
           {WAVE_VOTING_LABELS[drop.wave.voting_credit_type]}{" "}
           {WAVE_VOTE_STATS_LABELS.TOTAL}
         </span>
@@ -61,7 +61,7 @@ export const SingleWaveDropVotes: React.FC<SingleWaveDropVotesProps> = ({
             >
               {isUserVoteNegative && "-"}
               {formatNumberWithCommas(Math.abs(userVote))}{" "}
-              <span className="tw-text-iron-400 tw-font-normal">
+              <span className="tw-font-normal tw-text-iron-400">
                 {WAVE_VOTING_LABELS[drop.wave.voting_credit_type]}
               </span>
             </span>
diff --git a/components/waves/drops/ContentDisplay.tsx b/components/waves/drops/ContentDisplay.tsx
index 0c345e844c..251064f0e1 100644
--- a/components/waves/drops/ContentDisplay.tsx
+++ b/components/waves/drops/ContentDisplay.tsx
@@ -9,6 +9,7 @@ interface ContentDisplayProps {
   readonly textClassName?: string | undefined;
   readonly shouldClamp?: boolean;
   readonly linkify?: boolean;
+  readonly linkClassName?: string | undefined;
 }
 
 /**
@@ -21,6 +22,7 @@ export default function ContentDisplay({
   textClassName,
   shouldClamp = true,
   linkify = true,
+  linkClassName,
 }: ContentDisplayProps) {
   const clampClass = shouldClamp ? "tw-line-clamp-1" : "";
   const containerClasses = [
@@ -46,6 +48,7 @@ export default function ContentDisplay({
             segment={segment}
             index={i}
             linkify={linkify}
+            linkClassName={linkClassName}
           />
         ))}
       </span>
diff --git a/components/waves/drops/ContentSegmentComponent.tsx b/components/waves/drops/ContentSegmentComponent.tsx
index 0b40dc1436..fd16fb17fa 100644
--- a/components/waves/drops/ContentSegmentComponent.tsx
+++ b/components/waves/drops/ContentSegmentComponent.tsx
@@ -5,17 +5,29 @@ interface ContentSegmentComponentProps {
   readonly segment: ContentSegment;
   readonly index: number;
   readonly linkify?: boolean;
+  readonly linkClassName?: string | undefined;
 }
 
 const URL_REGEX = /(https?:\/\/[^\s<]+[^\s<.,;:!?)\]"'])/g;
-function linkifyText(text: string, segmentIndex: number): React.ReactNode[] {
+const DEFAULT_LINK_CLASSES =
+  "tw-text-iron-200/90 tw-underline tw-decoration-white/20 tw-underline-offset-2 tw-transition-colors tw-duration-300 hover:tw-text-iron-50 hover:tw-decoration-white/45";
+
+function linkifyText({
+  linkClassName,
+  segmentIndex,
+  text,
+}: {
+  readonly linkClassName?: string | undefined;
+  readonly segmentIndex: number;
+  readonly text: string;
+}): React.ReactNode[] {
   const parts: React.ReactNode[] = [];
   let lastIndex = 0;
   let match;
   let partIndex = 0;
 
-  const regex = new RegExp(URL_REGEX.source, "g");
-  while ((match = regex.exec(text)) !== null) {
+  URL_REGEX.lastIndex = 0;
+  while ((match = URL_REGEX.exec(text)) !== null) {
     if (match.index > lastIndex) {
       parts.push(
         <span key={`${segmentIndex}-text-${partIndex++}`}>
@@ -30,12 +42,12 @@ function linkifyText(text: string, segmentIndex: number): React.ReactNode[] {
         target="_blank"
         rel="noopener noreferrer"
         onClick={(e) => e.stopPropagation()}
-        className="tw-text-iron-200/90 tw-underline tw-decoration-white/20 tw-underline-offset-2 tw-transition-colors tw-duration-300 hover:tw-text-iron-50 hover:tw-decoration-white/45"
+        className={linkClassName ?? DEFAULT_LINK_CLASSES}
       >
         {match[0]}
       </a>
     );
-    lastIndex = regex.lastIndex;
+    lastIndex = URL_REGEX.lastIndex;
   }
 
   if (lastIndex < text.length) {
@@ -56,11 +68,18 @@ export default function ContentSegmentComponent({
   segment,
   index,
   linkify = true,
+  linkClassName,
 }: ContentSegmentComponentProps) {
   if (segment.type === "text") {
     return (
       <span key={`segment-${index}`}>
-        {linkify ? linkifyText(segment.content, index) : segment.content}
+        {linkify
+          ? linkifyText({
+              linkClassName,
+              segmentIndex: index,
+              text: segment.content,
+            })
+          : segment.content}
       </span>
     );
   }
diff --git a/components/waves/drops/reaction-utils.ts b/components/waves/drops/reaction-utils.ts
index ddfce438c6..954ef7df29 100644
--- a/components/waves/drops/reaction-utils.ts
+++ b/components/waves/drops/reaction-utils.ts
@@ -1,4 +1,4 @@
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 import type { ApiProfileMin } from "@/generated/models/ApiProfileMin";
 import type { ApiDropReaction } from "@/generated/models/ApiDropReaction";
 import { getBannerColorValue } from "@/helpers/profile-banner.helpers";
diff --git a/components/waves/header/WaveHeader.tsx b/components/waves/header/WaveHeader.tsx
index b811bb509d..a8770434e6 100644
--- a/components/waves/header/WaveHeader.tsx
+++ b/components/waves/header/WaveHeader.tsx
@@ -10,7 +10,7 @@ import WaveHeaderName from "./name/WaveHeaderName";
 import WaveHeaderFollowers from "./WaveHeaderFollowers";
 import WaveHeaderDescription from "./WaveHeaderDescription";
 import WaveHeaderPinButton from "./WaveHeaderPinButton";
-import { ApiWaveType } from "@/generated/models/ObjectSerializer";
+import { ApiWaveType } from "@/generated/models/ApiWaveType";
 import WavePicture from "../WavePicture";
 import { Time } from "@/helpers/time";
 import WaveNotificationSettings from "../specs/WaveNotificationSettings";
diff --git a/components/waves/layout/WavesLayout.tsx b/components/waves/layout/WavesLayout.tsx
index 8aa036d9eb..f83e2543e1 100644
--- a/components/waves/layout/WavesLayout.tsx
+++ b/components/waves/layout/WavesLayout.tsx
@@ -1,16 +1,12 @@
 "use client";
 
 import type { ReactNode } from "react";
-import { usePathname, useSearchParams } from "next/navigation";
-import { getActiveWaveIdFromUrl } from "@/helpers/navigation.helpers";
 import { useAuthenticatedContent } from "../../../hooks/useAuthenticatedContent";
 import useDeviceInfo from "../../../hooks/useDeviceInfo";
 import ConnectWallet from "../../common/ConnectWallet";
-import HeaderUserConnect from "../../header/user/HeaderUserConnect";
 import UserSetUpProfileCta from "../../user/utils/set-up-profile/UserSetUpProfileCta";
 import WavesDesktop from "../WavesDesktop";
 import WavesMobile from "../WavesMobile";
-import WaveScreenMessage from "../WaveScreenMessage";
 
 function getConnectPrompt(
   contentState: ReturnType<typeof useAuthenticatedContent>["contentState"]
@@ -41,36 +37,22 @@ function getConnectPrompt(
 }
 
 function getNotAuthenticatedContent({
-  activeWaveId,
   children,
   containerClassName,
   isApp,
-  isMobileDevice,
 }: {
-  readonly activeWaveId: string | null;
   readonly children: ReactNode;
   readonly containerClassName: string;
   readonly isApp: boolean;
-  readonly isMobileDevice: boolean;
 }): ReactNode {
-  if (isApp || (isMobileDevice && activeWaveId === null)) {
+  if (isApp) {
     return <ConnectWallet />;
   }
 
   return (
     <div className="tw-flex-1" id="waves-content">
       <WavesDesktop showLeftSidebar={true}>
-        <div className={containerClassName}>
-          {activeWaveId === null ? (
-            <WaveScreenMessage
-              title="Select a Wave"
-              description="Connect your wallet to access waves and join the conversation."
-              action={<HeaderUserConnect label="Connect Wallet" />}
-            />
-          ) : (
-            children
-          )}
-        </div>
+        <div className={containerClassName}>{children}</div>
       </WavesDesktop>
     </div>
   );
@@ -79,10 +61,7 @@ function getNotAuthenticatedContent({
 // Main layout content that uses the Layout context
 function WavesLayoutContent({ children }: { readonly children: ReactNode }) {
   const { contentState } = useAuthenticatedContent();
-  const { isApp, isMobileDevice } = useDeviceInfo();
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  const activeWaveId = getActiveWaveIdFromUrl({ pathname, searchParams });
+  const { isApp } = useDeviceInfo();
 
   const containerClassName =
     "tw-relative tw-flex tw-flex-col tw-flex-1 tailwind-scope";
@@ -101,11 +80,9 @@ function WavesLayoutContent({ children }: { readonly children: ReactNode }) {
     );
   } else if (contentState === "not-authenticated") {
     content = getNotAuthenticatedContent({
-      activeWaveId,
       children,
       containerClassName,
       isApp,
-      isMobileDevice,
     });
   } else {
     content =
diff --git a/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarBoostedDrops.tsx b/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarBoostedDrops.tsx
index 877f00da26..4517498ae8 100644
--- a/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarBoostedDrops.tsx
+++ b/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarBoostedDrops.tsx
@@ -64,7 +64,7 @@ export const WaveLeaderboardRightSidebarBoostedDrops =
       return (
         <div className="tw-border-x-0 tw-border-b tw-border-t-0 tw-border-solid tw-border-iron-800 tw-pb-4">
           <div className="tw-mb-3 tw-flex tw-items-center tw-justify-between">
-            <div className="tw-flex tw-items-center tw-gap-x-2">
+            <div className="tw-flex tw-items-center tw-gap-x-1.5">
               <BoostIcon className="tw-size-4 tw-text-amber-500" />
               <span className="tw-text-sm tw-font-semibold tw-text-iron-50">
                 Trending
diff --git a/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarTimeWindowSelect.tsx b/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarTimeWindowSelect.tsx
index fab1efc8f8..d97fa163f9 100644
--- a/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarTimeWindowSelect.tsx
+++ b/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarTimeWindowSelect.tsx
@@ -14,21 +14,30 @@ export const WaveLeaderboardRightSidebarTimeWindowSelect =
   memo<WaveLeaderboardRightSidebarTimeWindowSelectProps>(
     ({ value, onChange }) => {
       return (
-        <div className="tw-flex tw-items-center tw-gap-x-1">
-          {TIME_WINDOW_OPTIONS.map((option) => (
-            <button
-              key={option}
-              type="button"
-              onClick={() => onChange(option)}
-              className={`tw-rounded-full tw-border-0 tw-px-2 tw-py-0.5 tw-text-xs tw-font-medium tw-transition-all tw-duration-200 ${
-                value === option
-                  ? "tw-bg-amber-600/20 tw-text-amber-400 tw-ring-1 tw-ring-inset tw-ring-amber-500/40"
-                  : "tw-bg-iron-800 tw-text-iron-400 hover:tw-bg-iron-700 hover:tw-text-iron-200"
-              }`}
-            >
-              {TIME_WINDOW_LABELS[option]}
-            </button>
-          ))}
+        <div
+          className="tw-flex tw-items-center tw-gap-x-0.5"
+          role="tablist"
+          aria-label="Trending time window"
+        >
+          {TIME_WINDOW_OPTIONS.map((option) => {
+            const isActive = value === option;
+            return (
+              <button
+                key={option}
+                type="button"
+                role="tab"
+                aria-selected={isActive}
+                onClick={() => onChange(option)}
+                className={`tw-rounded-full tw-border-0 tw-px-2 tw-py-0.5 tw-text-xs tw-font-medium tw-leading-4 tw-transition-colors tw-duration-150 ${
+                  isActive
+                    ? "tw-bg-iron-700 tw-text-iron-50"
+                    : "tw-bg-transparent tw-text-iron-500 hover:tw-bg-iron-800/60 hover:tw-text-iron-200"
+                }`}
+              >
+                {TIME_WINDOW_LABELS[option]}
+              </button>
+            );
+          })}
         </div>
       );
     }
diff --git a/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarVoters.tsx b/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarVoters.tsx
index 2a0d3b3961..7888c3c901 100644
--- a/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarVoters.tsx
+++ b/components/waves/leaderboard/sidebar/WaveLeaderboardRightSidebarVoters.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import type { ApiWave } from "@/generated/models/ObjectSerializer";
+import type { ApiWave } from "@/generated/models/ApiWave";
 import { useAuth } from "@/components/auth/Auth";
 import { useWaveTopVoters } from "@/hooks/useWaveTopVoters";
 import { useIntersectionObserver } from "@/hooks/useIntersectionObserver";
@@ -34,21 +34,21 @@ export const WaveLeaderboardRightSidebarVoters: React.FC<
   return (
     <div className="tw-space-y-2">
       {voters.length === 0 && !isLoading ? (
-        <div className="tw-flex tw-flex-col tw-items-center tw-justify-center tw-mt-10 tw-space-y-6 tw-text-iron-400">
-          <div className="tw-relative tw-group">
-            <div className="tw-absolute tw-inset-0 tw-bg-gradient-to-br tw-from-primary-400/20 tw-via-indigo-500/10 tw-to-iron-800/10 tw-rounded-full tw-animate-[spin_4s_linear_infinite] group-hover:tw-from-primary-400/30"></div>
-            <div className="tw-absolute tw-inset-0 tw-bg-gradient-to-tr tw-from-iron-800/10 tw-via-indigo-500/10 tw-to-primary-400/20 tw-rounded-full tw-animate-[spin_5s_linear_infinite] group-hover:tw-to-primary-400/30"></div>
-            <div className="tw-absolute tw-inset-0 tw-bg-gradient-radial tw-from-primary-300/5 tw-to-transparent tw-animate-pulse"></div>
+        <div className="tw-mt-10 tw-flex tw-flex-col tw-items-center tw-justify-center tw-space-y-6 tw-text-iron-400">
+          <div className="tw-group tw-relative">
+            <div className="tw-absolute tw-inset-0 tw-animate-[spin_4s_linear_infinite] tw-rounded-full tw-bg-gradient-to-br tw-from-primary-400/20 tw-via-indigo-500/10 tw-to-iron-800/10 group-hover:tw-from-primary-400/30"></div>
+            <div className="tw-absolute tw-inset-0 tw-animate-[spin_5s_linear_infinite] tw-rounded-full tw-bg-gradient-to-tr tw-from-iron-800/10 tw-via-indigo-500/10 tw-to-primary-400/20 group-hover:tw-to-primary-400/30"></div>
+            <div className="tw-bg-gradient-radial tw-absolute tw-inset-0 tw-animate-pulse tw-from-primary-300/5 tw-to-transparent"></div>
             <FontAwesomeIcon
               icon={faClock}
-              className="tw-size-10 tw-flex-shrink-0 tw-relative tw-text-white/60"
+              className="tw-relative tw-size-10 tw-flex-shrink-0 tw-text-white/60"
             />
           </div>
           <div className="tw-flex tw-flex-col tw-items-center tw-gap-y-2">
-            <span className="tw-tracking-tight tw-text-lg tw-font-semibold tw-bg-gradient-to-br tw-from-iron-200 tw-via-iron-300 tw-to-iron-400 tw-bg-clip-text tw-text-transparent">
+            <span className="tw-bg-gradient-to-br tw-from-iron-200 tw-via-iron-300 tw-to-iron-400 tw-bg-clip-text tw-text-lg tw-font-semibold tw-tracking-tight tw-text-transparent">
               Be the First to Make a Vote
             </span>
-            <p className="tw-text-sm tw-text-iron-500 tw-text-center tw-mb-0 tw-max-w-64">
+            <p className="tw-mb-0 tw-max-w-64 tw-text-center tw-text-sm tw-text-iron-500">
               Vote on drops to see voter rankings appear here.
             </p>
           </div>
@@ -64,8 +64,8 @@ export const WaveLeaderboardRightSidebarVoters: React.FC<
             />
           ))}
           {isFetchingNextPage && (
-            <div className="tw-w-full tw-h-0.5 tw-bg-iron-800 tw-overflow-hidden">
-              <div className="tw-w-full tw-h-full tw-bg-indigo-400 tw-animate-loading-bar"></div>
+            <div className="tw-h-0.5 tw-w-full tw-overflow-hidden tw-bg-iron-800">
+              <div className="tw-h-full tw-w-full tw-animate-loading-bar tw-bg-indigo-400"></div>
             </div>
           )}
           <div ref={intersectionElementRef}></div>
diff --git a/components/waves/memes/submission/MobileMemesArtSubmissionBtn.tsx b/components/waves/memes/submission/MobileMemesArtSubmissionBtn.tsx
index 02e52032b6..194b5bee6f 100644
--- a/components/waves/memes/submission/MobileMemesArtSubmissionBtn.tsx
+++ b/components/waves/memes/submission/MobileMemesArtSubmissionBtn.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import React, { useMemo, useState } from "react";
-import type { ApiWave } from "@/generated/models/ObjectSerializer";
+import type { ApiWave } from "@/generated/models/ApiWave";
 import MemesArtSubmissionModal from "../MemesArtSubmissionModal";
 import { SubmissionStatus, useWave } from "@/hooks/useWave";
 
@@ -71,20 +71,22 @@ const MobileMemesArtSubmissionBtn: React.FC<
       <button
         onClick={() => setIsOpen(true)}
         disabled={!canSubmit}
-        className={`tw-absolute tw-top-4 tw-right-4 tw-z-40 tw-text-white tw-flex tw-items-center tw-justify-center tw-border tw-border-solid tw-rounded-full tw-size-10 tw-text-sm tw-font-semibold tw-shadow-sm focus-visible:tw-outline focus-visible:tw-outline-2 focus-visible:tw-outline-offset-2 focus-visible:tw-outline-primary-600 tw-transition tw-duration-300 tw-ease-out ${
+        className={`tw-absolute tw-right-4 tw-top-4 tw-z-40 tw-flex tw-size-10 tw-items-center tw-justify-center tw-rounded-full tw-border tw-border-solid tw-text-sm tw-font-semibold tw-text-white tw-shadow-sm 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-600 ${
           !canSubmit
-            ? "tw-bg-gray-400 tw-border-gray-400 tw-cursor-not-allowed"
+            ? "tw-cursor-not-allowed tw-border-gray-400 tw-bg-gray-400"
             : isUrgent
-            ? "tw-bg-primary-600 tw-border-primary-600 tw-animate-pulse"
-            : "tw-bg-primary-500 tw-border-primary-500 desktop-hover:hover:tw-bg-primary-600 desktop-hover:hover:tw-border-primary-600"
+              ? "tw-animate-pulse tw-border-primary-600 tw-bg-primary-600"
+              : "tw-border-primary-500 tw-bg-primary-500 desktop-hover:hover:tw-border-primary-600 desktop-hover:hover:tw-bg-primary-600"
         }`}
-        aria-label={getAriaLabel()}>
+        aria-label={getAriaLabel()}
+      >
         <svg
           xmlns="http://www.w3.org/2000/svg"
           className="tw-size-6 tw-flex-shrink-0"
           fill="none"
           viewBox="0 0 24 24"
-          stroke="currentColor">
+          stroke="currentColor"
+        >
           <path
             strokeLinecap="round"
             strokeLinejoin="round"
diff --git a/components/waves/utils/getOptimisticDrop.ts b/components/waves/utils/getOptimisticDrop.ts
index a462ee5a39..e911b27cbf 100644
--- a/components/waves/utils/getOptimisticDrop.ts
+++ b/components/waves/utils/getOptimisticDrop.ts
@@ -3,7 +3,7 @@
 import type { ApiCreateDropRequest } from "@/generated/models/ApiCreateDropRequest";
 import type { ApiDrop } from "@/generated/models/ApiDrop";
 import type { ApiDropType } from "@/generated/models/ApiDropType";
-import type { ApiIdentity } from "@/generated/models/ObjectSerializer";
+import type { ApiIdentity } from "@/generated/models/ApiIdentity";
 import type { ApiReplyToDropResponse } from "@/generated/models/ApiReplyToDropResponse";
 import type { ApiWave } from "@/generated/models/ApiWave";
 import { getOptimisticDropId } from "@/helpers/waves/drop.helpers";
diff --git a/contexts/wave/utils/wave-messages-utils.ts b/contexts/wave/utils/wave-messages-utils.ts
index 55ed0a37bd..bb5df1bba6 100644
--- a/contexts/wave/utils/wave-messages-utils.ts
+++ b/contexts/wave/utils/wave-messages-utils.ts
@@ -2,7 +2,7 @@ import { WAVE_DROPS_PARAMS } from "@/components/react-query-wrapper/utils/query-
 import type { ApiDrop } from "@/generated/models/ApiDrop";
 import type { ApiDropId } from "@/generated/models/ApiDropId";
 import type { ApiWaveDropsFeed } from "@/generated/models/ApiWaveDropsFeed";
-import { ApiDropSearchStrategy } from "@/generated/models/ObjectSerializer";
+import { ApiDropSearchStrategy } from "@/generated/models/ApiDropSearchStrategy";
 import type { Drop } from "@/helpers/waves/drop.helpers";
 import { DropSize, getStableDropKey } from "@/helpers/waves/drop.helpers";
 import {
diff --git a/hooks/useCommunityCurationsDrops.ts b/hooks/useCommunityCurationsDrops.ts
new file mode 100644
index 0000000000..769836e36b
--- /dev/null
+++ b/hooks/useCommunityCurationsDrops.ts
@@ -0,0 +1,115 @@
+"use client";
+
+import {
+  getCommunityCurationsMediaType,
+  type CommunityCurationsMediaType,
+} from "@/components/community-curations/communityCurations.helpers";
+import type { ApiDrop } from "@/generated/models/ApiDrop";
+import { DropSize, type ExtendedDrop } from "@/helpers/waves/drop.helpers";
+import { commonApiFetch } from "@/services/api/common-api";
+import { useInfiniteQuery } from "@tanstack/react-query";
+import { useMemo } from "react";
+
+export type CommunityCurationsMediaFilter =
+  | "all"
+  | Exclude<CommunityCurationsMediaType, "other">;
+
+const COMMUNITY_CURATIONS_DROPS_QUERY_KEY = "COMMUNITY_CURATIONS_DROPS";
+
+interface UseCommunityCurationsDropsProps {
+  readonly mediaFilter?: CommunityCurationsMediaFilter | undefined;
+  readonly limit: number;
+  readonly enabled?: boolean | undefined;
+}
+
+interface CommunityCurationsDropsPage {
+  readonly data: ApiDrop[];
+  readonly page: number;
+  readonly next: boolean;
+}
+
+const getUniqueDrops = (
+  pages: CommunityCurationsDropsPage[] | undefined
+): ExtendedDrop[] => {
+  if (!pages) {
+    return [];
+  }
+
+  const seen = new Set<string>();
+  const drops: ExtendedDrop[] = [];
+
+  for (const page of pages) {
+    for (const drop of page.data) {
+      if (seen.has(drop.id)) {
+        continue;
+      }
+      seen.add(drop.id);
+      drops.push({
+        ...drop,
+        type: DropSize.FULL,
+        stableKey: drop.id,
+        stableHash: drop.id,
+      });
+    }
+  }
+
+  return drops;
+};
+
+const matchesMediaFilter = (
+  drop: ExtendedDrop,
+  mediaFilter: CommunityCurationsMediaFilter
+): boolean =>
+  mediaFilter === "all" || getCommunityCurationsMediaType(drop) === mediaFilter;
+
+const fetchCommunityCurationsDrops = ({
+  limit,
+  page,
+}: {
+  readonly limit: number;
+  readonly page: number;
+}): Promise<CommunityCurationsDropsPage> => {
+  return commonApiFetch<CommunityCurationsDropsPage>({
+    endpoint: "curated-profile-wave-drops",
+    params: {
+      page: `${page}`,
+      page_size: `${limit}`,
+    },
+  });
+};
+
+export function useCommunityCurationsDrops({
+  mediaFilter = "all",
+  limit,
+  enabled = true,
+}: UseCommunityCurationsDropsProps) {
+  const query = useInfiniteQuery({
+    queryKey: [COMMUNITY_CURATIONS_DROPS_QUERY_KEY, { limit }],
+    queryFn: ({ pageParam }: { pageParam: number }) =>
+      fetchCommunityCurationsDrops({
+        limit,
+        page: pageParam,
+      }),
+    enabled,
+    initialPageParam: 1,
+    getNextPageParam: (lastPage) =>
+      lastPage.next ? lastPage.page + 1 : undefined,
+    staleTime: 60_000,
+  });
+
+  const allDrops = useMemo(
+    () => getUniqueDrops(query.data?.pages),
+    [query.data?.pages]
+  );
+
+  const drops = useMemo(
+    () => allDrops.filter((drop) => matchesMediaFilter(drop, mediaFilter)),
+    [allDrops, mediaFilter]
+  );
+
+  return {
+    ...query,
+    allDrops,
+    drops,
+  };
+}
diff --git a/services/distribution/distributionPhotoUpload.ts b/services/distribution/distributionPhotoUpload.ts
index cfc4a66b60..473cde6f72 100644
--- a/services/distribution/distributionPhotoUpload.ts
+++ b/services/distribution/distributionPhotoUpload.ts
@@ -1,7 +1,7 @@
-import { ApiCreateMediaUploadUrlRequest } from "@/generated/models/ApiCreateMediaUploadUrlRequest";
-import { ApiCreateMediaUrlResponse } from "@/generated/models/ApiCreateMediaUrlResponse";
-import { DistributionPhotoCompleteRequest } from "@/generated/models/DistributionPhotoCompleteRequest";
-import { DistributionPhotoCompleteResponse } from "@/generated/models/DistributionPhotoCompleteResponse";
+import type { ApiCreateMediaUrlResponse } from "@/generated/models/ApiCreateMediaUrlResponse";
+import type { ApiMediaUploadMimeType } from "@/generated/models/ApiMediaUploadMimeType";
+import type { DistributionPhotoCompleteRequest } from "@/generated/models/DistributionPhotoCompleteRequest";
+import type { DistributionPhotoCompleteResponse } from "@/generated/models/DistributionPhotoCompleteResponse";
 import { commonApiPost } from "@/services/api/common-api";
 import {
   getContentType,
@@ -25,6 +25,11 @@ interface SingleFileUploadParams {
   onProgress?: (bytesUploaded: number) => void;
 }
 
+interface MediaUploadUrlRequest {
+  content_type: ApiMediaUploadMimeType;
+  file_name: string;
+}
+
 async function uploadSingleFile({
   contract,
   tokenId,
@@ -35,7 +40,7 @@ async function uploadSingleFile({
   const contentType = getContentType(file);
 
   const prepData = await commonApiPost<
-    ApiCreateMediaUploadUrlRequest,
+    MediaUploadUrlRequest,
     ApiCreateMediaUrlResponse
   >({
     endpoint,
diff --git a/services/uploads/multipartUploadCore.ts b/services/uploads/multipartUploadCore.ts
index 6db92e64f5..26c66f47a4 100644
--- a/services/uploads/multipartUploadCore.ts
+++ b/services/uploads/multipartUploadCore.ts
@@ -2,7 +2,6 @@ import axios from "axios";
 import pLimit from "p-limit";
 import pRetry from "p-retry";
 import { commonApiPost } from "@/services/api/common-api";
-import type { ApiCreateMediaUploadUrlRequest } from "@/generated/models/ApiCreateMediaUploadUrlRequest";
 import { ApiMediaUploadMimeType } from "@/generated/models/ApiMediaUploadMimeType";
 import type { ApiStartMultipartMediaUploadResponse } from "@/generated/models/ApiStartMultipartMediaUploadResponse";
 import type { ApiUploadPartOfMultipartUploadRequest } from "@/generated/models/ApiUploadPartOfMultipartUploadRequest";
@@ -27,6 +26,11 @@ interface MultipartUploadCoreParams {
   onProgress?: ((bytesUploaded: number) => void) | undefined;
 }
 
+interface MediaUploadUrlRequest {
+  content_type: ApiMediaUploadMimeType;
+  file_name: string;
+}
+
 const SUPPORTED_MIME_TYPES = new Set<string>(
   Object.values(ApiMediaUploadMimeType)
 );
@@ -107,7 +111,7 @@ export async function multipartUploadCore({
   const contentType = getContentType(file);
 
   const startData = await commonApiPost<
-    ApiCreateMediaUploadUrlRequest,
+    MediaUploadUrlRequest,
     ApiStartMultipartMediaUploadResponse
   >({
     endpoint: endpoints.start,