diff --git a/packages/shared/src/components/ShareBar.spec.tsx b/packages/shared/src/components/ShareBar.spec.tsx
index 275c4e34b4c..7daee6962c2 100644
--- a/packages/shared/src/components/ShareBar.spec.tsx
+++ b/packages/shared/src/components/ShareBar.spec.tsx
@@ -12,6 +12,8 @@ import { generateTestSquad } from '../../__tests__/fixture/squads';
 import { getFacebookShareLink, getTwitterShareLink } from '../lib/share';
 import { LazyModalElement } from './modals/LazyModalElement';
 import { NotificationsContextProvider } from '../contexts/NotificationsContext';
+import SettingsContext from '../contexts/SettingsContext';
+import { settingsContext } from '../../__tests__/helpers/boot';
 
 const defaultPost = Post;
 Object.defineProperty(window, 'matchMedia', {
@@ -65,10 +67,12 @@ const renderComponent = (
         loadedUserFromCache
         squads={customSquads}
       >
-        <NotificationsContextProvider>
-          <LazyModalElement />
-          <ShareBar post={post} />
-        </NotificationsContextProvider>
+        <SettingsContext.Provider value={settingsContext}>
+          <NotificationsContextProvider>
+            <LazyModalElement />
+            <ShareBar post={post} />
+          </NotificationsContextProvider>
+        </SettingsContext.Provider>
       </AuthContextProvider>
     </QueryClientProvider>,
   );
@@ -113,15 +117,20 @@ describe('ShareBar Test Suite:', () => {
     });
   });
 
-  it('should render the component with logged user and squads and open the share to squad modal', async () => {
+  it('should render the component with logged user and squads and open the share to squad composer', async () => {
     renderComponent();
     const btn = await screen.findByTestId(`social-share-@${squads[0].handle}`);
 
     expect(btn).toBeInTheDocument();
     btn.click();
     await waitFor(() => {
-      expect(screen.getByText('New post')).toBeInTheDocument();
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toBeInTheDocument();
     });
+    expect(screen.getByRole('textbox', { name: 'Link URL' })).toHaveValue(
+      defaultPost.permalink,
+    );
   });
 
   it('should render the Facebook button and navigate to correct link', async () => {
diff --git a/packages/shared/src/components/ShareBar.tsx b/packages/shared/src/components/ShareBar.tsx
index 6b9461f11cf..6044ec84af3 100644
--- a/packages/shared/src/components/ShareBar.tsx
+++ b/packages/shared/src/components/ShareBar.tsx
@@ -79,12 +79,12 @@ export default function ShareBar({ post }: ShareBarProps): ReactElement {
   const onShareToSquad = (squad: Squad) => {
     logEvent(postLogEvent(LogEvent.StartShareToSquad, post));
     openModal({
-      type: LazyModal.CreateSharedPost,
+      type: LazyModal.SmartComposer,
       props: {
-        squad,
+        initialUrl: post.permalink,
         preview: post,
-        onSharedSuccessfully: () =>
-          logEvent(postLogEvent(LogEvent.ShareToSquad, post)),
+        initialSquadId: squad.id,
+        onPosted: () => logEvent(postLogEvent(LogEvent.ShareToSquad, post)),
       },
     });
   };
diff --git a/packages/shared/src/components/liveRooms/CreateLiveRoomForm.spec.tsx b/packages/shared/src/components/liveRooms/CreateLiveRoomForm.spec.tsx
deleted file mode 100644
index 3fa07f4174f..00000000000
--- a/packages/shared/src/components/liveRooms/CreateLiveRoomForm.spec.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import React from 'react';
-import { CreateLiveRoomForm } from './CreateLiveRoomForm';
-import { LiveRoomMode } from '../../graphql/liveRooms';
-
-const mockCreateLiveRoom = jest.fn();
-const mockDisplayToast = jest.fn();
-const mockLogEvent = jest.fn();
-const mockUseAuthContext = jest.fn();
-
-jest.mock('../../hooks/liveRooms/useCreateLiveRoom', () => ({
-  useCreateLiveRoom: () => ({
-    mutateAsync: mockCreateLiveRoom,
-    isPending: false,
-  }),
-}));
-
-jest.mock('../../hooks/useToastNotification', () => ({
-  useToastNotification: () => ({ displayToast: mockDisplayToast }),
-}));
-
-jest.mock('../fields/RichTextInput', () => ({
-  __esModule: true,
-  default: ({
-    initialContent,
-    maxInputLength,
-    onValueUpdate,
-    textareaProps,
-  }: {
-    initialContent?: string;
-    maxInputLength?: number;
-    onValueUpdate?: (value: string) => void;
-    textareaProps?: React.TextareaHTMLAttributes<HTMLTextAreaElement>;
-  }) => (
-    <textarea
-      aria-label={textareaProps?.['aria-label']}
-      maxLength={maxInputLength}
-      placeholder={textareaProps?.placeholder}
-      defaultValue={initialContent}
-      onInput={(event) => onValueUpdate?.(event.currentTarget.value)}
-    />
-  ),
-}));
-
-jest.mock('../../contexts/AuthContext', () => ({
-  useAuthContext: () => mockUseAuthContext(),
-}));
-
-jest.mock('../../contexts/LogContext', () => ({
-  useLogContext: () => ({ logEvent: mockLogEvent }),
-}));
-
-const DESCRIPTION_PLACEHOLDER =
-  'Add context, drop daily.dev posts to react to, or jot down questions for the room. Shown in the lobby while people RSVP, and in the Agenda tab once the standup is live.';
-
-const createJoinToken = () => ({
-  role: 'host',
-  token: 'join-token',
-  room: {
-    id: 'room-1',
-    topic: 'Open mic',
-    mode: LiveRoomMode.Moderated,
-    status: 'created',
-    createdAt: '2026-04-28T00:00:00.000Z',
-    updatedAt: '2026-04-28T00:00:00.000Z',
-    startedAt: null,
-    endedAt: null,
-    scheduledStart: null,
-    descriptionHtml: null,
-    subscribed: false,
-    contentEmbeds: [],
-    host: {
-      id: '1',
-      name: 'Host',
-      username: 'host',
-      image: '',
-      permalink: '#',
-    },
-  },
-});
-
-describe('CreateLiveRoomForm', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockCreateLiveRoom.mockResolvedValue(createJoinToken());
-    mockUseAuthContext.mockReturnValue({
-      user: { id: 'user-1', timezone: 'Asia/Jerusalem' },
-    });
-  });
-
-  afterEach(() => {
-    jest.useRealTimers();
-  });
-
-  it('creates a moderated standup with the entered topic', async () => {
-    const onCreated = jest.fn();
-
-    render(<CreateLiveRoomForm onCreated={onCreated} />);
-
-    fireEvent.change(screen.getByPlaceholderText('Topic'), {
-      target: { value: 'Structured discussion' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: 'Create standup' }));
-
-    await waitFor(() => {
-      expect(mockCreateLiveRoom).toHaveBeenCalledWith({
-        topic: 'Structured discussion',
-        mode: LiveRoomMode.Moderated,
-        scheduledStart: undefined,
-        description: undefined,
-      });
-    });
-    expect(onCreated).toHaveBeenCalledTimes(1);
-  });
-
-  it('submits scheduled lobby fields as UTC and explains the local delta', async () => {
-    jest.useFakeTimers().setSystemTime(new Date('2026-05-04T07:00:00.000Z'));
-
-    render(<CreateLiveRoomForm onCreated={jest.fn()} />);
-
-    fireEvent.change(screen.getByPlaceholderText('Topic'), {
-      target: { value: 'Scheduled lobby' },
-    });
-    fireEvent.input(screen.getByPlaceholderText(DESCRIPTION_PLACEHOLDER), {
-      target: { value: '## Agenda\nhttps://daily.dev/posts/example' },
-    });
-    fireEvent.click(screen.getByLabelText('Schedule for later'));
-
-    expect(screen.getByText(/30 minutes from now/)).toBeInTheDocument();
-    expect(screen.getByText(/UTC \+3/)).toBeInTheDocument();
-    expect(
-      screen.getByRole('link', { name: 'Change timezone' }),
-    ).toHaveAttribute('href', 'https://r.daily.dev/timezone');
-
-    fireEvent.change(screen.getByLabelText('Scheduled time'), {
-      target: { value: '2026-05-04T12:00' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: 'Schedule standup' }));
-
-    await waitFor(() => {
-      expect(mockCreateLiveRoom).toHaveBeenCalledWith({
-        topic: 'Scheduled lobby',
-        mode: LiveRoomMode.Moderated,
-        scheduledStart: '2026-05-04T09:00:00.000Z',
-        description: '## Agenda\nhttps://daily.dev/posts/example',
-      });
-    });
-    expect(mockLogEvent).toHaveBeenCalledWith(
-      expect.objectContaining({
-        event_name: 'create standup',
-        target_id: 'room-1',
-        extra: expect.stringContaining('"scheduled":true'),
-      }),
-    );
-  });
-
-  it('does not submit scheduled lobbies in the past', async () => {
-    jest.useFakeTimers().setSystemTime(new Date('2026-05-04T07:00:00.000Z'));
-
-    render(<CreateLiveRoomForm onCreated={jest.fn()} />);
-
-    fireEvent.change(screen.getByPlaceholderText('Topic'), {
-      target: { value: 'Scheduled lobby' },
-    });
-    fireEvent.click(screen.getByLabelText('Schedule for later'));
-    fireEvent.change(screen.getByLabelText('Scheduled time'), {
-      target: { value: '2026-05-04T09:30' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: 'Schedule standup' }));
-
-    await waitFor(() => {
-      expect(
-        screen.getByText('Scheduled time must be in the future'),
-      ).toBeInTheDocument();
-    });
-    expect(mockCreateLiveRoom).not.toHaveBeenCalled();
-  });
-
-  it('swaps submit copy based on schedule choice', () => {
-    render(<CreateLiveRoomForm onCreated={jest.fn()} />);
-
-    expect(
-      screen.getByRole('button', { name: 'Create standup' }),
-    ).toBeInTheDocument();
-
-    fireEvent.click(screen.getByLabelText('Schedule for later'));
-
-    expect(
-      screen.getByRole('button', { name: 'Schedule standup' }),
-    ).toBeInTheDocument();
-  });
-});
diff --git a/packages/shared/src/components/liveRooms/CreateLiveRoomForm.tsx b/packages/shared/src/components/liveRooms/CreateLiveRoomForm.tsx
deleted file mode 100644
index a60d1a1aad1..00000000000
--- a/packages/shared/src/components/liveRooms/CreateLiveRoomForm.tsx
+++ /dev/null
@@ -1,345 +0,0 @@
-import type { ReactElement } from 'react';
-import React, { useMemo } from 'react';
-import { Controller, FormProvider, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
-import zonedTimeToUtc from 'date-fns-tz/zonedTimeToUtc';
-import { Radio } from '../fields/Radio';
-import {
-  Typography,
-  TypographyColor,
-  TypographyTag,
-  TypographyType,
-} from '../typography/Typography';
-import { Button, ButtonVariant } from '../buttons/Button';
-import ControlledTextField from '../fields/ControlledTextField';
-import { TextField } from '../fields/TextField';
-import RichTextInput from '../fields/RichTextInput';
-import type { LiveRoomJoinToken } from '../../graphql/liveRooms';
-import { useSubmitStandup } from '../../hooks/liveRooms/useSubmitStandup';
-import { useAuthContext } from '../../contexts/AuthContext';
-import {
-  dateFormatInTimezone,
-  DEFAULT_TIMEZONE,
-  getTimezoneOffsetLabel,
-} from '../../lib/timezones';
-import { timezoneSettingsUrl } from '../../lib/constants';
-import Link from '../utilities/Link';
-import { CREATE_LIVE_ROOM_FORM_ID } from '../fields/form/common';
-import styles from '../fields/dateTimeInput.module.css';
-
-const DEFAULT_SCHEDULE_DELAY_MS = 30 * 60 * 1000;
-const TOPIC_MAX_LENGTH = 280;
-const DESCRIPTION_MAX_LENGTH = 4000;
-
-type ScheduleChoice = 'now' | 'later';
-
-const createLiveRoomFormSchema = z
-  .object({
-    topic: z
-      .string()
-      .trim()
-      .min(1, 'Topic is required')
-      .max(
-        TOPIC_MAX_LENGTH,
-        `Topic must be ${TOPIC_MAX_LENGTH} characters or less`,
-      ),
-    scheduleChoice: z.enum(['now', 'later']),
-    scheduledStart: z.string().optional(),
-    description: z
-      .string()
-      .trim()
-      .max(
-        DESCRIPTION_MAX_LENGTH,
-        'Description must be 4000 characters or less',
-      )
-      .optional(),
-  })
-  .superRefine((values, ctx) => {
-    if (values.scheduleChoice === 'later' && !values.scheduledStart) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        path: ['scheduledStart'],
-        message: 'Scheduled time is required',
-      });
-    }
-  });
-
-type CreateLiveRoomFormValues = z.infer<typeof createLiveRoomFormSchema>;
-
-const getDefaultScheduledStart = (timezone: string): string =>
-  dateFormatInTimezone(
-    new Date(Date.now() + DEFAULT_SCHEDULE_DELAY_MS),
-    "yyyy-MM-dd'T'HH:mm",
-    timezone,
-  );
-
-const formatScheduleDelta = (date: Date | null): string | null => {
-  if (!date) {
-    return null;
-  }
-
-  const diffMs = date.getTime() - Date.now();
-  if (diffMs <= 0) {
-    return 'now';
-  }
-
-  const minutes = Math.max(1, Math.round(diffMs / 60_000));
-  if (minutes < 60) {
-    return `${minutes} minute${minutes === 1 ? '' : 's'} from now`;
-  }
-
-  const hours = Math.round(minutes / 60);
-  if (hours < 24) {
-    return `${hours} hour${hours === 1 ? '' : 's'} from now`;
-  }
-
-  const days = Math.round(hours / 24);
-  return `${days} day${days === 1 ? '' : 's'} from now`;
-};
-
-const parseScheduledStart = (value: string | undefined, timezone: string) => {
-  if (!value) {
-    return null;
-  }
-
-  const date = zonedTimeToUtc(value, timezone);
-  return Number.isNaN(date.getTime()) ? null : date;
-};
-
-interface CreateLiveRoomFormProps {
-  onCreated: (joinToken: LiveRoomJoinToken) => void;
-}
-
-export const CreateLiveRoomForm = ({
-  onCreated,
-}: CreateLiveRoomFormProps): ReactElement => {
-  const { user } = useAuthContext();
-  const { submit: submitStandup, isPending } = useSubmitStandup();
-  const timezone = user?.timezone || DEFAULT_TIMEZONE;
-  const timezoneLabel = getTimezoneOffsetLabel(timezone);
-  const defaultScheduledStart = useMemo(
-    () => getDefaultScheduledStart(timezone),
-    [timezone],
-  );
-
-  const form = useForm<CreateLiveRoomFormValues>({
-    resolver: zodResolver(createLiveRoomFormSchema),
-    defaultValues: {
-      topic: '',
-      scheduleChoice: 'now',
-      scheduledStart: defaultScheduledStart,
-      description: '',
-    },
-  });
-  const scheduleChoice = form.watch('scheduleChoice');
-  const scheduledStart = form.watch('scheduledStart');
-  const scheduledStartDate = parseScheduledStart(scheduledStart, timezone);
-  const isScheduled = scheduleChoice === 'later';
-  const scheduleDelta = isScheduled
-    ? formatScheduleDelta(scheduledStartDate)
-    : null;
-  const submitCopy = isScheduled ? 'Schedule standup' : 'Create standup';
-
-  const onSubmit = form.handleSubmit(async (values) => {
-    const result = await submitStandup(values);
-    if (result.type === 'error') {
-      form.setError(result.error.field, { message: result.error.message });
-      return;
-    }
-    if (result.type === 'success') {
-      onCreated(result.joinToken);
-    }
-  });
-
-  return (
-    <FormProvider {...form}>
-      <form
-        id={CREATE_LIVE_ROOM_FORM_ID}
-        onSubmit={onSubmit}
-        className="flex flex-col gap-5"
-      >
-        <Typography
-          type={TypographyType.Callout}
-          color={TypographyColor.Tertiary}
-        >
-          Standups are short, host-led audio and video rooms on daily.dev. Pick
-          a topic, optionally schedule it, and go live when you&apos;re ready.
-          Standups don&apos;t start automatically.
-        </Typography>
-        <ControlledTextField
-          name="topic"
-          label="Topic"
-          placeholder="What do you want to talk about?"
-          maxLength={TOPIC_MAX_LENGTH}
-          hint="Keep it short and specific. Examples: “AMA: shipping a side project in 24h”, “Live code review: Next.js refactor”."
-        />
-        <Controller
-          control={form.control}
-          name="scheduleChoice"
-          render={({ field }) => (
-            <div className="flex flex-col gap-2">
-              <Typography type={TypographyType.Footnote} bold>
-                When do you want to start?
-              </Typography>
-              <Radio<ScheduleChoice>
-                name={field.name}
-                value={field.value}
-                onChange={(value) => {
-                  field.onChange(value);
-                  if (value === 'later' && !form.getValues('scheduledStart')) {
-                    form.setValue('scheduledStart', defaultScheduledStart, {
-                      shouldDirty: true,
-                      shouldValidate: true,
-                    });
-                  }
-                }}
-                options={[
-                  {
-                    value: 'now',
-                    label: 'Start now',
-                    className: { wrapper: 'gap-0' },
-                    afterElement: (
-                      <Typography
-                        type={TypographyType.Caption1}
-                        color={TypographyColor.Tertiary}
-                        className="-mt-1 pl-10"
-                      >
-                        Open the room immediately. You&apos;ll still need to
-                        click &quot;Go live&quot; before listeners can join.
-                      </Typography>
-                    ),
-                  },
-                  {
-                    value: 'later',
-                    label: 'Schedule for later',
-                    className: { wrapper: 'gap-0' },
-                    afterElement: (
-                      <Typography
-                        type={TypographyType.Caption1}
-                        color={TypographyColor.Tertiary}
-                        className="-mt-1 pl-10"
-                      >
-                        Open a lobby where people can RSVP, chat, and get
-                        notified when you go live.
-                      </Typography>
-                    ),
-                  },
-                ]}
-              />
-            </div>
-          )}
-        />
-        {isScheduled ? (
-          <Controller
-            control={form.control}
-            name="scheduledStart"
-            render={({ field, fieldState }) => (
-              <div className="flex flex-col gap-1">
-                <TextField
-                  inputId={field.name}
-                  name={field.name}
-                  label="Scheduled time"
-                  aria-label="Scheduled time"
-                  type="datetime-local"
-                  value={field.value ?? ''}
-                  onChange={field.onChange}
-                  onBlur={field.onBlur}
-                  valid={!fieldState.error}
-                  className={{ input: styles.dateTimeInput }}
-                />
-                <Typography
-                  type={TypographyType.Caption1}
-                  color={
-                    fieldState.error
-                      ? TypographyColor.StatusError
-                      : TypographyColor.Tertiary
-                  }
-                >
-                  {fieldState.error?.message ?? (
-                    <>
-                      {[scheduleDelta, `Timezone: ${timezoneLabel}`]
-                        .filter(Boolean)
-                        .join(' · ')}
-                      {' · '}
-                      <Link href={timezoneSettingsUrl} passHref>
-                        <a className="text-text-link">Change timezone</a>
-                      </Link>
-                    </>
-                  )}
-                </Typography>
-              </div>
-            )}
-          />
-        ) : null}
-        <Controller
-          control={form.control}
-          name="description"
-          render={({ field, fieldState }) => (
-            <div className="flex flex-col gap-1">
-              <Typography type={TypographyType.Footnote} bold>
-                Description{' '}
-                <Typography
-                  tag={TypographyTag.Span}
-                  type={TypographyType.Footnote}
-                  color={TypographyColor.Tertiary}
-                >
-                  (optional)
-                </Typography>
-              </Typography>
-              <RichTextInput
-                initialContent={field.value ?? ''}
-                maxInputLength={DESCRIPTION_MAX_LENGTH}
-                onValueUpdate={field.onChange}
-                minHeightClassName="min-h-[8rem]"
-                textareaProps={{
-                  name: field.name,
-                  'aria-label': 'Description',
-                  placeholder:
-                    'Add context, drop daily.dev posts to react to, or jot down questions for the room. Shown in the lobby while people RSVP, and in the Agenda tab once the standup is live.',
-                  maxLength: DESCRIPTION_MAX_LENGTH,
-                }}
-                className={{
-                  container: fieldState.error
-                    ? 'border border-status-error'
-                    : '',
-                }}
-              />
-              <Typography
-                type={TypographyType.Caption1}
-                color={
-                  fieldState.error
-                    ? TypographyColor.StatusError
-                    : TypographyColor.Quaternary
-                }
-              >
-                {fieldState.error?.message ??
-                  'Supports rich text, markdown shortcuts, and daily.dev post embeds.'}
-              </Typography>
-            </div>
-          )}
-        />
-        <div className="mt-2 hidden items-center justify-end gap-3 laptop:flex">
-          <Typography
-            type={TypographyType.Caption1}
-            color={TypographyColor.Tertiary}
-            className="min-w-0 flex-1"
-          >
-            {isScheduled
-              ? "We'll open the lobby right away and share a post on your feed so people can RSVP. You can go live at the scheduled time."
-              : "You'll be asked for camera and microphone access before going live."}
-          </Typography>
-          <Button
-            type="submit"
-            variant={ButtonVariant.Primary}
-            loading={isPending}
-          >
-            {submitCopy}
-          </Button>
-        </div>
-      </form>
-    </FormProvider>
-  );
-};
-
-export default CreateLiveRoomForm;
diff --git a/packages/shared/src/components/modals/ShareModal.spec.tsx b/packages/shared/src/components/modals/ShareModal.spec.tsx
index 92b8fe04c65..e706bed4c39 100644
--- a/packages/shared/src/components/modals/ShareModal.spec.tsx
+++ b/packages/shared/src/components/modals/ShareModal.spec.tsx
@@ -95,11 +95,16 @@ describe('ShareModal Test Suite:', () => {
     });
   });
 
-  it('should render the component with logged user and squads and open the share to squad modal', async () => {
+  it('should render the component with logged user and squads and open the share to squad composer', async () => {
     renderComponent(true, true);
     const btn = await screen.findByTestId(`social-share-@${squads[0].handle}`);
     fireEvent.click(btn);
-    await screen.findByText('New post');
+    expect(
+      await screen.findByRole('textbox', { name: 'Post commentary' }),
+    ).toBeInTheDocument();
+    expect(screen.getByRole('textbox', { name: 'Link URL' })).toHaveValue(
+      defaultPost.permalink,
+    );
   });
 
   it('should render the Facebook button and navigate to the correct link', async () => {
diff --git a/packages/shared/src/components/modals/common.tsx b/packages/shared/src/components/modals/common.tsx
index a02bdc7d4da..c749a59fc2a 100644
--- a/packages/shared/src/components/modals/common.tsx
+++ b/packages/shared/src/components/modals/common.tsx
@@ -41,13 +41,6 @@ const ReadingHistoryModal = dynamic(
     ),
 );
 
-const CreateSharedPostModal = dynamic(
-  () =>
-    import(
-      /* webpackChunkName: "createSharedPostModal" */ './post/CreateSharedPostModal'
-    ),
-);
-
 const SmartComposerModal = dynamic(
   () =>
     import(
@@ -540,7 +533,6 @@ export const modals = {
   [LazyModal.SquadTour]: SquadTourModal,
   [LazyModal.ReadingHistory]: ReadingHistoryModal,
   [LazyModal.SquadPromotion]: SquadPromotionModal,
-  [LazyModal.CreateSharedPost]: CreateSharedPostModal,
   [LazyModal.SmartComposer]: SmartComposerModal,
   [LazyModal.ReportPost]: ReportPostModal,
   [LazyModal.ReportComment]: ReportCommentModal,
diff --git a/packages/shared/src/components/modals/common/types.ts b/packages/shared/src/components/modals/common/types.ts
index cb070ec0a8e..05db3ab6cbb 100644
--- a/packages/shared/src/components/modals/common/types.ts
+++ b/packages/shared/src/components/modals/common/types.ts
@@ -31,7 +31,6 @@ export enum LazyModal {
   RepostsPopup = 'repostsPopup',
   ReadingHistory = 'readingHistory',
   SquadPromotion = 'squadPromotion',
-  CreateSharedPost = 'createSharedPost',
   SmartComposer = 'smartComposer',
   ReasonSelection = 'reasonSelection',
   ReportPost = 'reportPost',
diff --git a/packages/shared/src/components/modals/post/CreateSharedPostModal.spec.tsx b/packages/shared/src/components/modals/post/CreateSharedPostModal.spec.tsx
deleted file mode 100644
index 1b429f3ec0b..00000000000
--- a/packages/shared/src/components/modals/post/CreateSharedPostModal.spec.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import { CreateSharedPostModal } from './CreateSharedPostModal';
-import { usePostToSquad } from '../../../hooks';
-import { useNotificationToggle } from '../../../hooks/notifications';
-
-jest.mock('../../../hooks', () => ({
-  ...(jest.requireActual('../../../hooks') as Iterable<unknown>),
-  usePostToSquad: jest.fn(),
-}));
-
-jest.mock('../../../hooks/notifications', () => ({
-  useNotificationToggle: jest.fn(),
-}));
-
-jest.mock('../common/Modal', () => {
-  const MockModal = ({ children }: React.PropsWithChildren) => (
-    <div>{children}</div>
-  );
-  const MockModalHeader = () => null;
-  const MockModalFooter = ({ children }: React.PropsWithChildren) => (
-    <div>{children}</div>
-  );
-
-  MockModal.Kind = { FlexibleCenter: 'FlexibleCenter' };
-  MockModal.Size = { Medium: 'Medium' };
-  MockModal.Header = MockModalHeader;
-  MockModal.Footer = MockModalFooter;
-
-  return {
-    Modal: MockModal,
-  };
-});
-
-jest.mock('../../fields/RichTextInput', () => {
-  const { forwardRef } = jest.requireActual('react') as typeof React;
-
-  return forwardRef(() => null);
-});
-jest.mock('../../post/write', () => ({
-  WriteLinkPreview: () => null,
-  WritePreviewSkeleton: () => null,
-}));
-jest.mock('../../cards/common/SourceButton', () => () => null);
-
-describe('CreateSharedPostModal', () => {
-  const onRequestClose = jest.fn();
-  const onSharedSuccessfully = jest.fn();
-  const onSubmitted = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    jest.mocked(useNotificationToggle).mockReturnValue({
-      shouldShowCta: false,
-      isEnabled: false,
-      onToggle: jest.fn(),
-      onSubmitted,
-    } as unknown as ReturnType<typeof useNotificationToggle>);
-    jest.mocked(usePostToSquad).mockReturnValue({
-      getLinkPreview: jest.fn(),
-      isLoadingPreview: false,
-      preview: {},
-      isPosting: false,
-      onSubmitPost: jest.fn(),
-    } as unknown as ReturnType<typeof usePostToSquad>);
-  });
-
-  it('closes the modal from the shared completion callback', () => {
-    render(
-      <CreateSharedPostModal
-        isOpen
-        preview={{ url: 'https://daily.dev/post' }}
-        squad={{ id: 'squad-1', name: 'Squad', handle: 'squad' } as never}
-        onRequestClose={onRequestClose}
-        onSharedSuccessfully={onSharedSuccessfully}
-      />,
-    );
-
-    const hookProps = jest.mocked(usePostToSquad).mock.calls[0]?.[0];
-
-    expect(hookProps?.onComplete).toBeDefined();
-
-    hookProps?.onComplete?.();
-
-    expect(onSharedSuccessfully).toHaveBeenCalledTimes(1);
-    expect(onSubmitted).toHaveBeenCalledTimes(1);
-    expect(onRequestClose).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/packages/shared/src/components/modals/post/CreateSharedPostModal.tsx b/packages/shared/src/components/modals/post/CreateSharedPostModal.tsx
deleted file mode 100644
index 1521a7fc3c0..00000000000
--- a/packages/shared/src/components/modals/post/CreateSharedPostModal.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import type { FormEventHandler, ReactElement } from 'react';
-import React, { useRef, useState } from 'react';
-import type { LazyModalCommonProps } from '../common/Modal';
-import { Modal } from '../common/Modal';
-import type { ExternalLinkPreview } from '../../../graphql/posts';
-import type { RichTextInputRef } from '../../fields/RichTextInput';
-import RichTextInput from '../../fields/RichTextInput';
-import { WriteLinkPreview, WritePreviewSkeleton } from '../../post/write';
-import { usePostToSquad } from '../../../hooks';
-import {
-  Button,
-  ButtonColor,
-  ButtonSize,
-  ButtonVariant,
-} from '../../buttons/Button';
-import { AtIcon } from '../../icons';
-import { Divider, Justify } from '../../utilities';
-import SourceButton from '../../cards/common/SourceButton';
-import type { Squad } from '../../../graphql/sources';
-import { formToJson } from '../../../lib/form';
-import { useDebouncedUrl } from '../../../hooks/input';
-import { useNotificationToggle } from '../../../hooks/notifications';
-import { Switch } from '../../fields/Switch';
-import { ProfileImageSize } from '../../ProfilePicture';
-
-export interface CreateSharedPostModalProps extends LazyModalCommonProps {
-  preview: ExternalLinkPreview;
-  onSharedSuccessfully?: (enableNotification?: boolean) => void;
-  squad: Squad;
-}
-
-export function CreateSharedPostModal({
-  preview,
-  squad,
-  onSharedSuccessfully,
-  onRequestClose,
-  ...props
-}: CreateSharedPostModalProps): ReactElement {
-  const richTextRef = useRef<RichTextInputRef | null>(null);
-  const [link, setLink] = useState(preview?.permalink ?? preview?.url ?? '');
-  const { shouldShowCta, isEnabled, onToggle, onSubmitted } =
-    useNotificationToggle();
-  const onSuccess = () => {
-    onSharedSuccessfully?.();
-    onSubmitted();
-    onRequestClose();
-  };
-  const {
-    getLinkPreview,
-    isLoadingPreview,
-    preview: updatedPreview,
-    isPosting,
-    onSubmitPost,
-  } = usePostToSquad({
-    initialPreview: preview,
-    onComplete: onSuccess,
-  });
-
-  const onFormSubmit: FormEventHandler<HTMLFormElement> = (e) => {
-    e.preventDefault();
-
-    const { commentary } = formToJson<{ commentary: string }>(e.currentTarget);
-    return onSubmitPost(e, squad, commentary);
-  };
-
-  const links = [updatedPreview?.url, updatedPreview?.permalink];
-  const [checkUrl] = useDebouncedUrl(
-    (value) => {
-      if (!value) {
-        return undefined;
-      }
-
-      return getLinkPreview(value);
-    },
-    (value) => links.every((url) => url !== value),
-  );
-
-  const onInput: FormEventHandler<HTMLInputElement> = (e) => {
-    const { value } = e.currentTarget;
-    setLink(value);
-    checkUrl(value);
-  };
-
-  const footer = (
-    <>
-      <Button
-        icon={<AtIcon />}
-        size={ButtonSize.Small}
-        variant={ButtonVariant.Tertiary}
-        onClick={richTextRef?.current?.onMentionCommand}
-      />
-      <Divider vertical />
-      <SourceButton source={squad} size={ProfileImageSize.Small} />
-      <span className="-ml-1 flex-1">
-        <strong>{squad.name}</strong>
-        <span className="ml-1 text-text-tertiary">@{squad.handle}</span>
-      </span>
-    </>
-  );
-
-  const submitProps = {
-    color: ButtonColor.Cabbage,
-    variant: ButtonVariant.Primary,
-    disabled: isPosting,
-    loading: isPosting,
-  };
-
-  return (
-    <Modal
-      kind={Modal.Kind.FlexibleCenter}
-      size={Modal.Size.Medium}
-      onRequestClose={onRequestClose}
-      {...props}
-      formProps={{
-        form: 'share_post',
-        title: 'New post',
-        rightButtonProps: submitProps,
-        copy: { right: 'Post' },
-      }}
-    >
-      <Modal.Header title="New post" />
-      <form
-        className="flex w-full flex-col p-3"
-        action="#"
-        onSubmit={onFormSubmit}
-        id="share_post"
-      >
-        <RichTextInput
-          ref={richTextRef}
-          showUserAvatar
-          textareaProps={{ rows: 5, name: 'commentary' }}
-          sourceId={squad?.id}
-          enabledCommand={{ mention: true }}
-          footer={
-            isLoadingPreview ? (
-              <WritePreviewSkeleton
-                link={link}
-                className="m-3 flex-col-reverse"
-              />
-            ) : (
-              <WriteLinkPreview
-                className="m-3 !w-auto flex-col-reverse"
-                preview={updatedPreview ?? preview}
-                link={link}
-                onLinkChange={onInput}
-                variant="modal"
-              />
-            )
-          }
-        />
-        {shouldShowCta && (
-          <Switch
-            data-testid="push_notification-switch"
-            inputId="push_notification-switch"
-            name="push_notification"
-            labelClassName="flex-1 font-normal"
-            className="py-3"
-            compact={false}
-            checked={isEnabled}
-            onToggle={onToggle}
-          >
-            Receive updates whenever your Squad members engage with your post
-          </Switch>
-        )}
-      </form>
-      <span className="flex flex-row items-center gap-2 px-4 tablet:hidden">
-        {footer}
-      </span>
-      <Modal.Footer className="typo-caption1" justify={Justify.Start}>
-        {footer}
-        <Button {...submitProps} className="ml-auto" form="share_post">
-          Post
-        </Button>
-      </Modal.Footer>
-    </Modal>
-  );
-}
-
-export default CreateSharedPostModal;
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
index 39fa4e2722c..9980c720a0e 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { useAuthContext } from '../../../contexts/AuthContext';
 import { useLogContext } from '../../../contexts/LogContext';
@@ -10,6 +10,8 @@ import { useNotificationToggle } from '../../../hooks/notifications';
 import { useComposerAudience } from '../../post/composer/useComposerAudience';
 import { useComposerSubmit } from '../../post/composer/useComposerSubmit';
 import { LogEvent } from '../../../lib/log';
+import type { Post } from '../../../graphql/posts';
+import { PostType } from '../../../graphql/posts';
 import { SmartComposerModal } from './SmartComposerModal';
 
 jest.mock('../../../contexts/AuthContext', () => ({
@@ -234,6 +236,20 @@ describe('SmartComposerModal', () => {
     );
   });
 
+  it('portals the mobile drawer to the root, away from transformed ancestors', () => {
+    jest.mocked(useViewSize).mockReturnValue(false);
+
+    renderWithClient(
+      <div data-testid="host">
+        <SmartComposerModal isOpen onRequestClose={onRequestClose} />
+      </div>,
+    );
+
+    const form = document.getElementById('smart_composer');
+    expect(form).toBeInTheDocument();
+    expect(screen.getByTestId('host')).not.toContainElement(form);
+  });
+
   it('hides the expand control on mobile, where it is already full-screen', () => {
     jest.mocked(useViewSize).mockReturnValue(false);
 
@@ -285,4 +301,205 @@ describe('SmartComposerModal', () => {
     });
     expect(schedule.parentElement).not.toBe(scheduledNav.parentElement);
   });
+
+  describe('sharing a post to a squad', () => {
+    const postPreview = {
+      id: 'post-1',
+      title: 'The shared article',
+      permalink: 'https://api.daily.dev/r/post-1',
+    };
+
+    it('notifies the caller once the post goes through', async () => {
+      const onPosted = jest.fn();
+
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          initialUrl={postPreview.permalink}
+          preview={postPreview}
+          onPosted={onPosted}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      const hookProps = jest.mocked(useComposerSubmit).mock.calls[0]?.[0];
+      await hookProps?.onComplete();
+
+      expect(onPosted).toHaveBeenCalledTimes(1);
+      expect(onRequestClose).toHaveBeenCalledTimes(1);
+    });
+
+    it('closes an untouched seeded composer without the discard prompt', async () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          initialUrl={postPreview.permalink}
+          preview={postPreview}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      fireEvent.click(screen.getByRole('button', { name: 'Close composer' }));
+
+      await waitFor(() => expect(onRequestClose).toHaveBeenCalledTimes(1));
+      expect(showPrompt).not.toHaveBeenCalled();
+    });
+
+    it('still prompts once the commentary diverges from the seed', async () => {
+      showPrompt.mockResolvedValue(false);
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          initialUrl={postPreview.permalink}
+          preview={postPreview}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      fireEvent.change(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+        {
+          target: { value: 'my take' },
+        },
+      );
+      fireEvent.click(screen.getByRole('button', { name: 'Close composer' }));
+
+      await waitFor(() => expect(showPrompt).toHaveBeenCalledTimes(1));
+      expect(onRequestClose).not.toHaveBeenCalled();
+    });
+
+    it('opens on the link kind with the post seeded, ready to submit', () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          initialUrl={postPreview.permalink}
+          preview={postPreview}
+          initialSquadId="squad-1"
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      expect(screen.getByRole('textbox', { name: 'Link URL' })).toHaveValue(
+        postPreview.permalink,
+      );
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toHaveValue('');
+
+      const hookProps = jest.mocked(useComposerSubmit).mock.calls[0]?.[0];
+      expect(hookProps?.initialPreview).toBe(postPreview);
+      expect(hookProps?.editPostId).toBeUndefined();
+    });
+  });
+
+  describe('editing a share post', () => {
+    const sharedPost = {
+      title: 'The shared article',
+      permalink: 'https://daily.dev/posts/shared',
+    };
+    const editShare = {
+      id: 'post-1',
+      type: PostType.Share,
+      title: 'My take on this',
+      sharedPost,
+      source: { id: 'squad-1' },
+    } as unknown as Post;
+
+    it('opens on the link kind rather than defaulting to text', () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={editShare}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toHaveValue('My take on this');
+    });
+
+    it('locks the link, since only the commentary is editable', () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={editShare}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      expect(
+        screen.queryByRole('textbox', { name: 'Link URL' }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByRole('button', { name: 'Remove link preview' }),
+      ).not.toBeInTheDocument();
+    });
+
+    it('seeds the preview from the post instead of refetching it', () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={editShare}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      const hookProps = jest.mocked(useComposerSubmit).mock.calls[0]?.[0];
+      expect(hookProps?.initialPreview).toBe(sharedPost);
+      expect(hookProps?.editPostId).toBe('post-1');
+    });
+
+    it('targets the post source even when it is not a postable audience', () => {
+      const foreignSource = { id: 'left-squad', handle: 'left' };
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={{ ...editShare, source: foreignSource } as unknown as Post}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      const hookProps = jest.mocked(useComposerSubmit).mock.calls[0]?.[0];
+      expect(hookProps?.primary).toBe(foreignSource);
+      expect(hookProps?.isMulti).toBe(false);
+    });
+
+    it('treats a trailing space as no change to the commentary', async () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={editShare}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      fireEvent.change(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+        { target: { value: 'My take on this ' } },
+      );
+      fireEvent.click(screen.getByRole('button', { name: 'Close composer' }));
+
+      await waitFor(() => expect(onRequestClose).toHaveBeenCalledTimes(1));
+      expect(showPrompt).not.toHaveBeenCalled();
+    });
+
+    it('offers an empty commentary when the share never had one', () => {
+      // A share posted without commentary carries the shared post's title,
+      // which is not the author's words and must not be presented as theirs.
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={
+            { ...editShare, title: sharedPost.title } as unknown as Post
+          }
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toHaveValue('');
+    });
+  });
 });
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
index 115425c7e92..f14a67747aa 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
@@ -36,6 +36,7 @@ import { LogEvent } from '../../../lib/log';
 import { useViewSize, ViewSize } from '../../../hooks';
 import { usePrompt } from '../../../hooks/usePrompt';
 import type { ExternalLinkPreview, Post } from '../../../graphql/posts';
+import { PostType } from '../../../graphql/posts';
 import type { Squad } from '../../../graphql/sources';
 import { getPostByIdKey } from '../../../lib/query';
 import { moderationRequired } from '../../squads/utils';
@@ -104,6 +105,7 @@ export interface SmartComposerModalProps extends LazyModalCommonProps {
   initialCommentary?: string;
   preview?: ExternalLinkPreview;
   editPost?: Post;
+  onPosted?: () => void;
 }
 
 export function SmartComposerModal({
@@ -117,6 +119,7 @@ export function SmartComposerModal({
   initialCommentary,
   preview: initialPreview,
   editPost,
+  onPosted,
   ...props
 }: SmartComposerModalProps): ReactElement {
   const { user } = useAuthContext();
@@ -132,7 +135,7 @@ export function SmartComposerModal({
   const isEditing = !!editPost;
   const [kind, setKind] = useState<ComposerKind>(() => {
     if (isEditing) {
-      return 'text';
+      return editPost.type === PostType.Share ? 'link' : 'text';
     }
     if (initialUrl) {
       return 'link';
@@ -175,10 +178,34 @@ export function SmartComposerModal({
       body: initialContent ?? DEFAULT_TEXT.body,
     };
   });
-  const [link, setLink] = useState<LinkFormState>({
-    ...DEFAULT_LINK,
-    url: initialUrl ?? '',
-    commentary: initialCommentary ?? DEFAULT_LINK.commentary,
+  const editShare = editPost?.type === PostType.Share ? editPost : undefined;
+  // A share posted without commentary carries the shared post's own title,
+  // which is not the author's text and must not be offered back to them as if
+  // it were.
+  const editShareCommentary = ((): string => {
+    if (!editShare) {
+      return '';
+    }
+    if (!editShare.sharedPost) {
+      return editShare.content ?? '';
+    }
+    return editShare.title === editShare.sharedPost.title
+      ? ''
+      : editShare.title ?? '';
+  })();
+  const [link, setLink] = useState<LinkFormState>(() => {
+    if (editShare) {
+      return {
+        ...DEFAULT_LINK,
+        url: editShare.sharedPost?.permalink ?? '',
+        commentary: editShareCommentary,
+      };
+    }
+    return {
+      ...DEFAULT_LINK,
+      url: initialUrl ?? '',
+      commentary: initialCommentary ?? DEFAULT_LINK.commentary,
+    };
   });
   const [poll, setPoll] = useState<PollFormState>(DEFAULT_POLL);
   const [standup, setStandup] = useState<StandupFormState>(DEFAULT_STANDUP);
@@ -191,6 +218,9 @@ export function SmartComposerModal({
   useDisableSpotlightShortcut();
 
   const isDirty = useMemo(() => {
+    if (editShare) {
+      return link.commentary.trim() !== editShareCommentary.trim();
+    }
     if (editPost) {
       if (text.title !== (editPost.title ?? '')) {
         return true;
@@ -209,10 +239,18 @@ export function SmartComposerModal({
     if (cover) {
       return true;
     }
-    if (text.title.trim() || text.body.trim()) {
+    const isChanged = (value: string, initial: string | undefined) =>
+      value.trim() !== (initial ?? '').trim();
+    if (
+      isChanged(text.title, initialTitle) ||
+      isChanged(text.body, initialContent)
+    ) {
       return true;
     }
-    if (link.url.trim() || link.commentary.trim()) {
+    if (
+      isChanged(link.url, initialUrl) ||
+      isChanged(link.commentary, initialCommentary)
+    ) {
       return true;
     }
     if (poll.question.trim() || poll.options.some((option) => option.trim())) {
@@ -222,7 +260,20 @@ export function SmartComposerModal({
       return true;
     }
     return false;
-  }, [cover, text, link, poll, standup, editPost]);
+  }, [
+    cover,
+    text,
+    link,
+    poll,
+    standup,
+    editPost,
+    editShare,
+    editShareCommentary,
+    initialTitle,
+    initialContent,
+    initialUrl,
+    initialCommentary,
+  ]);
 
   const confirmDiscardIfDirty = useCallback(async () => {
     if (!isDirty) {
@@ -334,8 +385,14 @@ export function SmartComposerModal({
       initialSquadHandle,
       initialSquadId ?? editPost?.source?.id,
     );
-  const primary = selected[0];
-  const isMulti = selected.length > 1;
+  // An edit must target the post's own source — the audience list only holds
+  // currently postable squads, and its fallback would silently retarget.
+  const editSource = editPost
+    ? audiences.find((audience) => audience.id === editPost.source?.id) ??
+      (editPost.source as Squad)
+    : undefined;
+  const primary = editSource ?? selected[0];
+  const isMulti = !editPost && selected.length > 1;
 
   const schedule = useSchedulePost();
   // Scheduling: single-source, non-moderated create only (any post type
@@ -365,7 +422,7 @@ export function SmartComposerModal({
     primary,
     selectedIds,
     isMulti,
-    initialPreview,
+    initialPreview: editShare?.sharedPost ?? initialPreview,
     editPostId: editPost?.id,
     resolveScheduledAt: canSchedule ? schedule.resolveScheduledAt : undefined,
     onComplete: () => {
@@ -374,6 +431,7 @@ export function SmartComposerModal({
           queryKey: getPostByIdKey(editPost.id),
         });
       }
+      onPosted?.();
       onSubmitted();
       onRequestClose?.();
     },
@@ -614,6 +672,7 @@ export function SmartComposerModal({
                 logEvent({ event_name: LogEvent.DismissComposerPreview })
               }
               initialUrl={initialUrl ? link.url : undefined}
+              isUrlLocked={!!editShare}
             />
           )}
           {kind === 'poll' && <PollForm value={poll} onChange={setPoll} />}
@@ -638,6 +697,8 @@ export function SmartComposerModal({
       <Drawer
         isOpen
         isFullScreen
+        // Transformed ancestors (the Share modal's drawer) trap position: fixed
+        appendOnRoot
         position={DrawerPosition.Bottom}
         onClose={() => {
           handleClose();
diff --git a/packages/shared/src/components/post/composer/LinkForm.spec.tsx b/packages/shared/src/components/post/composer/LinkForm.spec.tsx
index 13daaee41e7..18436185c2d 100644
--- a/packages/shared/src/components/post/composer/LinkForm.spec.tsx
+++ b/packages/shared/src/components/post/composer/LinkForm.spec.tsx
@@ -17,8 +17,13 @@ jest.mock('../../../hooks/input', () => ({
   ],
 }));
 
+const mockWriteLinkPreview = jest.fn();
+
 jest.mock('../write/WriteLinkPreview', () => ({
-  WriteLinkPreview: () => null,
+  WriteLinkPreview: (props: unknown) => {
+    mockWriteLinkPreview(props);
+    return null;
+  },
 }));
 
 jest.mock('../write/WritePreviewSkeleton', () => ({
@@ -28,9 +33,15 @@ jest.mock('../write/WritePreviewSkeleton', () => ({
 const renderLinkForm = ({
   initialValue = DEFAULT_LINK,
   onSubmit = jest.fn(),
+  isUrlLocked = false,
+  initialUrl,
+  preview,
 }: {
   initialValue?: LinkFormState;
   onSubmit?: jest.Mock;
+  isUrlLocked?: boolean;
+  initialUrl?: string;
+  preview?: { url?: string; title?: string };
 } = {}) => {
   const fetchPreview = jest.fn();
 
@@ -48,6 +59,9 @@ const renderLinkForm = ({
           value={value}
           onChange={setValue}
           fetchPreview={fetchPreview}
+          isUrlLocked={isUrlLocked}
+          initialUrl={initialUrl}
+          preview={preview}
         />
         <button type="submit">Post</button>
       </form>
@@ -56,10 +70,14 @@ const renderLinkForm = ({
 
   render(<FormHarness />);
 
-  return { onSubmit };
+  return { onSubmit, fetchPreview };
 };
 
 describe('LinkForm', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('collapses pasted commentary newlines into spaces', () => {
     renderLinkForm();
 
@@ -136,4 +154,44 @@ describe('LinkForm', () => {
     expect(notPrevented).toBe(false);
     expect(onSubmit).not.toHaveBeenCalled();
   });
+
+  describe('with a locked URL', () => {
+    const lockedProps = {
+      isUrlLocked: true,
+      initialValue: { url: 'https://daily.dev/posts/shared', commentary: 'hi' },
+      initialUrl: 'https://daily.dev/posts/shared',
+      preview: { url: 'https://daily.dev/posts/shared', title: 'Shared' },
+    };
+
+    it('drops the URL field and the preview remove button', () => {
+      renderLinkForm(lockedProps);
+
+      expect(
+        screen.queryByRole('textbox', { name: 'Link URL' }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByRole('button', { name: 'Remove link preview' }),
+      ).not.toBeInTheDocument();
+    });
+
+    it('starts in the commentary, the only field left to edit', () => {
+      renderLinkForm(lockedProps);
+
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toHaveFocus();
+    });
+
+    it('never refetches a preview for a link that cannot change', () => {
+      const { fetchPreview } = renderLinkForm(lockedProps);
+
+      expect(fetchPreview).not.toHaveBeenCalled();
+    });
+
+    it('shows no preview card when the shared post is gone', () => {
+      renderLinkForm({ ...lockedProps, preview: {} });
+
+      expect(mockWriteLinkPreview).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/packages/shared/src/components/post/composer/LinkForm.tsx b/packages/shared/src/components/post/composer/LinkForm.tsx
index cc9da570f49..210c77b56bc 100644
--- a/packages/shared/src/components/post/composer/LinkForm.tsx
+++ b/packages/shared/src/components/post/composer/LinkForm.tsx
@@ -23,6 +23,8 @@ interface LinkFormProps {
   fetchPreview: (url?: string) => void;
   onDismissPreview?: () => void;
   initialUrl?: string;
+  /** Drops the URL field and preview removal; only the commentary is open. */
+  isUrlLocked?: boolean;
 }
 
 export const LinkForm = ({
@@ -33,14 +35,19 @@ export const LinkForm = ({
   fetchPreview,
   onDismissPreview,
   initialUrl,
+  isUrlLocked = false,
 }: LinkFormProps): ReactElement => {
   const urlRef = useRef<HTMLInputElement>(null);
   const commentaryRef = useRef<HTMLTextAreaElement>(null);
   const [dismissedUrl, setDismissedUrl] = useState<string | null>(null);
 
   useEffect(() => {
+    if (isUrlLocked) {
+      commentaryRef.current?.focus();
+      return;
+    }
     urlRef.current?.focus();
-  }, []);
+  }, [isUrlLocked]);
 
   const hasPreviewForUrl = useCallback(
     (next?: string): boolean =>
@@ -70,9 +77,16 @@ export const LinkForm = ({
     onDismissPreview?.();
   };
 
+  const hasPreviewContent = !!(
+    preview?.title ||
+    preview?.url ||
+    preview?.permalink
+  );
   const showPreview =
-    isPreviewForComposerUrl(preview, value.url) && !isDismissedForCurrentUrl;
-  const showSkeleton = isLoadingPreview && !isDismissedForCurrentUrl;
+    (isUrlLocked && hasPreviewContent) ||
+    (isPreviewForComposerUrl(preview, value.url) && !isDismissedForCurrentUrl);
+  const showSkeleton =
+    !isUrlLocked && isLoadingPreview && !isDismissedForCurrentUrl;
 
   useAutoResizeTextarea(commentaryRef, value.commentary);
 
@@ -94,33 +108,35 @@ export const LinkForm = ({
   );
 
   useEffect(() => {
-    if (!initialUrl) {
+    if (!initialUrl || isUrlLocked) {
       return;
     }
 
     onUrlChangeRef.current(initialUrl);
-  }, [initialUrl]);
+  }, [initialUrl, isUrlLocked]);
 
   return (
     <div className="flex flex-1 flex-col gap-3">
-      <input
-        ref={urlRef}
-        type="text"
-        name="url"
-        inputMode="url"
-        autoComplete="url"
-        autoCapitalize="none"
-        autoCorrect="off"
-        spellCheck={false}
-        placeholder="Paste a link…"
-        value={value.url}
-        onInput={(event) => {
-          onUrlChange(event.currentTarget.value);
-        }}
-        onKeyDown={onEnterKeyDown}
-        aria-label="Link URL"
-        className="w-full bg-transparent font-bold leading-tight text-text-primary outline-none typo-title2 placeholder:text-text-quaternary"
-      />
+      {!isUrlLocked && (
+        <input
+          ref={urlRef}
+          type="text"
+          name="url"
+          inputMode="url"
+          autoComplete="url"
+          autoCapitalize="none"
+          autoCorrect="off"
+          spellCheck={false}
+          placeholder="Paste a link…"
+          value={value.url}
+          onInput={(event) => {
+            onUrlChange(event.currentTarget.value);
+          }}
+          onKeyDown={onEnterKeyDown}
+          aria-label="Link URL"
+          className="w-full bg-transparent font-bold leading-tight text-text-primary outline-none typo-title2 placeholder:text-text-quaternary"
+        />
+      )}
       <textarea
         ref={commentaryRef}
         name="commentary"
@@ -152,21 +168,23 @@ export const LinkForm = ({
             <WriteLinkPreview
               className="!w-auto flex-col-reverse"
               preview={preview}
-              link={normalizedUrl}
+              link={normalizedUrl || value.url}
               showPreviewLink={false}
             />
           )}
-          <Tooltip content="Remove link preview">
-            <Button
-              type="button"
-              size={ButtonSize.Small}
-              variant={ButtonVariant.Primary}
-              icon={<MiniCloseIcon />}
-              onClick={dismissPreview}
-              aria-label="Remove link preview"
-              className="absolute right-3 top-3 z-1 !rounded-full !bg-surface-invert !text-text-primary !shadow-3 hover:!bg-text-primary hover:!text-surface-invert"
-            />
-          </Tooltip>
+          {!isUrlLocked && (
+            <Tooltip content="Remove link preview">
+              <Button
+                type="button"
+                size={ButtonSize.Small}
+                variant={ButtonVariant.Primary}
+                icon={<MiniCloseIcon />}
+                onClick={dismissPreview}
+                aria-label="Remove link preview"
+                className="absolute right-3 top-3 z-1 !rounded-full !bg-surface-invert !text-text-primary !shadow-3 hover:!bg-text-primary hover:!text-surface-invert"
+              />
+            </Tooltip>
+          )}
         </div>
       )}
     </div>
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
new file mode 100644
index 00000000000..2627ed169df
--- /dev/null
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
@@ -0,0 +1,125 @@
+import { renderHook, act } from '@testing-library/react';
+import type { FormEvent } from 'react';
+import { usePostToSquad } from '../../../hooks';
+import type { Squad } from '../../../graphql/sources';
+import { DEFAULT_LINK, DEFAULT_POLL, DEFAULT_TEXT } from './types';
+import { useComposerSubmit } from './useComposerSubmit';
+
+const mockOnUpdateSharePost = jest.fn();
+const mockOnSubmitPost = jest.fn();
+const mockDisplayToast = jest.fn();
+
+jest.mock('../../../hooks', () => {
+  const actual = jest.requireActual('../../../hooks');
+
+  return {
+    ...actual,
+    usePostToSquad: jest.fn(),
+  };
+});
+
+jest.mock('../../../hooks/useToastNotification', () => ({
+  useToastNotification: () => ({ displayToast: mockDisplayToast }),
+}));
+
+jest.mock('next/router', () => ({
+  useRouter: () => ({ push: jest.fn() }),
+}));
+
+jest.mock('../../../contexts/AuthContext', () => ({
+  useAuthContext: () => ({ user: { id: 'u1', username: 'me' } }),
+}));
+
+jest.mock('../../../hooks/liveRooms/useSubmitStandup', () => ({
+  useSubmitStandup: () => ({ submit: jest.fn(), isPending: false }),
+}));
+
+jest.mock('../../../features/squads/hooks/useMultipleSourcePost', () => ({
+  useMultipleSourcePost: () => ({ onCreate: jest.fn(), isPending: false }),
+}));
+
+const squad = { id: 'squad-1', handle: 'squad' } as Squad;
+
+const renderSubmit = (overrides = {}) =>
+  renderHook(() =>
+    useComposerSubmit({
+      kind: 'link',
+      text: DEFAULT_TEXT,
+      link: { ...DEFAULT_LINK, commentary: '  updated take  ' },
+      poll: DEFAULT_POLL,
+      standup: { topic: '', description: '' },
+      cover: null,
+      primary: squad,
+      selectedIds: ['squad-1'],
+      isMulti: false,
+      onComplete: jest.fn(),
+      editPostId: 'post-1',
+      ...overrides,
+    } as unknown as Parameters<typeof useComposerSubmit>[0]),
+  );
+
+describe('useComposerSubmit editing a share', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.mocked(usePostToSquad).mockReturnValue({
+      getLinkPreview: jest.fn(),
+      isLoadingPreview: false,
+      preview: undefined,
+      isPosting: false,
+      onSubmitPost: mockOnSubmitPost,
+      onSubmitFreeformPost: jest.fn(),
+      onEditFreeformPost: jest.fn(),
+      onSubmitPollPost: jest.fn(),
+      onUpdateSharePost: mockOnUpdateSharePost,
+    } as unknown as ReturnType<typeof usePostToSquad>);
+  });
+
+  it('updates the existing share instead of posting a new one', async () => {
+    const { result } = renderSubmit();
+
+    await act(async () => {
+      await result.current.handleSubmit({
+        preventDefault: jest.fn(),
+      } as unknown as FormEvent<HTMLFormElement>);
+    });
+
+    expect(mockOnUpdateSharePost).toHaveBeenCalledWith(
+      expect.anything(),
+      'post-1',
+      'updated take',
+      squad,
+    );
+    expect(mockOnSubmitPost).not.toHaveBeenCalled();
+  });
+
+  it('stays submittable without a resolved preview', () => {
+    const { result } = renderSubmit();
+
+    expect(result.current.isSubmitDisabled).toBe(false);
+  });
+
+  it('still requires a valid preview when creating', () => {
+    const { result } = renderSubmit({ editPostId: undefined });
+
+    expect(result.current.isSubmitDisabled).toBe(true);
+  });
+
+  it('lets a title-only freeform edit save without a body', () => {
+    const { result } = renderSubmit({
+      kind: 'text',
+      text: { title: 'Just a title', body: '' },
+    });
+
+    expect(result.current.isSubmitDisabled).toBe(false);
+  });
+
+  it('still requires a body when creating a freeform post', () => {
+    const { result } = renderSubmit({
+      kind: 'text',
+      text: { title: 'Just a title', body: '' },
+      editPostId: undefined,
+    });
+
+    expect(result.current.isSubmitDisabled).toBe(true);
+  });
+});
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.ts b/packages/shared/src/components/post/composer/useComposerSubmit.ts
index 1404f42188d..ef868fbd0a5 100644
--- a/packages/shared/src/components/post/composer/useComposerSubmit.ts
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.ts
@@ -116,6 +116,7 @@ export const useComposerSubmit = ({
     onSubmitFreeformPost,
     onEditFreeformPost,
     onSubmitPollPost,
+    onUpdateSharePost,
   } = usePostToSquad({
     initialPreview,
     onComplete,
@@ -175,10 +176,13 @@ export const useComposerSubmit = ({
       return true;
     }
     if (kind === 'text') {
-      return !isTextValid(text);
+      // Freeform posts can legitimately have no body (title + cover only),
+      // so an edit only requires the title.
+      return editPostId ? !text.title.trim() : !isTextValid(text);
     }
     if (kind === 'link') {
-      return !isLinkValid(link, preview);
+      // Editing keeps the original link — there is no URL/preview to validate.
+      return editPostId ? false : !isLinkValid(link, preview);
     }
     return !isPollValid(poll);
   };
@@ -252,6 +256,20 @@ export const useComposerSubmit = ({
     event: FormEvent<HTMLFormElement>,
     scheduledAt?: string,
   ) => {
+    if (editPostId) {
+      await onUpdateSharePost(
+        event,
+        editPostId,
+        link.commentary.trim(),
+        primary as Squad,
+      );
+      // The plain update path toasts from usePostToSquad; the moderation one
+      // completes silently, so it is the only case that needs confirming here.
+      if (moderationRequired(primary as Squad)) {
+        displayToast('✅ Your edit has been submitted for moderation');
+      }
+      return;
+    }
     if (!isPreviewForComposerUrl(preview, link.url)) {
       displayToast('Invalid link');
       return;
diff --git a/packages/shared/src/components/post/focus/DiscussionShareRow.spec.tsx b/packages/shared/src/components/post/focus/DiscussionShareRow.spec.tsx
new file mode 100644
index 00000000000..15f037faf08
--- /dev/null
+++ b/packages/shared/src/components/post/focus/DiscussionShareRow.spec.tsx
@@ -0,0 +1,104 @@
+import type { RenderResult } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import React from 'react';
+import nock from 'nock';
+import Post from '../../../../__tests__/fixture/post';
+import loggedUser from '../../../../__tests__/fixture/loggedUser';
+import { generateTestSquad } from '../../../../__tests__/fixture/squads';
+import { settingsContext } from '../../../../__tests__/helpers/boot';
+import { AuthContextProvider } from '../../../contexts/AuthContext';
+import SettingsContext from '../../../contexts/SettingsContext';
+import { NotificationsContextProvider } from '../../../contexts/NotificationsContext';
+import { LazyModalElement } from '../../modals/LazyModalElement';
+import { DiscussionShareRow } from './DiscussionShareRow';
+
+const defaultPost = Post;
+
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: jest.fn().mockImplementation((query) => ({
+    matches: true,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(),
+    removeListener: jest.fn(),
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+  })),
+});
+
+beforeEach(() => {
+  nock.cleanAll();
+  jest.clearAllMocks();
+});
+
+const squads = Array.from({ length: 6 }, (_, index) =>
+  generateTestSquad({
+    id: `squad-${index}`,
+    handle: `webteam-${index}`,
+    name: `Web team ${index}`,
+  }),
+);
+
+const renderComponent = (withSquads = true): RenderResult => {
+  const client = new QueryClient();
+
+  return render(
+    <QueryClientProvider client={client}>
+      <AuthContextProvider
+        user={loggedUser}
+        updateUser={jest.fn()}
+        tokenRefreshed
+        getRedirectUri={jest.fn()}
+        loadingUser={false}
+        loadedUserFromCache
+        squads={squads}
+      >
+        <SettingsContext.Provider value={settingsContext}>
+          <NotificationsContextProvider>
+            <LazyModalElement />
+            <DiscussionShareRow post={defaultPost} withSquads={withSquads} />
+          </NotificationsContextProvider>
+        </SettingsContext.Provider>
+      </AuthContextProvider>
+    </QueryClientProvider>,
+  );
+};
+
+describe('DiscussionShareRow', () => {
+  it('opens the share composer seeded with the post when a squad is clicked', async () => {
+    renderComponent();
+
+    screen.getByRole('button', { name: 'Share to Web team 0' }).click();
+
+    await waitFor(() => {
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toBeInTheDocument();
+    });
+    expect(screen.getByRole('textbox', { name: 'Link URL' })).toHaveValue(
+      defaultPost.permalink,
+    );
+  });
+
+  it('caps the inline squads at four', () => {
+    renderComponent();
+
+    expect(
+      screen.getAllByRole('button', { name: /^Share to Web team/ }),
+    ).toHaveLength(4);
+  });
+
+  it('shows no squad avatars unless asked for them', () => {
+    renderComponent(false);
+
+    expect(
+      screen.queryByRole('button', { name: /^Share to Web team/ }),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.getByRole('button', { name: 'More sharing options' }),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/packages/shared/src/components/post/focus/DiscussionShareRow.tsx b/packages/shared/src/components/post/focus/DiscussionShareRow.tsx
index 51058cae65e..f4301b8ef73 100644
--- a/packages/shared/src/components/post/focus/DiscussionShareRow.tsx
+++ b/packages/shared/src/components/post/focus/DiscussionShareRow.tsx
@@ -59,12 +59,12 @@ export const DiscussionShareRow = ({
   const onShareToSquad = (squad: Squad) => {
     logEvent(postLogEvent(LogEvent.StartShareToSquad, post));
     openModal({
-      type: LazyModal.CreateSharedPost,
+      type: LazyModal.SmartComposer,
       props: {
-        squad,
+        initialUrl: post.permalink,
         preview: post,
-        onSharedSuccessfully: () =>
-          logEvent(postLogEvent(LogEvent.ShareToSquad, post)),
+        initialSquadId: squad.id,
+        onPosted: () => logEvent(postLogEvent(LogEvent.ShareToSquad, post)),
       },
     });
   };
diff --git a/packages/shared/src/components/post/poll/CreatePoll.tsx b/packages/shared/src/components/post/poll/CreatePoll.tsx
deleted file mode 100644
index 34e144fc143..00000000000
--- a/packages/shared/src/components/post/poll/CreatePoll.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import type { FormEventHandler } from 'react';
-import React, { useEffect, useImperativeHandle, useRef } from 'react';
-import { WritePageMain } from '../freeform';
-import { TextField } from '../../fields/TextField';
-import { useWritePostContext } from '../../../contexts';
-import { Typography, TypographyType } from '../../typography/Typography';
-import { WriteFooter } from '../write';
-import { Button, ButtonVariant } from '../../buttons/Button';
-import { PlusIcon } from '../../icons';
-import { ActionType } from '../../../graphql/actions';
-import { useActions } from '../../../hooks';
-import { formToJson } from '../../../lib/form';
-import { PostType } from '../../../types';
-import useDebounceFn from '../../../hooks/useDebounceFn';
-
-const MAX_TITLE_LENGTH = 250;
-const MAX_OPTION_LENGTH = 35;
-
-const CreatePoll = () => {
-  const {
-    onSubmitForm,
-    isPosting,
-    draft,
-    isUpdatingDraft,
-    updateDraft,
-    formRef: propRef,
-  } = useWritePostContext();
-  const formRef = useRef<HTMLFormElement>();
-  useImperativeHandle(propRef, () => formRef?.current);
-  const { completeAction } = useActions();
-
-  const onAddOption = () => {
-    const opts = draft?.options || [];
-    updateDraft({
-      ...draft,
-      options: [...opts, ''],
-    });
-  };
-
-  const handleTitle = (value: string) => {
-    updateDraft({
-      ...draft,
-      title: value,
-    });
-  };
-
-  const handleOption = (value: string, index: number) => {
-    const newOpts = draft?.options?.map((opt, i) =>
-      i === index ? value : opt,
-    );
-    updateDraft({
-      ...draft,
-      options: newOpts,
-    });
-  };
-
-  useEffect(() => {
-    if (!isUpdatingDraft && !draft?.options) {
-      updateDraft({
-        ...draft,
-        options: ['', ''],
-        duration: 7,
-      });
-    }
-  }, [draft, updateDraft, isUpdatingDraft]);
-
-  const handleSubmit: FormEventHandler<HTMLFormElement> = async (e) => {
-    e.preventDefault();
-    completeAction(ActionType.WritePost);
-    const {
-      title,
-      options,
-      duration,
-    }: {
-      title: string;
-      options: string[];
-      duration?: number;
-    } = formToJson(e.currentTarget);
-
-    onSubmitForm(
-      e,
-      {
-        title,
-        options,
-        duration: duration ? Number(duration) : undefined,
-        content: '',
-        image: undefined,
-      },
-      PostType.Poll,
-    );
-  };
-
-  const [onUpdateTitle] = useDebounceFn(handleTitle, 3000);
-  const [onOptionUpdate] = useDebounceFn(
-    ({ value, index }) => handleOption(value, index),
-    3000,
-  );
-
-  return (
-    <WritePageMain
-      onSubmit={handleSubmit}
-      className="gap-4"
-      ref={formRef}
-      id="write-post-poll"
-    >
-      <TextField
-        className={{ container: 'w-full' }}
-        inputId="title"
-        name="title"
-        label="Ask a question*"
-        required
-        defaultValue={draft?.title || ''}
-        onInput={(e) => onUpdateTitle(e.currentTarget.value)}
-        maxLength={MAX_TITLE_LENGTH}
-      />
-      <div className="flex flex-col gap-2">
-        <Typography type={TypographyType.Body} bold>
-          Poll options
-        </Typography>
-        {draft?.options?.map((option, index) => (
-          <TextField
-            key={`option-${index + 1}`}
-            className={{ container: 'w-full' }}
-            inputId={`options-${index}`}
-            name="options[]"
-            label={`Option ${index + 1}${index <= 1 ? '*' : ' (optional)'}`}
-            required={index <= 1}
-            defaultValue={option || ''}
-            onInput={(e) =>
-              onOptionUpdate({ value: e.currentTarget.value, index })
-            }
-            onBlur={(e) => handleOption(e.currentTarget.value, index)}
-            maxLength={MAX_OPTION_LENGTH}
-          />
-        ))}
-        {draft?.options && draft?.options.length < 4 && (
-          <Button
-            type="button"
-            icon={<PlusIcon />}
-            onClick={onAddOption}
-            variant={ButtonVariant.Subtle}
-          >
-            Add option
-          </Button>
-        )}
-      </div>
-      <WriteFooter isLoading={isPosting} isPoll />
-    </WritePageMain>
-  );
-};
-
-export default CreatePoll;
diff --git a/packages/shared/src/components/widgets/SocialShare.tsx b/packages/shared/src/components/widgets/SocialShare.tsx
index 41ab8310dfd..84dd2bb811c 100644
--- a/packages/shared/src/components/widgets/SocialShare.tsx
+++ b/packages/shared/src/components/widgets/SocialShare.tsx
@@ -1,4 +1,4 @@
-import type { Dispatch, ReactElement } from 'react';
+import type { Dispatch, ReactElement, SetStateAction } from 'react';
 import React, { useContext } from 'react';
 import { ShareProvider, addLogQueryParams } from '../../lib/share';
 import type { Post } from '../../graphql/posts';
@@ -18,7 +18,7 @@ import { useGetShortUrl } from '../../hooks';
 import { ReferralCampaignKey } from '../../lib';
 import { useAuthContext } from '../../contexts/AuthContext';
 import type { Squad } from '../../graphql/sources';
-import { CreateSharedPostModal } from '../modals/post/CreateSharedPostModal';
+import { SmartComposerModal } from '../modals/post/SmartComposerModal';
 import type { ModalProps } from '../modals/common/Modal';
 
 interface SocialShareProps extends Pick<ModalProps, 'parentSelector'> {
@@ -27,7 +27,10 @@ interface SocialShareProps extends Pick<ModalProps, 'parentSelector'> {
   comment?: Comment;
   onClose?: () => void;
   commentary?: string;
-  shareToSquadState: [Squad, Dispatch<Squad>];
+  shareToSquadState: [
+    Squad | undefined,
+    Dispatch<SetStateAction<Squad | undefined>>,
+  ];
 }
 
 export const SocialShare = ({
@@ -101,23 +104,24 @@ export const SocialShare = ({
       <SocialShareContainer title="Share externally">
         <SocialShareList
           link={link}
-          description={post?.title}
+          description={post?.title ?? ''}
           emailSummary={post?.summary}
           isCopying={copying}
           onCopy={logAndCopyLink}
-          onNativeShare={() => openNativeSharePost(post)}
+          onNativeShare={() => openNativeSharePost?.(post)}
           onClickSocial={logClick}
           emailTitle={emailTitle}
         />
       </SocialShareContainer>
       {squadToShare && ( // using lazy modal would result to dep-cycle since this whole component is used in the share modal
-        <CreateSharedPostModal
+        <SmartComposerModal
           isOpen
+          initialUrl={post.permalink}
           preview={post}
-          squad={squadToShare}
-          onSharedSuccessfully={onSharedSuccessfully}
+          initialSquadId={squadToShare.id}
+          onPosted={onSharedSuccessfully}
           parentSelector={parentSelector}
-          onRequestClose={() => setSquadToShare(null)}
+          onRequestClose={() => setSquadToShare(undefined)}
         />
       )}
     </>
diff --git a/packages/shared/src/features/posts/PostOptionButton.tsx b/packages/shared/src/features/posts/PostOptionButton.tsx
index 574f5db2a96..f3a2733d6aa 100644
--- a/packages/shared/src/features/posts/PostOptionButton.tsx
+++ b/packages/shared/src/features/posts/PostOptionButton.tsx
@@ -801,8 +801,12 @@ const PostOptionButtonContent = ({
         icon: <MenuIcon Icon={EditIcon} />,
         label: 'Edit post',
         action: () => {
+          // Moderation items keep the dedicated page: it edits a pending
+          // submission rather than a post, which the composer cannot do.
           const canUseSmartComposer =
-            post.type === PostType.Freeform || post.type === PostType.Welcome;
+            post.type === PostType.Freeform ||
+            post.type === PostType.Welcome ||
+            post.type === PostType.Share;
           if (canUseSmartComposer) {
             openModal({
               type: LazyModal.SmartComposer,
diff --git a/packages/shared/src/hooks/squads/usePostToSquad.tsx b/packages/shared/src/hooks/squads/usePostToSquad.tsx
index fa13a146e63..8a7fdf91deb 100644
--- a/packages/shared/src/hooks/squads/usePostToSquad.tsx
+++ b/packages/shared/src/hooks/squads/usePostToSquad.tsx
@@ -371,6 +371,7 @@ export const usePostToSquad = ({
     isLinkLoading ||
     isPostModerationLoading ||
     isEditLoading ||
+    isUpdatePostLoading ||
     isPollLoading ||
     isLoadingFreeform;
 
@@ -463,7 +464,8 @@ export const usePostToSquad = ({
       const squadId = getSquadIdOrThrow(squad);
 
       if (moderationRequired(squad)) {
-        moderationCreationRef.current = PostType.Share;
+        // An edit, not a creation — must not log as one.
+        moderationCreationRef.current = null;
         return onCreatePostModeration({
           postId,
           type: PostType.Share,