From 05cd0c7d1512e8e2bfb43379a58df0464ff9a223 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 9 Jun 2026 11:00:02 +0300
Subject: [PATCH 1/7] feat: comment-first action row experiment

Place Comment before Upvote/Downvote across feed cards, mobile floating
bar, reader bars, and the extension companion menu. Swap the comment
icon for a new Filled=yes/no design (DiscussIconV2) only inside those
action rows; other DiscussIcon consumers (Reply, notifications, sidebar)
are untouched. The post page (PostActions) only swaps the icon and keeps
its existing order.

When the flag is on, the feed Reply button navigates to the post page
with ?comment=true so NewComment auto-opens the composer on arrival; the
post-type guard in NewComment is dropped so this works for all post
types. Tooltip copy renamed "Comment"/"Comments" to "Reply" in feed
cards and reader bars, with matching spec selector updates.

All behavior gated behind a new boolean GrowthBook flag
`comment_first_action`, default off.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../extension/src/companion/CompanionMenu.tsx |  57 +++---
 packages/shared/src/components/Feed.spec.tsx  |   4 +-
 .../cards/article/ArticleGrid.spec.tsx        |   2 +-
 .../cards/collection/CollectionGrid.spec.tsx  |   2 +-
 .../components/cards/common/ActionButtons.tsx | 166 +++++++++++-------
 .../cards/common/list/SignalList.spec.tsx     |   2 +-
 .../components/cards/share/ShareGrid.spec.tsx |   2 +-
 .../components/cards/share/ShareList.spec.tsx |   2 +-
 .../components/icons/Discuss/filled-v2.svg    |   3 +
 .../src/components/icons/Discuss/index.tsx    |   6 +
 .../components/icons/Discuss/outlined-v2.svg  |   3 +
 .../components/post/MobilePostFloatingBar.tsx | 101 +++++++----
 .../shared/src/components/post/NewComment.tsx |  23 +--
 .../src/components/post/PostActions.tsx       |  30 ++--
 .../post/reader/ReaderFloatingActionBar.tsx   |  49 ++++--
 .../post/reader/ReaderRailActionBar.tsx       |  34 ++--
 packages/shared/src/lib/featureManagement.ts  |   5 +
 scripts/typecheck-strict-changed.js           |   5 +
 18 files changed, 313 insertions(+), 183 deletions(-)
 create mode 100644 packages/shared/src/components/icons/Discuss/filled-v2.svg
 create mode 100644 packages/shared/src/components/icons/Discuss/outlined-v2.svg

diff --git a/packages/extension/src/companion/CompanionMenu.tsx b/packages/extension/src/companion/CompanionMenu.tsx
index 48711e5351e..1c297444764 100644
--- a/packages/extension/src/companion/CompanionMenu.tsx
+++ b/packages/extension/src/companion/CompanionMenu.tsx
@@ -9,6 +9,7 @@ import {
 import {
   BookmarkIcon,
   DiscussIcon as CommentIcon,
+  DiscussIconV2 as CommentIconV2,
   DownvoteIcon,
   EyeIcon,
   FeedbackIcon,
@@ -17,6 +18,8 @@ import {
   ShareIcon,
   UpvoteIcon,
 } from '@dailydotdev/shared/src/components/icons';
+import { useFeature } from '@dailydotdev/shared/src/components/GrowthBookProvider';
+import { featureCommentFirstAction } from '@dailydotdev/shared/src/lib/featureManagement';
 import { Tooltip } from '@dailydotdev/shared/src/components/tooltip/Tooltip';
 import Modal from 'react-modal';
 import { feedback, isTesting } from '@dailydotdev/shared/src/lib/constants';
@@ -92,6 +95,8 @@ export default function CompanionMenu({
   const { logEvent } = useLogContext();
   const { user } = useContext(AuthContext);
   const { showPrompt } = usePrompt();
+  const isCommentFirst = useFeature(featureCommentFirstAction);
+  const CommentIconComponent = isCommentFirst ? CommentIconV2 : CommentIcon;
   const [reportModal, setReportModal] = useState<boolean>();
   const { displayToast } = useToastNotification();
   const dragStartRef = useRef({ y: 0, initialY: 0 });
@@ -334,6 +339,32 @@ export default function CompanionMenu({
   useEventListener(isDragging ? window : null, 'mousemove', handleMouseMove);
   useEventListener(isDragging ? window : null, 'mouseup', handleMouseUp);
 
+  const commentButton = (
+    <Tooltip
+      side="left"
+      content="Add comment"
+      className={tooltipContainerClassName}
+    >
+      <Button
+        variant={ButtonVariant.Tertiary}
+        color={ButtonColor.BlueCheese}
+        pressed={post?.commented}
+        icon={<CommentIconComponent />}
+        onClick={() => {
+          setCompanionState(true);
+
+          const commentBox = getCompanionWrapper()?.querySelector<HTMLElement>(
+            '.companion-new-comment-button',
+          );
+
+          if (commentBox) {
+            commentBox.click();
+          }
+        }}
+      />
+    </Tooltip>
+  );
+
   return (
     <>
       {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
@@ -356,6 +387,7 @@ export default function CompanionMenu({
           tooltipContainerClassName={tooltipContainerClassName}
           onToggleCompanion={toggleCompanion}
         />
+        {isCommentFirst && commentButton}
         <Tooltip
           side="left"
           content={
@@ -373,30 +405,7 @@ export default function CompanionMenu({
             color={ButtonColor.Avocado}
           />
         </Tooltip>
-        <Tooltip
-          side="left"
-          content="Add comment"
-          className={tooltipContainerClassName}
-        >
-          <Button
-            variant={ButtonVariant.Tertiary}
-            color={ButtonColor.BlueCheese}
-            pressed={post?.commented}
-            icon={<CommentIcon />}
-            onClick={() => {
-              setCompanionState(true);
-
-              const commentBox =
-                getCompanionWrapper()?.querySelector<HTMLElement>(
-                  '.companion-new-comment-button',
-                );
-
-              if (commentBox) {
-                commentBox.click();
-              }
-            }}
-          />
-        </Tooltip>
+        {!isCommentFirst && commentButton}
         <Tooltip
           side="left"
           content={`${post?.bookmarked ? 'Remove from' : 'Save to'} bookmarks`}
diff --git a/packages/shared/src/components/Feed.spec.tsx b/packages/shared/src/components/Feed.spec.tsx
index c099a66458a..c88b53a169d 100644
--- a/packages/shared/src/components/Feed.spec.tsx
+++ b/packages/shared/src/components/Feed.spec.tsx
@@ -1267,7 +1267,7 @@ describe('Feed logged in', () => {
 
     renderComponent();
     await waitForNock();
-    const [first] = await screen.findAllByLabelText('Comments');
+    const [first] = await screen.findAllByLabelText('Reply');
     fireEvent.click(first);
     await screen.findByRole('dialog');
   });
@@ -1373,7 +1373,7 @@ describe('Feed logged in', () => {
     await waitForNock();
 
     mockGraphQL(createPostMock({ id: firstPost.node.id }));
-    const [first] = await screen.findAllByLabelText('Comments');
+    const [first] = await screen.findAllByLabelText('Reply');
     fireEvent.click(first);
 
     await screen.findByRole('dialog');
diff --git a/packages/shared/src/components/cards/article/ArticleGrid.spec.tsx b/packages/shared/src/components/cards/article/ArticleGrid.spec.tsx
index ef4ba5e4c74..a831fa12871 100644
--- a/packages/shared/src/components/cards/article/ArticleGrid.spec.tsx
+++ b/packages/shared/src/components/cards/article/ArticleGrid.spec.tsx
@@ -86,7 +86,7 @@ it('should call on upvote click on upvote button click', async () => {
 
 it('should call on comment click on comment button click', async () => {
   renderComponent();
-  const el = await screen.findByLabelText('Comments');
+  const el = await screen.findByLabelText('Reply');
   el.click();
   await waitFor(() => expect(defaultProps.onCommentClick).toBeCalledWith(post));
 });
diff --git a/packages/shared/src/components/cards/collection/CollectionGrid.spec.tsx b/packages/shared/src/components/cards/collection/CollectionGrid.spec.tsx
index 1b0cb9d0e28..2faf4b3a79b 100644
--- a/packages/shared/src/components/cards/collection/CollectionGrid.spec.tsx
+++ b/packages/shared/src/components/cards/collection/CollectionGrid.spec.tsx
@@ -72,7 +72,7 @@ it('should call on upvote click on upvote button click', async () => {
 
 it('should call on comment click on comment button click', async () => {
   renderComponent();
-  const el = await screen.findByLabelText('Comments');
+  const el = await screen.findByLabelText('Reply');
   el.click();
   await waitFor(() => expect(defaultProps.onCommentClick).toBeCalledWith(post));
 });
diff --git a/packages/shared/src/components/cards/common/ActionButtons.tsx b/packages/shared/src/components/cards/common/ActionButtons.tsx
index 5b21184be11..25007ed1827 100644
--- a/packages/shared/src/components/cards/common/ActionButtons.tsx
+++ b/packages/shared/src/components/cards/common/ActionButtons.tsx
@@ -6,11 +6,14 @@ import InteractionCounter from '../../InteractionCounter';
 import { QuaternaryButton } from '../../buttons/QuaternaryButton';
 import {
   DiscussIcon as CommentIcon,
+  DiscussIconV2 as CommentIconV2,
   LinkIcon,
   DownvoteIcon,
 } from '../../icons';
 import { ButtonColor, ButtonSize, ButtonVariant } from '../../buttons/Button';
 import { useFeedPreviewMode } from '../../../hooks';
+import { useFeature } from '../../GrowthBookProvider';
+import { featureCommentFirstAction } from '../../../lib/featureManagement';
 import { UpvoteButtonIcon } from './UpvoteButtonIcon';
 import { BookmarkButton } from '../../buttons';
 import { IconSize } from '../../Icon';
@@ -79,6 +82,19 @@ const ActionButtonsV1 = ({
   const config = variantConfig[variant];
   const isFeedPreview = useFeedPreviewMode();
   const { getUpvoteAnimation } = useBrandSponsorship();
+  const isCommentFirst = useFeature(featureCommentFirstAction);
+  const CommentIconComponent = isCommentFirst ? CommentIconV2 : CommentIcon;
+  const useCommentLink = isCommentFirst || config.useCommentLink;
+  const commentHref = isCommentFirst
+    ? `${post.commentsPermalink}${
+        post.commentsPermalink.includes('?') ? '&' : '?'
+      }comment=true`
+    : post.commentsPermalink;
+  // Skip the feed-level callback so the desktop post modal doesn't open
+  // alongside the link navigation when the comment-first link is used.
+  const handleCommentClick = isCommentFirst
+    ? undefined
+    : () => onCommentClick?.(post);
 
   const {
     isUpvoteActive,
@@ -121,23 +137,25 @@ const ActionButtonsV1 = ({
   const commentCount = post.numComments ?? 0;
   const upvoteCount = post.numUpvotes ?? 0;
 
-  const commentButton = config.useCommentLink ? (
-    <LinkWithTooltip
-      tooltip={{ content: 'Comment' }}
-      href={post.commentsPermalink}
-    >
+  const commentButton = useCommentLink ? (
+    <LinkWithTooltip tooltip={{ content: 'Reply' }} href={commentHref}>
       <QuaternaryButton
         labelClassName="!pl-0"
         id={`post-${post.id}-comment-btn`}
         className="btn-tertiary-blueCheese pointer-events-auto"
         color={ButtonColor.BlueCheese}
         tag="a"
-        href={post.commentsPermalink}
+        href={commentHref}
         pressed={post.commented}
         variant={ButtonVariant.Tertiary}
         size={config.buttonSize}
-        icon={<CommentIcon secondary={post.commented} size={config.iconSize} />}
-        onClick={() => onCommentClick?.(post)}
+        icon={
+          <CommentIconComponent
+            secondary={post.commented}
+            size={config.iconSize}
+          />
+        }
+        onClick={handleCommentClick}
       >
         {commentCount > 0 && (
           <InteractionCounter
@@ -148,11 +166,16 @@ const ActionButtonsV1 = ({
       </QuaternaryButton>
     </LinkWithTooltip>
   ) : (
-    <Tooltip content="Comments" side="bottom">
+    <Tooltip content="Reply" side="bottom">
       <QuaternaryButton
         labelClassName="!pl-[1px]"
         id={`post-${post.id}-comment-btn`}
-        icon={<CommentIcon secondary={post.commented} size={config.iconSize} />}
+        icon={
+          <CommentIconComponent
+            secondary={post.commented}
+            size={config.iconSize}
+          />
+        }
         pressed={post.commented}
         onClick={() => onCommentClick?.(post)}
         size={config.buttonSize}
@@ -171,70 +194,85 @@ const ActionButtonsV1 = ({
     </Tooltip>
   );
 
-  const buttons = (
-    <div
-      className={classNames(
-        'flex flex-row items-center justify-between',
-        config.containerClassName,
-        className,
-      )}
-    >
-      <div className="flex flex-1 items-center justify-between">
+  const voteButtons = (
+    <>
+      <Tooltip
+        content={isUpvoteActive ? 'Remove upvote' : 'More like this'}
+        side={variant === 'grid' ? 'bottom' : undefined}
+      >
+        <QuaternaryButton
+          labelClassName={variant === 'grid' ? '!pl-[1px]' : '!pl-0'}
+          className="btn-tertiary-avocado pointer-events-auto"
+          id={`post-${post.id}-upvote-btn`}
+          color={ButtonColor.Avocado}
+          pressed={isUpvoteActive}
+          onClick={onToggleUpvote}
+          variant={ButtonVariant.Tertiary}
+          size={config.buttonSize}
+          icon={
+            <UpvoteButtonIcon
+              secondary={isUpvoteActive}
+              size={config.iconSize}
+              brandAnimation={brandAnimation}
+            />
+          }
+        >
+          {upvoteCount > 0 && (
+            <InteractionCounter
+              className={classNames(
+                'tabular-nums',
+                variant === 'grid' && 'typo-footnote',
+              )}
+              value={upvoteCount}
+            />
+          )}
+        </QuaternaryButton>
+      </Tooltip>
+      {showDownvoteAction && (
         <Tooltip
-          content={isUpvoteActive ? 'Remove upvote' : 'More like this'}
+          content={isDownvoteActive ? 'Remove downvote' : 'Less like this'}
           side={variant === 'grid' ? 'bottom' : undefined}
         >
           <QuaternaryButton
-            labelClassName={variant === 'grid' ? '!pl-[1px]' : '!pl-0'}
-            className="btn-tertiary-avocado pointer-events-auto"
-            id={`post-${post.id}-upvote-btn`}
-            color={ButtonColor.Avocado}
-            pressed={isUpvoteActive}
-            onClick={onToggleUpvote}
-            variant={ButtonVariant.Tertiary}
-            size={config.buttonSize}
+            className="pointer-events-auto"
+            id={`post-${post.id}-downvote-btn`}
+            color={ButtonColor.Ketchup}
             icon={
-              <UpvoteButtonIcon
-                secondary={isUpvoteActive}
+              <DownvoteIcon
+                secondary={isDownvoteActive}
                 size={config.iconSize}
-                brandAnimation={brandAnimation}
               />
             }
-          >
-            {upvoteCount > 0 && (
-              <InteractionCounter
-                className={classNames(
-                  'tabular-nums',
-                  variant === 'grid' && 'typo-footnote',
-                )}
-                value={upvoteCount}
-              />
-            )}
-          </QuaternaryButton>
+            pressed={isDownvoteActive}
+            onClick={onToggleDownvote}
+            variant={ButtonVariant.Tertiary}
+            size={config.buttonSize}
+          />
         </Tooltip>
-        {showDownvoteAction && (
-          <Tooltip
-            content={isDownvoteActive ? 'Remove downvote' : 'Less like this'}
-            side={variant === 'grid' ? 'bottom' : undefined}
-          >
-            <QuaternaryButton
-              className="pointer-events-auto"
-              id={`post-${post.id}-downvote-btn`}
-              color={ButtonColor.Ketchup}
-              icon={
-                <DownvoteIcon
-                  secondary={isDownvoteActive}
-                  size={config.iconSize}
-                />
-              }
-              pressed={isDownvoteActive}
-              onClick={onToggleDownvote}
-              variant={ButtonVariant.Tertiary}
-              size={config.buttonSize}
-            />
-          </Tooltip>
+      )}
+    </>
+  );
+
+  const buttons = (
+    <div
+      className={classNames(
+        'flex flex-row items-center justify-between',
+        config.containerClassName,
+        className,
+      )}
+    >
+      <div className="flex flex-1 items-center justify-between">
+        {isCommentFirst ? (
+          <>
+            {commentButton}
+            {voteButtons}
+          </>
+        ) : (
+          <>
+            {voteButtons}
+            {commentButton}
+          </>
         )}
-        {commentButton}
         {showAwardAction && (
           <PostAwardAction post={post} iconSize={config.iconSize} />
         )}
diff --git a/packages/shared/src/components/cards/common/list/SignalList.spec.tsx b/packages/shared/src/components/cards/common/list/SignalList.spec.tsx
index 752cbcbc257..937d5caf6f2 100644
--- a/packages/shared/src/components/cards/common/list/SignalList.spec.tsx
+++ b/packages/shared/src/components/cards/common/list/SignalList.spec.tsx
@@ -109,7 +109,7 @@ it('should link the comment action to the post page', async () => {
     onCommentClick,
   });
 
-  const commentLink = screen.getByRole('link', { name: /comment/i });
+  const commentLink = screen.getByRole('link', { name: /reply/i });
 
   expect(commentLink).toHaveAttribute('href', basePost.commentsPermalink);
 
diff --git a/packages/shared/src/components/cards/share/ShareGrid.spec.tsx b/packages/shared/src/components/cards/share/ShareGrid.spec.tsx
index e534d827117..0a3dd27836b 100644
--- a/packages/shared/src/components/cards/share/ShareGrid.spec.tsx
+++ b/packages/shared/src/components/cards/share/ShareGrid.spec.tsx
@@ -105,7 +105,7 @@ it('should call on upvote click on upvote button click', async () => {
 
 it('should call on comment click on comment button click', async () => {
   renderComponent();
-  const el = await screen.findByLabelText('Comments');
+  const el = await screen.findByLabelText('Reply');
   el.click();
   await waitFor(() => expect(defaultProps.onCommentClick).toBeCalledWith(post));
 });
diff --git a/packages/shared/src/components/cards/share/ShareList.spec.tsx b/packages/shared/src/components/cards/share/ShareList.spec.tsx
index 9f5fef00448..34c72644cd2 100644
--- a/packages/shared/src/components/cards/share/ShareList.spec.tsx
+++ b/packages/shared/src/components/cards/share/ShareList.spec.tsx
@@ -70,7 +70,7 @@ describe('ShareList', () => {
     );
 
     const previewText = await screen.findByText('Referenced tweet body');
-    const commentsButton = await screen.findByLabelText('Comment');
+    const commentsButton = await screen.findByLabelText('Reply');
 
     const position =
       // eslint-disable-next-line no-bitwise
diff --git a/packages/shared/src/components/icons/Discuss/filled-v2.svg b/packages/shared/src/components/icons/Discuss/filled-v2.svg
new file mode 100644
index 00000000000..b679e8e6b7d
--- /dev/null
+++ b/packages/shared/src/components/icons/Discuss/filled-v2.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 3.24933L16.8352 3.28658C17.9335 3.40866 18.6137 3.64233 19.1998 4.01299C19.7858 4.38366 20.2359 4.88668 20.5394 5.51029C20.843 6.13391 21 6.83604 21 7.94155V12.7115C21 14.4672 19.7312 15.9655 18 16.2542L15.2566 16.7134L15.152 16.737L15.1107 16.7491C15.0425 16.7703 14.9835 16.7966 14.9221 16.8333L14.8113 16.9083L14.6559 17.0297L11.0577 20.7925C10.6432 21.1242 10.0507 21.0467 9.70664 20.6423C9.39803 20.2796 9.46544 19.4364 9.59837 18.6813L9.67551 18.2816L9.87292 17.3923C9.88456 17.333 9.8909 17.2903 9.89007 17.2675C9.88137 17.0288 9.7087 16.8977 9.56684 16.8038C9.42498 16.7099 9.28268 16.6518 8.87674 16.5938L6.5 16.2542C5.81467 16.1562 5.19734 15.9059 4.67882 15.5386C4.1603 15.1714 3.7406 14.6873 3.45052 14.1219C3.16045 13.5564 3 12.9097 3 12.2171V7.94155C3 6.83604 3.15703 6.13391 3.46057 5.51029C3.76412 4.88668 4.21417 4.38366 4.80022 4.01299C5.38627 3.64233 6.06651 3.40866 7.16485 3.28658L7.5 3.24933C10.4908 2.91689 13.5092 2.91689 16.5 3.24933Z" fill="currentColor"/>
+</svg>
diff --git a/packages/shared/src/components/icons/Discuss/index.tsx b/packages/shared/src/components/icons/Discuss/index.tsx
index 4d68ef70e83..578a884b066 100644
--- a/packages/shared/src/components/icons/Discuss/index.tsx
+++ b/packages/shared/src/components/icons/Discuss/index.tsx
@@ -4,7 +4,13 @@ import type { IconProps } from '../../Icon';
 import Icon from '../../Icon';
 import OutlinedIcon from './outlined.svg';
 import FilledIcon from './filled.svg';
+import OutlinedIconV2 from './outlined-v2.svg';
+import FilledIconV2 from './filled-v2.svg';
 
 export const DiscussIcon = (props: IconProps): ReactElement => (
   <Icon {...props} IconPrimary={OutlinedIcon} IconSecondary={FilledIcon} />
 );
+
+export const DiscussIconV2 = (props: IconProps): ReactElement => (
+  <Icon {...props} IconPrimary={OutlinedIconV2} IconSecondary={FilledIconV2} />
+);
diff --git a/packages/shared/src/components/icons/Discuss/outlined-v2.svg b/packages/shared/src/components/icons/Discuss/outlined-v2.svg
new file mode 100644
index 00000000000..748a9ebc3fa
--- /dev/null
+++ b/packages/shared/src/components/icons/Discuss/outlined-v2.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.08435 3.21693C10.4265 2.95661 12.7882 2.93058 15.1342 3.13884L15.9156 3.21693L16.1949 3.24797C17.2836 3.36897 18.08 3.62007 18.8014 4.07631C19.5254 4.53416 20.0898 5.16501 20.4648 5.9353C20.8011 6.62613 20.9656 7.35902 20.9951 8.29742L21 8.61806V12.5927C21 14.7183 19.5133 16.5423 17.4552 16.9849L17.2475 17.0245L15.159 17.3712L12.2987 20.3635L12.1518 20.4979C11.1658 21.287 9.75308 21.1214 8.94661 20.1737C8.41509 19.549 8.33064 18.8343 8.43787 17.8834L8.4659 17.6596L8.50442 17.4057L8.537 17.2191L7.20453 17.03C6.6073 16.9447 6.04129 16.7583 5.52766 16.4807L5.27532 16.3344L5.03229 16.1731C4.40312 15.7275 3.89289 15.139 3.54092 14.453C3.23002 13.847 3.04905 13.1779 3.00867 12.481L3 12.1808V8.61806C3 7.5224 3.16154 6.70289 3.53519 5.9353C3.91016 5.16501 4.47463 4.53416 5.19859 4.07631C5.84786 3.66569 6.55788 3.42124 7.48702 3.28825L7.80506 3.24797L8.08435 3.21693ZM15.75 4.70819C13.5069 4.45889 11.2452 4.43396 8.99834 4.6334L8.25 4.70819L7.97071 4.73923C7.05542 4.84096 6.48856 5.03567 6.00018 5.34453C5.51181 5.65339 5.13676 6.07254 4.88381 6.59218C4.65615 7.05985 4.52739 7.58052 4.50392 8.35152L4.5 8.61806V12.1808C4.5 12.7578 4.63371 13.2968 4.87543 13.7679C5.11716 14.2391 5.46692 14.6425 5.89902 14.9485C6.26939 15.2107 6.70026 15.4015 7.17545 15.502L7.41667 15.5447L9.39728 15.8277C9.73557 15.876 9.85415 15.9245 9.97237 16.0027C10.0906 16.0809 10.2345 16.1901 10.2417 16.3891L10.2405 16.4135L10.2274 16.4931L10.0629 17.2341L9.99864 17.5671C9.88787 18.1963 9.83169 18.8989 10.0889 19.2012C10.3517 19.51 10.7885 19.5901 11.1255 19.3883L11.2148 19.3263L14.2132 16.1909L14.3427 16.0897L14.4351 16.0272L14.5115 15.9873L14.5923 15.9571L14.6267 15.947L14.7138 15.9273L17 15.5447C18.3825 15.3142 19.4112 14.1579 19.4945 12.7744L19.5 12.5927V8.61806C19.5 7.69688 19.3691 7.11181 19.1162 6.59218C18.8632 6.07254 18.4882 5.65339 17.9998 5.34453C17.5603 5.06655 17.0572 4.88104 16.2937 4.77256L16.0293 4.73923L15.75 4.70819Z" fill="currentColor"/>
+</svg>
diff --git a/packages/shared/src/components/post/MobilePostFloatingBar.tsx b/packages/shared/src/components/post/MobilePostFloatingBar.tsx
index 4f595daff2a..ce098b1c5a4 100644
--- a/packages/shared/src/components/post/MobilePostFloatingBar.tsx
+++ b/packages/shared/src/components/post/MobilePostFloatingBar.tsx
@@ -3,10 +3,13 @@ import React, { useCallback } from 'react';
 import classNames from 'classnames';
 import {
   DiscussIcon as CommentIcon,
+  DiscussIconV2 as CommentIconV2,
   DownvoteIcon,
   LinkIcon,
   UpvoteIcon,
 } from '../icons';
+import { useFeature } from '../GrowthBookProvider';
+import { featureCommentFirstAction } from '../../lib/featureManagement';
 import type { Post } from '../../graphql/posts';
 import { UserVote } from '../../graphql/posts';
 import { QuaternaryButton } from '../buttons/QuaternaryButton';
@@ -63,6 +66,8 @@ function MobilePostFloatingBarV1({
   const { onClose, onShowPanel } = useBlockPostPanel(post);
   const { toggleUpvote, toggleDownvote } = useVotePost();
   const { toggleBookmark } = useBookmarkPost();
+  const isCommentFirst = useFeature(featureCommentFirstAction);
+  const CommentIconComponent = isCommentFirst ? CommentIconV2 : CommentIcon;
 
   // Match the desktop `PostActions` copy flow: fetch the short URL imperatively
   // on click so anonymous users still get a usable (long) link instead of a no-op.
@@ -110,45 +115,67 @@ function MobilePostFloatingBarV1({
     );
   }, [copyLink, getShortUrl, logEvent, origin, post]);
 
+  const upvoteButton = (
+    <QuaternaryButton
+      id="mobile-upvote-post-btn"
+      aria-label={isUpvoteActive ? 'Remove upvote' : 'Upvote'}
+      pressed={isUpvoteActive}
+      onClick={onToggleUpvote}
+      icon={<UpvoteIcon secondary={isUpvoteActive} />}
+      variant={ButtonVariant.Tertiary}
+      color={ButtonColor.Avocado}
+      size={ButtonSize.Medium}
+    >
+      {upvoteCount > 0 && (
+        <InteractionCounter className={counterClasses} value={upvoteCount} />
+      )}
+    </QuaternaryButton>
+  );
+
+  const downvoteButton = (
+    <QuaternaryButton
+      id="mobile-downvote-post-btn"
+      aria-label={isDownvoteActive ? 'Remove downvote' : 'Downvote'}
+      pressed={isDownvoteActive}
+      onClick={onToggleDownvote}
+      icon={<DownvoteIcon secondary={isDownvoteActive} />}
+      variant={ButtonVariant.Tertiary}
+      color={ButtonColor.Ketchup}
+      size={ButtonSize.Medium}
+    />
+  );
+
+  const commentButton = (
+    <QuaternaryButton
+      id="mobile-comment-post-btn"
+      aria-label="Comment"
+      pressed={post.commented}
+      onClick={() => onCommentClick(LogOrigin.PostCommentButton)}
+      icon={<CommentIconComponent secondary={post.commented} />}
+      size={ButtonSize.Medium}
+      className="btn-tertiary-blueCheese"
+    >
+      {commentCount > 0 && (
+        <InteractionCounter className={counterClasses} value={commentCount} />
+      )}
+    </QuaternaryButton>
+  );
+
   return (
     <div className={classNames(containerClasses, className)}>
-      <QuaternaryButton
-        id="mobile-upvote-post-btn"
-        aria-label={isUpvoteActive ? 'Remove upvote' : 'Upvote'}
-        pressed={isUpvoteActive}
-        onClick={onToggleUpvote}
-        icon={<UpvoteIcon secondary={isUpvoteActive} />}
-        variant={ButtonVariant.Tertiary}
-        color={ButtonColor.Avocado}
-        size={ButtonSize.Medium}
-      >
-        {upvoteCount > 0 && (
-          <InteractionCounter className={counterClasses} value={upvoteCount} />
-        )}
-      </QuaternaryButton>
-      <QuaternaryButton
-        id="mobile-downvote-post-btn"
-        aria-label={isDownvoteActive ? 'Remove downvote' : 'Downvote'}
-        pressed={isDownvoteActive}
-        onClick={onToggleDownvote}
-        icon={<DownvoteIcon secondary={isDownvoteActive} />}
-        variant={ButtonVariant.Tertiary}
-        color={ButtonColor.Ketchup}
-        size={ButtonSize.Medium}
-      />
-      <QuaternaryButton
-        id="mobile-comment-post-btn"
-        aria-label="Comment"
-        pressed={post.commented}
-        onClick={() => onCommentClick(LogOrigin.PostCommentButton)}
-        icon={<CommentIcon secondary={post.commented} />}
-        size={ButtonSize.Medium}
-        className="btn-tertiary-blueCheese"
-      >
-        {commentCount > 0 && (
-          <InteractionCounter className={counterClasses} value={commentCount} />
-        )}
-      </QuaternaryButton>
+      {isCommentFirst ? (
+        <>
+          {commentButton}
+          {upvoteButton}
+          {downvoteButton}
+        </>
+      ) : (
+        <>
+          {upvoteButton}
+          {downvoteButton}
+          {commentButton}
+        </>
+      )}
       <BookmarkButton
         post={post}
         iconSize={IconSize.Medium}
diff --git a/packages/shared/src/components/post/NewComment.tsx b/packages/shared/src/components/post/NewComment.tsx
index 705f41c3580..85c785a7767 100644
--- a/packages/shared/src/components/post/NewComment.tsx
+++ b/packages/shared/src/components/post/NewComment.tsx
@@ -117,21 +117,22 @@ function NewCommentComponent(
   }, [isComposerOpen, onComposerOpenChange]);
 
   useEffect(() => {
-    if (
-      !shouldHandleCommentQuery ||
-      !hasCommentQuery ||
-      (post.type !== PostType.Welcome && post.type !== PostType.Poll)
-    ) {
+    if (!shouldHandleCommentQuery || !hasCommentQuery) {
       return;
     }
 
     const { comment, ...query } = router.query;
-    const origin =
-      post.type === PostType.Poll
-        ? Origin.PollCommentButton
-        : Origin.SquadChecklist;
-
-    onShowComment(origin, comment as string);
+    const getOrigin = () => {
+      if (post.type === PostType.Poll) {
+        return Origin.PollCommentButton;
+      }
+      if (post.type === PostType.Welcome) {
+        return Origin.SquadChecklist;
+      }
+      return Origin.PostCommentButton;
+    };
+
+    onShowComment(getOrigin(), comment as string);
 
     router.replace({ pathname: router.pathname, query }, undefined, {
       shallow: true,
diff --git a/packages/shared/src/components/post/PostActions.tsx b/packages/shared/src/components/post/PostActions.tsx
index 5b0acf6a5dd..f0610cafd19 100644
--- a/packages/shared/src/components/post/PostActions.tsx
+++ b/packages/shared/src/components/post/PostActions.tsx
@@ -4,10 +4,13 @@ import type { QueryKey } from '@tanstack/react-query';
 import classNames from 'classnames';
 import {
   DiscussIcon as CommentIcon,
+  DiscussIconV2 as CommentIconV2,
   DownvoteIcon,
   LinkIcon,
   MedalBadgeIcon,
 } from '../icons';
+import { useFeature } from '../GrowthBookProvider';
+import { featureCommentFirstAction } from '../../lib/featureManagement';
 import type { Post } from '../../graphql/posts';
 import { UserVote } from '../../graphql/posts';
 import { QuaternaryButton } from '../buttons/QuaternaryButton';
@@ -60,6 +63,9 @@ function PostActionsV1({
     receivingUser: post.author as LoggedUser | undefined,
   });
   const { getUpvoteAnimation } = useBrandSponsorship();
+  const CommentIconComponent = useFeature(featureCommentFirstAction)
+    ? CommentIconV2
+    : CommentIcon;
 
   const { toggleUpvote, toggleDownvote } = useVotePost();
   const isUpvoteActive = post?.userState?.vote === UserVote.Up;
@@ -212,6 +218,19 @@ function PostActionsV1({
     // for labels is executed after the DOM is updated with the new state.
   }, [post?.userState?.awarded, canAward]);
 
+  const commentButton = (
+    <QuaternaryButton
+      id="comment-post-btn"
+      pressed={post.commented}
+      onClick={onComment}
+      icon={<CommentIconComponent secondary={post.commented} />}
+      aria-label="Comment"
+      className="btn-tertiary-blueCheese"
+    >
+      Comment
+    </QuaternaryButton>
+  );
+
   return (
     <div className="flex flex-col gap-4">
       <div className="flex items-center rounded-16 border border-border-subtlest-tertiary">
@@ -250,16 +269,7 @@ function PostActionsV1({
               color={ButtonColor.Ketchup}
             />
           </Tooltip>
-          <QuaternaryButton
-            id="comment-post-btn"
-            pressed={post.commented}
-            onClick={onComment}
-            icon={<CommentIcon secondary={post.commented} />}
-            aria-label="Comment"
-            className="btn-tertiary-blueCheese"
-          >
-            Comment
-          </QuaternaryButton>
+          {commentButton}
           {canAward && (
             <ConditionalWrapper
               condition={post?.userState?.awarded ?? false}
diff --git a/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx b/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
index c2a00364d9b..70c6729b337 100644
--- a/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
+++ b/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
@@ -5,10 +5,13 @@ import type { Post } from '../../../graphql/posts';
 import { UserVote } from '../../../graphql/posts';
 import {
   DiscussIcon as CommentIcon,
+  DiscussIconV2 as CommentIconV2,
   DownvoteIcon,
   ShareIcon,
   UpvoteIcon,
 } from '../../icons';
+import { useFeature } from '../../GrowthBookProvider';
+import { featureCommentFirstAction } from '../../../lib/featureManagement';
 import { Button, ButtonVariant, ButtonColor } from '../../buttons/Button';
 import { BookmarkButton } from '../../buttons';
 import { useBookmarkPost } from '../../../hooks/useBookmarkPost';
@@ -42,18 +45,45 @@ function ReaderFloatingActionBarV1({
   const { toggleBookmark } = useBookmarkPost();
   const { toggleUpvote, toggleDownvote } = useVotePost();
   const { openSharePost } = useSharePost(Origin.ReaderModal);
+  const isCommentFirst = useFeature(featureCommentFirstAction);
+  const CommentIconComponent = isCommentFirst ? CommentIconV2 : CommentIcon;
 
   const isUpvoteActive = post?.userState?.vote === UserVote.Up;
   const isDownvoteActive = post?.userState?.vote === UserVote.Down;
   const upvotes = largeNumberFormat(post.numUpvotes ?? 0) ?? '0';
   const comments = largeNumberFormat(post.numComments ?? 0) ?? '0';
 
+  const commentButton = (
+    <Tooltip content="Reply">
+      <Button
+        type="button"
+        pressed={post.commented}
+        onClick={onCommentClick}
+        icon={
+          <CommentIconComponent
+            secondary={post.commented}
+            size={FLOATING_ICON_SIZE}
+          />
+        }
+        aria-label="Comment"
+        variant={ButtonVariant.Tertiary}
+        className={classNames(
+          countActionButtonClasses,
+          'btn-tertiary-blueCheese',
+        )}
+      >
+        <span className={countClasses}>{comments}</span>
+      </Button>
+    </Tooltip>
+  );
+
   return (
     <div
       className="z-20 pointer-events-auto absolute bottom-6 left-1/2 flex -translate-x-1/2 items-center gap-2 rounded-20 border border-border-subtlest-tertiary bg-background-default px-3 py-2 shadow-3"
       role="toolbar"
       aria-label="Post actions"
     >
+      {isCommentFirst && commentButton}
       <Tooltip content={isUpvoteActive ? 'Remove upvote' : 'Upvote'}>
         <Button
           type="button"
@@ -95,24 +125,7 @@ function ReaderFloatingActionBarV1({
           className={iconActionButtonClasses}
         />
       </Tooltip>
-      <Tooltip content="Comment">
-        <Button
-          type="button"
-          pressed={post.commented}
-          onClick={onCommentClick}
-          icon={
-            <CommentIcon secondary={post.commented} size={FLOATING_ICON_SIZE} />
-          }
-          aria-label="Comment"
-          variant={ButtonVariant.Tertiary}
-          className={classNames(
-            countActionButtonClasses,
-            'btn-tertiary-blueCheese',
-          )}
-        >
-          <span className={countClasses}>{comments}</span>
-        </Button>
-      </Tooltip>
+      {!isCommentFirst && commentButton}
       <BookmarkButton
         post={post}
         iconSize={FLOATING_ICON_SIZE}
diff --git a/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx b/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
index 40595a0b660..140512d12a0 100644
--- a/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
+++ b/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
@@ -5,11 +5,14 @@ import type { Post } from '../../../graphql/posts';
 import { UserVote } from '../../../graphql/posts';
 import {
   DiscussIcon as CommentIcon,
+  DiscussIconV2 as CommentIconV2,
   DownvoteIcon,
   LinkIcon,
   MedalBadgeIcon,
   UpvoteIcon,
 } from '../../icons';
+import { useFeature } from '../../GrowthBookProvider';
+import { featureCommentFirstAction } from '../../../lib/featureManagement';
 import { Button, ButtonColor, ButtonVariant } from '../../buttons/Button';
 import { BookmarkButton } from '../../buttons';
 import { useBookmarkPost } from '../../../hooks/useBookmarkPost';
@@ -47,10 +50,27 @@ function ReaderRailActionBarV1({
     sendingUser: user,
     receivingUser: post.author as LoggedUser | undefined,
   });
+  const isCommentFirst = useFeature(featureCommentFirstAction);
+  const CommentIconComponent = isCommentFirst ? CommentIconV2 : CommentIcon;
 
   const isUpvoteActive = post?.userState?.vote === UserVote.Up;
   const isDownvoteActive = post?.userState?.vote === UserVote.Down;
 
+  const commentButton = (
+    <Tooltip content="Reply">
+      <Button
+        id="reader-comment-btn"
+        type="button"
+        pressed={post.commented}
+        onClick={onCommentClick}
+        icon={<CommentIconComponent secondary={post.commented} />}
+        aria-label="Comment"
+        variant={ButtonVariant.Tertiary}
+        color={ButtonColor.BlueCheese}
+      />
+    </Tooltip>
+  );
+
   return (
     <div
       className={classNames(
@@ -60,6 +80,7 @@ function ReaderRailActionBarV1({
       role="toolbar"
       aria-label="Post actions"
     >
+      {isCommentFirst && commentButton}
       <Tooltip content={isUpvoteActive ? 'Remove upvote' : 'More like this'}>
         <Button
           id="reader-upvote-btn"
@@ -95,18 +116,7 @@ function ReaderRailActionBarV1({
           color={ButtonColor.Ketchup}
         />
       </Tooltip>
-      <Tooltip content="Comment">
-        <Button
-          id="reader-comment-btn"
-          type="button"
-          pressed={post.commented}
-          onClick={onCommentClick}
-          icon={<CommentIcon secondary={post.commented} />}
-          aria-label="Comment"
-          variant={ButtonVariant.Tertiary}
-          color={ButtonColor.BlueCheese}
-        />
-      </Tooltip>
+      {!isCommentFirst && commentButton}
       {canAward && (
         <ConditionalWrapper
           condition={post?.userState?.awarded ?? false}
diff --git a/packages/shared/src/lib/featureManagement.ts b/packages/shared/src/lib/featureManagement.ts
index 5d493efa846..87b292d768f 100644
--- a/packages/shared/src/lib/featureManagement.ts
+++ b/packages/shared/src/lib/featureManagement.ts
@@ -230,3 +230,8 @@ export const featureOnboardingPermissionPrimer = new Feature(
 );
 
 export const featureAuthGoogleOneTap = new Feature('auth_google_onetap', false);
+
+export const featureCommentFirstAction = new Feature(
+  'comment_first_action',
+  false,
+);
diff --git a/scripts/typecheck-strict-changed.js b/scripts/typecheck-strict-changed.js
index 989e5447727..56cc30d67da 100644
--- a/scripts/typecheck-strict-changed.js
+++ b/scripts/typecheck-strict-changed.js
@@ -137,6 +137,11 @@ const strictSkipList = new Set([
   // ReactElement vs null return, Button props union) live on unrelated
   // lines and should be addressed in a dedicated cleanup PR.
   'packages/shared/src/components/streak/ReadingStreakButton.tsx',
+  // Comment-first action experiment — companion menu was reordered behind
+  // a feature flag, but the file has long-standing strict violations
+  // (implicit any in props/callbacks, modal duplicate `isOpen`,
+  // non-null parent selector return) unrelated to this experiment.
+  'packages/extension/src/companion/CompanionMenu.tsx',
 ]);
 
 const changedFiles = getChangedTypescriptFiles().filter(

From 55e8b771995bddcbb1c88033cd9d41dd296f53c0 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 9 Jun 2026 11:19:56 +0300
Subject: [PATCH 2/7] fix: keep feed card counters on consistent typography

When comment_first_action is on, the grid variant routes the comment
button through the link branch, which lacked the grid `typo-footnote`
size and used a different label padding than the upvote counter. That
made the comment number render larger and misaligned next to the smaller
upvote number. Share one variant-aware counter className and label
padding across the comment and upvote counters so every number in the
action row matches in size and alignment, as in production.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../components/cards/common/ActionButtons.tsx | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/shared/src/components/cards/common/ActionButtons.tsx b/packages/shared/src/components/cards/common/ActionButtons.tsx
index 25007ed1827..912959b7229 100644
--- a/packages/shared/src/components/cards/common/ActionButtons.tsx
+++ b/packages/shared/src/components/cards/common/ActionButtons.tsx
@@ -136,11 +136,18 @@ const ActionButtonsV1 = ({
 
   const commentCount = post.numComments ?? 0;
   const upvoteCount = post.numUpvotes ?? 0;
+  // Keep every count in the action row on the same typography as the upvote
+  // counter so the numbers match in size/style across variants.
+  const counterClassName = classNames(
+    'tabular-nums',
+    variant === 'grid' && 'typo-footnote',
+  );
+  const counterLabelClassName = variant === 'grid' ? '!pl-[1px]' : '!pl-0';
 
   const commentButton = useCommentLink ? (
     <LinkWithTooltip tooltip={{ content: 'Reply' }} href={commentHref}>
       <QuaternaryButton
-        labelClassName="!pl-0"
+        labelClassName={counterLabelClassName}
         id={`post-${post.id}-comment-btn`}
         className="btn-tertiary-blueCheese pointer-events-auto"
         color={ButtonColor.BlueCheese}
@@ -159,7 +166,7 @@ const ActionButtonsV1 = ({
       >
         {commentCount > 0 && (
           <InteractionCounter
-            className={classNames('tabular-nums', !commentCount && 'invisible')}
+            className={counterClassName}
             value={commentCount}
           />
         )}
@@ -168,7 +175,7 @@ const ActionButtonsV1 = ({
   ) : (
     <Tooltip content="Reply" side="bottom">
       <QuaternaryButton
-        labelClassName="!pl-[1px]"
+        labelClassName={counterLabelClassName}
         id={`post-${post.id}-comment-btn`}
         icon={
           <CommentIconComponent
@@ -183,10 +190,7 @@ const ActionButtonsV1 = ({
       >
         {commentCount > 0 && (
           <InteractionCounter
-            className={classNames(
-              'tabular-nums !typo-footnote',
-              !commentCount && 'invisible',
-            )}
+            className={counterClassName}
             value={commentCount}
           />
         )}
@@ -201,7 +205,7 @@ const ActionButtonsV1 = ({
         side={variant === 'grid' ? 'bottom' : undefined}
       >
         <QuaternaryButton
-          labelClassName={variant === 'grid' ? '!pl-[1px]' : '!pl-0'}
+          labelClassName={counterLabelClassName}
           className="btn-tertiary-avocado pointer-events-auto"
           id={`post-${post.id}-upvote-btn`}
           color={ButtonColor.Avocado}
@@ -219,10 +223,7 @@ const ActionButtonsV1 = ({
         >
           {upvoteCount > 0 && (
             <InteractionCounter
-              className={classNames(
-                'tabular-nums',
-                variant === 'grid' && 'typo-footnote',
-              )}
+              className={counterClassName}
               value={upvoteCount}
             />
           )}

From 5ffc7b25e71755df3fe2d3084fecc847ce55c2d6 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 9 Jun 2026 11:32:08 +0300
Subject: [PATCH 3/7] fix: vertically center feed card counters against icons

The counter's footnote line (18px) sat top-aligned inside its 20px (h-5)
box, so the numbers rode ~2px high relative to the action-row icons.
Add leading-5 to the shared counter className so the line fills the box
and the digits center optically against the icons. Animation-safe: the
scroll children are explicit h-5.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../shared/src/components/cards/common/ActionButtons.tsx    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/shared/src/components/cards/common/ActionButtons.tsx b/packages/shared/src/components/cards/common/ActionButtons.tsx
index 912959b7229..5cd99e60d12 100644
--- a/packages/shared/src/components/cards/common/ActionButtons.tsx
+++ b/packages/shared/src/components/cards/common/ActionButtons.tsx
@@ -137,9 +137,11 @@ const ActionButtonsV1 = ({
   const commentCount = post.numComments ?? 0;
   const upvoteCount = post.numUpvotes ?? 0;
   // Keep every count in the action row on the same typography as the upvote
-  // counter so the numbers match in size/style across variants.
+  // counter so the numbers match in size/style across variants. `leading-5`
+  // makes the footnote line fill the counter's h-5 box so the digits sit
+  // optically centered against the icons instead of riding ~2px high.
   const counterClassName = classNames(
-    'tabular-nums',
+    'tabular-nums leading-5',
     variant === 'grid' && 'typo-footnote',
   );
   const counterLabelClassName = variant === 'grid' ? '!pl-[1px]' : '!pl-0';

From 07903767cf8f8f981b816640eff1e425b36e2dd6 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 9 Jun 2026 11:53:07 +0300
Subject: [PATCH 4/7] fix: force counter line-height so feed card numbers truly
 center

The previous leading-5 was silently overridden by typo-footnote, whose
line-height is emitted later in the same Tailwind utilities layer, so the
computed line stayed 18px and the digits kept riding high in the 20px
(h-5) box. Use !leading-5 to win the override. Verified in Storybook: the
digit ink center now sits within 0.25px of each icon's center.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../src/components/cards/common/ActionButtons.tsx      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/shared/src/components/cards/common/ActionButtons.tsx b/packages/shared/src/components/cards/common/ActionButtons.tsx
index 5cd99e60d12..61f7e958a24 100644
--- a/packages/shared/src/components/cards/common/ActionButtons.tsx
+++ b/packages/shared/src/components/cards/common/ActionButtons.tsx
@@ -137,11 +137,13 @@ const ActionButtonsV1 = ({
   const commentCount = post.numComments ?? 0;
   const upvoteCount = post.numUpvotes ?? 0;
   // Keep every count in the action row on the same typography as the upvote
-  // counter so the numbers match in size/style across variants. `leading-5`
-  // makes the footnote line fill the counter's h-5 box so the digits sit
-  // optically centered against the icons instead of riding ~2px high.
+  // counter so the numbers match in size/style across variants. `!leading-5`
+  // forces the footnote line to fill the counter's h-5 box (it must beat
+  // typo-footnote's own line-height, which is emitted later in the same
+  // utilities layer) so the digits center against the icons instead of
+  // riding high.
   const counterClassName = classNames(
-    'tabular-nums leading-5',
+    'tabular-nums !leading-5',
     variant === 'grid' && 'typo-footnote',
   );
   const counterLabelClassName = variant === 'grid' ? '!pl-[1px]' : '!pl-0';

From 720e896ac7a7ff39f5f63214df3b04c24d48818a Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 9 Jun 2026 12:25:42 +0300
Subject: [PATCH 5/7] fix: scope comment-first experiment to order + icon only

Review fixes so the experiment isolates a single variable (comment
placement) and the control is byte-for-byte production:

- Gate the "Reply" tooltip/aria copy behind the flag. It was rendering
  for everyone, contaminating the control group. Control now keeps
  "Comment"/"Comments"; revert the 6 test selectors accordingly.
- Drop the feed link-navigation behavior: no more ?comment=true href,
  useCommentLink override, or nulled onClick. The comment button keeps
  the production click handler, so LogEvent.CommentsClick analytics and
  the post modal behave identically across both arms.
- Restore the NewComment Welcome/Poll guard removed for the dropped
  ?comment=true flow.
- Gate the reader-bar aria-label alongside the tooltip so they match.

Keeps (gated): comment-first ordering and the DiscussIconV2 swap. The
counter centering fix stays since it applies equally to both arms.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 packages/shared/src/components/Feed.spec.tsx  |  4 +--
 .../cards/article/ArticleGrid.spec.tsx        |  2 +-
 .../cards/collection/CollectionGrid.spec.tsx  |  2 +-
 .../components/cards/common/ActionButtons.tsx | 26 +++++++------------
 .../cards/common/list/SignalList.spec.tsx     |  2 +-
 .../components/cards/share/ShareGrid.spec.tsx |  2 +-
 .../components/cards/share/ShareList.spec.tsx |  2 +-
 .../shared/src/components/post/NewComment.tsx | 23 ++++++++--------
 .../post/reader/ReaderFloatingActionBar.tsx   |  5 ++--
 .../post/reader/ReaderRailActionBar.tsx       |  5 ++--
 10 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/packages/shared/src/components/Feed.spec.tsx b/packages/shared/src/components/Feed.spec.tsx
index c88b53a169d..c099a66458a 100644
--- a/packages/shared/src/components/Feed.spec.tsx
+++ b/packages/shared/src/components/Feed.spec.tsx
@@ -1267,7 +1267,7 @@ describe('Feed logged in', () => {
 
     renderComponent();
     await waitForNock();
-    const [first] = await screen.findAllByLabelText('Reply');
+    const [first] = await screen.findAllByLabelText('Comments');
     fireEvent.click(first);
     await screen.findByRole('dialog');
   });
@@ -1373,7 +1373,7 @@ describe('Feed logged in', () => {
     await waitForNock();
 
     mockGraphQL(createPostMock({ id: firstPost.node.id }));
-    const [first] = await screen.findAllByLabelText('Reply');
+    const [first] = await screen.findAllByLabelText('Comments');
     fireEvent.click(first);
 
     await screen.findByRole('dialog');
diff --git a/packages/shared/src/components/cards/article/ArticleGrid.spec.tsx b/packages/shared/src/components/cards/article/ArticleGrid.spec.tsx
index a831fa12871..ef4ba5e4c74 100644
--- a/packages/shared/src/components/cards/article/ArticleGrid.spec.tsx
+++ b/packages/shared/src/components/cards/article/ArticleGrid.spec.tsx
@@ -86,7 +86,7 @@ it('should call on upvote click on upvote button click', async () => {
 
 it('should call on comment click on comment button click', async () => {
   renderComponent();
-  const el = await screen.findByLabelText('Reply');
+  const el = await screen.findByLabelText('Comments');
   el.click();
   await waitFor(() => expect(defaultProps.onCommentClick).toBeCalledWith(post));
 });
diff --git a/packages/shared/src/components/cards/collection/CollectionGrid.spec.tsx b/packages/shared/src/components/cards/collection/CollectionGrid.spec.tsx
index 2faf4b3a79b..1b0cb9d0e28 100644
--- a/packages/shared/src/components/cards/collection/CollectionGrid.spec.tsx
+++ b/packages/shared/src/components/cards/collection/CollectionGrid.spec.tsx
@@ -72,7 +72,7 @@ it('should call on upvote click on upvote button click', async () => {
 
 it('should call on comment click on comment button click', async () => {
   renderComponent();
-  const el = await screen.findByLabelText('Reply');
+  const el = await screen.findByLabelText('Comments');
   el.click();
   await waitFor(() => expect(defaultProps.onCommentClick).toBeCalledWith(post));
 });
diff --git a/packages/shared/src/components/cards/common/ActionButtons.tsx b/packages/shared/src/components/cards/common/ActionButtons.tsx
index 61f7e958a24..168cc690227 100644
--- a/packages/shared/src/components/cards/common/ActionButtons.tsx
+++ b/packages/shared/src/components/cards/common/ActionButtons.tsx
@@ -82,19 +82,10 @@ const ActionButtonsV1 = ({
   const config = variantConfig[variant];
   const isFeedPreview = useFeedPreviewMode();
   const { getUpvoteAnimation } = useBrandSponsorship();
+  // The experiment only reorders the comment action and swaps its icon/label;
+  // click behavior stays identical to the control so the only variable is order.
   const isCommentFirst = useFeature(featureCommentFirstAction);
   const CommentIconComponent = isCommentFirst ? CommentIconV2 : CommentIcon;
-  const useCommentLink = isCommentFirst || config.useCommentLink;
-  const commentHref = isCommentFirst
-    ? `${post.commentsPermalink}${
-        post.commentsPermalink.includes('?') ? '&' : '?'
-      }comment=true`
-    : post.commentsPermalink;
-  // Skip the feed-level callback so the desktop post modal doesn't open
-  // alongside the link navigation when the comment-first link is used.
-  const handleCommentClick = isCommentFirst
-    ? undefined
-    : () => onCommentClick?.(post);
 
   const {
     isUpvoteActive,
@@ -148,15 +139,18 @@ const ActionButtonsV1 = ({
   );
   const counterLabelClassName = variant === 'grid' ? '!pl-[1px]' : '!pl-0';
 
-  const commentButton = useCommentLink ? (
-    <LinkWithTooltip tooltip={{ content: 'Reply' }} href={commentHref}>
+  const commentButton = config.useCommentLink ? (
+    <LinkWithTooltip
+      tooltip={{ content: isCommentFirst ? 'Reply' : 'Comment' }}
+      href={post.commentsPermalink}
+    >
       <QuaternaryButton
         labelClassName={counterLabelClassName}
         id={`post-${post.id}-comment-btn`}
         className="btn-tertiary-blueCheese pointer-events-auto"
         color={ButtonColor.BlueCheese}
         tag="a"
-        href={commentHref}
+        href={post.commentsPermalink}
         pressed={post.commented}
         variant={ButtonVariant.Tertiary}
         size={config.buttonSize}
@@ -166,7 +160,7 @@ const ActionButtonsV1 = ({
             size={config.iconSize}
           />
         }
-        onClick={handleCommentClick}
+        onClick={() => onCommentClick?.(post)}
       >
         {commentCount > 0 && (
           <InteractionCounter
@@ -177,7 +171,7 @@ const ActionButtonsV1 = ({
       </QuaternaryButton>
     </LinkWithTooltip>
   ) : (
-    <Tooltip content="Reply" side="bottom">
+    <Tooltip content={isCommentFirst ? 'Reply' : 'Comments'} side="bottom">
       <QuaternaryButton
         labelClassName={counterLabelClassName}
         id={`post-${post.id}-comment-btn`}
diff --git a/packages/shared/src/components/cards/common/list/SignalList.spec.tsx b/packages/shared/src/components/cards/common/list/SignalList.spec.tsx
index 937d5caf6f2..752cbcbc257 100644
--- a/packages/shared/src/components/cards/common/list/SignalList.spec.tsx
+++ b/packages/shared/src/components/cards/common/list/SignalList.spec.tsx
@@ -109,7 +109,7 @@ it('should link the comment action to the post page', async () => {
     onCommentClick,
   });
 
-  const commentLink = screen.getByRole('link', { name: /reply/i });
+  const commentLink = screen.getByRole('link', { name: /comment/i });
 
   expect(commentLink).toHaveAttribute('href', basePost.commentsPermalink);
 
diff --git a/packages/shared/src/components/cards/share/ShareGrid.spec.tsx b/packages/shared/src/components/cards/share/ShareGrid.spec.tsx
index 0a3dd27836b..e534d827117 100644
--- a/packages/shared/src/components/cards/share/ShareGrid.spec.tsx
+++ b/packages/shared/src/components/cards/share/ShareGrid.spec.tsx
@@ -105,7 +105,7 @@ it('should call on upvote click on upvote button click', async () => {
 
 it('should call on comment click on comment button click', async () => {
   renderComponent();
-  const el = await screen.findByLabelText('Reply');
+  const el = await screen.findByLabelText('Comments');
   el.click();
   await waitFor(() => expect(defaultProps.onCommentClick).toBeCalledWith(post));
 });
diff --git a/packages/shared/src/components/cards/share/ShareList.spec.tsx b/packages/shared/src/components/cards/share/ShareList.spec.tsx
index 34c72644cd2..9f5fef00448 100644
--- a/packages/shared/src/components/cards/share/ShareList.spec.tsx
+++ b/packages/shared/src/components/cards/share/ShareList.spec.tsx
@@ -70,7 +70,7 @@ describe('ShareList', () => {
     );
 
     const previewText = await screen.findByText('Referenced tweet body');
-    const commentsButton = await screen.findByLabelText('Reply');
+    const commentsButton = await screen.findByLabelText('Comment');
 
     const position =
       // eslint-disable-next-line no-bitwise
diff --git a/packages/shared/src/components/post/NewComment.tsx b/packages/shared/src/components/post/NewComment.tsx
index 85c785a7767..705f41c3580 100644
--- a/packages/shared/src/components/post/NewComment.tsx
+++ b/packages/shared/src/components/post/NewComment.tsx
@@ -117,22 +117,21 @@ function NewCommentComponent(
   }, [isComposerOpen, onComposerOpenChange]);
 
   useEffect(() => {
-    if (!shouldHandleCommentQuery || !hasCommentQuery) {
+    if (
+      !shouldHandleCommentQuery ||
+      !hasCommentQuery ||
+      (post.type !== PostType.Welcome && post.type !== PostType.Poll)
+    ) {
       return;
     }
 
     const { comment, ...query } = router.query;
-    const getOrigin = () => {
-      if (post.type === PostType.Poll) {
-        return Origin.PollCommentButton;
-      }
-      if (post.type === PostType.Welcome) {
-        return Origin.SquadChecklist;
-      }
-      return Origin.PostCommentButton;
-    };
-
-    onShowComment(getOrigin(), comment as string);
+    const origin =
+      post.type === PostType.Poll
+        ? Origin.PollCommentButton
+        : Origin.SquadChecklist;
+
+    onShowComment(origin, comment as string);
 
     router.replace({ pathname: router.pathname, query }, undefined, {
       shallow: true,
diff --git a/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx b/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
index 70c6729b337..f6c5eef99da 100644
--- a/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
+++ b/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
@@ -53,8 +53,9 @@ function ReaderFloatingActionBarV1({
   const upvotes = largeNumberFormat(post.numUpvotes ?? 0) ?? '0';
   const comments = largeNumberFormat(post.numComments ?? 0) ?? '0';
 
+  const commentLabel = isCommentFirst ? 'Reply' : 'Comment';
   const commentButton = (
-    <Tooltip content="Reply">
+    <Tooltip content={commentLabel}>
       <Button
         type="button"
         pressed={post.commented}
@@ -65,7 +66,7 @@ function ReaderFloatingActionBarV1({
             size={FLOATING_ICON_SIZE}
           />
         }
-        aria-label="Comment"
+        aria-label={commentLabel}
         variant={ButtonVariant.Tertiary}
         className={classNames(
           countActionButtonClasses,
diff --git a/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx b/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
index 140512d12a0..ce432fffa88 100644
--- a/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
+++ b/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
@@ -56,15 +56,16 @@ function ReaderRailActionBarV1({
   const isUpvoteActive = post?.userState?.vote === UserVote.Up;
   const isDownvoteActive = post?.userState?.vote === UserVote.Down;
 
+  const commentLabel = isCommentFirst ? 'Reply' : 'Comment';
   const commentButton = (
-    <Tooltip content="Reply">
+    <Tooltip content={commentLabel}>
       <Button
         id="reader-comment-btn"
         type="button"
         pressed={post.commented}
         onClick={onCommentClick}
         icon={<CommentIconComponent secondary={post.commented} />}
-        aria-label="Comment"
+        aria-label={commentLabel}
         variant={ButtonVariant.Tertiary}
         color={ButtonColor.BlueCheese}
       />

From 6e8d293123c72f8b7a7695e5b8e0d798c6f5e496 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 9 Jun 2026 12:43:25 +0300
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20address=20review=20=E2=80=94=20drop?=
 =?UTF-8?q?=20companion=20menu=20and=20tooltip=20experiment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per review feedback:
- Revert all CompanionMenu changes; the companion menu is out of scope
  for this experiment. Also drop the CompanionMenu strict-skip entry it
  required, restoring scripts/typecheck-strict-changed.js to baseline.
- Stop experimenting on the comment tooltip copy. Feed cards and reader
  bars keep the production "Comment"/"Comments" copy regardless of the
  flag. The experiment is now purely the comment-first ordering plus the
  DiscussIconV2 swap.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../extension/src/companion/CompanionMenu.tsx | 57 ++++++++-----------
 .../components/cards/common/ActionButtons.tsx |  9 +--
 .../post/reader/ReaderFloatingActionBar.tsx   |  5 +-
 .../post/reader/ReaderRailActionBar.tsx       |  5 +-
 scripts/typecheck-strict-changed.js           |  5 --
 5 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/packages/extension/src/companion/CompanionMenu.tsx b/packages/extension/src/companion/CompanionMenu.tsx
index 1c297444764..48711e5351e 100644
--- a/packages/extension/src/companion/CompanionMenu.tsx
+++ b/packages/extension/src/companion/CompanionMenu.tsx
@@ -9,7 +9,6 @@ import {
 import {
   BookmarkIcon,
   DiscussIcon as CommentIcon,
-  DiscussIconV2 as CommentIconV2,
   DownvoteIcon,
   EyeIcon,
   FeedbackIcon,
@@ -18,8 +17,6 @@ import {
   ShareIcon,
   UpvoteIcon,
 } from '@dailydotdev/shared/src/components/icons';
-import { useFeature } from '@dailydotdev/shared/src/components/GrowthBookProvider';
-import { featureCommentFirstAction } from '@dailydotdev/shared/src/lib/featureManagement';
 import { Tooltip } from '@dailydotdev/shared/src/components/tooltip/Tooltip';
 import Modal from 'react-modal';
 import { feedback, isTesting } from '@dailydotdev/shared/src/lib/constants';
@@ -95,8 +92,6 @@ export default function CompanionMenu({
   const { logEvent } = useLogContext();
   const { user } = useContext(AuthContext);
   const { showPrompt } = usePrompt();
-  const isCommentFirst = useFeature(featureCommentFirstAction);
-  const CommentIconComponent = isCommentFirst ? CommentIconV2 : CommentIcon;
   const [reportModal, setReportModal] = useState<boolean>();
   const { displayToast } = useToastNotification();
   const dragStartRef = useRef({ y: 0, initialY: 0 });
@@ -339,32 +334,6 @@ export default function CompanionMenu({
   useEventListener(isDragging ? window : null, 'mousemove', handleMouseMove);
   useEventListener(isDragging ? window : null, 'mouseup', handleMouseUp);
 
-  const commentButton = (
-    <Tooltip
-      side="left"
-      content="Add comment"
-      className={tooltipContainerClassName}
-    >
-      <Button
-        variant={ButtonVariant.Tertiary}
-        color={ButtonColor.BlueCheese}
-        pressed={post?.commented}
-        icon={<CommentIconComponent />}
-        onClick={() => {
-          setCompanionState(true);
-
-          const commentBox = getCompanionWrapper()?.querySelector<HTMLElement>(
-            '.companion-new-comment-button',
-          );
-
-          if (commentBox) {
-            commentBox.click();
-          }
-        }}
-      />
-    </Tooltip>
-  );
-
   return (
     <>
       {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
@@ -387,7 +356,6 @@ export default function CompanionMenu({
           tooltipContainerClassName={tooltipContainerClassName}
           onToggleCompanion={toggleCompanion}
         />
-        {isCommentFirst && commentButton}
         <Tooltip
           side="left"
           content={
@@ -405,7 +373,30 @@ export default function CompanionMenu({
             color={ButtonColor.Avocado}
           />
         </Tooltip>
-        {!isCommentFirst && commentButton}
+        <Tooltip
+          side="left"
+          content="Add comment"
+          className={tooltipContainerClassName}
+        >
+          <Button
+            variant={ButtonVariant.Tertiary}
+            color={ButtonColor.BlueCheese}
+            pressed={post?.commented}
+            icon={<CommentIcon />}
+            onClick={() => {
+              setCompanionState(true);
+
+              const commentBox =
+                getCompanionWrapper()?.querySelector<HTMLElement>(
+                  '.companion-new-comment-button',
+                );
+
+              if (commentBox) {
+                commentBox.click();
+              }
+            }}
+          />
+        </Tooltip>
         <Tooltip
           side="left"
           content={`${post?.bookmarked ? 'Remove from' : 'Save to'} bookmarks`}
diff --git a/packages/shared/src/components/cards/common/ActionButtons.tsx b/packages/shared/src/components/cards/common/ActionButtons.tsx
index 168cc690227..23b33a76c0e 100644
--- a/packages/shared/src/components/cards/common/ActionButtons.tsx
+++ b/packages/shared/src/components/cards/common/ActionButtons.tsx
@@ -82,8 +82,9 @@ const ActionButtonsV1 = ({
   const config = variantConfig[variant];
   const isFeedPreview = useFeedPreviewMode();
   const { getUpvoteAnimation } = useBrandSponsorship();
-  // The experiment only reorders the comment action and swaps its icon/label;
-  // click behavior stays identical to the control so the only variable is order.
+  // The experiment only reorders the comment action and swaps its icon;
+  // copy and click behavior stay identical to the control so the only
+  // variable is order.
   const isCommentFirst = useFeature(featureCommentFirstAction);
   const CommentIconComponent = isCommentFirst ? CommentIconV2 : CommentIcon;
 
@@ -141,7 +142,7 @@ const ActionButtonsV1 = ({
 
   const commentButton = config.useCommentLink ? (
     <LinkWithTooltip
-      tooltip={{ content: isCommentFirst ? 'Reply' : 'Comment' }}
+      tooltip={{ content: 'Comment' }}
       href={post.commentsPermalink}
     >
       <QuaternaryButton
@@ -171,7 +172,7 @@ const ActionButtonsV1 = ({
       </QuaternaryButton>
     </LinkWithTooltip>
   ) : (
-    <Tooltip content={isCommentFirst ? 'Reply' : 'Comments'} side="bottom">
+    <Tooltip content="Comments" side="bottom">
       <QuaternaryButton
         labelClassName={counterLabelClassName}
         id={`post-${post.id}-comment-btn`}
diff --git a/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx b/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
index f6c5eef99da..1564ad17693 100644
--- a/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
+++ b/packages/shared/src/components/post/reader/ReaderFloatingActionBar.tsx
@@ -53,9 +53,8 @@ function ReaderFloatingActionBarV1({
   const upvotes = largeNumberFormat(post.numUpvotes ?? 0) ?? '0';
   const comments = largeNumberFormat(post.numComments ?? 0) ?? '0';
 
-  const commentLabel = isCommentFirst ? 'Reply' : 'Comment';
   const commentButton = (
-    <Tooltip content={commentLabel}>
+    <Tooltip content="Comment">
       <Button
         type="button"
         pressed={post.commented}
@@ -66,7 +65,7 @@ function ReaderFloatingActionBarV1({
             size={FLOATING_ICON_SIZE}
           />
         }
-        aria-label={commentLabel}
+        aria-label="Comment"
         variant={ButtonVariant.Tertiary}
         className={classNames(
           countActionButtonClasses,
diff --git a/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx b/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
index ce432fffa88..bdb8e9dcec6 100644
--- a/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
+++ b/packages/shared/src/components/post/reader/ReaderRailActionBar.tsx
@@ -56,16 +56,15 @@ function ReaderRailActionBarV1({
   const isUpvoteActive = post?.userState?.vote === UserVote.Up;
   const isDownvoteActive = post?.userState?.vote === UserVote.Down;
 
-  const commentLabel = isCommentFirst ? 'Reply' : 'Comment';
   const commentButton = (
-    <Tooltip content={commentLabel}>
+    <Tooltip content="Comment">
       <Button
         id="reader-comment-btn"
         type="button"
         pressed={post.commented}
         onClick={onCommentClick}
         icon={<CommentIconComponent secondary={post.commented} />}
-        aria-label={commentLabel}
+        aria-label="Comment"
         variant={ButtonVariant.Tertiary}
         color={ButtonColor.BlueCheese}
       />
diff --git a/scripts/typecheck-strict-changed.js b/scripts/typecheck-strict-changed.js
index 56cc30d67da..989e5447727 100644
--- a/scripts/typecheck-strict-changed.js
+++ b/scripts/typecheck-strict-changed.js
@@ -137,11 +137,6 @@ const strictSkipList = new Set([
   // ReactElement vs null return, Button props union) live on unrelated
   // lines and should be addressed in a dedicated cleanup PR.
   'packages/shared/src/components/streak/ReadingStreakButton.tsx',
-  // Comment-first action experiment — companion menu was reordered behind
-  // a feature flag, but the file has long-standing strict violations
-  // (implicit any in props/callbacks, modal duplicate `isOpen`,
-  // non-null parent selector return) unrelated to this experiment.
-  'packages/extension/src/companion/CompanionMenu.tsx',
 ]);
 
 const changedFiles = getChangedTypescriptFiles().filter(

From 47dd49ab0b43af2fc594ff63687ce32ab8323dfb Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 9 Jun 2026 12:53:27 +0300
Subject: [PATCH 7/7] chore: re-trigger CI (flaky webapp test_webapp run)

The test_webapp job failed on an async findBy* timeout in an unrelated
test (PostPage "should show source name"). Reproduced locally as
suite-level flakiness: different unrelated tests fail across runs and a
full clean pass occurs, with the changed code gated off by default.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>