From dca2a10b23be4af8ac7340acd554240c07864010 Mon Sep 17 00:00:00 2001
From: austincalvelage <austin.calvelage@icloud.com>
Date: Tue, 15 Sep 2026 20:56:56 -0600
Subject: [PATCH 1/2] fix(ui): use flow autofocus for email verification

---
 .../user-profile-add-email.dialog.test.tsx    |   3 +-
 ...ser-profile-add-email.integration.test.tsx |   4 +-
 .../user-profile-add-email.dialog.tsx         | 310 ++++++++++--------
 3 files changed, 187 insertions(+), 130 deletions(-)

diff --git a/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-email.dialog.test.tsx b/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-email.dialog.test.tsx
index 5f7892f3338..86eaa964d24 100644
--- a/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-email.dialog.test.tsx
+++ b/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-email.dialog.test.tsx
@@ -63,7 +63,8 @@ describe('UserProfileAddEmailDialog', () => {
     const user = userEvent.setup();
     const onSubmit = vi.fn();
     render(<VerificationExample onSubmit={onSubmit} />);
-    await waitFor(() => expect(screen.getByRole('textbox', { name: 'Verification code' })).toHaveFocus());
+    await waitFor(() => expect(screen.getByRole('button', { name: 'Close', exact: true })).toHaveFocus());
+    await user.click(screen.getByRole('textbox', { name: 'Verification code' }));
 
     if (method === 'typing') {
       await user.keyboard('12345');
diff --git a/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-email.integration.test.tsx b/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-email.integration.test.tsx
index ceb1810f670..6b82e9d908f 100644
--- a/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-email.integration.test.tsx
+++ b/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-email.integration.test.tsx
@@ -30,7 +30,9 @@ describe('profile add email', () => {
       expect(screen.getByRole('dialog', { name: 'Add email' })).toBeInTheDocument();
       await user.type(screen.getByRole('textbox', { name: 'Email' }), 'new@example.com');
       await user.click(screen.getByRole('button', { name: 'Send code' }));
-      await user.type(await screen.findByRole('textbox', { name: 'Verification code' }), '123456');
+      const codeInput = await screen.findByRole('textbox', { name: 'Verification code' });
+      await waitFor(() => expect(codeInput).toHaveFocus());
+      await user.keyboard('123456');
       await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
       expect(onSend).toHaveBeenCalledExactlyOnceWith('new@example.com');
       expect(onVerify).toHaveBeenCalledExactlyOnceWith('new@example.com', '123456');
diff --git a/packages/ui/src/mosaic/features/user-profile/user-profile-account-section/user-profile-add-email.dialog.tsx b/packages/ui/src/mosaic/features/user-profile/user-profile-account-section/user-profile-add-email.dialog.tsx
index f7aaeab07a2..9d8008cd997 100644
--- a/packages/ui/src/mosaic/features/user-profile/user-profile-account-section/user-profile-add-email.dialog.tsx
+++ b/packages/ui/src/mosaic/features/user-profile/user-profile-account-section/user-profile-add-email.dialog.tsx
@@ -1,5 +1,5 @@
 import * as stylex from '@stylexjs/stylex';
-import type { FormEvent } from 'react';
+import type { FormEvent, Ref } from 'react';
 import { useId, useRef } from 'react';
 
 import { Button, SubmitButton } from '../../../components/button';
@@ -7,7 +7,7 @@ import { Card } from '../../../components/card';
 import type { DialogTriggerProps } from '../../../components/dialog';
 import { Dialog } from '../../../components/dialog';
 import { Field } from '../../../components/field';
-import { Flow } from '../../../components/flow';
+import { Flow, useFlowAutoFocus } from '../../../components/flow';
 import { Input } from '../../../components/input';
 import { Otp } from '../../../components/otp';
 import { styles } from '../user-profile-profile-panel.styles';
@@ -32,16 +32,7 @@ export interface UserProfileAddEmailDialogProps {
 }
 
 export function UserProfileAddEmailDialog(props: UserProfileAddEmailDialogProps) {
-  const emailFormId = useId();
-  const verifyFormId = useId();
   const emailRef = useRef<HTMLInputElement>(null);
-  const verifyRef = useRef<HTMLDivElement>(null);
-  const [beforeSeconds, afterSeconds] = m.verify.resendCountdown.split('{seconds}');
-
-  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    props.onSubmit();
-  };
 
   return (
     <Dialog.Root
@@ -52,9 +43,7 @@ export function UserProfileAddEmailDialog(props: UserProfileAddEmailDialogProps)
       {props.trigger ? <Dialog.Trigger render={props.trigger} /> : null}
       <Dialog.Popup
         size='card'
-        initialFocus={() =>
-          emailRef.current ?? verifyRef.current?.querySelector<HTMLInputElement>('input:not([type="hidden"])') ?? true
-        }
+        initialFocus={props.step === 'email' ? emailRef : undefined}
       >
         <Card.Root
           elevation='overlay'
@@ -67,121 +56,27 @@ export function UserProfileAddEmailDialog(props: UserProfileAddEmailDialogProps)
             {current => (
               <>
                 <Flow.Step ids={['email']}>
-                  <Card.Header>
-                    <Card.Title>{m.email.title}</Card.Title>
-                    <Card.Description>{m.email.description}</Card.Description>
-                  </Card.Header>
-                  <Card.Content
-                    render={
-                      <form
-                        id={emailFormId}
-                        onSubmit={handleSubmit}
-                      />
-                    }
-                  >
-                    <Field.Root
-                      required
-                      disabled={current.isPending}
-                      invalid={Boolean(current.errorMessage)}
-                    >
-                      <Field.Label>{m.email.label}</Field.Label>
-                      <Input
-                        ref={emailRef}
-                        name='emailAddress'
-                        type='email'
-                        autoComplete='email'
-                        value={current.emailAddress}
-                        onChange={event => current.onEmailAddressChange(event.target.value)}
-                      />
-                      {current.errorMessage ? <Field.Error>{current.errorMessage}</Field.Error> : null}
-                    </Field.Root>
-                  </Card.Content>
-                  <Card.Footer>
-                    <SubmitButton
-                      form={emailFormId}
-                      fullWidth
-                      isPending={current.isPending}
-                      pendingLabel={m.email.pending}
-                    >
-                      {m.email.submit}
-                    </SubmitButton>
-                  </Card.Footer>
+                  <EnterEmailStep
+                    inputRef={emailRef}
+                    emailAddress={current.emailAddress}
+                    onEmailAddressChange={current.onEmailAddressChange}
+                    onSubmit={current.onSubmit}
+                    isPending={current.isPending}
+                    errorMessage={current.errorMessage}
+                  />
                 </Flow.Step>
-                <Flow.Step
-                  ids={['verify']}
-                  ref={verifyRef}
-                >
-                  <Card.Header>
-                    <Card.Title>{m.verify.title}</Card.Title>
-                    <Card.Description>
-                      {fill(m.verify.description, { emailAddress: current.emailAddress })}
-                    </Card.Description>
-                  </Card.Header>
-                  <Card.Content
-                    render={
-                      <form
-                        id={verifyFormId}
-                        onSubmit={handleSubmit}
-                      />
-                    }
-                  >
-                    <Field.Root
-                      required
-                      disabled={current.isPending}
-                      invalid={Boolean(current.errorMessage)}
-                    >
-                      <Field.Label visuallyHidden>{m.verify.label}</Field.Label>
-                      <Otp
-                        name='code'
-                        value={current.code}
-                        onValueChange={current.onCodeChange}
-                        onComplete={current.onSubmit}
-                      />
-                      {current.errorMessage ? <Field.Error>{current.errorMessage}</Field.Error> : null}
-                      <Button
-                        type='button'
-                        size='sm'
-                        variant='link'
-                        color='neutral'
-                        disabled={current.isPending || current.isResending || (current.resendSeconds ?? 0) > 0}
-                        onClick={current.onResend}
-                      >
-                        {current.isResending ? (
-                          m.verify.resending
-                        ) : (current.resendSeconds ?? 0) > 0 ? (
-                          <span>
-                            {beforeSeconds}
-                            <span {...stylex.props(styles.countdown)}>{current.resendSeconds}</span>
-                            {afterSeconds}
-                          </span>
-                        ) : (
-                          m.verify.resend
-                        )}
-                      </Button>
-                    </Field.Root>
-                  </Card.Content>
-                  <Card.Footer>
-                    <Dialog.Close
-                      render={
-                        <Button
-                          variant='outline'
-                          color='neutral'
-                          fullWidth
-                        />
-                      }
-                    >
-                      {m.verify.cancel}
-                    </Dialog.Close>
-                    <SubmitButton
-                      form={verifyFormId}
-                      fullWidth
-                      isPending={current.isPending}
-                      disabled={current.isResending}
-                      pendingLabel={m.verify.pending}
-                    >
-                      {m.verify.submit}
-                    </SubmitButton>
-                  </Card.Footer>
+                <Flow.Step ids={['verify']}>
+                  <VerifyEmailStep
+                    emailAddress={current.emailAddress}
+                    code={current.code}
+                    onCodeChange={current.onCodeChange}
+                    onSubmit={current.onSubmit}
+                    onResend={current.onResend}
+                    isPending={current.isPending}
+                    errorMessage={current.errorMessage}
+                    isResending={current.isResending}
+                    resendSeconds={current.resendSeconds}
+                  />
                 </Flow.Step>
               </>
             )}
@@ -191,3 +86,162 @@ export function UserProfileAddEmailDialog(props: UserProfileAddEmailDialogProps)
     </Dialog.Root>
   );
 }
+
+interface EnterEmailStepProps {
+  inputRef: Ref<HTMLInputElement>;
+  emailAddress: string;
+  onEmailAddressChange: (value: string) => void;
+  onSubmit: () => void;
+  isPending?: boolean;
+  errorMessage?: string;
+}
+
+function EnterEmailStep(props: EnterEmailStepProps) {
+  const emailFormId = useId();
+
+  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    props.onSubmit();
+  };
+
+  return (
+    <>
+      <Card.Header>
+        <Card.Title>{m.email.title}</Card.Title>
+        <Card.Description>{m.email.description}</Card.Description>
+      </Card.Header>
+      <Card.Content
+        render={
+          <form
+            id={emailFormId}
+            onSubmit={handleSubmit}
+          />
+        }
+      >
+        <Field.Root
+          required
+          disabled={props.isPending}
+          invalid={Boolean(props.errorMessage)}
+        >
+          <Field.Label>{m.email.label}</Field.Label>
+          <Input
+            ref={props.inputRef}
+            name='emailAddress'
+            type='email'
+            autoComplete='email'
+            value={props.emailAddress}
+            onChange={event => props.onEmailAddressChange(event.target.value)}
+          />
+          {props.errorMessage ? <Field.Error>{props.errorMessage}</Field.Error> : null}
+        </Field.Root>
+      </Card.Content>
+      <Card.Footer>
+        <SubmitButton
+          form={emailFormId}
+          fullWidth
+          isPending={props.isPending}
+          pendingLabel={m.email.pending}
+        >
+          {m.email.submit}
+        </SubmitButton>
+      </Card.Footer>
+    </>
+  );
+}
+
+interface VerifyEmailStepProps {
+  emailAddress: string;
+  code: string;
+  onCodeChange: (value: string) => void;
+  onSubmit: (code?: string) => void;
+  onResend: () => void;
+  isPending?: boolean;
+  errorMessage?: string;
+  isResending?: boolean;
+  resendSeconds?: number;
+}
+
+function VerifyEmailStep(props: VerifyEmailStepProps) {
+  const verifyFormId = useId();
+  const [beforeSeconds, afterSeconds] = m.verify.resendCountdown.split('{seconds}');
+
+  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    props.onSubmit();
+  };
+
+  return (
+    <>
+      <Card.Header>
+        <Card.Title>{m.verify.title}</Card.Title>
+        <Card.Description>{fill(m.verify.description, { emailAddress: props.emailAddress })}</Card.Description>
+      </Card.Header>
+      <Card.Content
+        render={
+          <form
+            id={verifyFormId}
+            onSubmit={handleSubmit}
+          />
+        }
+      >
+        <Field.Root
+          required
+          disabled={props.isPending}
+          invalid={Boolean(props.errorMessage)}
+        >
+          <Field.Label visuallyHidden>{m.verify.label}</Field.Label>
+          <Otp
+            ref={useFlowAutoFocus<HTMLInputElement>()}
+            name='code'
+            value={props.code}
+            onValueChange={props.onCodeChange}
+            onComplete={props.onSubmit}
+          />
+          {props.errorMessage ? <Field.Error>{props.errorMessage}</Field.Error> : null}
+          <Button
+            type='button'
+            size='sm'
+            variant='link'
+            color='neutral'
+            disabled={props.isPending || props.isResending || (props.resendSeconds ?? 0) > 0}
+            onClick={props.onResend}
+          >
+            {props.isResending ? (
+              m.verify.resending
+            ) : (props.resendSeconds ?? 0) > 0 ? (
+              <span>
+                {beforeSeconds}
+                <span {...stylex.props(styles.countdown)}>{props.resendSeconds}</span>
+                {afterSeconds}
+              </span>
+            ) : (
+              m.verify.resend
+            )}
+          </Button>
+        </Field.Root>
+      </Card.Content>
+      <Card.Footer>
+        <Dialog.Close
+          render={
+            <Button
+              variant='outline'
+              color='neutral'
+              fullWidth
+            />
+          }
+        >
+          {m.verify.cancel}
+        </Dialog.Close>
+        <SubmitButton
+          form={verifyFormId}
+          fullWidth
+          isPending={props.isPending}
+          disabled={props.isResending}
+          pendingLabel={m.verify.pending}
+        >
+          {m.verify.submit}
+        </SubmitButton>
+      </Card.Footer>
+    </>
+  );
+}

From fd82262e2de1efdf4d6885c8e976716b5b8fb555 Mon Sep 17 00:00:00 2001
From: austincalvelage <austin.calvelage@icloud.com>
Date: Tue, 15 Sep 2026 20:57:17 -0600
Subject: [PATCH 2/2] fix(ui): use flow autofocus for phone verification

---
 .changeset/honest-chairs-cheat.md             |   2 +
 .../user-profile-add-phone.dialog.test.tsx    |   3 +-
 ...ser-profile-add-phone.integration.test.tsx |   4 +-
 .../user-profile-add-phone.dialog.tsx         | 316 +++++++++++-------
 4 files changed, 193 insertions(+), 132 deletions(-)
 create mode 100644 .changeset/honest-chairs-cheat.md

diff --git a/.changeset/honest-chairs-cheat.md b/.changeset/honest-chairs-cheat.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/honest-chairs-cheat.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-phone.dialog.test.tsx b/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-phone.dialog.test.tsx
index 8ad5297eb5e..579e56d6e3f 100644
--- a/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-phone.dialog.test.tsx
+++ b/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-phone.dialog.test.tsx
@@ -55,7 +55,8 @@ describe('UserProfileAddPhoneDialog', () => {
     const user = userEvent.setup();
     const onSubmit = vi.fn();
     render(<VerificationExample onSubmit={onSubmit} />);
-    await waitFor(() => expect(screen.getByRole('textbox', { name: 'Verification code' })).toHaveFocus());
+    await waitFor(() => expect(screen.getByRole('button', { name: 'Close', exact: true })).toHaveFocus());
+    await user.click(screen.getByRole('textbox', { name: 'Verification code' }));
 
     if (method === 'typing') {
       await user.keyboard('12345');
diff --git a/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-phone.integration.test.tsx b/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-phone.integration.test.tsx
index 876f2bc2382..38918699fe8 100644
--- a/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-phone.integration.test.tsx
+++ b/packages/ui/src/mosaic/features/user-profile/__tests__/user-profile-add-phone.integration.test.tsx
@@ -30,7 +30,9 @@ describe('profile add phone', () => {
       expect(screen.getByRole('dialog', { name: 'Add phone number' })).toBeInTheDocument();
       await user.type(screen.getByRole('textbox', { name: 'Phone' }), '8015550100');
       await user.click(screen.getByRole('button', { name: 'Send code' }));
-      await user.type(await screen.findByRole('textbox', { name: 'Verification code' }), '123456');
+      const codeInput = await screen.findByRole('textbox', { name: 'Verification code' });
+      await waitFor(() => expect(codeInput).toHaveFocus());
+      await user.keyboard('123456');
       await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
       expect(onSend).toHaveBeenCalledExactlyOnceWith('+18015550100');
       expect(onVerify).toHaveBeenCalledExactlyOnceWith('+18015550100', '123456');
diff --git a/packages/ui/src/mosaic/features/user-profile/user-profile-account-section/user-profile-add-phone.dialog.tsx b/packages/ui/src/mosaic/features/user-profile/user-profile-account-section/user-profile-add-phone.dialog.tsx
index 49079616771..00842155302 100644
--- a/packages/ui/src/mosaic/features/user-profile/user-profile-account-section/user-profile-add-phone.dialog.tsx
+++ b/packages/ui/src/mosaic/features/user-profile/user-profile-account-section/user-profile-add-phone.dialog.tsx
@@ -1,5 +1,5 @@
 import * as stylex from '@stylexjs/stylex';
-import type { FormEvent } from 'react';
+import type { FormEvent, Ref } from 'react';
 import { useId, useRef } from 'react';
 
 import { stringToFormattedPhoneString } from '../../../../utils/phoneUtils';
@@ -8,7 +8,7 @@ import { Card } from '../../../components/card';
 import type { DialogTriggerProps } from '../../../components/dialog';
 import { Dialog } from '../../../components/dialog';
 import { Field } from '../../../components/field';
-import { Flow } from '../../../components/flow';
+import { Flow, useFlowAutoFocus } from '../../../components/flow';
 import { Otp } from '../../../components/otp';
 import { PhoneInput } from '../../../components/phone-input';
 import { styles } from '../user-profile-profile-panel.styles';
@@ -33,16 +33,7 @@ export interface UserProfileAddPhoneDialogProps {
 }
 
 export function UserProfileAddPhoneDialog(props: UserProfileAddPhoneDialogProps) {
-  const phoneFormId = useId();
-  const verifyFormId = useId();
   const phoneRef = useRef<HTMLInputElement>(null);
-  const verifyRef = useRef<HTMLDivElement>(null);
-  const [beforeSeconds, afterSeconds] = m.verify.resendCountdown.split('{seconds}');
-
-  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-    props.onSubmit();
-  };
 
   return (
     <Dialog.Root
@@ -53,9 +44,7 @@ export function UserProfileAddPhoneDialog(props: UserProfileAddPhoneDialogProps)
       {props.trigger ? <Dialog.Trigger render={props.trigger} /> : null}
       <Dialog.Popup
         size='card'
-        initialFocus={() =>
-          phoneRef.current ?? verifyRef.current?.querySelector<HTMLInputElement>('input:not([type="hidden"])') ?? true
-        }
+        initialFocus={props.step === 'phone' ? phoneRef : undefined}
       >
         <Card.Root
           elevation='overlay'
@@ -68,123 +57,27 @@ export function UserProfileAddPhoneDialog(props: UserProfileAddPhoneDialogProps)
             {current => (
               <>
                 <Flow.Step ids={['phone']}>
-                  <Card.Header>
-                    <Card.Title>{m.phone.title}</Card.Title>
-                    <Card.Description>{m.phone.description}</Card.Description>
-                  </Card.Header>
-                  <Card.Content
-                    render={
-                      <form
-                        id={phoneFormId}
-                        onSubmit={handleSubmit}
-                      />
-                    }
-                  >
-                    <Field.Root
-                      required
-                      disabled={current.isPending}
-                      invalid={Boolean(current.errorMessage)}
-                    >
-                      <Field.Label>{m.phone.label}</Field.Label>
-                      <PhoneInput
-                        ref={phoneRef}
-                        name='phoneNumber'
-                        value={current.phoneNumber}
-                        onValueChange={current.onPhoneNumberChange}
-                      />
-                      <Field.Message>
-                        <Field.Error>{current.errorMessage}</Field.Error>
-                      </Field.Message>
-                    </Field.Root>
-                  </Card.Content>
-                  <Card.Footer>
-                    <SubmitButton
-                      form={phoneFormId}
-                      fullWidth
-                      isPending={current.isPending}
-                      pendingLabel={m.phone.pending}
-                    >
-                      {m.phone.submit}
-                    </SubmitButton>
-                  </Card.Footer>
+                  <EnterPhoneStep
+                    inputRef={phoneRef}
+                    phoneNumber={current.phoneNumber}
+                    onPhoneNumberChange={current.onPhoneNumberChange}
+                    onSubmit={current.onSubmit}
+                    isPending={current.isPending}
+                    errorMessage={current.errorMessage}
+                  />
                 </Flow.Step>
-                <Flow.Step
-                  ids={['verify']}
-                  ref={verifyRef}
-                >
-                  <Card.Header>
-                    <Card.Title>{m.verify.title}</Card.Title>
-                    <Card.Description>
-                      {fill(m.verify.description, { phoneNumber: stringToFormattedPhoneString(current.phoneNumber) })}
-                    </Card.Description>
-                  </Card.Header>
-                  <Card.Content
-                    render={
-                      <form
-                        id={verifyFormId}
-                        onSubmit={handleSubmit}
-                      />
-                    }
-                  >
-                    <Field.Root
-                      required
-                      disabled={current.isPending}
-                      invalid={Boolean(current.errorMessage)}
-                    >
-                      <Field.Label visuallyHidden>{m.verify.label}</Field.Label>
-                      <Otp
-                        name='code'
-                        value={current.code}
-                        onValueChange={current.onCodeChange}
-                        onComplete={current.onSubmit}
-                      />
-                      <Field.Message>
-                        <Field.Error>{current.errorMessage}</Field.Error>
-                      </Field.Message>
-                      <Button
-                        type='button'
-                        size='sm'
-                        variant='link'
-                        color='neutral'
-                        disabled={current.isPending || current.isResending || (current.resendSeconds ?? 0) > 0}
-                        onClick={current.onResend}
-                      >
-                        {current.isResending ? (
-                          m.verify.resending
-                        ) : (current.resendSeconds ?? 0) > 0 ? (
-                          <span>
-                            {beforeSeconds}
-                            <span {...stylex.props(styles.countdown)}>{current.resendSeconds}</span>
-                            {afterSeconds}
-                          </span>
-                        ) : (
-                          m.verify.resend
-                        )}
-                      </Button>
-                    </Field.Root>
-                  </Card.Content>
-                  <Card.Footer>
-                    <Dialog.Close
-                      render={
-                        <Button
-                          variant='outline'
-                          color='neutral'
-                          fullWidth
-                        />
-                      }
-                    >
-                      {m.verify.cancel}
-                    </Dialog.Close>
-                    <SubmitButton
-                      form={verifyFormId}
-                      fullWidth
-                      isPending={current.isPending}
-                      disabled={current.isResending}
-                      pendingLabel={m.verify.pending}
-                    >
-                      {m.verify.submit}
-                    </SubmitButton>
-                  </Card.Footer>
+                <Flow.Step ids={['verify']}>
+                  <VerifyPhoneStep
+                    phoneNumber={current.phoneNumber}
+                    code={current.code}
+                    onCodeChange={current.onCodeChange}
+                    onSubmit={current.onSubmit}
+                    onResend={current.onResend}
+                    isPending={current.isPending}
+                    errorMessage={current.errorMessage}
+                    isResending={current.isResending}
+                    resendSeconds={current.resendSeconds}
+                  />
                 </Flow.Step>
               </>
             )}
@@ -194,3 +87,166 @@ export function UserProfileAddPhoneDialog(props: UserProfileAddPhoneDialogProps)
     </Dialog.Root>
   );
 }
+
+interface EnterPhoneStepProps {
+  inputRef: Ref<HTMLInputElement>;
+  phoneNumber: string;
+  onPhoneNumberChange: (value: string) => void;
+  onSubmit: () => void;
+  isPending?: boolean;
+  errorMessage?: string;
+}
+
+function EnterPhoneStep(props: EnterPhoneStepProps) {
+  const phoneFormId = useId();
+
+  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    props.onSubmit();
+  };
+
+  return (
+    <>
+      <Card.Header>
+        <Card.Title>{m.phone.title}</Card.Title>
+        <Card.Description>{m.phone.description}</Card.Description>
+      </Card.Header>
+      <Card.Content
+        render={
+          <form
+            id={phoneFormId}
+            onSubmit={handleSubmit}
+          />
+        }
+      >
+        <Field.Root
+          required
+          disabled={props.isPending}
+          invalid={Boolean(props.errorMessage)}
+        >
+          <Field.Label>{m.phone.label}</Field.Label>
+          <PhoneInput
+            ref={props.inputRef}
+            name='phoneNumber'
+            value={props.phoneNumber}
+            onValueChange={props.onPhoneNumberChange}
+          />
+          <Field.Message>
+            <Field.Error>{props.errorMessage}</Field.Error>
+          </Field.Message>
+        </Field.Root>
+      </Card.Content>
+      <Card.Footer>
+        <SubmitButton
+          form={phoneFormId}
+          fullWidth
+          isPending={props.isPending}
+          pendingLabel={m.phone.pending}
+        >
+          {m.phone.submit}
+        </SubmitButton>
+      </Card.Footer>
+    </>
+  );
+}
+
+interface VerifyPhoneStepProps {
+  phoneNumber: string;
+  code: string;
+  onCodeChange: (value: string) => void;
+  onSubmit: (code?: string) => void;
+  onResend: () => void;
+  isPending?: boolean;
+  errorMessage?: string;
+  isResending?: boolean;
+  resendSeconds?: number;
+}
+
+function VerifyPhoneStep(props: VerifyPhoneStepProps) {
+  const verifyFormId = useId();
+  const [beforeSeconds, afterSeconds] = m.verify.resendCountdown.split('{seconds}');
+
+  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    props.onSubmit();
+  };
+
+  return (
+    <>
+      <Card.Header>
+        <Card.Title>{m.verify.title}</Card.Title>
+        <Card.Description>
+          {fill(m.verify.description, { phoneNumber: stringToFormattedPhoneString(props.phoneNumber) })}
+        </Card.Description>
+      </Card.Header>
+      <Card.Content
+        render={
+          <form
+            id={verifyFormId}
+            onSubmit={handleSubmit}
+          />
+        }
+      >
+        <Field.Root
+          required
+          disabled={props.isPending}
+          invalid={Boolean(props.errorMessage)}
+        >
+          <Field.Label visuallyHidden>{m.verify.label}</Field.Label>
+          <Otp
+            ref={useFlowAutoFocus<HTMLInputElement>()}
+            name='code'
+            value={props.code}
+            onValueChange={props.onCodeChange}
+            onComplete={props.onSubmit}
+          />
+          <Field.Message>
+            <Field.Error>{props.errorMessage}</Field.Error>
+          </Field.Message>
+          <Button
+            type='button'
+            size='sm'
+            variant='link'
+            color='neutral'
+            disabled={props.isPending || props.isResending || (props.resendSeconds ?? 0) > 0}
+            onClick={props.onResend}
+          >
+            {props.isResending ? (
+              m.verify.resending
+            ) : (props.resendSeconds ?? 0) > 0 ? (
+              <span>
+                {beforeSeconds}
+                <span {...stylex.props(styles.countdown)}>{props.resendSeconds}</span>
+                {afterSeconds}
+              </span>
+            ) : (
+              m.verify.resend
+            )}
+          </Button>
+        </Field.Root>
+      </Card.Content>
+      <Card.Footer>
+        <Dialog.Close
+          render={
+            <Button
+              variant='outline'
+              color='neutral'
+              fullWidth
+            />
+          }
+        >
+          {m.verify.cancel}
+        </Dialog.Close>
+        <SubmitButton
+          form={verifyFormId}
+          fullWidth
+          isPending={props.isPending}
+          disabled={props.isResending}
+          pendingLabel={m.verify.pending}
+        >
+          {m.verify.submit}
+        </SubmitButton>
+      </Card.Footer>
+    </>
+  );
+}