From 5d6cad0d419d4331096eab25df485984fc571fc9 Mon Sep 17 00:00:00 2001
From: ragnep <ragneinfo@gmail.com>
Date: Thu, 30 Apr 2026 11:54:15 +0300
Subject: [PATCH 1/5] wip

Signed-off-by: ragnep <ragneinfo@gmail.com>
---
 .../web/WebBrainLeftSidebarWaves.tsx          |   5 +-
 .../web/WebDirectMessagesList.tsx             |  19 +-
 .../brain/left-sidebar/web/WebLeftSidebar.tsx |   3 +
 .../left-sidebar/web/WebUnifiedWavesList.tsx  |  11 +-
 .../web/WebUnifiedWavesListWaves.tsx          | 593 +++++++++++-------
 .../CommunityCurations.tsx                    |  10 +-
 .../CommunityCurationsMasonry.tsx             |  38 +-
 components/shared/WavesMessagesWrapper.tsx    |   6 +-
 components/waves/drops/WaveDropQuote.tsx      | 197 +++---
 .../drops/WaveDropQuoteDisplayContext.tsx     |  40 ++
 10 files changed, 576 insertions(+), 346 deletions(-)
 create mode 100644 components/waves/drops/WaveDropQuoteDisplayContext.tsx

diff --git a/components/brain/left-sidebar/web/WebBrainLeftSidebarWaves.tsx b/components/brain/left-sidebar/web/WebBrainLeftSidebarWaves.tsx
index d740365045..013ea70ad7 100644
--- a/components/brain/left-sidebar/web/WebBrainLeftSidebarWaves.tsx
+++ b/components/brain/left-sidebar/web/WebBrainLeftSidebarWaves.tsx
@@ -5,14 +5,14 @@ import { useMyStream } from "../../../../contexts/wave/MyStreamContext";
 interface WebBrainLeftSidebarWavesProps {
   readonly scrollContainerRef: React.RefObject<HTMLElement | null>;
   readonly isCollapsed?: boolean | undefined;
+  readonly showProfileFeedShortcut?: boolean | undefined;
 }
 
 const WebBrainLeftSidebarWaves: React.FC<WebBrainLeftSidebarWavesProps> = ({
   scrollContainerRef,
   isCollapsed = false,
+  showProfileFeedShortcut = true,
 }) => {
-
-  
   const { waves, registerWave } = useMyStream();
 
   const onNextPage = () => {
@@ -31,6 +31,7 @@ const WebBrainLeftSidebarWaves: React.FC<WebBrainLeftSidebarWavesProps> = ({
       onHover={registerWave}
       scrollContainerRef={scrollContainerRef}
       isCollapsed={isCollapsed}
+      showProfileFeedShortcut={showProfileFeedShortcut}
     />
   );
 };
diff --git a/components/brain/left-sidebar/web/WebDirectMessagesList.tsx b/components/brain/left-sidebar/web/WebDirectMessagesList.tsx
index bfad294ad3..e3aaeeb4c5 100644
--- a/components/brain/left-sidebar/web/WebDirectMessagesList.tsx
+++ b/components/brain/left-sidebar/web/WebDirectMessagesList.tsx
@@ -17,7 +17,6 @@ import PrimaryButton from "../../../utils/button/PrimaryButton";
 import CreateDirectMessageModal from "../../../waves/create-dm/CreateDirectMessageModal";
 import UnifiedWavesListEmpty from "../waves/UnifiedWavesListEmpty";
 import { UnifiedWavesListLoader } from "../waves/UnifiedWavesListLoader";
-import type { WebUnifiedWavesListWavesHandle } from "./WebUnifiedWavesListWaves";
 import WebUnifiedWavesListWaves from "./WebUnifiedWavesListWaves";
 
 interface WebDirectMessagesListProps {
@@ -37,7 +36,7 @@ const WebDirectMessagesList: React.FC<WebDirectMessagesListProps> = ({
 
   const shouldRenderCreateDirectMessage = !isApp;
 
-  const listRef = useRef<WebUnifiedWavesListWavesHandle>(null);
+  const sentinelRef = useRef<HTMLDivElement>(null);
   const { directMessages, registerWave } = useMyStream();
 
   useInfiniteScroll(
@@ -45,7 +44,7 @@ const WebDirectMessagesList: React.FC<WebDirectMessagesListProps> = ({
     directMessages.isFetchingNextPage,
     directMessages.fetchNextPage,
     scrollContainerRef,
-    listRef.current?.sentinelRef || { current: null },
+    sentinelRef,
     "100px"
   );
 
@@ -70,7 +69,6 @@ const WebDirectMessagesList: React.FC<WebDirectMessagesListProps> = ({
   } else {
     listContent = (
       <WebUnifiedWavesListWaves
-        ref={listRef}
         waves={directMessages.list}
         onHover={registerWave}
         scrollContainerRef={scrollContainerRef}
@@ -79,6 +77,7 @@ const WebDirectMessagesList: React.FC<WebDirectMessagesListProps> = ({
         hidePin={true}
         basePath="/messages"
         isCollapsed={isCollapsed}
+        sentinelRef={sentinelRef}
       />
     );
   }
@@ -204,13 +203,11 @@ const WebDirectMessagesList: React.FC<WebDirectMessagesListProps> = ({
         />
       )}
 
-      {connectedProfile && (
-        <CreateDirectMessageModal
-          isOpen={isDirectMessageModalOpen}
-          onClose={close}
-          profile={connectedProfile}
-        />
-      )}
+      <CreateDirectMessageModal
+        isOpen={isDirectMessageModalOpen}
+        onClose={close}
+        profile={connectedProfile}
+      />
     </div>
   );
 };
diff --git a/components/brain/left-sidebar/web/WebLeftSidebar.tsx b/components/brain/left-sidebar/web/WebLeftSidebar.tsx
index cf897863f4..62699ded3f 100644
--- a/components/brain/left-sidebar/web/WebLeftSidebar.tsx
+++ b/components/brain/left-sidebar/web/WebLeftSidebar.tsx
@@ -22,6 +22,7 @@ import { ChevronDoubleRightIcon } from "@heroicons/react/24/outline";
  */
 interface WebLeftSidebarProps {
   readonly isCollapsed?: boolean | undefined;
+  readonly showProfileFeedShortcut?: boolean | undefined;
 }
 
 const WebLeftSidebarQuickVoteOwner: React.FC<{
@@ -45,6 +46,7 @@ const WebLeftSidebarQuickVoteOwner: React.FC<{
 
 const WebLeftSidebar: React.FC<WebLeftSidebarProps> = ({
   isCollapsed = false,
+  showProfileFeedShortcut = true,
 }) => {
   const scrollContainerRef = useRef<HTMLDivElement>(null);
   const pathname = usePathname();
@@ -93,6 +95,7 @@ const WebLeftSidebar: React.FC<WebLeftSidebarProps> = ({
             <WebBrainLeftSidebarWaves
               scrollContainerRef={scrollContainerRef}
               isCollapsed={isCollapsed}
+              showProfileFeedShortcut={showProfileFeedShortcut}
             />
           )}
           {isMessagesView && (
diff --git a/components/brain/left-sidebar/web/WebUnifiedWavesList.tsx b/components/brain/left-sidebar/web/WebUnifiedWavesList.tsx
index 5c863550e3..bdd3cf3034 100644
--- a/components/brain/left-sidebar/web/WebUnifiedWavesList.tsx
+++ b/components/brain/left-sidebar/web/WebUnifiedWavesList.tsx
@@ -4,7 +4,6 @@ import React, { useRef } from "react";
 import { useInfiniteScroll } from "../../../../hooks/useInfiniteScroll";
 import UnifiedWavesListEmpty from "../waves/UnifiedWavesListEmpty";
 import { UnifiedWavesListLoader } from "../waves/UnifiedWavesListLoader";
-import type { WebUnifiedWavesListWavesHandle } from "./WebUnifiedWavesListWaves";
 import WebUnifiedWavesListWaves from "./WebUnifiedWavesListWaves";
 import type { MinimalWave } from "@/contexts/wave/hooks/useEnhancedWavesListCore";
 
@@ -17,6 +16,7 @@ interface WebUnifiedWavesListProps {
   readonly onHover: (waveId: string) => void;
   readonly scrollContainerRef: React.RefObject<HTMLElement | null>;
   readonly isCollapsed?: boolean | undefined;
+  readonly showProfileFeedShortcut?: boolean | undefined;
 }
 
 const WebUnifiedWavesList: React.FC<WebUnifiedWavesListProps> = (props) => {
@@ -29,9 +29,9 @@ const WebUnifiedWavesList: React.FC<WebUnifiedWavesListProps> = (props) => {
     onHover,
     scrollContainerRef,
     isCollapsed = false,
+    showProfileFeedShortcut = true,
   } = props;
-  // Refs to the scroll container and sentinel
-  const listRef = useRef<WebUnifiedWavesListWavesHandle>(null);
+  const sentinelRef = useRef<HTMLDivElement>(null);
 
   // Use the custom hook for infinite scroll
   useInfiniteScroll(
@@ -39,7 +39,7 @@ const WebUnifiedWavesList: React.FC<WebUnifiedWavesListProps> = (props) => {
     isFetchingNextPage,
     fetchNextPage,
     scrollContainerRef,
-    listRef.current?.sentinelRef || { current: null },
+    sentinelRef,
     "100px"
   );
 
@@ -48,11 +48,12 @@ const WebUnifiedWavesList: React.FC<WebUnifiedWavesListProps> = (props) => {
       <div className="tw-w-full">
         {/* Unified Waves List */}
         <WebUnifiedWavesListWaves
-          ref={listRef}
           waves={waves}
           onHover={onHover}
           scrollContainerRef={scrollContainerRef}
           isCollapsed={isCollapsed}
+          showProfileFeedShortcut={showProfileFeedShortcut}
+          sentinelRef={sentinelRef}
         />
 
         {/* Loading indicator and intersection trigger */}
diff --git a/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx b/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
index f934b33138..c32a6f0c12 100644
--- a/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
+++ b/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
@@ -1,11 +1,13 @@
 "use client";
 
 import PrimaryButton from "@/components/utils/button/PrimaryButton";
+import { useMyStream } from "@/contexts/wave/MyStreamContext";
 import useCreateModalState from "@/hooks/useCreateModalState";
 import useIsTouchDevice from "@/hooks/useIsTouchDevice";
 import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import React, { forwardRef, useImperativeHandle, useMemo, useRef } from "react";
+import Link from "next/link";
+import React, { useMemo, useRef } from "react";
 import { Tooltip as ReactTooltip } from "react-tooltip";
 import type { VirtualItem } from "../../../../hooks/useVirtualizedWaves";
 import { useVirtualizedWaves } from "../../../../hooks/useVirtualizedWaves";
@@ -34,9 +36,38 @@ const EMPTY_WAVES_PLACEHOLDER_HEIGHT = "48px" as const;
 
 const WAVE_ROW_HEIGHT_DEFAULT = 62 as const;
 const WAVE_ROW_HEIGHT_COLLAPSED = 52 as const;
+const PROFILE_FEED_TOOLTIP_ID = "profile-feed-shortcut-tooltip";
+const PROFILE_FEED_LABEL = "Profile Waves Feed";
+const TOOLTIP_STYLE = {
+  padding: "6px 10px",
+  background: "#37373E",
+  color: "white",
+  fontSize: "12px",
+  fontWeight: 500,
+  borderRadius: "6px",
+  boxShadow: "0 4px 12px rgba(0, 0, 0, 0.3)",
+  zIndex: 10000,
+} as const satisfies React.CSSProperties;
 
-export interface WebUnifiedWavesListWavesHandle {
-  sentinelRef: React.RefObject<HTMLElement | null>;
+function MasonryGridIcon() {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      aria-hidden="true"
+      className="tw-size-4 tw-flex-shrink-0"
+    >
+      <rect width="7" height="9" x="3" y="3" rx="1" />
+      <rect width="7" height="5" x="14" y="3" rx="1" />
+      <rect width="7" height="9" x="14" y="12" rx="1" />
+      <rect width="7" height="5" x="3" y="16" rx="1" />
+    </svg>
+  );
 }
 
 interface WebUnifiedWavesListWavesProps {
@@ -48,80 +79,205 @@ interface WebUnifiedWavesListWavesProps {
   readonly scrollContainerRef?: React.RefObject<HTMLElement | null> | undefined;
   readonly basePath?: string | undefined;
   readonly isCollapsed?: boolean | undefined;
+  readonly showProfileFeedShortcut?: boolean | undefined;
+  readonly sentinelRef: React.RefObject<HTMLDivElement | null>;
 }
 
-const WebUnifiedWavesListWaves = forwardRef<
-  WebUnifiedWavesListWavesHandle,
-  WebUnifiedWavesListWavesProps
->(
-  (
-    {
-      waves,
-      onHover,
-      hideHeaders = false,
-      hideToggle = false,
-      hidePin = false,
-      scrollContainerRef,
-      basePath = "/waves",
-      isCollapsed = false,
-    },
-    ref
-  ) => {
-    const listContainerRef = useRef<HTMLDivElement>(null);
-    const sentinelRef = useRef<HTMLDivElement>(null);
-    const { connectedProfile } = useAuth();
-    const { openWave, isApp } = useCreateModalState();
-    const isTouchDevice = useIsTouchDevice();
-    const seizeSettings = useSeizeSettingsOptional();
+function ProfileFeedAvatar({ isActive }: { readonly isActive: boolean }) {
+  return (
+    <div
+      className={`tw-relative tw-size-8 tw-rounded-full tw-transition tw-duration-300 desktop-hover:group-hover:tw-brightness-110 ${
+        isActive
+          ? "tw-opacity-100 tw-ring-1 tw-ring-white/30 tw-ring-offset-2 tw-ring-offset-iron-950"
+          : "tw-opacity-80 tw-ring-1 tw-ring-white/20 desktop-hover:group-hover:tw-opacity-100"
+      }`}
+    >
+      <div
+        className={`tw-h-full tw-w-full tw-rounded-full ${
+          isActive
+            ? "tw-bg-primary-500"
+            : "tw-bg-gradient-to-br tw-from-iron-800 tw-to-iron-700"
+        }`}
+      />
+      <div
+        className={`tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center ${
+          isActive ? "tw-text-white" : "tw-text-iron-300"
+        }`}
+      >
+        <MasonryGridIcon />
+      </div>
+    </div>
+  );
+}
+
+function isModifiedClick(event: React.MouseEvent<HTMLAnchorElement>) {
+  return (
+    event.metaKey ||
+    event.ctrlKey ||
+    event.shiftKey ||
+    event.altKey ||
+    event.button === 1 ||
+    event.button === 2
+  );
+}
 
-    useImperativeHandle(ref, () => ({
-      sentinelRef,
-    }));
+function WebProfileFeedShortcut({
+  basePath,
+  isCollapsed,
+}: {
+  readonly basePath: string;
+  readonly isCollapsed: boolean;
+}) {
+  const { activeWave } = useMyStream();
+  const isActive = activeWave.id === null;
 
-    const showCreateWaveButton = !isApp && !!connectedProfile;
+  const handleClick = (event: React.MouseEvent<HTMLAnchorElement>) => {
+    if (event.defaultPrevented || isModifiedClick(event)) {
+      return;
+    }
 
-    const { announcementWaves, pinnedWaves, regularWaves } = useMemo(() => {
-      const announcements: MinimalWave[] = [];
-      const pinned: MinimalWave[] = [];
-      const regular: MinimalWave[] = [];
+    event.preventDefault();
+    activeWave.set(null, { isDirectMessage: false });
+  };
 
-      for (const wave of waves) {
-        if (seizeSettings?.isAnnouncementsWave(wave.id)) {
-          announcements.push(wave);
-        } else if (wave.isPinned) {
-          pinned.push(wave);
-        } else {
-          regular.push(wave);
-        }
+  if (isCollapsed) {
+    return (
+      <div
+        className={`tw-group tw-flex tw-items-center tw-justify-center tw-py-2 tw-transition-all tw-duration-200 tw-ease-out ${
+          isActive
+            ? "tw-bg-iron-700/60 desktop-hover:hover:tw-bg-iron-700/70"
+            : "desktop-hover:hover:tw-bg-iron-800/70"
+        }`}
+      >
+        <Link
+          href={basePath}
+          prefetch={false}
+          onClick={handleClick}
+          aria-label={PROFILE_FEED_LABEL}
+          className="tw-flex tw-items-center tw-justify-center tw-no-underline"
+          data-tooltip-id={PROFILE_FEED_TOOLTIP_ID}
+          data-tooltip-content={PROFILE_FEED_LABEL}
+        >
+          <ProfileFeedAvatar isActive={isActive} />
+        </Link>
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className={`tw-group tw-flex tw-items-center tw-gap-x-4 tw-px-5 tw-py-2 tw-transition-all tw-duration-200 tw-ease-out ${
+        isActive
+          ? "tw-bg-iron-700/60 desktop-hover:hover:tw-bg-iron-700/70"
+          : "desktop-hover:hover:tw-bg-iron-800/80"
+      }`}
+    >
+      <Link
+        href={basePath}
+        prefetch={false}
+        onClick={handleClick}
+        aria-current={isActive ? "page" : undefined}
+        className={`tw-flex tw-min-w-0 tw-flex-1 tw-items-center tw-space-x-3 tw-py-1 tw-no-underline tw-transition-all tw-duration-200 tw-ease-out ${
+          isActive
+            ? "tw-font-medium tw-text-white desktop-hover:group-hover:tw-text-white"
+            : "tw-font-normal tw-text-iron-400 desktop-hover:group-hover:tw-text-iron-300"
+        }`}
+      >
+        <ProfileFeedAvatar isActive={isActive} />
+        <div className="tw-min-w-0 tw-flex-1">
+          <div className="tw-truncate tw-text-sm">{PROFILE_FEED_LABEL}</div>
+        </div>
+      </Link>
+    </div>
+  );
+}
+
+const WebUnifiedWavesListWaves: React.FC<WebUnifiedWavesListWavesProps> = ({
+  waves,
+  onHover,
+  hideHeaders = false,
+  hideToggle = false,
+  hidePin = false,
+  scrollContainerRef,
+  basePath = "/waves",
+  isCollapsed = false,
+  showProfileFeedShortcut = true,
+  sentinelRef,
+}) => {
+  const listContainerRef = useRef<HTMLDivElement>(null);
+  const { connectedProfile } = useAuth();
+  const { openWave, isApp } = useCreateModalState();
+  const isTouchDevice = useIsTouchDevice();
+  const seizeSettings = useSeizeSettingsOptional();
+
+  const showCreateWaveButton = !isApp && !!connectedProfile;
+  const shouldShowProfileFeedShortcut = !hideHeaders && showProfileFeedShortcut;
+
+  const { announcementWaves, pinnedWaves, regularWaves } = useMemo(() => {
+    const announcements: MinimalWave[] = [];
+    const pinned: MinimalWave[] = [];
+    const regular: MinimalWave[] = [];
+
+    for (const wave of waves) {
+      if (seizeSettings?.isAnnouncementsWave(wave.id)) {
+        announcements.push(wave);
+      } else if (wave.isPinned) {
+        pinned.push(wave);
+      } else {
+        regular.push(wave);
       }
+    }
 
-      return {
-        announcementWaves: announcements,
-        pinnedWaves: pinned,
-        regularWaves: regular,
-      };
-    }, [waves, seizeSettings]);
+    return {
+      announcementWaves: announcements,
+      pinnedWaves: pinned,
+      regularWaves: regular,
+    };
+  }, [waves, seizeSettings]);
 
-    const rowHeight = isCollapsed
-      ? WAVE_ROW_HEIGHT_COLLAPSED
-      : WAVE_ROW_HEIGHT_DEFAULT;
+  const rowHeight = isCollapsed
+    ? WAVE_ROW_HEIGHT_COLLAPSED
+    : WAVE_ROW_HEIGHT_DEFAULT;
 
-    const virtual = useVirtualizedWaves<MinimalWave>(
-      regularWaves,
-      "web-unified-waves-regular",
-      scrollContainerRef ?? listContainerRef,
-      listContainerRef,
-      rowHeight,
-      5
-    );
+  const virtual = useVirtualizedWaves<MinimalWave>(
+    regularWaves,
+    "web-unified-waves-regular",
+    scrollContainerRef ?? listContainerRef,
+    listContainerRef,
+    rowHeight,
+    5
+  );
 
-    return (
-      <>
-        <div className="tw-flex tw-flex-col">
-          {!hideHeaders &&
-            (isCollapsed ? (
-              showCreateWaveButton && (
-                <div className="tw-mb-3.5 tw-flex tw-justify-center tw-px-2">
+  return (
+    <>
+      <div className="tw-flex tw-flex-col">
+        {!hideHeaders &&
+          (isCollapsed ? (
+            showCreateWaveButton && (
+              <div className="tw-mb-3.5 tw-flex tw-justify-center tw-px-2">
+                <div
+                  data-tooltip-id="create-wave-tooltip"
+                  data-tooltip-content="Create wave"
+                >
+                  <PrimaryButton
+                    onClicked={openWave}
+                    loading={false}
+                    disabled={false}
+                    padding="tw-p-2.5"
+                  >
+                    <FontAwesomeIcon
+                      icon={faPlus}
+                      className="tw-size-4 tw-flex-shrink-0"
+                    />
+                  </PrimaryButton>
+                </div>
+              </div>
+            )
+          ) : (
+            <SectionHeader
+              label="Waves"
+              rightContent={
+                showCreateWaveButton ? (
                   <div
                     data-tooltip-id="create-wave-tooltip"
                     data-tooltip-content="Create wave"
@@ -138,188 +294,173 @@ const WebUnifiedWavesListWaves = forwardRef<
                       />
                     </PrimaryButton>
                   </div>
-                </div>
-              )
-            ) : (
-              <SectionHeader
-                label="Waves"
-                rightContent={
-                  showCreateWaveButton ? (
-                    <div
-                      data-tooltip-id="create-wave-tooltip"
-                      data-tooltip-content="Create wave"
-                    >
-                      <PrimaryButton
-                        onClicked={openWave}
-                        loading={false}
-                        disabled={false}
-                        padding="tw-p-2.5"
-                      >
-                        <FontAwesomeIcon
-                          icon={faPlus}
-                          className="tw-size-4 tw-flex-shrink-0"
-                        />
-                      </PrimaryButton>
-                    </div>
-                  ) : undefined
-                }
-              />
-            ))}
-          {!hideHeaders && !hideToggle && !isCollapsed && (
-            <div className="tw-mt-4 tw-flex tw-px-4 tw-pb-3">
-              <WavesFilterToggle />
-            </div>
-          )}
+                ) : undefined
+              }
+            />
+          ))}
+        {!hideHeaders && !hideToggle && !isCollapsed && (
+          <div className="tw-mt-4 tw-flex tw-px-4 tw-pb-3">
+            <WavesFilterToggle />
+          </div>
+        )}
+        {shouldShowProfileFeedShortcut && (
+          <WebProfileFeedShortcut
+            basePath={basePath}
+            isCollapsed={isCollapsed}
+          />
+        )}
 
-          <div>
-            {announcementWaves.length > 0 && (
-              <section
-                className={`tw-flex tw-flex-col ${
-                  isCollapsed ? "tw-items-center tw-gap-y-2" : ""
-                }`}
-                aria-label="Announcement waves"
-              >
-                {announcementWaves
-                  .filter((wave): wave is MinimalWave => {
-                    if (!isValidWave(wave)) {
-                      console.warn("Invalid announcement wave object", wave);
-                      return false;
-                    }
-                    return true;
-                  })
-                  .map((wave) => (
-                    <div key={wave.id} className="tw-w-full">
-                      <WebBrainLeftSidebarWave
-                        wave={wave}
-                        onHover={onHover}
-                        showPin={!hidePin && !isCollapsed && wave.isPinned}
-                        basePath={basePath}
-                        collapsed={isCollapsed}
-                      />
-                    </div>
-                  ))}
-              </section>
-            )}
-            {announcementWaves.length > 0 &&
-              !hideHeaders &&
-              (pinnedWaves.length > 0 || regularWaves.length > 0) && (
-                <div className="tw-my-3 tw-border-x-0 tw-border-b-0 tw-border-t tw-border-solid tw-border-iron-700" />
-              )}
-            {!hideHeaders && pinnedWaves.length > 0 && (
-              <section
-                className={`tw-flex tw-flex-col ${
-                  isCollapsed ? "tw-items-center tw-gap-y-2" : ""
-                }`}
-                aria-label="Pinned waves"
-              >
-                {pinnedWaves
-                  .filter((wave): wave is MinimalWave => {
-                    if (!isValidWave(wave)) {
-                      console.warn("Invalid pinned wave object", wave);
-                      return false;
-                    }
-                    return true;
-                  })
-                  .map((wave) => (
-                    <div key={wave.id} className="tw-w-full">
-                      <WebBrainLeftSidebarWave
-                        wave={wave}
-                        onHover={onHover}
-                        showPin={!hidePin && !isCollapsed}
-                        basePath={basePath}
-                        collapsed={isCollapsed}
-                      />
-                    </div>
-                  ))}
-              </section>
-            )}
-            {!hideHeaders &&
-              pinnedWaves.length > 0 &&
-              regularWaves.length > 0 && (
-                <div className="tw-my-3 tw-border-x-0 tw-border-b-0 tw-border-t tw-border-solid tw-border-iron-700" />
-              )}
-            {regularWaves.length > 0 ? (
-              <section
-                ref={listContainerRef}
-                style={{
-                  height: virtual.totalHeight,
-                  position: "relative",
-                }}
-                aria-label="Regular waves list"
-              >
-                {virtual.virtualItems.map((v: VirtualItem) => {
-                  if (v.index === regularWaves.length) {
-                    return (
-                      <div
-                        key="sentinel"
-                        ref={sentinelRef}
-                        style={{
-                          position: "absolute",
-                          width: "100%",
-                          top: v.start,
-                          height: v.size,
-                        }}
-                      />
-                    );
+        <div>
+          {announcementWaves.length > 0 && (
+            <section
+              className={`tw-flex tw-flex-col ${
+                isCollapsed ? "tw-items-center tw-gap-y-2" : ""
+              }`}
+              aria-label="Announcement waves"
+            >
+              {announcementWaves
+                .filter((wave): wave is MinimalWave => {
+                  if (!isValidWave(wave)) {
+                    console.warn("Invalid announcement wave object", wave);
+                    return false;
                   }
-                  const wave = regularWaves[v.index];
+                  return true;
+                })
+                .map((wave) => (
+                  <div key={wave.id} className="tw-w-full">
+                    <WebBrainLeftSidebarWave
+                      wave={wave}
+                      onHover={onHover}
+                      showPin={!hidePin && !isCollapsed && wave.isPinned}
+                      basePath={basePath}
+                      collapsed={isCollapsed}
+                    />
+                  </div>
+                ))}
+            </section>
+          )}
+          {announcementWaves.length > 0 &&
+            !hideHeaders &&
+            (pinnedWaves.length > 0 || regularWaves.length > 0) && (
+              <div className="tw-my-2 tw-border-x-0 tw-border-b-0 tw-border-t tw-border-solid tw-border-iron-700" />
+            )}
+          {!hideHeaders && pinnedWaves.length > 0 && (
+            <section
+              className={`tw-flex tw-flex-col ${
+                isCollapsed ? "tw-items-center tw-gap-y-2" : ""
+              }`}
+              aria-label="Pinned waves"
+            >
+              {pinnedWaves
+                .filter((wave): wave is MinimalWave => {
                   if (!isValidWave(wave)) {
-                    console.warn("Invalid wave object at index", v.index, wave);
-                    return null;
+                    console.warn("Invalid pinned wave object", wave);
+                    return false;
                   }
+                  return true;
+                })
+                .map((wave) => (
+                  <div key={wave.id} className="tw-w-full">
+                    <WebBrainLeftSidebarWave
+                      wave={wave}
+                      onHover={onHover}
+                      showPin={!hidePin && !isCollapsed}
+                      basePath={basePath}
+                      collapsed={isCollapsed}
+                    />
+                  </div>
+                ))}
+            </section>
+          )}
+          {!hideHeaders &&
+            pinnedWaves.length > 0 &&
+            regularWaves.length > 0 && (
+              <div className="tw-my-2 tw-border-x-0 tw-border-b-0 tw-border-t tw-border-solid tw-border-iron-700" />
+            )}
+          {regularWaves.length > 0 ? (
+            <section
+              ref={listContainerRef}
+              style={{
+                height: virtual.totalHeight,
+                position: "relative",
+              }}
+              aria-label="Regular waves list"
+            >
+              {virtual.virtualItems.map((v: VirtualItem) => {
+                if (v.index === regularWaves.length) {
                   return (
                     <div
-                      key={wave.id}
+                      key="sentinel"
+                      ref={sentinelRef}
                       style={{
                         position: "absolute",
                         width: "100%",
                         top: v.start,
                         height: v.size,
                       }}
-                    >
-                      <WebBrainLeftSidebarWave
-                        wave={wave}
-                        onHover={onHover}
-                        showPin={!hidePin && !isCollapsed}
-                        basePath={basePath}
-                        collapsed={isCollapsed}
-                      />
-                    </div>
+                    />
                   );
-                })}
-              </section>
-            ) : (
-              <div
-                ref={listContainerRef}
-                style={{ minHeight: EMPTY_WAVES_PLACEHOLDER_HEIGHT }}
-              />
-            )}
-          </div>
+                }
+                const wave = regularWaves[v.index];
+                if (!isValidWave(wave)) {
+                  console.warn("Invalid wave object at index", v.index, wave);
+                  return null;
+                }
+                return (
+                  <div
+                    key={wave.id}
+                    style={{
+                      position: "absolute",
+                      width: "100%",
+                      top: v.start,
+                      height: v.size,
+                    }}
+                  >
+                    <WebBrainLeftSidebarWave
+                      wave={wave}
+                      onHover={onHover}
+                      showPin={!hidePin && !isCollapsed}
+                      basePath={basePath}
+                      collapsed={isCollapsed}
+                    />
+                  </div>
+                );
+              })}
+            </section>
+          ) : (
+            <div
+              ref={listContainerRef}
+              style={{ minHeight: EMPTY_WAVES_PLACEHOLDER_HEIGHT }}
+            />
+          )}
         </div>
+      </div>
 
-        {!isTouchDevice && (
+      {!isTouchDevice && (
+        <>
           <ReactTooltip
             id="create-wave-tooltip"
             place="bottom"
             offset={8}
             opacity={1}
-            style={{
-              padding: "6px 10px",
-              background: "#37373E",
-              color: "white",
-              fontSize: "12px",
-              fontWeight: 500,
-              borderRadius: "6px",
-              boxShadow: "0 4px 12px rgba(0, 0, 0, 0.3)",
-              zIndex: 10000,
-            }}
+            style={TOOLTIP_STYLE}
             border="1px solid #4C4C55"
           />
-        )}
-      </>
-    );
-  }
-);
+          {shouldShowProfileFeedShortcut && (
+            <ReactTooltip
+              id={PROFILE_FEED_TOOLTIP_ID}
+              place="right"
+              offset={8}
+              opacity={1}
+              style={TOOLTIP_STYLE}
+              border="1px solid #4C4C55"
+            />
+          )}
+        </>
+      )}
+    </>
+  );
+};
 
 WebUnifiedWavesListWaves.displayName = "WebUnifiedWavesListWaves";
 export default WebUnifiedWavesListWaves;
diff --git a/components/community-curations/CommunityCurations.tsx b/components/community-curations/CommunityCurations.tsx
index f82f7d5a4a..f2f2b4b9d0 100644
--- a/components/community-curations/CommunityCurations.tsx
+++ b/components/community-curations/CommunityCurations.tsx
@@ -163,11 +163,11 @@ export default function CommunityCurations() {
       <div className="tw-mx-auto tw-w-full tw-max-w-6xl">
         <div className="tw-flex tw-flex-col tw-gap-4">
           <div className="tw-max-w-2xl">
-            <h1 className="tw-mb-0 tw-text-2xl tw-font-bold tw-text-white">
-              Community Curations
+            <h1 className="tw-mb-0 tw-text-lg tw-font-bold tw-text-white md:tw-text-xl">
+              Latest From Profile Waves
             </h1>
             <p className="tw-mb-0 tw-mt-1 tw-text-sm tw-text-iron-400">
-              Community-curated drops from across 6529 Waves.
+              Drops 6529 users are featuring from their own profile waves.
             </p>
           </div>
         </div>
@@ -184,8 +184,8 @@ export default function CommunityCurations() {
 
           {shouldShowEmptyState && (
             <CommunityCurationsEmptyState
-              title="No curated drops yet"
-              description="Community-curated drops will appear here when visible curations have activity."
+              title="No profile wave drops yet"
+              description="Drops will appear here when users feature them from their profile waves."
             />
           )}
 
diff --git a/components/community-curations/CommunityCurationsMasonry.tsx b/components/community-curations/CommunityCurationsMasonry.tsx
index 3bd629b2c2..b3e23edfc4 100644
--- a/components/community-curations/CommunityCurationsMasonry.tsx
+++ b/components/community-curations/CommunityCurationsMasonry.tsx
@@ -6,6 +6,7 @@ import CircleLoader, {
 import { TweetPreviewModeProvider } from "@/components/tweets/TweetPreviewModeContext";
 import CurationDropFooter from "@/components/waves/drops/CurationDropFooter";
 import Drop, { DropLocation } from "@/components/waves/drops/Drop";
+import { WaveDropQuoteDisplayProvider } from "@/components/waves/drops/WaveDropQuoteDisplayContext";
 import type { ExtendedDrop } from "@/helpers/waves/drop.helpers";
 import { useNavigateToDropWave } from "@/hooks/useNavigateToDropWave";
 import { useIntersectionObserver } from "@/hooks/scroll/useIntersectionObserver";
@@ -249,24 +250,25 @@ function CommunityCurationsMasonryItem({
 
   return (
     <article className={CURATION_CARD_CLASS_NAME}>
-      <Drop
-        drop={drop}
-        previousDrop={null}
-        nextDrop={null}
-        showWaveInfo={false}
-        activeDrop={null}
-        showReplyAndQuote={false}
-        location={DropLocation.MY_STREAM}
-        dropViewDropId={null}
-        onReply={noop}
-        onReplyClick={noop}
-        onQuoteClick={navigateToDropWave}
-        onDropContentClick={navigateToDropWave}
-        footer={<CurationDropFooter drop={drop} />}
-        identityMode="default"
-        timestampLayout="stacked"
-        showInteractions={false}
-      />
+      <WaveDropQuoteDisplayProvider flattenWhenAuthorSameAs={drop.author}>
+        <Drop
+          drop={drop}
+          previousDrop={null}
+          nextDrop={null}
+          showWaveInfo={false}
+          activeDrop={null}
+          showReplyAndQuote={false}
+          location={DropLocation.MY_STREAM}
+          dropViewDropId={null}
+          onReply={noop}
+          onReplyClick={noop}
+          onQuoteClick={navigateToDropWave}
+          onDropContentClick={navigateToDropWave}
+          footer={<CurationDropFooter drop={drop} />}
+          timestampLayout="stacked"
+          showInteractions={false}
+        />
+      </WaveDropQuoteDisplayProvider>
       <div
         aria-hidden="true"
         className={CURATION_CARD_HOVER_FRAME_CLASS_NAME}
diff --git a/components/shared/WavesMessagesWrapper.tsx b/components/shared/WavesMessagesWrapper.tsx
index 99c46c8d42..ffbd50ab3f 100644
--- a/components/shared/WavesMessagesWrapper.tsx
+++ b/components/shared/WavesMessagesWrapper.tsx
@@ -114,6 +114,7 @@ const WavesMessagesWrapper: React.FC<WavesMessagesWrapperProps> = ({
   // Clear logic for when to show each part
   const hasWave = waveId !== undefined;
   const canShowMainContent = !isMobile || hasWave;
+  const showProfileFeedShortcut = !isMobile;
   const shouldShowLeftSidebar =
     showLeftSidebar && (!isMobile || (!hasWave && !canShowMainContent));
   const shouldShowMainContent = canShowMainContent;
@@ -143,7 +144,10 @@ const WavesMessagesWrapper: React.FC<WavesMessagesWrapperProps> = ({
               style={contentContainerStyle}
             >
               {shouldShowLeftSidebar && (
-                <WebBrainLeftSidebar isCollapsed={rightVariant === "inline"} />
+                <WebBrainLeftSidebar
+                  isCollapsed={rightVariant === "inline"}
+                  showProfileFeedShortcut={showProfileFeedShortcut}
+                />
               )}
               {shouldShowMainContent && (
                 <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">
diff --git a/components/waves/drops/WaveDropQuote.tsx b/components/waves/drops/WaveDropQuote.tsx
index 1a4128e77c..f7d81efc02 100644
--- a/components/waves/drops/WaveDropQuote.tsx
+++ b/components/waves/drops/WaveDropQuote.tsx
@@ -14,6 +14,11 @@ import Image from "next/image";
 import { resolveIpfsUrlSync } from "@/components/ipfs/IPFSContext";
 import { useLinkPreviewContext } from "@/components/waves/LinkPreviewContext";
 import DropNotFound from "./DropNotFound";
+import { areSameProfileIdentity } from "@/helpers/ProfileHelpers";
+import {
+  useWaveDropQuoteDisplay,
+  WaveDropQuoteDisplayProvider,
+} from "./WaveDropQuoteDisplayContext";
 
 interface WaveDropQuoteProps {
   readonly drop: ApiDrop | null;
@@ -65,6 +70,71 @@ const WaveDropQuoteProfilePicture: React.FC<
   );
 };
 
+function WaveDropQuoteBody({
+  drop,
+  quoteAuthorLabel,
+  quoteContent,
+  waveHref,
+}: {
+  readonly drop: ApiDrop | null;
+  readonly quoteAuthorLabel: string | null;
+  readonly quoteContent: React.ReactNode;
+  readonly waveHref: string;
+}) {
+  return (
+    <div className="tw-group tw-relative tw-flex tw-w-full tw-flex-col">
+      <div className="tw-flex tw-gap-x-2">
+        <div className="tw-relative tw-h-6 tw-w-6 tw-flex-shrink-0 tw-rounded-md tw-bg-iron-900">
+          <div className="tw-h-full tw-w-full tw-rounded-md">
+            <WaveDropQuoteProfilePicture drop={drop} />
+          </div>
+        </div>
+        <div className="tw-flex tw-w-full tw-flex-col">
+          <div className="tw-flex tw-items-center tw-gap-x-2">
+            <div className="tw-flex tw-items-center tw-gap-x-2">
+              {quoteAuthorLabel && (
+                <p className="tw-mb-0 tw-text-md tw-font-semibold tw-leading-none">
+                  <Link
+                    href={`/${quoteAuthorLabel}`}
+                    className="tw-text-iron-200 tw-no-underline tw-transition tw-duration-300 tw-ease-out hover:tw-text-iron-500"
+                  >
+                    {quoteAuthorLabel}
+                  </Link>
+                </p>
+              )}
+
+              {!!drop && (
+                <UserCICAndLevel
+                  level={drop.author.level}
+                  size={UserCICAndLevelSize.SMALL}
+                />
+              )}
+            </div>
+
+            {!!drop && (
+              <>
+                <div className="tw-size-[3px] tw-flex-shrink-0 tw-rounded-full tw-bg-iron-600"></div>
+                <WaveDropTime timestamp={drop.created_at} />
+              </>
+            )}
+          </div>
+          <div>
+            {drop && waveHref && (
+              <Link
+                href={waveHref}
+                className="tw-leading-0 -tw-mt-1 tw-text-[11px] tw-text-iron-500 tw-no-underline tw-transition tw-duration-300 tw-ease-out hover:tw-text-iron-300"
+              >
+                {drop.wave.name}
+              </Link>
+            )}
+          </div>
+          <div className="tw-mt-0.5">{quoteContent}</div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
 const WaveDropQuote: React.FC<WaveDropQuoteProps> = ({
   drop,
   partId,
@@ -77,6 +147,7 @@ const WaveDropQuote: React.FC<WaveDropQuoteProps> = ({
   onLinkCardActionsActiveChange,
 }) => {
   const { onCardActionsActiveChange } = useLinkPreviewContext();
+  const { flattenWhenAuthorSameAs } = useWaveDropQuoteDisplay();
   const quotedPart = useMemo<ApiDropPart | null>(() => {
     if (!drop) {
       return null;
@@ -133,6 +204,13 @@ const WaveDropQuote: React.FC<WaveDropQuoteProps> = ({
   const resolvedOnLinkCardActionsActiveChange =
     onLinkCardActionsActiveChange ?? onCardActionsActiveChange;
   const isInteractive = drop !== null && !isNotFound;
+  const shouldFlattenQuote = areSameProfileIdentity({
+    left: drop?.author,
+    right: flattenWhenAuthorSameAs,
+  });
+  const quoteAuthorLabel = drop
+    ? (drop.author.handle ?? drop.author.primary_address)
+    : null;
   const handleQuoteContainerClick = (
     event: React.MouseEvent<HTMLDivElement>
   ) => {
@@ -142,6 +220,15 @@ const WaveDropQuote: React.FC<WaveDropQuoteProps> = ({
       goToQuoteDrop();
     }
   };
+  const handleQuoteContainerKeyDown = isInteractive
+    ? (event: React.KeyboardEvent<HTMLDivElement>) => {
+        if (event.key === "Enter" || event.key === " ") {
+          event.preventDefault();
+          event.stopPropagation();
+          goToQuoteDrop();
+        }
+      }
+    : undefined;
   const quoteContainerClassName = `tw-mt-1 ${
     isInteractive ? "tw-cursor-pointer" : ""
   } tw-rounded-xl tw-bg-iron-950 tw-px-3 tw-py-3 tw-ring-1 tw-ring-inset tw-ring-iron-800`;
@@ -157,91 +244,45 @@ const WaveDropQuote: React.FC<WaveDropQuoteProps> = ({
     );
   }
 
+  const quoteContent = (
+    <WaveDropQuoteDisplayProvider flattenWhenAuthorSameAs={null}>
+      <DropPartMarkdownWithPropLogger
+        partContent={quotedPart?.content ?? ""}
+        mentionedUsers={drop?.mentioned_users ?? []}
+        mentionedGroups={drop?.mentioned_groups ?? []}
+        mentionedWaves={drop?.mentioned_waves ?? []}
+        referencedNfts={drop?.referenced_nfts ?? []}
+        nftLinks={drop?.nft_links}
+        textSize="sm"
+        onQuoteClick={onQuoteClick}
+        currentDropId={drop?.id}
+        embedPath={embedPath}
+        quotePath={effectiveQuotePath}
+        embedDepth={embedDepth}
+        maxEmbedDepth={maxEmbedDepth}
+        onLinkCardActionsActiveChange={resolvedOnLinkCardActionsActiveChange}
+      />
+    </WaveDropQuoteDisplayProvider>
+  );
+
+  if (shouldFlattenQuote) {
+    return quoteContent;
+  }
+
   return (
     <div
       className={quoteContainerClassName}
       onClick={handleQuoteContainerClick}
-      onKeyDown={
-        isInteractive
-          ? (e) => {
-              if (e.key === "Enter" || e.key === " ") {
-                e.preventDefault();
-                e.stopPropagation();
-                goToQuoteDrop();
-              }
-            }
-          : undefined
-      }
+      onKeyDown={handleQuoteContainerKeyDown}
       role={isInteractive ? "button" : undefined}
       tabIndex={isInteractive ? 0 : undefined}
     >
-      <div className="tw-group tw-relative tw-flex tw-w-full tw-flex-col">
-        <div className="tw-flex tw-gap-x-2">
-          <div className="tw-relative tw-h-6 tw-w-6 tw-flex-shrink-0 tw-rounded-md tw-bg-iron-900">
-            <div className="tw-h-full tw-w-full tw-rounded-md">
-              <WaveDropQuoteProfilePicture drop={drop} />
-            </div>
-          </div>
-          <div className="tw-flex tw-w-full tw-flex-col">
-            <div className="tw-flex tw-items-center tw-gap-x-2">
-              <div className="tw-flex tw-items-center tw-gap-x-2">
-                {!!drop && (
-                  <UserCICAndLevel
-                    level={drop.author.level}
-                    size={UserCICAndLevelSize.SMALL}
-                  />
-                )}
-
-                <p className="tw-mb-0 tw-text-md tw-font-semibold tw-leading-none">
-                  <Link
-                    href={`/${drop?.author.handle ?? drop?.author.primary_address}`}
-                    className="tw-text-iron-200 tw-no-underline tw-transition tw-duration-300 tw-ease-out hover:tw-text-iron-500"
-                  >
-                    {drop?.author.handle ?? drop?.author.primary_address}
-                  </Link>
-                </p>
-              </div>
-
-              {!!drop && (
-                <>
-                  <div className="tw-size-[3px] tw-flex-shrink-0 tw-rounded-full tw-bg-iron-600"></div>
-                  <WaveDropTime timestamp={drop.created_at} />
-                </>
-              )}
-            </div>
-            <div>
-              {drop && waveHref && (
-                <Link
-                  href={waveHref}
-                  className="tw-leading-0 -tw-mt-1 tw-text-[11px] tw-text-iron-500 tw-no-underline tw-transition tw-duration-300 tw-ease-out hover:tw-text-iron-300"
-                >
-                  {drop.wave.name}
-                </Link>
-              )}
-            </div>
-            <div className="tw-mt-0.5">
-              <DropPartMarkdownWithPropLogger
-                partContent={quotedPart?.content ?? ""}
-                mentionedUsers={drop?.mentioned_users ?? []}
-                mentionedGroups={drop?.mentioned_groups ?? []}
-                mentionedWaves={drop?.mentioned_waves ?? []}
-                referencedNfts={drop?.referenced_nfts ?? []}
-                nftLinks={drop?.nft_links}
-                textSize="sm"
-                onQuoteClick={onQuoteClick}
-                currentDropId={drop?.id}
-                embedPath={embedPath}
-                quotePath={effectiveQuotePath}
-                embedDepth={embedDepth}
-                maxEmbedDepth={maxEmbedDepth}
-                onLinkCardActionsActiveChange={
-                  resolvedOnLinkCardActionsActiveChange
-                }
-              />
-            </div>
-          </div>
-        </div>
-      </div>
+      <WaveDropQuoteBody
+        drop={drop}
+        quoteAuthorLabel={quoteAuthorLabel}
+        quoteContent={quoteContent}
+        waveHref={waveHref}
+      />
     </div>
   );
 };
diff --git a/components/waves/drops/WaveDropQuoteDisplayContext.tsx b/components/waves/drops/WaveDropQuoteDisplayContext.tsx
new file mode 100644
index 0000000000..e1d2c77c02
--- /dev/null
+++ b/components/waves/drops/WaveDropQuoteDisplayContext.tsx
@@ -0,0 +1,40 @@
+"use client";
+
+import type { ApiProfileMin } from "@/generated/models/ApiProfileMin";
+import { createContext, type ReactNode, useContext, useMemo } from "react";
+
+type QuoteAuthorIdentity = Pick<
+  ApiProfileMin,
+  "handle" | "id" | "primary_address"
+>;
+
+type WaveDropQuoteDisplayContextValue = {
+  readonly flattenWhenAuthorSameAs: QuoteAuthorIdentity | null;
+};
+
+const WaveDropQuoteDisplayContext =
+  createContext<WaveDropQuoteDisplayContextValue>({
+    flattenWhenAuthorSameAs: null,
+  });
+
+export function WaveDropQuoteDisplayProvider({
+  children,
+  flattenWhenAuthorSameAs,
+}: {
+  readonly children: ReactNode;
+  readonly flattenWhenAuthorSameAs: QuoteAuthorIdentity | null;
+}) {
+  const value = useMemo(
+    () => ({ flattenWhenAuthorSameAs }),
+    [flattenWhenAuthorSameAs]
+  );
+
+  return (
+    <WaveDropQuoteDisplayContext.Provider value={value}>
+      {children}
+    </WaveDropQuoteDisplayContext.Provider>
+  );
+}
+
+export const useWaveDropQuoteDisplay = () =>
+  useContext(WaveDropQuoteDisplayContext);

From 4111e8c1598f515dbb8a92850f6ea79e9a281289 Mon Sep 17 00:00:00 2001
From: ragnep <ragneinfo@gmail.com>
Date: Thu, 30 Apr 2026 12:06:30 +0300
Subject: [PATCH 2/5] wip

Signed-off-by: ragnep <ragneinfo@gmail.com>
---
 components/community-curations/CommunityCurationsMasonry.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/community-curations/CommunityCurationsMasonry.tsx b/components/community-curations/CommunityCurationsMasonry.tsx
index b3e23edfc4..120203edc9 100644
--- a/components/community-curations/CommunityCurationsMasonry.tsx
+++ b/components/community-curations/CommunityCurationsMasonry.tsx
@@ -32,9 +32,9 @@ const MASONRY_GUTTER = 16;
 const INFINITE_SCROLL_ROOT_MARGIN = "1200px 0px";
 const SCROLL_IDLE_DELAY_MS = 120;
 const CURATION_CARD_CLASS_NAME =
-  "tw-group tw-relative tw-isolate tw-rounded-xl";
+  "tw-group tw-relative tw-isolate tw-z-0 tw-rounded-xl desktop-hover:hover:tw-z-30 focus-within:tw-z-30";
 const CURATION_CARD_HOVER_FRAME_CLASS_NAME =
-  "tw-pointer-events-none tw-absolute tw-inset-0 tw-z-10 tw-rounded-xl tw-border tw-border-solid tw-border-transparent tw-transition-colors tw-duration-200 tw-ease-out desktop-hover:group-hover:tw-border-white/10 motion-reduce:tw-transition-none";
+  "tw-pointer-events-none tw-absolute tw-inset-0 -tw-z-10 tw-rounded-xl tw-border tw-border-solid tw-border-transparent tw-transition-colors tw-duration-200 tw-ease-out desktop-hover:group-hover:tw-border-white/10 motion-reduce:tw-transition-none";
 
 type PanelViewport = {
   readonly height: number;

From d68276a584e074b4a6ec33124d3210a3dd972b51 Mon Sep 17 00:00:00 2001
From: ragnep <ragneinfo@gmail.com>
Date: Thu, 30 Apr 2026 12:13:59 +0300
Subject: [PATCH 3/5] wip

Signed-off-by: ragnep <ragneinfo@gmail.com>
---
 components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx b/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
index c32a6f0c12..ea98bf7a4a 100644
--- a/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
+++ b/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
@@ -154,6 +154,7 @@ function WebProfileFeedShortcut({
           prefetch={false}
           onClick={handleClick}
           aria-label={PROFILE_FEED_LABEL}
+          aria-current={isActive ? "page" : undefined}
           className="tw-flex tw-items-center tw-justify-center tw-no-underline"
           data-tooltip-id={PROFILE_FEED_TOOLTIP_ID}
           data-tooltip-content={PROFILE_FEED_LABEL}

From d61974abb0dd673f2db35aad533947e3f9a84be9 Mon Sep 17 00:00:00 2001
From: ragnep <ragneinfo@gmail.com>
Date: Thu, 30 Apr 2026 12:19:01 +0300
Subject: [PATCH 4/5] wip

Signed-off-by: ragnep <ragneinfo@gmail.com>
---
 .../left-sidebar/web/WebUnifiedWavesListWaves.tsx    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx b/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
index ea98bf7a4a..3502dfb762 100644
--- a/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
+++ b/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
@@ -86,22 +86,20 @@ interface WebUnifiedWavesListWavesProps {
 function ProfileFeedAvatar({ isActive }: { readonly isActive: boolean }) {
   return (
     <div
-      className={`tw-relative tw-size-8 tw-rounded-full tw-transition tw-duration-300 desktop-hover:group-hover:tw-brightness-110 ${
+      className={`tw-relative tw-size-8 tw-rounded-full tw-transition tw-duration-200 desktop-hover:group-hover:tw-brightness-110 ${
         isActive
-          ? "tw-opacity-100 tw-ring-1 tw-ring-white/30 tw-ring-offset-2 tw-ring-offset-iron-950"
-          : "tw-opacity-80 tw-ring-1 tw-ring-white/20 desktop-hover:group-hover:tw-opacity-100"
+          ? "tw-opacity-100 tw-ring-1 tw-ring-primary-300/35"
+          : "tw-opacity-90 tw-ring-1 tw-ring-iron-700/80 desktop-hover:group-hover:tw-opacity-100 desktop-hover:group-hover:tw-ring-iron-500/80"
       }`}
     >
       <div
         className={`tw-h-full tw-w-full tw-rounded-full ${
-          isActive
-            ? "tw-bg-primary-500"
-            : "tw-bg-gradient-to-br tw-from-iron-800 tw-to-iron-700"
+          isActive ? "tw-bg-primary-500/90" : "tw-bg-iron-900"
         }`}
       />
       <div
         className={`tw-absolute tw-inset-0 tw-flex tw-items-center tw-justify-center ${
-          isActive ? "tw-text-white" : "tw-text-iron-300"
+          isActive ? "tw-text-primary-50" : "tw-text-iron-400"
         }`}
       >
         <MasonryGridIcon />

From 826a1d609635e24e2a45a98dbccaea6492057d63 Mon Sep 17 00:00:00 2001
From: ragnep <ragneinfo@gmail.com>
Date: Thu, 30 Apr 2026 12:23:29 +0300
Subject: [PATCH 5/5] wip

Signed-off-by: ragnep <ragneinfo@gmail.com>
---
 .../brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx b/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
index 3502dfb762..59efea0882 100644
--- a/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
+++ b/components/brain/left-sidebar/web/WebUnifiedWavesListWaves.tsx
@@ -86,10 +86,10 @@ interface WebUnifiedWavesListWavesProps {
 function ProfileFeedAvatar({ isActive }: { readonly isActive: boolean }) {
   return (
     <div
-      className={`tw-relative tw-size-8 tw-rounded-full tw-transition tw-duration-200 desktop-hover:group-hover:tw-brightness-110 ${
+      className={`tw-relative tw-size-8 tw-rounded-full tw-border tw-border-solid tw-transition tw-duration-200 desktop-hover:group-hover:tw-brightness-110 ${
         isActive
-          ? "tw-opacity-100 tw-ring-1 tw-ring-primary-300/35"
-          : "tw-opacity-90 tw-ring-1 tw-ring-iron-700/80 desktop-hover:group-hover:tw-opacity-100 desktop-hover:group-hover:tw-ring-iron-500/80"
+          ? "tw-border-primary-300/75 tw-opacity-100"
+          : "tw-border-iron-700/80 tw-opacity-90 desktop-hover:group-hover:tw-border-iron-500/80 desktop-hover:group-hover:tw-opacity-100"
       }`}
     >
       <div