about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--bskyweb/templates/base.html2
-rw-r--r--package.json7
-rw-r--r--src/Splash.tsx12
-rw-r--r--src/alf/atoms.ts36
-rw-r--r--src/alf/util/useColorModeTheme.ts19
-rw-r--r--src/components/Button.tsx100
-rw-r--r--src/components/Link.tsx85
-rw-r--r--src/components/Loader.tsx13
-rw-r--r--src/lib/country-codes.ts256
-rw-r--r--src/lib/themes.ts19
-rw-r--r--src/locale/locales/ca/messages.po225
-rw-r--r--src/locale/locales/de/messages.po225
-rw-r--r--src/locale/locales/en/messages.po225
-rw-r--r--src/locale/locales/es/messages.po225
-rw-r--r--src/locale/locales/fr/messages.po225
-rw-r--r--src/locale/locales/hi/messages.po225
-rw-r--r--src/locale/locales/id/messages.po225
-rw-r--r--src/locale/locales/it/messages.po225
-rw-r--r--src/locale/locales/ja/messages.po225
-rw-r--r--src/locale/locales/ko/messages.po225
-rw-r--r--src/locale/locales/pt-BR/messages.po225
-rw-r--r--src/locale/locales/uk/messages.po225
-rw-r--r--src/locale/locales/zh-CN/messages.po225
-rw-r--r--src/state/session/index.tsx6
-rw-r--r--src/view/com/auth/create/CaptchaWebView.tsx86
-rw-r--r--src/view/com/auth/create/CaptchaWebView.web.tsx61
-rw-r--r--src/view/com/auth/create/CreateAccount.tsx71
-rw-r--r--src/view/com/auth/create/Step1.tsx9
-rw-r--r--src/view/com/auth/create/Step2.tsx308
-rw-r--r--src/view/com/auth/create/Step3.tsx120
-rw-r--r--src/view/com/auth/create/StepHeader.tsx2
-rw-r--r--src/view/com/auth/create/state.ts301
-rw-r--r--src/view/com/feeds/FeedPage.tsx15
-rw-r--r--src/view/com/pager/FeedsTabBar.web.tsx19
-rw-r--r--src/view/com/post-thread/PostThread.tsx86
-rw-r--r--src/view/com/post-thread/PostThreadItem.tsx32
-rw-r--r--src/view/com/posts/FeedItem.tsx3
-rw-r--r--src/view/com/util/PostSandboxWarning.tsx35
-rw-r--r--src/view/screens/Storybook/Icons.tsx9
-rw-r--r--src/view/screens/Storybook/Links.tsx7
-rw-r--r--src/view/shell/desktop/RightNav.tsx12
-rw-r--r--web/index.html1
-rw-r--r--yarn.lock13
43 files changed, 2288 insertions, 2382 deletions
diff --git a/bskyweb/templates/base.html b/bskyweb/templates/base.html
index a2d81fc96..99b6f1dc6 100644
--- a/bskyweb/templates/base.html
+++ b/bskyweb/templates/base.html
@@ -2,6 +2,7 @@
 <html>
 <head>
   <meta charset="UTF-8">
+  <meta name="theme-color">
   <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, viewport-fit=cover">
   <meta name="referrer" content="origin-when-cross-origin">
   <!--
@@ -215,6 +216,7 @@
   <meta name="application-name" content="Bluesky">
   <meta name="generator" content="bskyweb">
   <meta property="og:site_name" content="Bluesky Social" />
+  <link type="application/activity+json" href="" />
 
   {% block html_head_extra -%}{%- endblock %}
 </head>
diff --git a/package.json b/package.json
index 837a8d0e4..4a3a2a7dc 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,6 @@
     "js-sha256": "^0.9.0",
     "jwt-decode": "^4.0.0",
     "lande": "^1.0.10",
-    "libphonenumber-js": "^1.10.53",
     "lodash.chunk": "^4.2.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isequal": "^4.5.0",
@@ -137,7 +136,7 @@
     "mobx": "^6.6.1",
     "mobx-react-lite": "^3.4.0",
     "mobx-utils": "^6.0.6",
-    "nanoid": "^5.0.2",
+    "nanoid": "^5.0.5",
     "normalize-url": "^8.0.0",
     "patch-package": "^6.5.1",
     "postinstall-postinstall": "^2.1.0",
@@ -164,6 +163,7 @@
     "react-native-safe-area-context": "4.8.2",
     "react-native-screens": "~3.29.0",
     "react-native-svg": "14.1.0",
+    "react-native-ui-text-view": "link:./modules/react-native-ui-text-view",
     "react-native-url-polyfill": "^1.3.0",
     "react-native-uuid": "^2.0.1",
     "react-native-version-number": "^0.3.6",
@@ -178,8 +178,7 @@
     "tlds": "^1.234.0",
     "use-deep-compare": "^1.1.0",
     "zeego": "^1.6.2",
-    "zod": "^3.20.2",
-    "react-native-ui-text-view": "link:./modules/react-native-ui-text-view"
+    "zod": "^3.20.2"
   },
   "devDependencies": {
     "@atproto/dev-env": "^0.2.28",
diff --git a/src/Splash.tsx b/src/Splash.tsx
index 80d0a66e7..b2381f923 100644
--- a/src/Splash.tsx
+++ b/src/Splash.tsx
@@ -21,7 +21,6 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import Svg, {Path, SvgProps} from 'react-native-svg'
 
 import {isAndroid} from '#/platform/detection'
-import {useThemePrefs} from 'state/shell'
 import {Logotype} from '#/view/icons/Logotype'
 
 // @ts-ignore
@@ -75,10 +74,8 @@ export function Splash(props: React.PropsWithChildren<Props>) {
     isLayoutReady &&
     reduceMotion !== undefined
 
-  const {colorMode} = useThemePrefs()
   const colorScheme = useColorScheme()
-  const themeName = colorMode === 'system' ? colorScheme : colorMode
-  const isDarkMode = themeName === 'dark'
+  const isDarkMode = colorScheme === 'dark'
 
   const logoAnimation = useAnimatedStyle(() => {
     return {
@@ -263,7 +260,12 @@ export function Splash(props: React.PropsWithChildren<Props>) {
               <View
                 style={[
                   StyleSheet.absoluteFillObject,
-                  {backgroundColor: '#fff'},
+                  {
+                    backgroundColor: isDarkMode
+                      ? // special off-spec color for dark mode
+                        '#0F1824'
+                      : '#fff',
+                  },
                 ]}
               />
             )}
diff --git a/src/alf/atoms.ts b/src/alf/atoms.ts
index bbf7e3243..f75e8ffe0 100644
--- a/src/alf/atoms.ts
+++ b/src/alf/atoms.ts
@@ -122,6 +122,9 @@ export const atoms = {
   flex_shrink: {
     flexShrink: 1,
   },
+  justify_start: {
+    justifyContent: 'flex-start',
+  },
   justify_center: {
     justifyContent: 'center',
   },
@@ -140,10 +143,31 @@ export const atoms = {
   align_end: {
     alignItems: 'flex-end',
   },
+  self_auto: {
+    alignSelf: 'auto',
+  },
+  self_start: {
+    alignSelf: 'flex-start',
+  },
+  self_end: {
+    alignSelf: 'flex-end',
+  },
+  self_center: {
+    alignSelf: 'center',
+  },
+  self_stretch: {
+    alignSelf: 'stretch',
+  },
+  self_baseline: {
+    alignSelf: 'baseline',
+  },
 
   /*
    * Text
    */
+  text_left: {
+    textAlign: 'left',
+  },
   text_center: {
     textAlign: 'center',
   },
@@ -195,10 +219,16 @@ export const atoms = {
   font_bold: {
     fontWeight: tokens.fontWeight.semibold,
   },
+  italic: {
+    fontStyle: 'italic',
+  },
 
   /*
    * Border
    */
+  border_0: {
+    borderWidth: 0,
+  },
   border: {
     borderWidth: 1,
   },
@@ -208,6 +238,12 @@ export const atoms = {
   border_b: {
     borderBottomWidth: 1,
   },
+  border_l: {
+    borderLeftWidth: 1,
+  },
+  border_r: {
+    borderRightWidth: 1,
+  },
 
   /*
    * Shadow
diff --git a/src/alf/util/useColorModeTheme.ts b/src/alf/util/useColorModeTheme.ts
index 48cf904fe..4f8921bf9 100644
--- a/src/alf/util/useColorModeTheme.ts
+++ b/src/alf/util/useColorModeTheme.ts
@@ -13,7 +13,7 @@ export function useColorModeTheme(): ThemeName {
   React.useLayoutEffect(() => {
     const theme = getThemeName(colorScheme, colorMode, darkTheme)
     updateDocument(theme)
-    updateSystemBackground(theme)
+    SystemUI.setBackgroundColorAsync(getBackgroundColor(theme))
   }, [colorMode, colorScheme, darkTheme])
 
   return React.useMemo(
@@ -42,23 +42,24 @@ function updateDocument(theme: ThemeName) {
   if (isWeb && typeof window !== 'undefined') {
     // @ts-ignore web only
     const html = window.document.documentElement
+    // @ts-ignore web only
+    const meta = window.document.querySelector('meta[name="theme-color"]')
+
     // remove any other color mode classes
     html.className = html.className.replace(/(theme)--\w+/g, '')
-
     html.classList.add(`theme--${theme}`)
+    // set color to 'theme-color' meta tag
+    meta?.setAttribute('content', getBackgroundColor(theme))
   }
 }
 
-function updateSystemBackground(theme: ThemeName) {
+function getBackgroundColor(theme: ThemeName): string {
   switch (theme) {
     case 'light':
-      SystemUI.setBackgroundColorAsync(light.atoms.bg.backgroundColor)
-      break
+      return light.atoms.bg.backgroundColor
     case 'dark':
-      SystemUI.setBackgroundColorAsync(dark.atoms.bg.backgroundColor)
-      break
+      return dark.atoms.bg.backgroundColor
     case 'dim':
-      SystemUI.setBackgroundColorAsync(dim.atoms.bg.backgroundColor)
-      break
+      return dim.atoms.bg.backgroundColor
   }
 }
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 68cee4374..e401bda2a 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -27,7 +27,7 @@ export type ButtonColor =
   | 'gradient_sunset'
   | 'gradient_nordic'
   | 'gradient_bonfire'
-export type ButtonSize = 'small' | 'large'
+export type ButtonSize = 'tiny' | 'small' | 'large'
 export type ButtonShape = 'round' | 'square' | 'default'
 export type VariantProps = {
   /**
@@ -48,25 +48,32 @@ export type VariantProps = {
   shape?: ButtonShape
 }
 
-export type ButtonProps = React.PropsWithChildren<
-  Pick<PressableProps, 'disabled' | 'onPress'> &
-    AccessibilityProps &
-    VariantProps & {
-      testID?: string
-      label: string
-      style?: StyleProp<ViewStyle>
-    }
->
-export type ButtonTextProps = TextProps & VariantProps & {disabled?: boolean}
+export type ButtonState = {
+  hovered: boolean
+  focused: boolean
+  pressed: boolean
+  disabled: boolean
+}
+
+export type ButtonContext = VariantProps & ButtonState
 
-const Context = React.createContext<
+export type ButtonProps = Pick<
+  PressableProps,
+  'disabled' | 'onPress' | 'testID'
+> &
+  AccessibilityProps &
   VariantProps & {
-    hovered: boolean
-    focused: boolean
-    pressed: boolean
-    disabled: boolean
+    testID?: string
+    label: string
+    style?: StyleProp<ViewStyle>
+    children:
+      | React.ReactNode
+      | string
+      | ((context: ButtonContext) => React.ReactNode | string)
   }
->({
+export type ButtonTextProps = TextProps & VariantProps & {disabled?: boolean}
+
+const Context = React.createContext<VariantProps & ButtonState>({
   hovered: false,
   focused: false,
   pressed: false,
@@ -277,6 +284,8 @@ export function Button({
         baseStyles.push({paddingVertical: 15}, a.px_2xl, a.rounded_sm, a.gap_md)
       } else if (size === 'small') {
         baseStyles.push({paddingVertical: 9}, a.px_lg, a.rounded_sm, a.gap_sm)
+      } else if (size === 'tiny') {
+        baseStyles.push({paddingVertical: 4}, a.px_sm, a.rounded_xs, a.gap_xs)
       }
     } else if (shape === 'round' || shape === 'square') {
       if (size === 'large') {
@@ -287,12 +296,18 @@ export function Button({
         }
       } else if (size === 'small') {
         baseStyles.push({height: 40, width: 40})
+      } else if (size === 'tiny') {
+        baseStyles.push({height: 20, width: 20})
       }
 
       if (shape === 'round') {
         baseStyles.push(a.rounded_full)
       } else if (shape === 'square') {
-        baseStyles.push(a.rounded_sm)
+        if (size === 'tiny') {
+          baseStyles.push(a.rounded_xs)
+        } else {
+          baseStyles.push(a.rounded_sm)
+        }
       }
     }
 
@@ -338,7 +353,7 @@ export function Button({
       }
     }, [variant, color])
 
-  const context = React.useMemo(
+  const context = React.useMemo<ButtonContext>(
     () => ({
       ...state,
       variant,
@@ -349,6 +364,8 @@ export function Button({
     [state, variant, color, size, disabled],
   )
 
+  const flattenedBaseStyles = flatten(baseStyles)
+
   return (
     <Pressable
       role="button"
@@ -362,15 +379,14 @@ export function Button({
         disabled: disabled || false,
       }}
       style={[
-        flatten(style),
         a.flex_row,
         a.align_center,
         a.justify_center,
-        a.overflow_hidden,
         a.justify_center,
-        ...baseStyles,
+        flattenedBaseStyles,
         ...(state.hovered || state.pressed ? hoverStyles : []),
         ...(state.focused ? focusStyles : []),
+        flatten(style),
       ]}
       onPressIn={onPressIn}
       onPressOut={onPressOut}
@@ -379,21 +395,31 @@ export function Button({
       onFocus={onFocus}
       onBlur={onBlur}>
       {variant === 'gradient' && (
-        <LinearGradient
-          colors={
-            state.hovered || state.pressed || state.focused
-              ? gradientHoverColors
-              : gradientColors
-          }
-          locations={gradientLocations}
-          start={{x: 0, y: 0}}
-          end={{x: 1, y: 1}}
-          style={[a.absolute, a.inset_0]}
-        />
+        <View
+          style={[
+            a.absolute,
+            a.inset_0,
+            a.overflow_hidden,
+            {borderRadius: flattenedBaseStyles.borderRadius},
+          ]}>
+          <LinearGradient
+            colors={
+              state.hovered || state.pressed || state.focused
+                ? gradientHoverColors
+                : gradientColors
+            }
+            locations={gradientLocations}
+            start={{x: 0, y: 0}}
+            end={{x: 1, y: 1}}
+            style={[a.absolute, a.inset_0]}
+          />
+        </View>
       )}
       <Context.Provider value={context}>
         {typeof children === 'string' ? (
           <ButtonText>{children}</ButtonText>
+        ) : typeof children === 'function' ? (
+          children(context)
         ) : (
           children
         )}
@@ -493,6 +519,8 @@ export function useSharedButtonTextStyles() {
 
     if (size === 'large') {
       baseStyles.push(a.text_md, android({paddingBottom: 1}))
+    } else if (size === 'tiny') {
+      baseStyles.push(a.text_xs, android({paddingBottom: 1}))
     } else {
       baseStyles.push(a.text_sm, android({paddingBottom: 1}))
     }
@@ -514,9 +542,11 @@ export function ButtonText({children, style, ...rest}: ButtonTextProps) {
 export function ButtonIcon({
   icon: Comp,
   position,
+  size: iconSize,
 }: {
   icon: React.ComponentType<SVGIconProps>
   position?: 'left' | 'right'
+  size?: SVGIconProps['size']
 }) {
   const {size, disabled} = useButtonContext()
   const textStyles = useSharedButtonTextStyles()
@@ -532,7 +562,9 @@ export function ButtonIcon({
         },
       ]}>
       <Comp
-        size={size === 'large' ? 'md' : 'sm'}
+        size={
+          iconSize ?? (size === 'large' ? 'md' : size === 'tiny' ? 'xs' : 'sm')
+        }
         style={[{color: textStyles.color, pointerEvents: 'none'}]}
       />
     </View>
diff --git a/src/components/Link.tsx b/src/components/Link.tsx
index 763f07ca9..afd30b5ee 100644
--- a/src/components/Link.tsx
+++ b/src/components/Link.tsx
@@ -13,7 +13,7 @@ import {sanitizeUrl} from '@braintree/sanitize-url'
 
 import {useInteractionState} from '#/components/hooks/useInteractionState'
 import {isWeb} from '#/platform/detection'
-import {useTheme, web, flatten, TextStyleProp} from '#/alf'
+import {useTheme, web, flatten, TextStyleProp, atoms as a} from '#/alf'
 import {Button, ButtonProps} from '#/components/Button'
 import {AllNavigatorParams, NavigationProp} from '#/lib/routes/types'
 import {
@@ -35,6 +35,13 @@ type BaseLinkProps = Pick<
   Parameters<typeof useLinkProps<AllNavigatorParams>>[0],
   'to'
 > & {
+  testID?: string
+
+  /**
+   * Label for a11y. Defaults to the href.
+   */
+  label?: string
+
   /**
    * The React Navigation `StackAction` to perform when the link is pressed.
    */
@@ -46,6 +53,18 @@ type BaseLinkProps = Pick<
    * Note: atm this only works for `InlineLink`s with a string child.
    */
   warnOnMismatchingTextChild?: boolean
+
+  /**
+   * Callback for when the link is pressed.
+   *
+   * DO NOT use this for navigation, that's what the `to` prop is for.
+   */
+  onPress?: (e: GestureResponderEvent) => void
+
+  /**
+   * Web-only attribute. Sets `download` attr on web.
+   */
+  download?: string
 }
 
 export function useLink({
@@ -53,6 +72,7 @@ export function useLink({
   displayText,
   action = 'push',
   warnOnMismatchingTextChild,
+  onPress: outerOnPress,
 }: BaseLinkProps & {
   displayText: string
 }) {
@@ -66,6 +86,8 @@ export function useLink({
 
   const onPress = React.useCallback(
     (e: GestureResponderEvent) => {
+      outerOnPress?.(e)
+
       const requiresWarning = Boolean(
         warnOnMismatchingTextChild &&
           displayText &&
@@ -132,6 +154,7 @@ export function useLink({
       displayText,
       closeModal,
       openModal,
+      outerOnPress,
     ],
   )
 
@@ -143,16 +166,7 @@ export function useLink({
 }
 
 export type LinkProps = Omit<BaseLinkProps, 'warnOnMismatchingTextChild'> &
-  Omit<ButtonProps, 'style' | 'onPress' | 'disabled' | 'label'> & {
-    /**
-     * Label for a11y. Defaults to the href.
-     */
-    label?: string
-    /**
-     * Web-only attribute. Sets `download` attr on web.
-     */
-    download?: string
-  }
+  Omit<ButtonProps, 'onPress' | 'disabled' | 'label'>
 
 /**
  * A interactive element that renders as a `<a>` tag on the web. On mobile it
@@ -166,6 +180,7 @@ export function Link({
   children,
   to,
   action = 'push',
+  onPress: outerOnPress,
   download,
   ...rest
 }: LinkProps) {
@@ -173,24 +188,26 @@ export function Link({
     to,
     displayText: typeof children === 'string' ? children : '',
     action,
+    onPress: outerOnPress,
   })
 
   return (
     <Button
       label={href}
       {...rest}
+      style={[a.justify_start, flatten(rest.style)]}
       role="link"
       accessibilityRole="link"
       href={href}
-      onPress={onPress}
+      onPress={download ? undefined : onPress}
       {...web({
         hrefAttrs: {
-          target: isExternal ? 'blank' : undefined,
+          target: download ? undefined : isExternal ? 'blank' : undefined,
           rel: isExternal ? 'noopener noreferrer' : undefined,
           download,
         },
         dataSet: {
-          // default to no underline, apply this ourselves
+          // no underline, only `InlineLink` has underlines
           noUnderline: '1',
         },
       })}>
@@ -200,13 +217,7 @@ export function Link({
 }
 
 export type InlineLinkProps = React.PropsWithChildren<
-  BaseLinkProps &
-    TextStyleProp & {
-      /**
-       * Label for a11y. Defaults to the href.
-       */
-      label?: string
-    }
+  BaseLinkProps & TextStyleProp
 >
 
 export function InlineLink({
@@ -215,6 +226,8 @@ export function InlineLink({
   action = 'push',
   warnOnMismatchingTextChild,
   style,
+  onPress: outerOnPress,
+  download,
   ...rest
 }: InlineLinkProps) {
   const t = useTheme()
@@ -224,18 +237,25 @@ export function InlineLink({
     displayText: stringChildren ? children : '',
     action,
     warnOnMismatchingTextChild,
+    onPress: outerOnPress,
   })
+  const {
+    state: hovered,
+    onIn: onHoverIn,
+    onOut: onHoverOut,
+  } = useInteractionState()
   const {state: focused, onIn: onFocus, onOut: onBlur} = useInteractionState()
   const {
     state: pressed,
     onIn: onPressIn,
     onOut: onPressOut,
   } = useInteractionState()
+  const flattenedStyle = flatten(style)
 
   return (
     <TouchableWithoutFeedback
       accessibilityRole="button"
-      onPress={onPress}
+      onPress={download ? undefined : onPress}
       onPressIn={onPressIn}
       onPressOut={onPressOut}
       onFocus={onFocus}
@@ -245,27 +265,28 @@ export function InlineLink({
         {...rest}
         style={[
           {color: t.palette.primary_500},
-          (focused || pressed) && {
+          (hovered || focused || pressed) && {
             outline: 0,
             textDecorationLine: 'underline',
-            textDecorationColor: t.palette.primary_500,
+            textDecorationColor: flattenedStyle.color ?? t.palette.primary_500,
           },
-          flatten(style),
+          flattenedStyle,
         ]}
         role="link"
+        onMouseEnter={onHoverIn}
+        onMouseLeave={onHoverOut}
         accessibilityRole="link"
         href={href}
         {...web({
           hrefAttrs: {
-            target: isExternal ? 'blank' : undefined,
+            target: download ? undefined : isExternal ? 'blank' : undefined,
             rel: isExternal ? 'noopener noreferrer' : undefined,
+            download,
+          },
+          dataSet: {
+            // default to no underline, apply this ourselves
+            noUnderline: '1',
           },
-          dataSet: stringChildren
-            ? {}
-            : {
-                // default to no underline, apply this ourselves
-                noUnderline: '1',
-              },
         })}>
         {children}
       </Text>
diff --git a/src/components/Loader.tsx b/src/components/Loader.tsx
index bbe4e2f75..b9f399f95 100644
--- a/src/components/Loader.tsx
+++ b/src/components/Loader.tsx
@@ -7,11 +7,12 @@ import Animated, {
   withTiming,
 } from 'react-native-reanimated'
 
-import {atoms as a} from '#/alf'
+import {atoms as a, useTheme, flatten} from '#/alf'
 import {Props, useCommonSVGProps} from '#/components/icons/common'
 import {Loader_Stroke2_Corner0_Rounded as Icon} from '#/components/icons/Loader'
 
 export function Loader(props: Props) {
+  const t = useTheme()
   const common = useCommonSVGProps(props)
   const rotation = useSharedValue(0)
 
@@ -35,7 +36,15 @@ export function Loader(props: Props) {
         {width: common.size, height: common.size},
         animatedStyles,
       ]}>
-      <Icon {...props} style={[a.absolute, a.inset_0, props.style]} />
+      <Icon
+        {...props}
+        style={[
+          a.absolute,
+          a.inset_0,
+          t.atoms.text_contrast_high,
+          flatten(props.style),
+        ]}
+      />
     </Animated.View>
   )
 }
diff --git a/src/lib/country-codes.ts b/src/lib/country-codes.ts
deleted file mode 100644
index 9c9da84cf..000000000
--- a/src/lib/country-codes.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import {CountryCode} from 'libphonenumber-js'
-
-// ISO 3166-1 alpha-2 codes
-
-export interface CountryCodeMap {
-  code2: CountryCode
-  name: string
-}
-
-export const COUNTRY_CODES: CountryCodeMap[] = [
-  {code2: 'AF', name: 'Afghanistan (+93)'},
-  {code2: 'AX', name: 'Ă…land Islands (+358)'},
-  {code2: 'AL', name: 'Albania (+355)'},
-  {code2: 'DZ', name: 'Algeria (+213)'},
-  {code2: 'AS', name: 'American Samoa (+1)'},
-  {code2: 'AD', name: 'Andorra (+376)'},
-  {code2: 'AO', name: 'Angola (+244)'},
-  {code2: 'AI', name: 'Anguilla (+1)'},
-  {code2: 'AG', name: 'Antigua and Barbuda (+1)'},
-  {code2: 'AR', name: 'Argentina (+54)'},
-  {code2: 'AM', name: 'Armenia (+374)'},
-  {code2: 'AW', name: 'Aruba (+297)'},
-  {code2: 'AU', name: 'Australia (+61)'},
-  {code2: 'AT', name: 'Austria (+43)'},
-  {code2: 'AZ', name: 'Azerbaijan (+994)'},
-  {code2: 'BS', name: 'Bahamas (+1)'},
-  {code2: 'BH', name: 'Bahrain (+973)'},
-  {code2: 'BD', name: 'Bangladesh (+880)'},
-  {code2: 'BB', name: 'Barbados (+1)'},
-  {code2: 'BY', name: 'Belarus (+375)'},
-  {code2: 'BE', name: 'Belgium (+32)'},
-  {code2: 'BZ', name: 'Belize (+501)'},
-  {code2: 'BJ', name: 'Benin (+229)'},
-  {code2: 'BM', name: 'Bermuda (+1)'},
-  {code2: 'BT', name: 'Bhutan (+975)'},
-  {code2: 'BO', name: 'Bolivia (Plurinational State of) (+591)'},
-  {code2: 'BQ', name: 'Bonaire, Sint Eustatius and Saba (+599)'},
-  {code2: 'BA', name: 'Bosnia and Herzegovina (+387)'},
-  {code2: 'BW', name: 'Botswana (+267)'},
-  {code2: 'BR', name: 'Brazil (+55)'},
-  {code2: 'IO', name: 'British Indian Ocean Territory (+246)'},
-  {code2: 'BN', name: 'Brunei Darussalam (+673)'},
-  {code2: 'BG', name: 'Bulgaria (+359)'},
-  {code2: 'BF', name: 'Burkina Faso (+226)'},
-  {code2: 'BI', name: 'Burundi (+257)'},
-  {code2: 'CV', name: 'Cabo Verde (+238)'},
-  {code2: 'KH', name: 'Cambodia (+855)'},
-  {code2: 'CM', name: 'Cameroon (+237)'},
-  {code2: 'CA', name: 'Canada (+1)'},
-  {code2: 'KY', name: 'Cayman Islands (+1)'},
-  {code2: 'CF', name: 'Central African Republic (+236)'},
-  {code2: 'TD', name: 'Chad (+235)'},
-  {code2: 'CL', name: 'Chile (+56)'},
-  {code2: 'CN', name: 'China (+86)'},
-  {code2: 'CX', name: 'Christmas Island (+61)'},
-  {code2: 'CC', name: 'Cocos (Keeling) Islands (+61)'},
-  {code2: 'CO', name: 'Colombia (+57)'},
-  {code2: 'KM', name: 'Comoros (+269)'},
-  {code2: 'CG', name: 'Congo (+242)'},
-  {code2: 'CD', name: 'Congo, Democratic Republic of the (+243)'},
-  {code2: 'CK', name: 'Cook Islands (+682)'},
-  {code2: 'CR', name: 'Costa Rica (+506)'},
-  {code2: 'CI', name: "CĂ´te d'Ivoire (+225)"},
-  {code2: 'HR', name: 'Croatia (+385)'},
-  {code2: 'CU', name: 'Cuba (+53)'},
-  {code2: 'CW', name: 'Curaçao (+599)'},
-  {code2: 'CY', name: 'Cyprus (+357)'},
-  {code2: 'CZ', name: 'Czechia (+420)'},
-  {code2: 'DK', name: 'Denmark (+45)'},
-  {code2: 'DJ', name: 'Djibouti (+253)'},
-  {code2: 'DM', name: 'Dominica (+1)'},
-  {code2: 'DO', name: 'Dominican Republic (+1)'},
-  {code2: 'EC', name: 'Ecuador (+593)'},
-  {code2: 'EG', name: 'Egypt (+20)'},
-  {code2: 'SV', name: 'El Salvador (+503)'},
-  {code2: 'GQ', name: 'Equatorial Guinea (+240)'},
-  {code2: 'ER', name: 'Eritrea (+291)'},
-  {code2: 'EE', name: 'Estonia (+372)'},
-  {code2: 'SZ', name: 'Eswatini (+268)'},
-  {code2: 'ET', name: 'Ethiopia (+251)'},
-  {code2: 'FK', name: 'Falkland Islands (Malvinas) (+500)'},
-  {code2: 'FO', name: 'Faroe Islands (+298)'},
-  {code2: 'FJ', name: 'Fiji (+679)'},
-  {code2: 'FI', name: 'Finland (+358)'},
-  {code2: 'FR', name: 'France (+33)'},
-  {code2: 'GF', name: 'French Guiana (+594)'},
-  {code2: 'PF', name: 'French Polynesia (+689)'},
-  {code2: 'GA', name: 'Gabon (+241)'},
-  {code2: 'GM', name: 'Gambia (+220)'},
-  {code2: 'GE', name: 'Georgia (+995)'},
-  {code2: 'DE', name: 'Germany (+49)'},
-  {code2: 'GH', name: 'Ghana (+233)'},
-  {code2: 'GI', name: 'Gibraltar (+350)'},
-  {code2: 'GR', name: 'Greece (+30)'},
-  {code2: 'GL', name: 'Greenland (+299)'},
-  {code2: 'GD', name: 'Grenada (+1)'},
-  {code2: 'GP', name: 'Guadeloupe (+590)'},
-  {code2: 'GU', name: 'Guam (+1)'},
-  {code2: 'GT', name: 'Guatemala (+502)'},
-  {code2: 'GG', name: 'Guernsey (+44)'},
-  {code2: 'GN', name: 'Guinea (+224)'},
-  {code2: 'GW', name: 'Guinea-Bissau (+245)'},
-  {code2: 'GY', name: 'Guyana (+592)'},
-  {code2: 'HT', name: 'Haiti (+509)'},
-  {code2: 'VA', name: 'Holy See (+39)'},
-  {code2: 'HN', name: 'Honduras (+504)'},
-  {code2: 'HK', name: 'Hong Kong (+852)'},
-  {code2: 'HU', name: 'Hungary (+36)'},
-  {code2: 'IS', name: 'Iceland (+354)'},
-  {code2: 'IN', name: 'India (+91)'},
-  {code2: 'ID', name: 'Indonesia (+62)'},
-  {code2: 'IR', name: 'Iran (Islamic Republic of) (+98)'},
-  {code2: 'IQ', name: 'Iraq (+964)'},
-  {code2: 'IE', name: 'Ireland (+353)'},
-  {code2: 'IM', name: 'Isle of Man (+44)'},
-  {code2: 'IL', name: 'Israel (+972)'},
-  {code2: 'IT', name: 'Italy (+39)'},
-  {code2: 'JM', name: 'Jamaica (+1)'},
-  {code2: 'JP', name: 'Japan (+81)'},
-  {code2: 'JE', name: 'Jersey (+44)'},
-  {code2: 'JO', name: 'Jordan (+962)'},
-  {code2: 'KZ', name: 'Kazakhstan (+7)'},
-  {code2: 'KE', name: 'Kenya (+254)'},
-  {code2: 'KI', name: 'Kiribati (+686)'},
-  {code2: 'KP', name: "Korea (Democratic People's Republic of) (+850)"},
-  {code2: 'KR', name: 'Korea, Republic of (+82)'},
-  {code2: 'KW', name: 'Kuwait (+965)'},
-  {code2: 'KG', name: 'Kyrgyzstan (+996)'},
-  {code2: 'LA', name: "Lao People's Democratic Republic (+856)"},
-  {code2: 'LV', name: 'Latvia (+371)'},
-  {code2: 'LB', name: 'Lebanon (+961)'},
-  {code2: 'LS', name: 'Lesotho (+266)'},
-  {code2: 'LR', name: 'Liberia (+231)'},
-  {code2: 'LY', name: 'Libya (+218)'},
-  {code2: 'LI', name: 'Liechtenstein (+423)'},
-  {code2: 'LT', name: 'Lithuania (+370)'},
-  {code2: 'LU', name: 'Luxembourg (+352)'},
-  {code2: 'MO', name: 'Macao (+853)'},
-  {code2: 'MG', name: 'Madagascar (+261)'},
-  {code2: 'MW', name: 'Malawi (+265)'},
-  {code2: 'MY', name: 'Malaysia (+60)'},
-  {code2: 'MV', name: 'Maldives (+960)'},
-  {code2: 'ML', name: 'Mali (+223)'},
-  {code2: 'MT', name: 'Malta (+356)'},
-  {code2: 'MH', name: 'Marshall Islands (+692)'},
-  {code2: 'MQ', name: 'Martinique (+596)'},
-  {code2: 'MR', name: 'Mauritania (+222)'},
-  {code2: 'MU', name: 'Mauritius (+230)'},
-  {code2: 'YT', name: 'Mayotte (+262)'},
-  {code2: 'MX', name: 'Mexico (+52)'},
-  {code2: 'FM', name: 'Micronesia (Federated States of) (+691)'},
-  {code2: 'MD', name: 'Moldova, Republic of (+373)'},
-  {code2: 'MC', name: 'Monaco (+377)'},
-  {code2: 'MN', name: 'Mongolia (+976)'},
-  {code2: 'ME', name: 'Montenegro (+382)'},
-  {code2: 'MS', name: 'Montserrat (+1)'},
-  {code2: 'MA', name: 'Morocco (+212)'},
-  {code2: 'MZ', name: 'Mozambique (+258)'},
-  {code2: 'MM', name: 'Myanmar (+95)'},
-  {code2: 'NA', name: 'Namibia (+264)'},
-  {code2: 'NR', name: 'Nauru (+674)'},
-  {code2: 'NP', name: 'Nepal (+977)'},
-  {code2: 'NL', name: 'Netherlands, Kingdom of the (+31)'},
-  {code2: 'NC', name: 'New Caledonia (+687)'},
-  {code2: 'NZ', name: 'New Zealand (+64)'},
-  {code2: 'NI', name: 'Nicaragua (+505)'},
-  {code2: 'NE', name: 'Niger (+227)'},
-  {code2: 'NG', name: 'Nigeria (+234)'},
-  {code2: 'NU', name: 'Niue (+683)'},
-  {code2: 'NF', name: 'Norfolk Island (+672)'},
-  {code2: 'MK', name: 'North Macedonia (+389)'},
-  {code2: 'MP', name: 'Northern Mariana Islands (+1)'},
-  {code2: 'NO', name: 'Norway (+47)'},
-  {code2: 'OM', name: 'Oman (+968)'},
-  {code2: 'PK', name: 'Pakistan (+92)'},
-  {code2: 'PW', name: 'Palau (+680)'},
-  {code2: 'PS', name: 'Palestine, State of (+970)'},
-  {code2: 'PA', name: 'Panama (+507)'},
-  {code2: 'PG', name: 'Papua New Guinea (+675)'},
-  {code2: 'PY', name: 'Paraguay (+595)'},
-  {code2: 'PE', name: 'Peru (+51)'},
-  {code2: 'PH', name: 'Philippines (+63)'},
-  {code2: 'PL', name: 'Poland (+48)'},
-  {code2: 'PT', name: 'Portugal (+351)'},
-  {code2: 'PR', name: 'Puerto Rico (+1)'},
-  {code2: 'QA', name: 'Qatar (+974)'},
-  {code2: 'RE', name: 'Réunion (+262)'},
-  {code2: 'RO', name: 'Romania (+40)'},
-  {code2: 'RU', name: 'Russian Federation (+7)'},
-  {code2: 'RW', name: 'Rwanda (+250)'},
-  {code2: 'BL', name: 'Saint Barthélemy (+590)'},
-  {code2: 'SH', name: 'Saint Helena, Ascension and Tristan da Cunha (+290)'},
-  {code2: 'KN', name: 'Saint Kitts and Nevis (+1)'},
-  {code2: 'LC', name: 'Saint Lucia (+1)'},
-  {code2: 'MF', name: 'Saint Martin (French part) (+590)'},
-  {code2: 'PM', name: 'Saint Pierre and Miquelon (+508)'},
-  {code2: 'VC', name: 'Saint Vincent and the Grenadines (+1)'},
-  {code2: 'WS', name: 'Samoa (+685)'},
-  {code2: 'SM', name: 'San Marino (+378)'},
-  {code2: 'ST', name: 'Sao Tome and Principe (+239)'},
-  {code2: 'SA', name: 'Saudi Arabia (+966)'},
-  {code2: 'SN', name: 'Senegal (+221)'},
-  {code2: 'RS', name: 'Serbia (+381)'},
-  {code2: 'SC', name: 'Seychelles (+248)'},
-  {code2: 'SL', name: 'Sierra Leone (+232)'},
-  {code2: 'SG', name: 'Singapore (+65)'},
-  {code2: 'SX', name: 'Sint Maarten (Dutch part) (+1)'},
-  {code2: 'SK', name: 'Slovakia (+421)'},
-  {code2: 'SI', name: 'Slovenia (+386)'},
-  {code2: 'SB', name: 'Solomon Islands (+677)'},
-  {code2: 'SO', name: 'Somalia (+252)'},
-  {code2: 'ZA', name: 'South Africa (+27)'},
-  {code2: 'SS', name: 'South Sudan (+211)'},
-  {code2: 'ES', name: 'Spain (+34)'},
-  {code2: 'LK', name: 'Sri Lanka (+94)'},
-  {code2: 'SD', name: 'Sudan (+249)'},
-  {code2: 'SR', name: 'Suriname (+597)'},
-  {code2: 'SJ', name: 'Svalbard and Jan Mayen (+47)'},
-  {code2: 'SE', name: 'Sweden (+46)'},
-  {code2: 'CH', name: 'Switzerland (+41)'},
-  {code2: 'SY', name: 'Syrian Arab Republic (+963)'},
-  {code2: 'TW', name: 'Taiwan (+886)'},
-  {code2: 'TJ', name: 'Tajikistan (+992)'},
-  {code2: 'TZ', name: 'Tanzania, United Republic of (+255)'},
-  {code2: 'TH', name: 'Thailand (+66)'},
-  {code2: 'TL', name: 'Timor-Leste (+670)'},
-  {code2: 'TG', name: 'Togo (+228)'},
-  {code2: 'TK', name: 'Tokelau (+690)'},
-  {code2: 'TO', name: 'Tonga (+676)'},
-  {code2: 'TT', name: 'Trinidad and Tobago (+1)'},
-  {code2: 'TN', name: 'Tunisia (+216)'},
-  {code2: 'TR', name: 'TĂ¼rkiye (+90)'},
-  {code2: 'TM', name: 'Turkmenistan (+993)'},
-  {code2: 'TC', name: 'Turks and Caicos Islands (+1)'},
-  {code2: 'TV', name: 'Tuvalu (+688)'},
-  {code2: 'UG', name: 'Uganda (+256)'},
-  {code2: 'UA', name: 'Ukraine (+380)'},
-  {code2: 'AE', name: 'United Arab Emirates (+971)'},
-  {
-    code2: 'GB',
-    name: 'United Kingdom of Great Britain and Northern Ireland (+44)',
-  },
-  {code2: 'US', name: 'United States of America (+1)'},
-  {code2: 'UY', name: 'Uruguay (+598)'},
-  {code2: 'UZ', name: 'Uzbekistan (+998)'},
-  {code2: 'VU', name: 'Vanuatu (+678)'},
-  {code2: 'VE', name: 'Venezuela (Bolivarian Republic of) (+58)'},
-  {code2: 'VN', name: 'Viet Nam (+84)'},
-  {code2: 'VG', name: 'Virgin Islands (British) (+1)'},
-  {code2: 'VI', name: 'Virgin Islands (U.S.) (+1)'},
-  {code2: 'WF', name: 'Wallis and Futuna (+681)'},
-  {code2: 'EH', name: 'Western Sahara (+212)'},
-  {code2: 'YE', name: 'Yemen (+967)'},
-  {code2: 'ZM', name: 'Zambia (+260)'},
-  {code2: 'ZW', name: 'Zimbabwe (+263)'},
-]
diff --git a/src/lib/themes.ts b/src/lib/themes.ts
index 9a3880b92..f75ac8ab4 100644
--- a/src/lib/themes.ts
+++ b/src/lib/themes.ts
@@ -344,6 +344,25 @@ export const dimTheme: Theme = {
     default: {
       ...darkTheme.palette.default,
       background: dimPalette.black,
+      backgroundLight: dimPalette.contrast_50,
+      text: dimPalette.white,
+      textLight: dimPalette.contrast_700,
+      textInverted: dimPalette.black,
+      link: dimPalette.primary_500,
+      border: dimPalette.contrast_100,
+      borderDark: dimPalette.contrast_200,
+      icon: dimPalette.contrast_500,
+
+      // non-standard
+      textVeryLight: dimPalette.contrast_400,
+      replyLine: dimPalette.contrast_100,
+      replyLineDot: dimPalette.contrast_200,
+      unreadNotifBg: dimPalette.primary_975,
+      unreadNotifBorder: dimPalette.primary_900,
+      postCtrl: dimPalette.contrast_500,
+      brandText: dimPalette.primary_500,
+      emptyStateIcon: dimPalette.contrast_300,
+      borderLinkHover: dimPalette.contrast_300,
     },
   },
 }
diff --git a/src/locale/locales/ca/messages.po b/src/locale/locales/ca/messages.po
index aacf5f4f5..dd0aca58b 100644
--- a/src/locale/locales/ca/messages.po
+++ b/src/locale/locales/ca/messages.po
@@ -361,21 +361,21 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr "Nuesa artĂ­stica o no erĂ²tica."
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "Endarrere"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr "Endarrere"
@@ -388,7 +388,7 @@ msgstr ""
 msgid "Basics"
 msgstr "Conceptes bĂ sics"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "Aniversari"
@@ -440,7 +440,7 @@ msgstr "Els comptes bloquejats no poden respondre cap fil teu, ni anomenar-te ni
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "Els comptes bloquejats no poden respondre a cap fil teu, ni anomenar-te ni interactuar amb tu de cap manera. No veurĂ s mai el seu contingut ni ells el teu."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "PublicaciĂ³ bloquejada."
 
@@ -681,7 +681,7 @@ msgstr "Tria els algoritmes que potenciaran la teva experiència amb els canals
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "Tria la teva contrasenya"
 
@@ -782,6 +782,10 @@ msgstr "Directrius de la comunitat"
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr "Crea publicacions de fins a {MAX_GRAPHEME_LENGTH} carĂ cters"
@@ -837,12 +841,12 @@ msgstr "Codi de confirmaciĂ³"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr "Confirma afegir {email} a la llista d'espera"
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "Connectant…"
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr "Contacta amb suport"
 
@@ -954,8 +958,8 @@ msgid "Could not load list"
 msgstr "No es pot carregar la llista"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr "PaĂ­s"
+#~ msgid "Country"
+#~ msgstr "PaĂ­s"
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -967,7 +971,7 @@ msgstr "Crea un nou compte"
 msgid "Create a new Bluesky account"
 msgstr "Crea un nou compte de Bluesky"
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "Crea un compte"
 
@@ -1081,7 +1085,7 @@ msgstr "Vols eliminar aquesta publicaciĂ³?"
 msgid "Deleted"
 msgstr "Eliminat"
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "PublicaciĂ³ eliminada."
 
@@ -1145,7 +1149,7 @@ msgstr "Nom mostrat"
 msgid "Domain verified!"
 msgstr "Domini verificat!"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr "No tens un codi d'invitaciĂ³?"
 
@@ -1287,16 +1291,14 @@ msgstr "Edita la descripciĂ³ del teu perfil"
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "Correu"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "Adreça de correu"
@@ -1371,7 +1373,7 @@ msgstr "Introdueix el domini que vols utilitzar"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "Introdueix el correu que vas fer servir per crear el teu compte. T'enviarem un \"codi de restabliment\" perquè puguis posar una nova contrasenya."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr "Introdueix la teva data de naixement"
@@ -1380,7 +1382,7 @@ msgstr "Introdueix la teva data de naixement"
 msgid "Enter your email"
 msgstr "Introdueix el teu correu"
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "Introdueix el teu correu"
 
@@ -1393,13 +1395,17 @@ msgid "Enter your new email address below."
 msgstr "Introdueix el teu nou correu a continuaciĂ³."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr "Introdueix el teu telèfon"
+#~ msgid "Enter your phone number"
+#~ msgstr "Introdueix el teu telèfon"
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "Introdueix el teu usuari i contrasenya"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "Error:"
@@ -1496,7 +1502,7 @@ msgstr "Canal fora de lĂ­nia"
 msgid "Feed Preferences"
 msgstr "Preferències del canal"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "Comentaris"
@@ -1667,7 +1673,7 @@ msgstr "He oblidat la contrasenya"
 msgid "Forgot Password"
 msgstr "He oblidat la contrasenya"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr "De <0/>"
@@ -1717,11 +1723,11 @@ msgstr "Ves al segĂ¼ent"
 msgid "Handle"
 msgstr "Identificador"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr "Tens problemes?"
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "Ajuda"
@@ -1811,7 +1817,7 @@ msgstr "Inici"
 msgid "Home Feed Preferences"
 msgstr "Preferències dels canals a l'inici"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "ProveĂ¯dor d'allotjament"
@@ -1870,11 +1876,11 @@ msgstr "Introdueix el codi que s'ha enviat al teu correu per restablir la contra
 msgid "Input confirmation code for account deletion"
 msgstr "Introdueix el codi de confirmaciĂ³ per eliminar el compte"
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr "Introdueix el correu del compte de Bluesky"
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr "Introdueix el codi d'invitaciĂ³ per continuar"
 
@@ -1891,8 +1897,8 @@ msgid "Input password for account deletion"
 msgstr "Introdueix la contrasenya per elimiar el compte"
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr "Introdueix el telèfon per la verificaciĂ³ per SMS"
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr "Introdueix el telèfon per la verificaciĂ³ per SMS"
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1903,8 +1909,8 @@ msgid "Input the username or email address you used at signup"
 msgstr "Introdueix el nom d'usuari o correu que vas utilitzar per registrar-te"
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr "Introdueix el codi de verificaciĂ³ que t'hem enviat"
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr "Introdueix el codi de verificaciĂ³ que t'hem enviat"
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1914,11 +1920,11 @@ msgstr "Introdueix el teu correu per afegir-te a la llista d'espera de Bluesky"
 msgid "Input your password"
 msgstr "Introdueix la teva contrasenya"
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr "Introdueix el teu identificador d'usuari"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr "Registre de publicaciĂ³ no vĂ lid o no admès"
 
@@ -1934,12 +1940,12 @@ msgstr "Nom d'usuari o contrasenya incorrectes"
 msgid "Invite a Friend"
 msgstr "Convida un amic"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "Codi d'invitaciĂ³"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "Codi d'invitaciĂ³ rebutjat. Comprova que l'has entrat correctament i torna-ho a provar."
 
@@ -1968,8 +1974,8 @@ msgstr "Feines"
 msgid "Join the waitlist"
 msgstr "Uneix-te a la llista d'espera"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "Uneix-te a la llista d'espera."
 
@@ -2100,7 +2106,7 @@ msgstr "li ha agradat la teva publicaciĂ³"
 msgid "Likes"
 msgstr "M'agrades"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr "M'agrades a aquesta publicaciĂ³"
 
@@ -2148,8 +2154,8 @@ msgstr "Llista no silenciada"
 msgid "Lists"
 msgstr "Llistes"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "Carrega més publicacions"
 
@@ -2157,7 +2163,7 @@ msgstr "Carrega més publicacions"
 msgid "Load new notifications"
 msgstr "Carrega noves notificacions"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2415,7 +2421,7 @@ msgstr "Nova contrasenya"
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr "Nova publicaciĂ³"
@@ -2451,7 +2457,7 @@ msgstr "Les respostes més noves primer"
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2727,8 +2733,8 @@ msgstr "PĂ gina no trobada"
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2764,8 +2770,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr "Telèfon"
+#~ msgid "Phone number"
+#~ msgstr "Telèfon"
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2793,14 +2799,18 @@ msgstr "Reprodueix el vĂ­deo"
 msgid "Plays the GIF"
 msgstr "Reprodueix el GIF"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "Tria el teu identificador."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "Tria la teva contrasenya."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "Confirma el teu correu abans de canviar-lo. Aquest és un requisit temporal mentre no s'afegeixin eines per actualitzar el correu. Aviat no serà necessari,"
@@ -2810,22 +2820,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr "Introdueix un nom per a la contrasenya de la vostra aplicaciĂ³. No es permeten tot en espais."
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr "Introdueix un telèfon que pugui rebre missatges SMS"
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr "Introdueix un telèfon que pugui rebre missatges SMS"
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "Introdueix un nom Ăºnic per aquesta contrasenya d'aplicaciĂ³ o fes servir un nom generat aleatĂ²riament."
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr "Introdueix el codi que has rebut per SMS"
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr "Introdueix el codi que has rebut per SMS"
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr "Introdueix el codi de verificaciĂ³ enviat a {phoneNumberFormatted}"
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr "Introdueix el codi de verificaciĂ³ enviat a {phoneNumberFormatted}"
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "Introdueix el teu correu."
 
@@ -2863,7 +2873,7 @@ msgctxt "action"
 msgid "Post"
 msgstr "Publica"
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "PublicaciĂ³"
@@ -2874,7 +2884,7 @@ msgstr "PublicaciĂ³"
 #~ msgid "Post"
 #~ msgstr "PublicaciĂ³"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr "PublicaciĂ³ per {0}"
 
@@ -2888,7 +2898,7 @@ msgstr "PublicaciĂ³ per @{0}"
 msgid "Post deleted"
 msgstr "PublicaciĂ³ eliminada"
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "PublicaciĂ³ oculta"
 
@@ -2900,7 +2910,7 @@ msgstr "Idioma de la publicaciĂ³"
 msgid "Post Languages"
 msgstr "Idiomes de les publicacions"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "PublicaciĂ³ no trobada"
 
@@ -2929,7 +2939,7 @@ msgid "Prioritize Your Follows"
 msgstr "Prioritza els usuaris que segueixes"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "Privacitat"
 
@@ -3095,7 +3105,7 @@ msgid "Reply Filters"
 msgstr "Filtres de resposta"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr "Resposta a <0/>"
@@ -3146,7 +3156,7 @@ msgstr "Republica o cita la publicaciĂ³"
 msgid "Reposted By"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr ""
 
@@ -3154,7 +3164,7 @@ msgstr ""
 #~ msgid "Reposted by {0})"
 #~ msgstr "Republicada per {0}"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "Republicada per <0/>"
 
@@ -3162,7 +3172,7 @@ msgstr "Republicada per <0/>"
 msgid "reposted your post"
 msgstr "ha republicat la teva publicaciĂ³"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr "Republicacions d'aquesta publicaciĂ³"
 
@@ -3172,8 +3182,8 @@ msgid "Request Change"
 msgstr "Demana un canvi"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr "Demana un codi"
+#~ msgid "Request code"
+#~ msgstr "Demana un codi"
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3184,7 +3194,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr "Requereix un text alternatiu abans de publicar"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "Requerit per aquest proveĂ¯dor"
 
@@ -3236,9 +3246,8 @@ msgstr "Torna a intentar l'Ăºltima acciĂ³, que ha donat error"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3247,16 +3256,16 @@ msgid "Retry"
 msgstr "Torna-ho a provar"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr "Torna-ho a provar"
+#~ msgid "Retry."
+#~ msgstr "Torna-ho a provar"
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr "Torna a la pĂ gina anterior"
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr "ENTORN DE PROVES. Les publicacions i els comptes no sĂ³n permanents."
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr "ENTORN DE PROVES. Les publicacions i els comptes no sĂ³n permanents."
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3365,7 +3374,7 @@ msgstr "Selecciona d'un compte existent"
 msgid "Select option {i} of {numItems}"
 msgstr "Selecciona l'opciĂ³ {i} de {numItems}"
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "Selecciona el servei"
@@ -3399,8 +3408,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr "Selecciona el país del teu telèfon"
+#~ msgid "Select your phone's country"
+#~ msgstr "Selecciona el país del teu telèfon"
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3483,7 +3492,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "Estableix una nova contrasenya"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr "Estableix una contrasenya"
 
@@ -3523,7 +3532,7 @@ msgstr "Estableix un correu per restablir la contrasenya"
 msgid "Sets hosting provider for password reset"
 msgstr "Estableix un proveĂ¯dor d'allotjament per restablir la contrasenya"
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr "Estableix el servidor pel cient de Bluesky"
@@ -3579,9 +3588,9 @@ msgstr "Mostra els incrustats de {0}"
 msgid "Show follows similar to {0}"
 msgstr "Mostra seguidors semblants a {0}"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr "Mostra més"
 
@@ -3734,8 +3743,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr "VerificaciĂ³ per SMS"
+#~ msgid "SMS verification"
+#~ msgstr "VerificaciĂ³ per SMS"
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3863,7 +3872,7 @@ msgstr "Toca per veure-ho completament"
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "Condicions"
 
@@ -3879,6 +3888,10 @@ msgstr "Condicions del servei"
 msgid "Text input field"
 msgstr "Camp d'introducciĂ³ de text"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "El compte podrà interactuar amb tu després del desbloqueig."
@@ -3895,7 +3908,7 @@ msgstr "La polĂ­tica de drets d'autoria ha estat traslladada a <0/>"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "És possible que la publicaciĂ³ s'hagi esborrat."
 
@@ -4000,8 +4013,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr "Aquest telèfon és erroni. Tria el teu país i introdueix el teu telèfon complert"
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr "Aquest telèfon és erroni. Tria el teu país i introdueix el teu telèfon complert"
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4121,8 +4134,8 @@ msgstr "Commuta el menĂº desplegable"
 msgid "Transformations"
 msgstr "Transformacions"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "Tradueix"
@@ -4144,7 +4157,7 @@ msgstr "Desbloqueja la llista"
 msgid "Un-mute list"
 msgstr "Deixa de silenciar la llista"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4183,7 +4196,7 @@ msgstr "Deixa de seguir"
 msgid "Unfollow {0}"
 msgstr "Deixa de seguir a {0}"
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "No compleixes les condicions per crear un compte."
 
@@ -4275,7 +4288,7 @@ msgstr "Usuari bloquejat per una llista"
 msgid "User Blocks You"
 msgstr "L'usuari t'ha bloquejat"
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "Identificador d'usuari"
 
@@ -4324,8 +4337,8 @@ msgid "Users in \"{0}\""
 msgstr "Usuaris a \"{0}\""
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr "Codi de verificaciĂ³"
+#~ msgid "Verification code"
+#~ msgstr "Codi de verificaciĂ³"
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4417,7 +4430,7 @@ msgstr "Analitzarem la teva apel·laciĂ³ rĂ pidament."
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "Ens fa molta il·lusiĂ³ que t'uneixis a nosaltres!"
 
@@ -4484,8 +4497,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr "XXXXXX"
+#~ msgid "XXXXXX"
+#~ msgstr "XXXXXX"
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4535,7 +4548,7 @@ msgstr "No tens cap canal desat!"
 msgid "You don't have any saved feeds."
 msgstr "No tens cap canal desat."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "Has bloquejat l'autor o has estat bloquejat per ell."
 
@@ -4625,7 +4638,7 @@ msgstr "El teu compte s'ha eliminat"
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "La teva data de naixement"
 
@@ -4637,7 +4650,7 @@ msgstr "La teva elecciĂ³ es desarĂ , perĂ² es pot canviar mĂ©s endavant a la con
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4659,7 +4672,7 @@ msgstr "El teu correu encara no s'ha verificat. Et recomanem fer-ho per segureta
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr "El teu canal de seguint està buit! Segueix a més usuaris per saber què està passant."
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "El teu identificador complet serĂ "
 
@@ -4700,6 +4713,6 @@ msgstr "El teu perfil"
 msgid "Your reply has been published"
 msgstr "S'ha publicat a teva resposta"
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "El teu identificador d'usuari"
diff --git a/src/locale/locales/de/messages.po b/src/locale/locales/de/messages.po
index 6e1b8e03b..a961f738d 100644
--- a/src/locale/locales/de/messages.po
+++ b/src/locale/locales/de/messages.po
@@ -347,21 +347,21 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr "KĂ¼nstlerische oder nicht-erotische Nacktheit."
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "ZurĂ¼ck"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr ""
@@ -374,7 +374,7 @@ msgstr ""
 msgid "Basics"
 msgstr "Grundlagen"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "Geburtstag"
@@ -426,7 +426,7 @@ msgstr "Blockierte Konten können nicht in deinen Threads antworten, dich erwäh
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "Blockierte Konten können nicht in deinen Threads antworten, dich erwähnen oder anderweitig mit dir interagieren. Du wirst ihre Inhalte nicht sehen und sie werden daran gehindert, deine zu sehen."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "Gesperrter Beitrag."
 
@@ -663,7 +663,7 @@ msgstr ""
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "Wähle dein Passwort"
 
@@ -764,6 +764,10 @@ msgstr "Community-Richtlinien"
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr ""
@@ -819,12 +823,12 @@ msgstr "Bestätigungscode"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr ""
 
@@ -936,8 +940,8 @@ msgid "Could not load list"
 msgstr "Liste konnte nicht geladen werden"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr ""
+#~ msgid "Country"
+#~ msgstr ""
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -949,7 +953,7 @@ msgstr "Ein neues Konto erstellen"
 msgid "Create a new Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "Konto erstellen"
 
@@ -1063,7 +1067,7 @@ msgstr "Diesen Beitrag löschen?"
 msgid "Deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "Gelöschter Beitrag."
 
@@ -1123,7 +1127,7 @@ msgstr "Anzeigename"
 msgid "Domain verified!"
 msgstr "Domain verifiziert!"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr ""
 
@@ -1265,16 +1269,14 @@ msgstr ""
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "E-Mail"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "E-Mail-Adresse"
@@ -1345,7 +1347,7 @@ msgstr "Gib die Domain ein, die du verwenden möchtest"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "Gib die E-Mail ein, die du zur Erstellung deines Kontos verwendet hast. Wir schicken dir einen \"Reset-Code\", damit du ein neues Passwort festlegen kannst."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr ""
@@ -1354,7 +1356,7 @@ msgstr ""
 msgid "Enter your email"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "Gib deine E-Mail-Adresse ein"
 
@@ -1367,13 +1369,17 @@ msgid "Enter your new email address below."
 msgstr "Gib unten deine neue E-Mail-Adresse ein."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr ""
+#~ msgid "Enter your phone number"
+#~ msgstr ""
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "Gib deinen Benutzernamen und dein Passwort ein"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "Fehler:"
@@ -1470,7 +1476,7 @@ msgstr "Feed offline"
 msgid "Feed Preferences"
 msgstr "Feed-Einstellungen"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "Feedback"
@@ -1645,7 +1651,7 @@ msgstr "Passwort vergessen"
 msgid "Forgot Password"
 msgstr "Passwort vergessen"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr ""
@@ -1695,11 +1701,11 @@ msgstr "Gehe zum nächsten"
 msgid "Handle"
 msgstr "Handle"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "Hilfe"
@@ -1789,7 +1795,7 @@ msgstr "Home"
 msgid "Home Feed Preferences"
 msgstr "Home-Feed-Einstellungen"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "Hosting-Anbieter"
@@ -1843,11 +1849,11 @@ msgstr ""
 msgid "Input confirmation code for account deletion"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr ""
 
@@ -1864,8 +1870,8 @@ msgid "Input password for account deletion"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr ""
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr ""
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1876,8 +1882,8 @@ msgid "Input the username or email address you used at signup"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr ""
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr ""
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1887,11 +1893,11 @@ msgstr ""
 msgid "Input your password"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr ""
 
@@ -1907,12 +1913,12 @@ msgstr "UngĂ¼ltiger Benutzername oder Passwort"
 msgid "Invite a Friend"
 msgstr "Einen Freund einladen"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "Einladungscode"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "Einladungscode nicht akzeptiert. ĂœberprĂ¼fe, ob du ihn richtig eingegeben hast und versuche es erneut."
 
@@ -1941,8 +1947,8 @@ msgstr "Jobs"
 msgid "Join the waitlist"
 msgstr "Der Warteliste beitreten"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "Der Warteliste beitreten."
 
@@ -2069,7 +2075,7 @@ msgstr ""
 msgid "Likes"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr ""
 
@@ -2117,8 +2123,8 @@ msgstr ""
 msgid "Lists"
 msgstr "Listen"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "Mehr Beiträge laden"
 
@@ -2126,7 +2132,7 @@ msgstr "Mehr Beiträge laden"
 msgid "Load new notifications"
 msgstr "Neue Benachrichtigungen laden"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2377,7 +2383,7 @@ msgstr ""
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr ""
@@ -2409,7 +2415,7 @@ msgstr ""
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2685,8 +2691,8 @@ msgstr "Seite nicht gefunden"
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2722,8 +2728,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr ""
+#~ msgid "Phone number"
+#~ msgstr ""
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2751,14 +2757,18 @@ msgstr ""
 msgid "Plays the GIF"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "Bitte wähle deinen Handle."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "Bitte wähle dein Passwort."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "Bitte bestätige deine E-Mail, bevor du sie änderst. Dies ist eine vorĂ¼bergehende Anforderung, während E-Mail-Aktualisierungstools hinzugefĂ¼gt werden, und wird bald wieder entfernt."
@@ -2768,22 +2778,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr ""
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr ""
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr ""
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr ""
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr ""
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr ""
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "Bitte gib deine E-Mail ein."
 
@@ -2818,12 +2828,12 @@ msgctxt "action"
 msgid "Post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "Beitrag"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr ""
 
@@ -2837,7 +2847,7 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "Beitrag ausgeblendet"
 
@@ -2849,7 +2859,7 @@ msgstr "Beitragssprache"
 msgid "Post Languages"
 msgstr "Beitragssprachen"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "Beitrag nicht gefunden"
 
@@ -2878,7 +2888,7 @@ msgid "Prioritize Your Follows"
 msgstr "Priorisiere deine Follower"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "Privatsphäre"
 
@@ -3040,7 +3050,7 @@ msgid "Reply Filters"
 msgstr "Antwortfilter"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr ""
@@ -3087,11 +3097,11 @@ msgstr ""
 msgid "Reposted By"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr ""
 
@@ -3099,7 +3109,7 @@ msgstr ""
 msgid "reposted your post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr ""
 
@@ -3109,8 +3119,8 @@ msgid "Request Change"
 msgstr "Änderung anfordern"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr ""
+#~ msgid "Request code"
+#~ msgstr ""
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3121,7 +3131,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "FĂ¼r diesen Anbieter erforderlich"
 
@@ -3173,9 +3183,8 @@ msgstr ""
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3184,16 +3193,16 @@ msgid "Retry"
 msgstr "Wiederholen"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr ""
+#~ msgid "Retry."
+#~ msgstr ""
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr ""
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr ""
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr ""
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3302,7 +3311,7 @@ msgstr "Von einem bestehenden Konto auswählen"
 msgid "Select option {i} of {numItems}"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "Service auswählen"
@@ -3340,8 +3349,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr ""
+#~ msgid "Select your phone's country"
+#~ msgstr ""
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3420,7 +3429,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "Neues Passwort festlegen"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr ""
 
@@ -3460,7 +3469,7 @@ msgstr ""
 msgid "Sets hosting provider for password reset"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr ""
@@ -3516,9 +3525,9 @@ msgstr ""
 msgid "Show follows similar to {0}"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr ""
 
@@ -3671,8 +3680,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr ""
+#~ msgid "SMS verification"
+#~ msgstr ""
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3800,7 +3809,7 @@ msgstr ""
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "Bedingungen"
 
@@ -3816,6 +3825,10 @@ msgstr "Nutzungsbedingungen"
 msgid "Text input field"
 msgstr "Text-Eingabefeld"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr ""
@@ -3832,7 +3845,7 @@ msgstr ""
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "Möglicherweise wurde der Post gelöscht."
 
@@ -3933,8 +3946,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr ""
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr ""
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4047,8 +4060,8 @@ msgstr ""
 msgid "Transformations"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "Ăœbersetzen"
@@ -4066,7 +4079,7 @@ msgstr ""
 msgid "Un-mute list"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4105,7 +4118,7 @@ msgstr ""
 msgid "Unfollow {0}"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "Leider erfĂ¼llst du nicht die Voraussetzungen, um einen Account zu erstellen."
 
@@ -4197,7 +4210,7 @@ msgstr ""
 msgid "User Blocks You"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "Benutzerhandle"
 
@@ -4246,8 +4259,8 @@ msgid "Users in \"{0}\""
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr ""
+#~ msgid "Verification code"
+#~ msgstr ""
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4343,7 +4356,7 @@ msgstr ""
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "Wir freuen uns sehr, dass du dabei bist!"
 
@@ -4407,8 +4420,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr ""
+#~ msgid "XXXXXX"
+#~ msgstr ""
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4462,7 +4475,7 @@ msgstr "Du hast keine gespeicherten Feeds!"
 msgid "You don't have any saved feeds."
 msgstr "Du hast keine gespeicherten Feeds."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "Du hast den Verfasser blockiert oder du wurdest vom Verfasser blockiert."
 
@@ -4552,7 +4565,7 @@ msgstr ""
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "Dein Geburtsdatum"
 
@@ -4564,7 +4577,7 @@ msgstr ""
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4586,7 +4599,7 @@ msgstr "Deine E-Mail wurde noch nicht bestätigt. Dies ist ein wichtiger Sicherh
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr ""
 
@@ -4623,6 +4636,6 @@ msgstr "Dein Profil"
 msgid "Your reply has been published"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "Dein Benutzerhandle"
diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po
index 85115f687..4065910ee 100644
--- a/src/locale/locales/en/messages.po
+++ b/src/locale/locales/en/messages.po
@@ -347,21 +347,21 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr ""
@@ -374,7 +374,7 @@ msgstr ""
 msgid "Basics"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr ""
@@ -426,7 +426,7 @@ msgstr ""
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr ""
 
@@ -663,7 +663,7 @@ msgstr ""
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr ""
 
@@ -764,6 +764,10 @@ msgstr ""
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr ""
@@ -819,12 +823,12 @@ msgstr ""
 msgid "Confirms signing up {email} to the waitlist"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr ""
 
@@ -936,8 +940,8 @@ msgid "Could not load list"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr ""
+#~ msgid "Country"
+#~ msgstr ""
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -949,7 +953,7 @@ msgstr ""
 msgid "Create a new Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr ""
 
@@ -1063,7 +1067,7 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr ""
 
@@ -1123,7 +1127,7 @@ msgstr ""
 msgid "Domain verified!"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr ""
 
@@ -1265,16 +1269,14 @@ msgstr ""
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr ""
@@ -1345,7 +1347,7 @@ msgstr ""
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr ""
@@ -1354,7 +1356,7 @@ msgstr ""
 msgid "Enter your email"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr ""
 
@@ -1367,13 +1369,17 @@ msgid "Enter your new email address below."
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr ""
+#~ msgid "Enter your phone number"
+#~ msgstr ""
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr ""
@@ -1470,7 +1476,7 @@ msgstr ""
 msgid "Feed Preferences"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr ""
@@ -1645,7 +1651,7 @@ msgstr ""
 msgid "Forgot Password"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr ""
@@ -1695,11 +1701,11 @@ msgstr ""
 msgid "Handle"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr ""
@@ -1789,7 +1795,7 @@ msgstr ""
 msgid "Home Feed Preferences"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr ""
@@ -1843,11 +1849,11 @@ msgstr ""
 msgid "Input confirmation code for account deletion"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr ""
 
@@ -1864,8 +1870,8 @@ msgid "Input password for account deletion"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr ""
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr ""
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1876,8 +1882,8 @@ msgid "Input the username or email address you used at signup"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr ""
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr ""
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1887,11 +1893,11 @@ msgstr ""
 msgid "Input your password"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr ""
 
@@ -1907,12 +1913,12 @@ msgstr ""
 msgid "Invite a Friend"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr ""
 
@@ -1941,8 +1947,8 @@ msgstr ""
 msgid "Join the waitlist"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr ""
 
@@ -2069,7 +2075,7 @@ msgstr ""
 msgid "Likes"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr ""
 
@@ -2117,8 +2123,8 @@ msgstr ""
 msgid "Lists"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr ""
 
@@ -2126,7 +2132,7 @@ msgstr ""
 msgid "Load new notifications"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2377,7 +2383,7 @@ msgstr ""
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr ""
@@ -2409,7 +2415,7 @@ msgstr ""
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2685,8 +2691,8 @@ msgstr ""
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2722,8 +2728,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr ""
+#~ msgid "Phone number"
+#~ msgstr ""
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2751,14 +2757,18 @@ msgstr ""
 msgid "Plays the GIF"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr ""
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr ""
@@ -2768,22 +2778,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr ""
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr ""
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr ""
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr ""
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr ""
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr ""
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr ""
 
@@ -2823,12 +2833,12 @@ msgctxt "action"
 msgid "Post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr ""
 
@@ -2842,7 +2852,7 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr ""
 
@@ -2854,7 +2864,7 @@ msgstr ""
 msgid "Post Languages"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr ""
 
@@ -2883,7 +2893,7 @@ msgid "Prioritize Your Follows"
 msgstr ""
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr ""
 
@@ -3045,7 +3055,7 @@ msgid "Reply Filters"
 msgstr ""
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr ""
@@ -3092,11 +3102,11 @@ msgstr ""
 msgid "Reposted By"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr ""
 
@@ -3104,7 +3114,7 @@ msgstr ""
 msgid "reposted your post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr ""
 
@@ -3114,8 +3124,8 @@ msgid "Request Change"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr ""
+#~ msgid "Request code"
+#~ msgstr ""
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3126,7 +3136,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr ""
 
@@ -3178,9 +3188,8 @@ msgstr ""
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3189,16 +3198,16 @@ msgid "Retry"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr ""
+#~ msgid "Retry."
+#~ msgstr ""
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr ""
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr ""
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr ""
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3307,7 +3316,7 @@ msgstr ""
 msgid "Select option {i} of {numItems}"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr ""
@@ -3345,8 +3354,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr ""
+#~ msgid "Select your phone's country"
+#~ msgstr ""
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3425,7 +3434,7 @@ msgstr ""
 msgid "Set new password"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr ""
 
@@ -3465,7 +3474,7 @@ msgstr ""
 msgid "Sets hosting provider for password reset"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr ""
@@ -3521,9 +3530,9 @@ msgstr ""
 msgid "Show follows similar to {0}"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr ""
 
@@ -3676,8 +3685,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr ""
+#~ msgid "SMS verification"
+#~ msgstr ""
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3805,7 +3814,7 @@ msgstr ""
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr ""
 
@@ -3821,6 +3830,10 @@ msgstr ""
 msgid "Text input field"
 msgstr ""
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr ""
@@ -3837,7 +3850,7 @@ msgstr ""
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr ""
 
@@ -3938,8 +3951,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr ""
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr ""
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4052,8 +4065,8 @@ msgstr ""
 msgid "Transformations"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr ""
@@ -4071,7 +4084,7 @@ msgstr ""
 msgid "Un-mute list"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4110,7 +4123,7 @@ msgstr ""
 msgid "Unfollow {0}"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr ""
 
@@ -4202,7 +4215,7 @@ msgstr ""
 msgid "User Blocks You"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr ""
 
@@ -4251,8 +4264,8 @@ msgid "Users in \"{0}\""
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr ""
+#~ msgid "Verification code"
+#~ msgstr ""
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4348,7 +4361,7 @@ msgstr ""
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr ""
 
@@ -4412,8 +4425,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr ""
+#~ msgid "XXXXXX"
+#~ msgstr ""
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4467,7 +4480,7 @@ msgstr ""
 msgid "You don't have any saved feeds."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr ""
 
@@ -4557,7 +4570,7 @@ msgstr ""
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr ""
 
@@ -4569,7 +4582,7 @@ msgstr ""
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4591,7 +4604,7 @@ msgstr ""
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr ""
 
@@ -4628,6 +4641,6 @@ msgstr ""
 msgid "Your reply has been published"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr ""
diff --git a/src/locale/locales/es/messages.po b/src/locale/locales/es/messages.po
index 6d57d69b7..1190d52eb 100644
--- a/src/locale/locales/es/messages.po
+++ b/src/locale/locales/es/messages.po
@@ -347,21 +347,21 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr "Desnudez artĂ­stica o no erĂ³tica."
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "Regresar"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr ""
@@ -374,7 +374,7 @@ msgstr ""
 msgid "Basics"
 msgstr "Conceptos bĂ¡sicos"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "Cumpleaños"
@@ -426,7 +426,7 @@ msgstr "Las cuentas bloqueadas no pueden responder en tus hilos, mencionarte ni
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "Las cuentas bloqueadas no pueden responder en tus hilos, mencionarte ni interactuar contigo de ninguna otra forma. TĂº no verĂ¡s su contenido y ellos no podrĂ¡n ver el tuyo."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "PublicaciĂ³n bloqueada."
 
@@ -663,7 +663,7 @@ msgstr "Elige los algoritmos que potencian tu experiencia con publicaciones pers
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "Elige tu contraseña"
 
@@ -764,6 +764,10 @@ msgstr "Directrices de la comunidad"
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr ""
@@ -819,12 +823,12 @@ msgstr "CĂ³digo de confirmaciĂ³n"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr ""
 
@@ -936,8 +940,8 @@ msgid "Could not load list"
 msgstr "No se ha podido cargar la lista"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr ""
+#~ msgid "Country"
+#~ msgstr ""
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -949,7 +953,7 @@ msgstr "Crear una cuenta nueva"
 msgid "Create a new Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "Crear una cuenta"
 
@@ -1063,7 +1067,7 @@ msgstr "¿Borrar esta publicaciĂ³n?"
 msgid "Deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "Se borrĂ³ la publicaciĂ³n."
 
@@ -1123,7 +1127,7 @@ msgstr "Mostrar el nombre"
 msgid "Domain verified!"
 msgstr "¡Dominio verificado!"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr ""
 
@@ -1265,16 +1269,14 @@ msgstr ""
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "Correo electrĂ³nico"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "DirecciĂ³n de correo electrĂ³nico"
@@ -1345,7 +1347,7 @@ msgstr "Introduce el dominio que quieres utilizar"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "Introduce el correo electrĂ³nico que utilizaste para crear tu cuenta. Te enviaremos un \"cĂ³digo de restablecimiento\" para que puedas establecer una nueva contraseña."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr ""
@@ -1354,7 +1356,7 @@ msgstr ""
 msgid "Enter your email"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "Introduce la direcciĂ³n de correo electrĂ³nico"
 
@@ -1367,13 +1369,17 @@ msgid "Enter your new email address below."
 msgstr "Introduce tu nueva direcciĂ³n de correo electrĂ³nico a continuaciĂ³n."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr ""
+#~ msgid "Enter your phone number"
+#~ msgstr ""
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "Introduce tu nombre de usuario y contraseña"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "Error:"
@@ -1470,7 +1476,7 @@ msgstr "Noticias fuera de lĂ­nea"
 msgid "Feed Preferences"
 msgstr "Preferencias de noticias"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "Comentarios"
@@ -1645,7 +1651,7 @@ msgstr "Olvidé mi contraseña"
 msgid "Forgot Password"
 msgstr "Olvidé mi contraseña"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr ""
@@ -1695,11 +1701,11 @@ msgstr "Ir al siguiente"
 msgid "Handle"
 msgstr "Identificador"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "Ayuda"
@@ -1789,7 +1795,7 @@ msgstr "PĂ¡gina inicial"
 msgid "Home Feed Preferences"
 msgstr "Preferencias de noticias de la pĂ¡gina inicial"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "Proveedor de alojamiento"
@@ -1843,11 +1849,11 @@ msgstr ""
 msgid "Input confirmation code for account deletion"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr ""
 
@@ -1864,8 +1870,8 @@ msgid "Input password for account deletion"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr ""
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr ""
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1876,8 +1882,8 @@ msgid "Input the username or email address you used at signup"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr ""
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr ""
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1887,11 +1893,11 @@ msgstr ""
 msgid "Input your password"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr ""
 
@@ -1907,12 +1913,12 @@ msgstr "Nombre de usuario o contraseña no vĂ¡lidos"
 msgid "Invite a Friend"
 msgstr "Invitar a un amigo"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "CĂ³digo de invitaciĂ³n"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "No se acepta el cĂ³digo de invitaciĂ³n. Comprueba que lo has introducido correctamente e intĂ©ntalo de nuevo."
 
@@ -1941,8 +1947,8 @@ msgstr "Tareas"
 msgid "Join the waitlist"
 msgstr "Ănete a la lista de espera"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "Ănete a la lista de espera."
 
@@ -2069,7 +2075,7 @@ msgstr ""
 msgid "Likes"
 msgstr "Cantidad de «Me gusta»"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr ""
 
@@ -2117,8 +2123,8 @@ msgstr ""
 msgid "Lists"
 msgstr "Listas"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "Cargar mĂ¡s publicaciones"
 
@@ -2126,7 +2132,7 @@ msgstr "Cargar mĂ¡s publicaciones"
 msgid "Load new notifications"
 msgstr "Cargar notificaciones nuevas"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2377,7 +2383,7 @@ msgstr ""
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr ""
@@ -2409,7 +2415,7 @@ msgstr ""
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2685,8 +2691,8 @@ msgstr "PĂ¡gina no encontrada"
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2722,8 +2728,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr ""
+#~ msgid "Phone number"
+#~ msgstr ""
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2751,14 +2757,18 @@ msgstr ""
 msgid "Plays the GIF"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "Por favor, elige tu identificador."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "Por favor, elige tu contraseña."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "Por favor, confirma tu correo electrĂ³nico antes de cambiarlo. Se trata de un requisito temporal mientras se añaden herramientas de actualizaciĂ³n de correo electrĂ³nico, y pronto se eliminarĂ¡."
@@ -2768,22 +2778,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr ""
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr ""
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "Introduce un nombre Ăºnico para la contraseña de esta app o utiliza una generada aleatoriamente."
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr ""
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr ""
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr ""
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "Introduce tu correo electrĂ³nico."
 
@@ -2818,12 +2828,12 @@ msgctxt "action"
 msgid "Post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "PublicaciĂ³n"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr ""
 
@@ -2837,7 +2847,7 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "PublicaciĂ³n oculta"
 
@@ -2849,7 +2859,7 @@ msgstr "Lenguaje de la publicaciĂ³n"
 msgid "Post Languages"
 msgstr "Lenguajes de la publicaciĂ³n"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "PublicaciĂ³n no encontrada"
 
@@ -2878,7 +2888,7 @@ msgid "Prioritize Your Follows"
 msgstr "Priorizar los usuarios a los que sigue"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -3040,7 +3050,7 @@ msgid "Reply Filters"
 msgstr "Filtros de respuestas"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr ""
@@ -3087,11 +3097,11 @@ msgstr "Volver a publicar o citar publicaciĂ³n"
 msgid "Reposted By"
 msgstr "Vuelto a publicar por"
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr "Vuelto a publicar por {0}"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "Vuelto a publicar por <0/>"
 
@@ -3099,7 +3109,7 @@ msgstr "Vuelto a publicar por <0/>"
 msgid "reposted your post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr ""
 
@@ -3109,8 +3119,8 @@ msgid "Request Change"
 msgstr "Solicitar un cambio"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr ""
+#~ msgid "Request code"
+#~ msgstr ""
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3121,7 +3131,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "Requerido para este proveedor"
 
@@ -3173,9 +3183,8 @@ msgstr ""
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3184,16 +3193,16 @@ msgid "Retry"
 msgstr "Volver a intentar"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr ""
+#~ msgid "Retry."
+#~ msgstr ""
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr ""
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr ""
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr ""
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3302,7 +3311,7 @@ msgstr "Selecciona de una cuenta existente"
 msgid "Select option {i} of {numItems}"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "Selecciona el servicio"
@@ -3340,8 +3349,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr ""
+#~ msgid "Select your phone's country"
+#~ msgstr ""
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3420,7 +3429,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "Establecer la contraseña nueva"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr ""
 
@@ -3460,7 +3469,7 @@ msgstr ""
 msgid "Sets hosting provider for password reset"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr ""
@@ -3516,9 +3525,9 @@ msgstr ""
 msgid "Show follows similar to {0}"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr ""
 
@@ -3671,8 +3680,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr ""
+#~ msgid "SMS verification"
+#~ msgstr ""
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3800,7 +3809,7 @@ msgstr ""
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "Condiciones"
 
@@ -3816,6 +3825,10 @@ msgstr "Condiciones de servicio"
 msgid "Text input field"
 msgstr "Campo de introducciĂ³n de texto"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "La cuenta podrĂ¡ interactuar contigo tras el desbloqueo."
@@ -3832,7 +3845,7 @@ msgstr "La PolĂ­tica de derechos de autor se han trasladado a <0/>"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "Es posible que se haya borrado la publicaciĂ³n."
 
@@ -3933,8 +3946,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr ""
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr ""
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4047,8 +4060,8 @@ msgstr "Conmutar el menĂº desplegable"
 msgid "Transformations"
 msgstr "Transformaciones"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "Traducir"
@@ -4066,7 +4079,7 @@ msgstr "Desbloquear una lista"
 msgid "Un-mute list"
 msgstr "Desactivar la opciĂ³n de silenciar la lista"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4105,7 +4118,7 @@ msgstr ""
 msgid "Unfollow {0}"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "Lamentablemente, no cumples los requisitos para crear una cuenta."
 
@@ -4197,7 +4210,7 @@ msgstr ""
 msgid "User Blocks You"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "Identificador del usuario"
 
@@ -4246,8 +4259,8 @@ msgid "Users in \"{0}\""
 msgstr "Usuarios en «{0}»"
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr ""
+#~ msgid "Verification code"
+#~ msgstr ""
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4343,7 +4356,7 @@ msgstr ""
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "¡Nos hace mucha ilusiĂ³n que te unas a nosotros!"
 
@@ -4407,8 +4420,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr ""
+#~ msgid "XXXXXX"
+#~ msgstr ""
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4462,7 +4475,7 @@ msgstr "¡No tienes ninguna noticia guardada!"
 msgid "You don't have any saved feeds."
 msgstr "No tienes ninguna noticia guardada."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "Has bloqueado al autor o has sido bloqueado por el autor."
 
@@ -4552,7 +4565,7 @@ msgstr ""
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "Tu fecha de nacimiento"
 
@@ -4564,7 +4577,7 @@ msgstr ""
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4586,7 +4599,7 @@ msgstr "Tu correo electrĂ³nico aĂºn no ha sido verificado. Este es un paso de se
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "Tu identificador completo serĂ¡"
 
@@ -4623,6 +4636,6 @@ msgstr "Tu perfil"
 msgid "Your reply has been published"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "Tu identificador del usuario"
diff --git a/src/locale/locales/fr/messages.po b/src/locale/locales/fr/messages.po
index 48172bf46..632fa6112 100644
--- a/src/locale/locales/fr/messages.po
+++ b/src/locale/locales/fr/messages.po
@@ -351,21 +351,21 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr "Nudité artistique ou non érotique."
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "Arrière"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr "Retour"
@@ -378,7 +378,7 @@ msgstr ""
 msgid "Basics"
 msgstr "Principes de base"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "Date de naissance"
@@ -430,7 +430,7 @@ msgstr "Les comptes bloqués ne peuvent pas répondre à vos discussions, vous m
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "Les comptes bloqués ne peuvent pas répondre à vos discussions, vous mentionner ou interagir avec vous. Vous ne verrez pas leur contenu et ils ne pourront pas voir le vôtre."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "Post bloqué."
 
@@ -667,7 +667,7 @@ msgstr "Choisissez les algorithmes qui alimentent votre expérience avec des fil
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "Choisissez votre mot de passe"
 
@@ -768,6 +768,10 @@ msgstr "Directives communautaires"
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr "Permet d’écrire des messages de {MAX_GRAPHEME_LENGTH} caractères maximum"
@@ -823,12 +827,12 @@ msgstr "Code de confirmation"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr "Confirme l’inscription de {email} sur la liste d’attente"
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "Connexion…"
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr ""
 
@@ -940,8 +944,8 @@ msgid "Could not load list"
 msgstr "Impossible de charger la liste"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr ""
+#~ msgid "Country"
+#~ msgstr ""
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -953,7 +957,7 @@ msgstr "Créer un nouveau compte"
 msgid "Create a new Bluesky account"
 msgstr "Créer un compte Bluesky"
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "Créer un compte"
 
@@ -1067,7 +1071,7 @@ msgstr "Supprimer ce post ?"
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "Post supprimé."
 
@@ -1127,7 +1131,7 @@ msgstr "Afficher le nom"
 msgid "Domain verified!"
 msgstr "Domaine vérifié !"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr "Pas de code d’invitation ?"
 
@@ -1269,16 +1273,14 @@ msgstr "Modifier votre description de profil"
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "E-mail"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "Adresse e-mail"
@@ -1349,7 +1351,7 @@ msgstr "Entrez le domaine que vous voulez utiliser"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "Saisissez l’e-mail que vous avez utilisé pour créer votre compte. Nous vous enverrons un « code de réinitialisation » afin changer votre mot de passe."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr "Saisissez votre date de naissance"
@@ -1358,7 +1360,7 @@ msgstr "Saisissez votre date de naissance"
 msgid "Enter your email"
 msgstr "Entrez votre e-mail"
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "Entrez votre e-mail"
 
@@ -1371,13 +1373,17 @@ msgid "Enter your new email address below."
 msgstr "Entrez votre nouvelle e-mail ci-dessous."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr ""
+#~ msgid "Enter your phone number"
+#~ msgstr ""
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "Entrez votre pseudo et votre mot de passe"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "Erreur :"
@@ -1474,7 +1480,7 @@ msgstr "Fil d’actu hors ligne"
 msgid "Feed Preferences"
 msgstr "Préférences en matière de fil d’actu"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "Feedback"
@@ -1649,7 +1655,7 @@ msgstr "Mot de passe oublié"
 msgid "Forgot Password"
 msgstr "Mot de passe oublié"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr "Tiré de <0/>"
@@ -1699,11 +1705,11 @@ msgstr "Aller Ă  la suite"
 msgid "Handle"
 msgstr "Pseudo"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "Aide"
@@ -1793,7 +1799,7 @@ msgstr "Accueil"
 msgid "Home Feed Preferences"
 msgstr "Préférences de fils d’actu de l’accueil"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "Hébergeur"
@@ -1847,11 +1853,11 @@ msgstr "Entrez le code envoyé à votre e-mail pour réinitialiser le mot de pas
 msgid "Input confirmation code for account deletion"
 msgstr "Entrez le code de confirmation pour supprimer le compte"
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr "Entrez le code d’invitation pour continuer"
 
@@ -1868,8 +1874,8 @@ msgid "Input password for account deletion"
 msgstr "Entrez le mot de passe pour la suppression du compte"
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr ""
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr ""
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1880,8 +1886,8 @@ msgid "Input the username or email address you used at signup"
 msgstr "Entrez le pseudo ou l’adresse e-mail que vous avez utilisé lors de l’inscription"
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr ""
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr ""
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1891,11 +1897,11 @@ msgstr "Entrez votre e-mail pour vous inscrire sur la liste d’attente de Blues
 msgid "Input your password"
 msgstr "Entrez votre mot de passe"
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr "Entrez votre pseudo"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr "Enregistrement de post invalide ou non pris en charge"
 
@@ -1911,12 +1917,12 @@ msgstr "Pseudo ou mot de passe incorrect"
 msgid "Invite a Friend"
 msgstr "Inviter un ami"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "Code d’invitation"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "Code d’invitation refusé. Vérifiez que vous l’avez saisi correctement et réessayez."
 
@@ -1945,8 +1951,8 @@ msgstr "Emplois"
 msgid "Join the waitlist"
 msgstr "S’inscrire sur la liste d’attente"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "S’inscrire sur la liste d’attente."
 
@@ -2073,7 +2079,7 @@ msgstr "liké votre post"
 msgid "Likes"
 msgstr "Likes"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr "Likes sur ce post"
 
@@ -2121,8 +2127,8 @@ msgstr "Liste démasquée"
 msgid "Lists"
 msgstr "Listes"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "Charger plus d’articles"
 
@@ -2130,7 +2136,7 @@ msgstr "Charger plus d’articles"
 msgid "Load new notifications"
 msgstr "Charger les nouvelles notifications"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2381,7 +2387,7 @@ msgstr "Nouveau mot de passe"
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr "Nouveau post"
@@ -2413,7 +2419,7 @@ msgstr "Réponses les plus récentes en premier"
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2689,8 +2695,8 @@ msgstr "Page introuvable"
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2726,8 +2732,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr ""
+#~ msgid "Phone number"
+#~ msgstr ""
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2755,14 +2761,18 @@ msgstr "Lire la vidéo"
 msgid "Plays the GIF"
 msgstr "Lit le GIF"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "Veuillez choisir votre pseudo."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "Veuillez choisir votre mot de passe."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "Veuillez confirmer votre e-mail avant de le modifier. Ceci est temporairement requis pendant que des outils de mise à jour d’e-mail sont ajoutés, cette étape ne sera bientôt plus nécessaire."
@@ -2772,22 +2782,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr "Veuillez entrer un nom pour votre mot de passe d’application. Les espaces ne sont pas autorisés."
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr ""
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr ""
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "Veuillez saisir un nom unique pour le mot de passe de l’application ou utiliser celui que nous avons généré de manière aléatoire."
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr ""
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr ""
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr ""
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "Veuillez entrer votre e-mail."
 
@@ -2822,12 +2832,12 @@ msgctxt "action"
 msgid "Post"
 msgstr "Poster"
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "Post"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr "Post de {0}"
 
@@ -2841,7 +2851,7 @@ msgstr "Post de @{0}"
 msgid "Post deleted"
 msgstr "Post supprimé"
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "Post caché"
 
@@ -2853,7 +2863,7 @@ msgstr "Langue du post"
 msgid "Post Languages"
 msgstr "Langues du post"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "Post introuvable"
 
@@ -2882,7 +2892,7 @@ msgid "Prioritize Your Follows"
 msgstr "Définissez des priorités de vos suivis"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "Vie privée"
 
@@ -3044,7 +3054,7 @@ msgid "Reply Filters"
 msgstr "Filtres de réponse"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr "Réponse à <0/>"
@@ -3091,11 +3101,11 @@ msgstr "Republier ou citer"
 msgid "Reposted By"
 msgstr "Republié par"
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr "Republié par {0}"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "Republié par <0/>"
 
@@ -3103,7 +3113,7 @@ msgstr "Republié par <0/>"
 msgid "reposted your post"
 msgstr "a republié votre post"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr "Reposts de ce post"
 
@@ -3113,8 +3123,8 @@ msgid "Request Change"
 msgstr "Demande de modification"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr ""
+#~ msgid "Request code"
+#~ msgstr ""
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3125,7 +3135,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr "Nécessiter un texte alt avant de publier"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "Obligatoire pour cet hébergeur"
 
@@ -3177,9 +3187,8 @@ msgstr "Réessaye la dernière action, qui a échoué"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3188,16 +3197,16 @@ msgid "Retry"
 msgstr "Réessayer"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr ""
+#~ msgid "Retry."
+#~ msgstr ""
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr "Retourne à la page précédente"
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr "SANDBOX. Les posts et les comptes ne sont pas permanents."
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr "SANDBOX. Les posts et les comptes ne sont pas permanents."
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3306,7 +3315,7 @@ msgstr "Sélectionner un compte existant"
 msgid "Select option {i} of {numItems}"
 msgstr "Sélectionne l’option {i} sur {numItems}"
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "Sélectionner un service"
@@ -3344,8 +3353,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr ""
+#~ msgid "Select your phone's country"
+#~ msgstr ""
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3424,7 +3433,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "Définir un nouveau mot de passe"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr "Définit le mot de passe"
 
@@ -3464,7 +3473,7 @@ msgstr "Définit l’e-mail pour la réinitialisation du mot de passe"
 msgid "Sets hosting provider for password reset"
 msgstr "Définit l’hébergeur pour la réinitialisation du mot de passe"
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr "Définit le serveur pour le client Bluesky"
@@ -3520,9 +3529,9 @@ msgstr "Afficher les intégrations de {0}"
 msgid "Show follows similar to {0}"
 msgstr "Afficher les suivis similaires Ă  {0}"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr "Voir plus"
 
@@ -3675,8 +3684,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr ""
+#~ msgid "SMS verification"
+#~ msgstr ""
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3804,7 +3813,7 @@ msgstr "Tapper pour voir en entier"
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "Conditions générales"
 
@@ -3820,6 +3829,10 @@ msgstr "Conditions d’utilisation"
 msgid "Text input field"
 msgstr "Champ de saisie de texte"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "Ce compte pourra interagir avec vous après le déblocage."
@@ -3836,7 +3849,7 @@ msgstr "Notre politique de droits d’auteur a été déplacée vers <0/>"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "Ce post a peut-Ăªtre Ă©tĂ© supprimĂ©."
 
@@ -3937,8 +3950,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr ""
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr ""
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4051,8 +4064,8 @@ msgstr "Activer le menu déroulant"
 msgid "Transformations"
 msgstr "Transformations"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "Traduire"
@@ -4070,7 +4083,7 @@ msgstr "Débloquer la liste"
 msgid "Un-mute list"
 msgstr "Réafficher cette liste"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4109,7 +4122,7 @@ msgstr "Se désabonner"
 msgid "Unfollow {0}"
 msgstr "Se désabonner de {0}"
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "Malheureusement, vous ne remplissez pas les conditions requises pour créer un compte."
 
@@ -4201,7 +4214,7 @@ msgstr "Compte bloqué par liste"
 msgid "User Blocks You"
 msgstr "Compte qui vous bloque"
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "Pseudo"
 
@@ -4250,8 +4263,8 @@ msgid "Users in \"{0}\""
 msgstr "Comptes dans « {0} »"
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr ""
+#~ msgid "Verification code"
+#~ msgstr ""
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4347,7 +4360,7 @@ msgstr "Nous examinerons votre appel rapidement."
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "Nous sommes ravis de vous accueillir !"
 
@@ -4411,8 +4424,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr ""
+#~ msgid "XXXXXX"
+#~ msgstr ""
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4466,7 +4479,7 @@ msgstr "Vous n’avez encore aucun fil enregistré !"
 msgid "You don't have any saved feeds."
 msgstr "Vous n’avez encore aucun fil enregistré."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "Vous avez bloqué cet auteur ou vous avez été bloqué par celui-ci."
 
@@ -4556,7 +4569,7 @@ msgstr "Votre compte a été supprimé"
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "Votre date de naissance"
 
@@ -4568,7 +4581,7 @@ msgstr ""
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4590,7 +4603,7 @@ msgstr "Votre e-mail n’a pas encore été vérifié. Il s’agit d’une mesur
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr "Votre fil d’actu des comptes suivis est vide ! Suivez plus de comptes pour voir ce qui se passe."
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "Votre nom complet sera"
 
@@ -4627,6 +4640,6 @@ msgstr "Votre profil"
 msgid "Your reply has been published"
 msgstr "Votre réponse a été publiée"
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "Votre pseudo"
diff --git a/src/locale/locales/hi/messages.po b/src/locale/locales/hi/messages.po
index 8b5653645..070add14f 100644
--- a/src/locale/locales/hi/messages.po
+++ b/src/locale/locales/hi/messages.po
@@ -351,21 +351,21 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr "कलातà¥à¤®à¤• या गैर-कामà¥à¤• नगà¥à¤¨à¤¤à¤¾à¥¤à¥¤"
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "वापस"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr ""
@@ -378,7 +378,7 @@ msgstr ""
 msgid "Basics"
 msgstr "मूल बातें"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "जनà¥à¤®à¤¦à¤¿à¤¨"
@@ -430,7 +430,7 @@ msgstr "अवरà¥à¤¦à¥à¤§ खाते आपके थà¥à¤°à¥‡à¤¡à¥à¤¸ à¤
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "अवरà¥à¤¦à¥à¤§ खाते आपके थà¥à¤°à¥‡à¤¡à¥à¤¸ में उतà¥à¤¤à¤° नहीं दे सकते, आपका उलà¥à¤²à¥‡à¤– नहीं कर सकते, या अनà¥à¤¯à¤¥à¤¾ आपके साथ बातà¤à¥€à¤¤ नहीं कर सकते। आप उनकी सामगà¥à¤°à¥€ नहीं देख पाà¤à¤‚गे और उनà¥à¤¹à¥‡à¤‚ आपकी सामगà¥à¤°à¥€ देखने से रोका जाà¤à¤—ा।"
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "बà¥à¤²à¥‰à¤• पोसà¥à¤Ÿà¥¤"
 
@@ -667,7 +667,7 @@ msgstr "उन à¤à¤²à¥à¤—ोरिदम का à¤à¤¯à¤¨ करें जो
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "अपना पासवरà¥à¤¡ à¤à¥à¤¨à¥‡à¤‚"
 
@@ -768,6 +768,10 @@ msgstr "समà¥à¤¦à¤¾à¤¯ दिशानिरà¥à¤¦à¥‡à¤¶"
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr ""
@@ -823,12 +827,12 @@ msgstr "OTP कोड"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "कनेकà¥à¤Ÿà¤¿à¤‚ग ..।"
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr ""
 
@@ -940,8 +944,8 @@ msgid "Could not load list"
 msgstr "सूà¤à¥€ लोड नहीं कर सकता"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr ""
+#~ msgid "Country"
+#~ msgstr ""
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -953,7 +957,7 @@ msgstr "नया खाता बनाà¤à¤‚"
 msgid "Create a new Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "खाता बनाà¤à¤"
 
@@ -1067,7 +1071,7 @@ msgstr "इस पोसà¥à¤Ÿ को डीलीट करें?"
 msgid "Deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "यह पोसà¥à¤Ÿ मिटाई जा à¤à¥à¤•ी है"
 
@@ -1127,7 +1131,7 @@ msgstr "पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ का नाम"
 msgid "Domain verified!"
 msgstr "डोमेन सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤!"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr ""
 
@@ -1269,16 +1273,14 @@ msgstr ""
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "ईमेल"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "ईमेल"
@@ -1349,7 +1351,7 @@ msgstr "आप जिस डोमेन का उपयोग करना à¤
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "वह ईमेल दरà¥à¤œ करें जिसका उपयोग आपने अपना खाता बनाने के लिठकिया था। हम आपको à¤à¤• \"reset code\" भेजेंगे ताकि आप à¤à¤• नया पासवरà¥à¤¡ सेट कर सकें।"
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr ""
@@ -1358,7 +1360,7 @@ msgstr ""
 msgid "Enter your email"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "अपना ईमेल पता दरà¥à¤œ करें"
 
@@ -1371,13 +1373,17 @@ msgid "Enter your new email address below."
 msgstr "नीà¤à¥‡ अपना नया ईमेल पता दरà¥à¤œ करें।।"
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr ""
+#~ msgid "Enter your phone number"
+#~ msgstr ""
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "अपने यूज़रनेम और पासवरà¥à¤¡ दरà¥à¤œ करें"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr ""
@@ -1474,7 +1480,7 @@ msgstr "फ़ीड ऑफ़लाइन है"
 msgid "Feed Preferences"
 msgstr "फ़ीड पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•ता"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "पà¥à¤°à¤¤à¤¿à¤•à¥à¤°à¤¿à¤¯à¤¾"
@@ -1649,7 +1655,7 @@ msgstr "पासवरà¥à¤¡ भूल गà¤"
 msgid "Forgot Password"
 msgstr "पासवरà¥à¤¡ भूल गà¤"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr ""
@@ -1699,11 +1705,11 @@ msgstr "अगला"
 msgid "Handle"
 msgstr "हैंडल"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "सहायता"
@@ -1793,7 +1799,7 @@ msgstr "होम फीड"
 msgid "Home Feed Preferences"
 msgstr "होम फ़ीड पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•ताà¤à¤‚"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "होसà¥à¤Ÿà¤¿à¤‚ग पà¥à¤°à¤¦à¤¾à¤¤à¤¾"
@@ -1847,11 +1853,11 @@ msgstr ""
 msgid "Input confirmation code for account deletion"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr ""
 
@@ -1868,8 +1874,8 @@ msgid "Input password for account deletion"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr ""
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr ""
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1880,8 +1886,8 @@ msgid "Input the username or email address you used at signup"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr ""
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr ""
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1891,11 +1897,11 @@ msgstr ""
 msgid "Input your password"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr ""
 
@@ -1911,12 +1917,12 @@ msgstr "अवैध उपयोगकरà¥à¤¤à¤¾ नाम या पासà¤
 msgid "Invite a Friend"
 msgstr "à¤à¤• दोसà¥à¤¤ को आमंतà¥à¤°à¤¿à¤¤ करें"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "आमंतà¥à¤°à¤£ कोड"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr ""
 
@@ -1945,8 +1951,8 @@ msgstr ""
 msgid "Join the waitlist"
 msgstr "पà¥à¤°à¤¤à¥€à¤•à¥à¤·à¤¾ सूà¤à¥€ में शामिल हों"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "पà¥à¤°à¤¤à¥€à¤•à¥à¤·à¤¾ सूà¤à¥€ में शामिल हों।।"
 
@@ -2073,7 +2079,7 @@ msgstr ""
 msgid "Likes"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr ""
 
@@ -2121,8 +2127,8 @@ msgstr ""
 msgid "Lists"
 msgstr "सूà¤à¥€"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "अधिक पोसà¥à¤Ÿ लोड करें"
 
@@ -2130,7 +2136,7 @@ msgstr "अधिक पोसà¥à¤Ÿ लोड करें"
 msgid "Load new notifications"
 msgstr "नई सूà¤à¤¨à¤¾à¤à¤‚ लोड करें"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2381,7 +2387,7 @@ msgstr ""
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr ""
@@ -2413,7 +2419,7 @@ msgstr ""
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2693,8 +2699,8 @@ msgstr "पृषà¥à¤  नहीं मिला"
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2730,8 +2736,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr ""
+#~ msgid "Phone number"
+#~ msgstr ""
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2759,14 +2765,18 @@ msgstr ""
 msgid "Plays the GIF"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr ""
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "इसे बदलने से पहले कृपया अपने ईमेल की पà¥à¤·à¥à¤Ÿà¤¿ करें। यह à¤à¤• असà¥à¤¥à¤¾à¤¯à¥€ आवशà¥à¤¯à¤•ता है जबकि ईमेल-अपडेटिंग टूल जोड़ा जाता है, और इसे जलà¥à¤¦ ही हटा दिया जाà¤à¤—ा।।"
@@ -2776,22 +2786,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr ""
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr ""
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "कृपया इस à¤à¤ª पासवरà¥à¤¡ के लिठà¤à¤• अदà¥à¤µà¤¿à¤¤à¥€à¤¯ नाम दरà¥à¤œ करें या हमारे यादृà¤à¥à¤›à¤¿à¤• रूप से उतà¥à¤ªà¤¨à¥à¤¨ à¤à¤• का उपयोग करें।।"
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr ""
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr ""
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr ""
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr ""
 
@@ -2826,12 +2836,12 @@ msgctxt "action"
 msgid "Post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "पोसà¥à¤Ÿ"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr ""
 
@@ -2845,7 +2855,7 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "छà¥à¤ªà¤¾ पोसà¥à¤Ÿ"
 
@@ -2857,7 +2867,7 @@ msgstr "पोसà¥à¤Ÿ भाषा"
 msgid "Post Languages"
 msgstr "पोसà¥à¤Ÿ भाषा"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "पोसà¥à¤Ÿ नहीं मिला"
 
@@ -2886,7 +2896,7 @@ msgid "Prioritize Your Follows"
 msgstr "अपने फ़ॉलोअरà¥à¤¸ को पà¥à¤°à¤¾à¤¥à¤®à¤¿à¤•ता दें"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "गोपनीयता"
 
@@ -3048,7 +3058,7 @@ msgid "Reply Filters"
 msgstr "फिलà¥à¤Ÿà¤°"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr ""
@@ -3095,11 +3105,11 @@ msgstr "पोसà¥à¤Ÿ दोबारा पोसà¥à¤Ÿ करें या à
 msgid "Reposted By"
 msgstr "दà¥à¤µà¤¾à¤°à¤¾ दोबारा पोसà¥à¤Ÿ किया गया"
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr ""
 
@@ -3107,7 +3117,7 @@ msgstr ""
 msgid "reposted your post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr ""
 
@@ -3117,8 +3127,8 @@ msgid "Request Change"
 msgstr "अनà¥à¤°à¥‹à¤§ बदलें"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr ""
+#~ msgid "Request code"
+#~ msgstr ""
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3129,7 +3139,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr "पोसà¥à¤Ÿ करने से पहले वैकलà¥à¤ªà¤¿à¤• टेकà¥à¤¸à¥à¤Ÿ की आवशà¥à¤¯à¤•ता है"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "इस पà¥à¤°à¤¦à¤¾à¤¤à¤¾ के लिठआवशà¥à¤¯à¤•"
 
@@ -3181,9 +3191,8 @@ msgstr ""
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3192,16 +3201,16 @@ msgid "Retry"
 msgstr "फिर से कोशिश करो"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr ""
+#~ msgid "Retry."
+#~ msgstr ""
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr ""
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr ""
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr ""
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3310,7 +3319,7 @@ msgstr "मौजूदा खाते से à¤à¥à¤¨à¥‡à¤‚"
 msgid "Select option {i} of {numItems}"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "सेवा à¤à¥à¤¨à¥‡à¤‚"
@@ -3348,8 +3357,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr ""
+#~ msgid "Select your phone's country"
+#~ msgstr ""
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3428,7 +3437,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "नया पासवरà¥à¤¡ सेट करें"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr ""
 
@@ -3468,7 +3477,7 @@ msgstr ""
 msgid "Sets hosting provider for password reset"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr ""
@@ -3524,9 +3533,9 @@ msgstr ""
 msgid "Show follows similar to {0}"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr ""
 
@@ -3679,8 +3688,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr ""
+#~ msgid "SMS verification"
+#~ msgstr ""
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3808,7 +3817,7 @@ msgstr ""
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "शरà¥à¤¤à¥‡à¤‚"
 
@@ -3824,6 +3833,10 @@ msgstr "सेवा की शरà¥à¤¤à¥‡à¤‚"
 msgid "Text input field"
 msgstr "पाठ इनपà¥à¤Ÿ फ़ीलà¥à¤¡"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "अनबà¥à¤²à¥‰à¤• करने के बाद अकाउंट आपसे इंटरैकà¥à¤Ÿ कर सकेगा।"
@@ -3840,7 +3853,7 @@ msgstr "कॉपीराइट नीति को <0/> पर सà¥à¤¥à¤¾à¤¨
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "हो सकता है कि यह पोसà¥à¤Ÿ हटा दी गई हो।"
 
@@ -3941,8 +3954,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr ""
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr ""
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4055,8 +4068,8 @@ msgstr "डà¥à¤°à¥‰à¤ªà¤¡à¤¾à¤‰à¤¨ टॉगल करें"
 msgid "Transformations"
 msgstr "परिवरà¥à¤¤à¤¨"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "अनà¥à¤µà¤¾à¤¦"
@@ -4074,7 +4087,7 @@ msgstr ""
 msgid "Un-mute list"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4113,7 +4126,7 @@ msgstr ""
 msgid "Unfollow {0}"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr ""
 
@@ -4205,7 +4218,7 @@ msgstr ""
 msgid "User Blocks You"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "यूजर हैंडल"
 
@@ -4254,8 +4267,8 @@ msgid "Users in \"{0}\""
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr ""
+#~ msgid "Verification code"
+#~ msgstr ""
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4351,7 +4364,7 @@ msgstr ""
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "हम आपके हमारी सेवा में शामिल होने को लेकर बहà¥à¤¤ उतà¥à¤¸à¤¾à¤¹à¤¿à¤¤ हैं!"
 
@@ -4415,8 +4428,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr ""
+#~ msgid "XXXXXX"
+#~ msgstr ""
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4470,7 +4483,7 @@ msgstr ""
 msgid "You don't have any saved feeds."
 msgstr "आपके पास कोई सहेजी गई फ़ीड नहीं है."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "आपने लेखक को अवरà¥à¤¦à¥à¤§ किया है या आपने लेखक दà¥à¤µà¤¾à¤°à¤¾ अवरà¥à¤¦à¥à¤§ किया है।।"
 
@@ -4560,7 +4573,7 @@ msgstr ""
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "जनà¥à¤® तिथि"
 
@@ -4572,7 +4585,7 @@ msgstr ""
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4594,7 +4607,7 @@ msgstr "आपका ईमेल अभी तक सतà¥à¤¯à¤¾à¤ªà¤¿à¤¤ नà
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "आपका पूरा हैंडल होगा"
 
@@ -4631,6 +4644,6 @@ msgstr "आपकी पà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤²"
 msgid "Your reply has been published"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "आपका यूजर हैंडल"
diff --git a/src/locale/locales/id/messages.po b/src/locale/locales/id/messages.po
index 462a65ac2..b548834dd 100644
--- a/src/locale/locales/id/messages.po
+++ b/src/locale/locales/id/messages.po
@@ -366,21 +366,21 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr "Ketelanjangan artistik atau non-erotis."
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "Kembali"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr "Kembali"
@@ -393,7 +393,7 @@ msgstr ""
 msgid "Basics"
 msgstr "Dasar"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "Tanggal lahir"
@@ -445,7 +445,7 @@ msgstr "Akun yang diblokir tidak dapat membalas di utas Anda, menyebut Anda, ata
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "Akun yang diblokir tidak dapat membalas postingan Anda, menyebutkan Anda, dan interaksi lain dengan Anda. Anda tidak akan melihat konten mereka dan mereka akan dicegah melihat konten Anda."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "Postingan yang diblokir."
 
@@ -688,7 +688,7 @@ msgstr "Pilih algoritma yang akan digunakan untuk kustom feed Anda."
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "Pilih kata sandi Anda"
 
@@ -789,6 +789,10 @@ msgstr "Panduan Komunitas"
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr "Buat postingan dengan panjang hingga {MAX_GRAPHEME_LENGTH} karakter"
@@ -844,12 +848,12 @@ msgstr "Kode konfirmasi"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr "Konfirmasi pendaftaran {email} ke daftar tunggu"
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "Menghubungkan..."
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr ""
 
@@ -961,8 +965,8 @@ msgid "Could not load list"
 msgstr "Tidak dapat memuat daftar"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr ""
+#~ msgid "Country"
+#~ msgstr ""
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -974,7 +978,7 @@ msgstr "Buat akun baru"
 msgid "Create a new Bluesky account"
 msgstr "Buat akun Bluesky baru"
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "Buat Akun"
 
@@ -1092,7 +1096,7 @@ msgstr "Hapus postingan ini?"
 msgid "Deleted"
 msgstr "Dihapus"
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "Postingan dihapus."
 
@@ -1156,7 +1160,7 @@ msgstr "Nama Tampilan"
 msgid "Domain verified!"
 msgstr "Domain terverifikasi!"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr "Tidak punya kode undangan?"
 
@@ -1298,16 +1302,14 @@ msgstr "Ubah deskripsi profil Anda"
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "Email"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "Alamat email"
@@ -1382,7 +1384,7 @@ msgstr "Masukkan domain yang ingin Anda gunakan"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "Masukkan email yang Anda gunakan untuk membuat akun. Kami akan mengirimkan \"kode reset\" untuk mengatur kata sandi baru."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr "Masukkan tanggal lahir Anda"
@@ -1391,7 +1393,7 @@ msgstr "Masukkan tanggal lahir Anda"
 msgid "Enter your email"
 msgstr "Masukkan email Anda"
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "Masukkan alamat email Anda"
 
@@ -1404,13 +1406,17 @@ msgid "Enter your new email address below."
 msgstr "Masukkan alamat email baru Anda di bawah ini."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr ""
+#~ msgid "Enter your phone number"
+#~ msgstr ""
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "Masukkan nama pengguna dan kata sandi Anda"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "Eror:"
@@ -1507,7 +1513,7 @@ msgstr "Feed offline"
 msgid "Feed Preferences"
 msgstr "Preferensi Feed"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "Masukan"
@@ -1689,7 +1695,7 @@ msgstr "Lupa kata sandi"
 msgid "Forgot Password"
 msgstr "Lupa Kata Sandi"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr "Dari <0/>"
@@ -1739,11 +1745,11 @@ msgstr "Berikutnya"
 msgid "Handle"
 msgstr "Handle"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "Bantuan"
@@ -1837,7 +1843,7 @@ msgstr "Beranda"
 msgid "Home Feed Preferences"
 msgstr "Preferensi Feed Beranda"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "Provider hosting"
@@ -1895,7 +1901,7 @@ msgstr "Masukkan kode yang dikirim ke email Anda untuk pengaturan ulang kata san
 msgid "Input confirmation code for account deletion"
 msgstr "Masukkan kode konfirmasi untuk penghapusan akun"
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr ""
 
@@ -1907,7 +1913,7 @@ msgstr ""
 #~ msgid "Input hosting provider address"
 #~ msgstr "Masukkan alamat penyedia hosting"
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr "Masukkan kode undangan untuk melanjutkan"
 
@@ -1924,8 +1930,8 @@ msgid "Input password for account deletion"
 msgstr "Masukkan kata sandi untuk penghapusan akun"
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr ""
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr ""
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1936,8 +1942,8 @@ msgid "Input the username or email address you used at signup"
 msgstr "Masukkan nama pengguna atau alamat email yang Anda gunakan saat mendaftar"
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr ""
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr ""
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1947,11 +1953,11 @@ msgstr "Masukkan email Anda untuk masuk ke daftar tunggu Bluesky"
 msgid "Input your password"
 msgstr "Masukkan kata sandi Anda"
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr "Masukkan handle pengguna Anda"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr "Catatan posting tidak valid atau tidak didukung"
 
@@ -1967,12 +1973,12 @@ msgstr "Username atau kata sandi salah"
 msgid "Invite a Friend"
 msgstr "Undang Teman"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "Kode Undangan"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "Kode undangan salah. Periksa bahwa Anda memasukkannya dengan benar dan coba lagi."
 
@@ -2001,8 +2007,8 @@ msgstr "Karir"
 msgid "Join the waitlist"
 msgstr "Gabung ke daftar tunggu"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "Gabung ke daftar tunggu."
 
@@ -2137,7 +2143,7 @@ msgstr "menyukai postingan Anda"
 msgid "Likes"
 msgstr "Suka"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr "Suka pada postingan ini"
 
@@ -2185,8 +2191,8 @@ msgstr "Daftar tidak dibisukan"
 msgid "Lists"
 msgstr "Daftar"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "Muat postingan lainnya"
 
@@ -2194,7 +2200,7 @@ msgstr "Muat postingan lainnya"
 msgid "Load new notifications"
 msgstr "Muat notifikasi baru"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2451,7 +2457,7 @@ msgstr "Kata sandi baru"
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr "Postingan baru"
@@ -2486,7 +2492,7 @@ msgstr "Balasan terbaru terlebih dahulu"
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2766,8 +2772,8 @@ msgstr "Halaman tidak ditemukan"
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2803,8 +2809,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr ""
+#~ msgid "Phone number"
+#~ msgstr ""
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2832,14 +2838,18 @@ msgstr "Putar Video"
 msgid "Plays the GIF"
 msgstr "Putar GIF"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "Silakan pilih handle Anda."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "Masukkan kata sandi Anda."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "Harap konfirmasi email Anda sebelum mengubahnya. Ini adalah persyaratan sementara selama alat pembaruan email ditambahkan, dan akan segera dihapus."
@@ -2849,22 +2859,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr "Masukkan nama untuk kata sandi aplikasi Anda. Semua spasi tidak diperbolehkan."
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr ""
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr ""
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "Masukkan nama unik untuk Kata Sandi Aplikasi ini atau gunakan nama yang dibuat secara acak."
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr ""
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr ""
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr ""
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "Masukkan email Anda."
 
@@ -2902,7 +2912,7 @@ msgctxt "action"
 msgid "Post"
 msgstr "Posting"
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "Posting"
@@ -2910,7 +2920,7 @@ msgstr "Posting"
 #~ msgid "Post"
 #~ msgstr "Posting"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr "Postingan oleh {0}"
 
@@ -2924,7 +2934,7 @@ msgstr "Postingan oleh @{0}"
 msgid "Post deleted"
 msgstr "Postingan dihapus"
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "Postingan disembunyikan"
 
@@ -2936,7 +2946,7 @@ msgstr "Bahasa postingan"
 msgid "Post Languages"
 msgstr "Bahasa Postingan"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "Postingan tidak ditemukan"
 
@@ -2965,7 +2975,7 @@ msgid "Prioritize Your Follows"
 msgstr "Prioritaskan Pengikut Anda"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "Privasi"
 
@@ -3130,7 +3140,7 @@ msgid "Reply Filters"
 msgstr "Penyaring Balasan"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr "Balas ke <0/>"
@@ -3181,7 +3191,7 @@ msgstr "Posting ulang atau kutip postingan"
 msgid "Reposted By"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr ""
 
@@ -3189,7 +3199,7 @@ msgstr ""
 #~ msgid "Reposted by {0})"
 #~ msgstr "Diposting ulang oleh {0})"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "Diposting ulang oleh <0/>"
 
@@ -3197,7 +3207,7 @@ msgstr "Diposting ulang oleh <0/>"
 msgid "reposted your post"
 msgstr "posting ulang posting Anda"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr "Posting ulang postingan ini"
 
@@ -3207,8 +3217,8 @@ msgid "Request Change"
 msgstr "Ajukan Perubahan"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr ""
+#~ msgid "Request code"
+#~ msgstr ""
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3219,7 +3229,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr "Memerlukan teks alt sebelum memposting"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "Diwajibkan untuk provider ini"
 
@@ -3271,9 +3281,8 @@ msgstr "Coba kembali tindakan terakhir, yang gagal"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3282,16 +3291,16 @@ msgid "Retry"
 msgstr "Ulangi"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr ""
+#~ msgid "Retry."
+#~ msgstr ""
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr "Kembali ke halaman sebelumnya"
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr "SANDBOX. Postingan dan akun tidak bersifat permanen."
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr "SANDBOX. Postingan dan akun tidak bersifat permanen."
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3400,7 +3409,7 @@ msgstr "Pilih dari akun yang sudah ada"
 msgid "Select option {i} of {numItems}"
 msgstr "Pilih opsi {i} dari {numItems}"
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "Pilih layanan"
@@ -3438,8 +3447,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr ""
+#~ msgid "Select your phone's country"
+#~ msgstr ""
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3521,7 +3530,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "Buat kata sandi baru"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr "Atur kata sandi"
 
@@ -3565,7 +3574,7 @@ msgstr "Atur penyedia hosting untuk pengaturan ulang kata sandi"
 #~ msgid "Sets hosting provider to {label}"
 #~ msgstr "Atur penyedia hosting ke {label}"
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr "Atur server untuk klien Bluesky"
@@ -3621,9 +3630,9 @@ msgstr "Tampilkan embed dari {0}"
 msgid "Show follows similar to {0}"
 msgstr "Tampilkan berikut ini mirip dengan {0}"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr "Tampilkan Lebih Lanjut"
 
@@ -3776,8 +3785,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr ""
+#~ msgid "SMS verification"
+#~ msgstr ""
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3909,7 +3918,7 @@ msgstr "Ketuk untuk melihat sepenuhnya"
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "Ketentuan"
 
@@ -3925,6 +3934,10 @@ msgstr "Ketentuan Layanan"
 msgid "Text input field"
 msgstr "Area input teks"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "Akun ini akan dapat berinteraksi dengan Anda setelah blokir dibuka."
@@ -3941,7 +3954,7 @@ msgstr "Kebijakan Hak Cipta telah dipindahkan ke <0/>"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "Postingan mungkin telah dihapus."
 
@@ -4045,8 +4058,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr ""
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr ""
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4170,8 +4183,8 @@ msgstr "Beralih dropdown"
 msgid "Transformations"
 msgstr "Transformasi"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "Terjemahkan"
@@ -4192,7 +4205,7 @@ msgstr "Buka blokir daftar"
 msgid "Un-mute list"
 msgstr "Bunyikan daftar"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4231,7 +4244,7 @@ msgstr "Berhenti mengikuti"
 msgid "Unfollow {0}"
 msgstr "Berhenti mengikuti {0}"
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "Sayangnya, Anda tidak memenuhi syarat untuk membuat akun."
 
@@ -4323,7 +4336,7 @@ msgstr "Pengguna Diblokir oleh Daftar"
 msgid "User Blocks You"
 msgstr "Pengguna Memblokir Anda"
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "Handle pengguna"
 
@@ -4372,8 +4385,8 @@ msgid "Users in \"{0}\""
 msgstr "Pengguna di \"{0}\""
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr ""
+#~ msgid "Verification code"
+#~ msgstr ""
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4473,7 +4486,7 @@ msgstr "Kami akan segera memeriksa permohonan banding Anda."
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "Kami sangat senang Anda bergabung dengan kami!"
 
@@ -4540,8 +4553,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr ""
+#~ msgid "XXXXXX"
+#~ msgstr ""
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4599,7 +4612,7 @@ msgstr "Anda tidak memiliki feed yang disimpan!"
 msgid "You don't have any saved feeds."
 msgstr "Anda tidak memiliki feed yang disimpan."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "Anda telah memblokir atau diblokir oleh penulis ini."
 
@@ -4689,7 +4702,7 @@ msgstr "Akun Anda telah dihapus"
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "Tanggal lahir Anda"
 
@@ -4701,7 +4714,7 @@ msgstr "Pilihan Anda akan disimpan, tetapi dapat diubah nanti di pengaturan."
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4723,7 +4736,7 @@ msgstr "Alamat email Anda belum diverifikasi. Ini merupakan langkah keamanan pen
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr "Feed mengikuti Anda kosong! Ikuti lebih banyak pengguna untuk melihat apa yang terjadi."
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "Handle lengkap Anda akan menjadi"
 
@@ -4764,6 +4777,6 @@ msgstr "Profil Anda"
 msgid "Your reply has been published"
 msgstr "Balasan Anda telah dipublikasikan"
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "Handle Anda"
diff --git a/src/locale/locales/it/messages.po b/src/locale/locales/it/messages.po
index a76f3fdd8..517e6f8c9 100644
--- a/src/locale/locales/it/messages.po
+++ b/src/locale/locales/it/messages.po
@@ -354,21 +354,21 @@ msgstr ""
 msgid "Artistic or non-erotic nudity."
 msgstr "NuditĂ  artistica o non erotica."
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "Indietro"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr "Indietro"
@@ -381,7 +381,7 @@ msgstr ""
 msgid "Basics"
 msgstr "Nozioni di base"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "Compleanno"
@@ -433,7 +433,7 @@ msgstr "Gli account bloccati non possono rispondere nelle tue discussioni, menzi
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "Gli account bloccati non possono rispondere nelle tue discussioni, menzionarti in nessun altro modo con te. Non vedrai il loro contenuto e non vedranno il tuo.."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "Post bloccato."
 
@@ -672,7 +672,7 @@ msgstr "Scegli gli algoritmi che alimentano la tua esperienza con feed personali
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "Scegli la tua password"
 
@@ -773,6 +773,10 @@ msgstr "Linee guida della community"
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr "Componi un post fino a {MAX_GRAPHEME_LENGTH} caratteri"
@@ -828,12 +832,12 @@ msgstr "Codice di conferma"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr "Conferma l'iscrizione di {email} alla lista d'attesa"
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "Connessione in corso..."
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr "Contatta il supporto"
 
@@ -945,8 +949,8 @@ msgid "Could not load list"
 msgstr "No si è potuto caricare la lista"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr "Paese"
+#~ msgid "Country"
+#~ msgstr "Paese"
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -958,7 +962,7 @@ msgstr "Crea un nuovo account"
 msgid "Create a new Bluesky account"
 msgstr "Crea un nuovo Bluesky account"
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "Crea un account"
 
@@ -1072,7 +1076,7 @@ msgstr "Elimina questo post?"
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "Post eliminato."
 
@@ -1135,7 +1139,7 @@ msgstr "Nome Visualizzato"
 msgid "Domain verified!"
 msgstr "Dominio verificato!"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr "Non hai un codice di invito?"
 
@@ -1277,16 +1281,14 @@ msgstr "Modifica la descrizione del tuo profilo"
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "Email"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "Indirizzo email"
@@ -1360,7 +1362,7 @@ msgstr "Inserisci il dominio che vuoi utilizzare"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "Inserisci l'e-mail che hai utilizzato per creare il tuo account. Ti invieremo un \"codice di reset\" in modo che tu possa impostare una nuova password."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr "Inserisci la tua data di nascita"
@@ -1369,7 +1371,7 @@ msgstr "Inserisci la tua data di nascita"
 msgid "Enter your email"
 msgstr "Inserisci la tua email"
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "Inserisci il tuo indirizzo email"
 
@@ -1382,13 +1384,17 @@ msgid "Enter your new email address below."
 msgstr "Inserisci il tuo nuovo indirizzo email qui sotto."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr "Inserisci il tuo numero di telefono"
+#~ msgid "Enter your phone number"
+#~ msgstr "Inserisci il tuo numero di telefono"
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "Inserisci il tuo nome di utente e la tua password"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "Errore:"
@@ -1485,7 +1491,7 @@ msgstr "Feed offline"
 msgid "Feed Preferences"
 msgstr "Preferenze del feed"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "Commenti"
@@ -1655,7 +1661,7 @@ msgstr "Ho dimenticato il password"
 msgid "Forgot Password"
 msgstr "Ho dimenticato il Password"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr "Da <0/>"
@@ -1705,11 +1711,11 @@ msgstr "Seguente"
 msgid "Handle"
 msgstr "Nome Utente"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr "Ci sono problemi?"
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "Aiuto"
@@ -1799,7 +1805,7 @@ msgstr "Home"
 msgid "Home Feed Preferences"
 msgstr "Preferenze per i feed per la pagina d'inizio"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "Servizio di hosting"
@@ -1856,11 +1862,11 @@ msgstr "Inserisci il codice inviato alla tua email per reimpostare la password"
 msgid "Input confirmation code for account deletion"
 msgstr "Inserisci il codice di conferma per la cancellazione dell'account"
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr "Inserisci l'e-mail per l'account di Bluesky"
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr "Inserisci il codice di invito per procedere"
 
@@ -1877,8 +1883,8 @@ msgid "Input password for account deletion"
 msgstr "Inserisci la password per la cancellazione dell'account"
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr "Inserisci il numero di telefono per la verifica via SMS"
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr "Inserisci il numero di telefono per la verifica via SMS"
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1889,8 +1895,8 @@ msgid "Input the username or email address you used at signup"
 msgstr "Inserisci il nome utente o l'indirizzo email che hai utilizzato al momento della registrazione"
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr "Inserisci il codice di verifica che ti abbiamo inviato tramite SMS"
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr "Inserisci il codice di verifica che ti abbiamo inviato tramite SMS"
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1900,11 +1906,11 @@ msgstr "Inserisci la tua email per entrare nella lista d'attesa di Bluesky"
 msgid "Input your password"
 msgstr "Inserisci la tua password"
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr "Inserisci il tuo identificatore"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr "Protocollo del post non valido o non supportato"
 
@@ -1920,12 +1926,12 @@ msgstr "Nome dell'utente o password errato"
 msgid "Invite a Friend"
 msgstr "Invita un amico"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "Codice d'invito"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "Codice invito non accettato. Controlla di averlo inserito correttamente e riprova."
 
@@ -1954,8 +1960,8 @@ msgstr "Lavori"
 msgid "Join the waitlist"
 msgstr "Iscriviti alla lista d'attesa"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "Iscriviti alla lista d'attesa."
 
@@ -2086,7 +2092,7 @@ msgstr "è piaciuto il tuo post"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr "Mi Piace in questo post"
 
@@ -2134,8 +2140,8 @@ msgstr "Lista non mutata"
 msgid "Lists"
 msgstr "Liste"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "Carica piĂ¹ post"
 
@@ -2143,7 +2149,7 @@ msgstr "Carica piĂ¹ post"
 msgid "Load new notifications"
 msgstr "Carica piĂ¹ notifiche"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2400,7 +2406,7 @@ msgstr "Nuovo Password"
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr "Nuovo Post"
@@ -2435,7 +2441,7 @@ msgstr "Mostrare prima le risposte piĂ¹ recenti"
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2711,8 +2717,8 @@ msgstr "Pagina non trovata"
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2748,8 +2754,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr "Numero di telefono"
+#~ msgid "Phone number"
+#~ msgstr "Numero di telefono"
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2777,14 +2783,18 @@ msgstr "Riproduci video"
 msgid "Plays the GIF"
 msgstr "Riproduci questa GIF"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "Scegli il tuo nome utente."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "Scegli la tua password."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "Conferma la tua email prima di cambiarla. Si tratta di un requisito temporaneo durante l'aggiunta degli strumenti di aggiornamento della posta elettronica e verrĂ  presto rimosso."
@@ -2794,22 +2804,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr "Inserisci un nome per la password dell'app. Tutti gli spazi non sono consentiti."
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr "Inserisci un numero di telefono in grado di ricevere messaggi di testo SMS."
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr "Inserisci un numero di telefono in grado di ricevere messaggi di testo SMS."
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "Inserisci un nome unico per la password dell'app o utilizzane uno generato automaticamente."
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr "Inserisci il codice che hai ricevuto via SMS."
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr "Inserisci il codice che hai ricevuto via SMS."
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr "Inserisci il codice di verifica inviato a {phoneNumberFormatted}."
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr "Inserisci il codice di verifica inviato a {phoneNumberFormatted}."
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "Inserisci la tua email."
 
@@ -2847,7 +2857,7 @@ msgctxt "action"
 msgid "Post"
 msgstr "Post"
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "Post"
@@ -2855,7 +2865,7 @@ msgstr "Post"
 #~ msgid "Post"
 #~ msgstr "PublicaciĂ³"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr "Pubblicato da {0}"
 
@@ -2869,7 +2879,7 @@ msgstr "Pubblicato da @{0}"
 msgid "Post deleted"
 msgstr "Post eliminato"
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "Post nascosto"
 
@@ -2881,7 +2891,7 @@ msgstr "Lingua del post"
 msgid "Post Languages"
 msgstr "Lingue del post"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "Post non trovato"
 
@@ -2910,7 +2920,7 @@ msgid "Prioritize Your Follows"
 msgstr "Dai prioritĂ  a quelli che segui"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -3075,7 +3085,7 @@ msgid "Reply Filters"
 msgstr "Filtri di risposta"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr "Rispondi a <0/>"
@@ -3126,7 +3136,7 @@ msgstr "Ripubblicare o citare il post"
 msgid "Reposted By"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr ""
 
@@ -3134,7 +3144,7 @@ msgstr ""
 #~ msgid "Reposted by {0})"
 #~ msgstr "Ripubblicato da {0})"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "Ripubblicato da <0/>"
 
@@ -3142,7 +3152,7 @@ msgstr "Ripubblicato da <0/>"
 msgid "reposted your post"
 msgstr "ripubblicato il tuo post"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr "Ripubblicazione di questo post"
 
@@ -3152,8 +3162,8 @@ msgid "Request Change"
 msgstr "Richiedi un cambio"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr "Richiedi un codice"
+#~ msgid "Request code"
+#~ msgstr "Richiedi un codice"
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3164,7 +3174,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr "Richiedi il testo alternativo prima di pubblicare"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "Obbligatorio per questo operatore"
 
@@ -3216,9 +3226,8 @@ msgstr "Ritenta l'ultima azione che ha generato un errore"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3227,16 +3236,16 @@ msgid "Retry"
 msgstr "Riprova"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr "Riprova."
+#~ msgid "Retry."
+#~ msgstr "Riprova."
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr "Ritorna alla pagina precedente"
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr "SANDBOX. I post e gli account non sono permanenti."
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr "SANDBOX. I post e gli account non sono permanenti."
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3345,7 +3354,7 @@ msgstr "Seleziona da un account esistente"
 msgid "Select option {i} of {numItems}"
 msgstr "Seleziona l'opzione {i} di {numItems}"
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "Selecciona el servei"
@@ -3379,8 +3388,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr "Seleziona il Paese del tuo cellulare"
+#~ msgid "Select your phone's country"
+#~ msgstr "Seleziona il Paese del tuo cellulare"
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3462,7 +3471,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "Imposta una nuova password"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr "Imposta la password"
 
@@ -3502,7 +3511,7 @@ msgstr "Imposta l'email per la reimpostazione della password"
 msgid "Sets hosting provider for password reset"
 msgstr "Imposta il provider del hosting per la reimpostazione della password"
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr "Imposta il server per il client Bluesky"
@@ -3558,9 +3567,9 @@ msgstr "Mostra incorporamenti di {0}"
 msgid "Show follows similar to {0}"
 msgstr "Mostra follows simile a {0}"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr "Mostra di piĂ¹"
 
@@ -3713,8 +3722,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr "Verifica tramite SMS"
+#~ msgid "SMS verification"
+#~ msgstr "Verifica tramite SMS"
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3842,7 +3851,7 @@ msgstr "Tocca per visualizzare completamente"
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "Termini"
 
@@ -3858,6 +3867,10 @@ msgstr "Termini di servizio"
 msgid "Text input field"
 msgstr "Campo di testo"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "L'account sarĂ  in grado di interagire con te dopo lo sblocco."
@@ -3874,7 +3887,7 @@ msgstr "La politica sul copyright è stata spostata a <0/>"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "Il post potrebbe essere stato cancellato."
 
@@ -3978,8 +3991,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr "C'è qualcosa di sbagliato in questo numero. Scegli il tuo Paese e inserisci il tuo numero di telefono completo!"
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr "C'è qualcosa di sbagliato in questo numero. Scegli il tuo Paese e inserisci il tuo numero di telefono completo!"
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4098,8 +4111,8 @@ msgstr "Attiva/disattiva il menu a discesa"
 msgid "Transformations"
 msgstr "Trasformazioni"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "Tradurre"
@@ -4120,7 +4133,7 @@ msgstr "Sblocca la lista"
 msgid "Un-mute list"
 msgstr "Riattiva questa lista"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4159,7 +4172,7 @@ msgstr "Smetti di seguire"
 msgid "Unfollow {0}"
 msgstr "Smetti di seguire {0}"
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "Sfortunatamente, non soddisfi i requisiti per creare un account."
 
@@ -4251,7 +4264,7 @@ msgstr "Utente bloccato dalla lista"
 msgid "User Blocks You"
 msgstr "Questo utente ti blocca"
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "Handle dell'utente"
 
@@ -4300,8 +4313,8 @@ msgid "Users in \"{0}\""
 msgstr "Utenti in «{0}»"
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr "Codice di verifica"
+#~ msgid "Verification code"
+#~ msgstr "Codice di verifica"
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4393,7 +4406,7 @@ msgstr "Esamineremo il tuo ricorso al piĂ¹ presto."
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "Siamo felici che tu ti unisca a noi!"
 
@@ -4460,8 +4473,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr "XXXXXX"
+#~ msgid "XXXXXX"
+#~ msgstr "XXXXXX"
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4510,7 +4523,7 @@ msgstr "Non hai salvato nessun feed!"
 msgid "You don't have any saved feeds."
 msgstr "Non hai salvato nessun feed."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "Hai bloccato l'autore o sei stato bloccato dall'autore."
 
@@ -4600,7 +4613,7 @@ msgstr "Il tuo account è stato eliminato"
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "La tua data di nascita"
 
@@ -4612,7 +4625,7 @@ msgstr "La tua scelta verrĂ  salvata, ma potrĂ  essere modificata successivament
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4634,7 +4647,7 @@ msgstr "La tua email non è stata ancora verificata. Ti consigliamo di fare ques
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr "Il tuo feed seguente è vuoto! Segui piĂ¹ utenti per vedere cosa sta succedendo."
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "Il tuo nome di utente completo sarĂ "
 
@@ -4673,6 +4686,6 @@ msgstr "Il tuo profilo"
 msgid "Your reply has been published"
 msgstr "La tua risposta è stata pubblicata"
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "Il tuo handle utente"
diff --git a/src/locale/locales/ja/messages.po b/src/locale/locales/ja/messages.po
index 230ccb7d0..76aaffdcc 100644
--- a/src/locale/locales/ja/messages.po
+++ b/src/locale/locales/ja/messages.po
@@ -368,21 +368,21 @@ msgstr "ă‚¢ăƒ¼ăƒˆ"
 msgid "Artistic or non-erotic nudity."
 msgstr "è¸è¡“ç„ă¾ăŸă¯æ€§ç„ă§ă¯ăªă„ăƒŒăƒ¼ăƒ‰ă€‚"
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "æˆ»ă‚‹"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr "æˆ»ă‚‹"
@@ -395,7 +395,7 @@ msgstr "ă€Œ{interestsText}ă€ă¸ă®èˆˆå‘³ă«åŸºă¥ă„ăŸăă™ă™ă‚ă§ă™ă€‚"
 msgid "Basics"
 msgstr "基本"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "誕生日"
@@ -447,7 +447,7 @@ msgstr "ăƒ–ăƒ­ăƒƒă‚¯ä¸­ă®ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă¯ă€ă‚ăªăŸă®ă‚¹ăƒ¬ăƒƒăƒ‰ă§ă®è¿”
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "ăƒ–ăƒ­ăƒƒă‚¯ä¸­ă®ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă¯ă€ă‚ăªăŸă®ă‚¹ăƒ¬ăƒƒăƒ‰ă§ă®è¿”ä¿¡ă€ă‚ăªăŸă¸ă®ăƒ¡ăƒ³ă‚·ăƒ§ăƒ³ă€ăă®ä»–ă®æ–¹æ³•ă§ă‚ăªăŸă¨ă‚„ă‚å–ă‚ă™ă‚‹ă“ă¨ă¯ă§ăă¾ă›ă‚“。ă‚ăªăŸă¯ç›¸æ‰‹ă®ă‚³ăƒ³ăƒ†ăƒ³ăƒ„ă‚’è¦‹ă‚‹ă“ă¨ăŒă§ăăă€ç›¸æ‰‹ă¯ă‚ăªăŸă®ă‚³ăƒ³ăƒ†ăƒ³ăƒ„ă‚’è¦‹ă‚‹ă“ă¨ăŒă§ăăªăăªă‚ă¾ă™ă€‚"
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "æ•ç¨¿ă‚’ăƒ–ăƒ­ăƒƒă‚¯ă—ă¾ă—ăŸă€‚"
 
@@ -692,7 +692,7 @@ msgstr "ă‚«ă‚¹ă‚¿ăƒ ăƒ•ă‚£ăƒ¼ăƒ‰ă‚’ä½¿ç”¨ă—ă¦ă‚ăªăŸă®ä½“é¨“ă‚’å¼·åŒ–ă™ă‚‹
 msgid "Choose your main feeds"
 msgstr "ăƒ¡ă‚¤ăƒ³ă®ăƒ•ă‚£ăƒ¼ăƒ‰ă‚’é¸æ"
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’å…¥å›"
 
@@ -793,6 +793,10 @@ msgstr "ă‚³ăƒŸăƒ¥ăƒ‹ăƒ†ă‚£ăƒ¼ă‚¬ă‚¤ăƒ‰ăƒ©ă‚¤ăƒ³"
 msgid "Complete onboarding and start using your account"
 msgstr "åˆæœŸè¨­å®ă‚’完了ă—ă¦ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă‚’使ă„å§‹ă‚ă‚‹"
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr "{MAX_GRAPHEME_LENGTH}文字ă¾ă§ă®æ•ç¨¿ă‚’ä½œæˆ"
@@ -848,12 +852,12 @@ msgstr "確èªă‚³ăƒ¼ăƒ‰"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr "{email}ă®Waitlistă¸ă®ç™»éŒ²ă‚’確èª"
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "æ¥ç¶ä¸­..."
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr "サăƒăƒ¼ăƒˆă«é€£çµ¡"
 
@@ -965,8 +969,8 @@ msgid "Could not load list"
 msgstr "ăƒªă‚¹ăƒˆă®ăƒ­ăƒ¼ăƒ‰ă«å¤±æ•—ă—ă¾ă—ăŸ"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr "国"
+#~ msgid "Country"
+#~ msgstr "国"
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -978,7 +982,7 @@ msgstr "æ–°ă—ă„ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă‚’ä½œæˆ"
 msgid "Create a new Bluesky account"
 msgstr "æ–°ă—ă„Blueskyă‚¢ă‚«ă‚¦ăƒ³ăƒˆă‚’ä½œæˆ"
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă‚’ä½œæˆ"
 
@@ -1096,7 +1100,7 @@ msgstr "ă“ă®æ•ç¨¿ă‚’å‰é™¤ă—ă¾ă™ă‹ï¼Ÿ"
 msgid "Deleted"
 msgstr "å‰é™¤ă•ă‚Œă¦ă„ă¾ă™"
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "æ•ç¨¿ă‚’å‰é™¤ă—ă¾ă—ăŸă€‚"
 
@@ -1160,7 +1164,7 @@ msgstr "表示å"
 msgid "Domain verified!"
 msgstr "ăƒ‰ăƒ¡ă‚¤ăƒ³ă‚’ç¢ºèªă—ă¾ă—ăŸï¼"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr "æ‹›å¾…ă‚³ăƒ¼ăƒ‰ă‚’ăæŒă¡ă§ăªă„å ´åˆ"
 
@@ -1302,16 +1306,14 @@ msgstr "ă‚ăªăŸă®ăƒ—ăƒ­ăƒ•ă‚£ăƒ¼ăƒ«ă®èª¬æ˜ă‚’編集ă—ă¾ă™"
 msgid "Education"
 msgstr "教育"
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹"
@@ -1386,7 +1388,7 @@ msgstr "使用ă™ă‚‹ăƒ‰ăƒ¡ă‚¤ăƒ³ă‚’å…¥å›ă—ă¦ăă ă•ă„"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă®ä½œæˆă«ä½¿ç”¨ă—ăŸăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›ă—ă¾ă™ă€‚æ–°ă—ă„ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’è¨­å®ă§ăă‚‹ă‚ˆă†ă«ă€ă€Œăƒªă‚»ăƒƒăƒˆă‚³ăƒ¼ăƒ‰ă€ă‚’ăé€ă‚ă—ă¾ă™ă€‚"
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr "èª•ç”Ÿæ—¥ă‚’å…¥å›ă—ă¦ăă ă•ă„"
@@ -1395,7 +1397,7 @@ msgstr "èª•ç”Ÿæ—¥ă‚’å…¥å›ă—ă¦ăă ă•ă„"
 msgid "Enter your email"
 msgstr "ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›ă—ă¦ăă ă•ă„"
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›ă—ă¦ăă ă•ă„"
 
@@ -1408,13 +1410,17 @@ msgid "Enter your new email address below."
 msgstr "ä»¥ä¸‹ă«æ–°ă—ă„ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›ă—ă¦ăă ă•ă„。"
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr "電話番å·ă‚’å…¥å›"
+#~ msgid "Enter your phone number"
+#~ msgstr "電話番å·ă‚’å…¥å›"
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "ăƒ¦ăƒ¼ă‚¶ăƒ¼åă¨ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’å…¥å›ă—ă¦ăă ă•ă„"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "ă‚¨ăƒ©ăƒ¼ï¼"
@@ -1511,7 +1517,7 @@ msgstr "ăƒ•ă‚£ăƒ¼ăƒ‰ă¯ă‚ªăƒ•ăƒ©ă‚¤ăƒ³ă§ă™"
 msgid "Feed Preferences"
 msgstr "ăƒ•ă‚£ăƒ¼ăƒ‰ă®è¨­å®"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "ăƒ•ă‚£ăƒ¼ăƒ‰ăƒăƒƒă‚¯"
@@ -1694,7 +1700,7 @@ msgstr "ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’å¿˜ă‚ŒăŸ"
 msgid "Forgot Password"
 msgstr "ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’å¿˜ă‚ŒăŸ"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr "<0/>ă‹ă‚‰"
@@ -1744,11 +1750,11 @@ msgstr "次ă¸"
 msgid "Handle"
 msgstr "ăƒăƒ³ăƒ‰ăƒ«"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr "何ă‹å•題ăŒç™ºç”Ÿă—ă¾ă—ăŸă‹ï¼Ÿ"
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "ăƒ˜ăƒ«ăƒ—"
@@ -1842,7 +1848,7 @@ msgstr "ăƒ›ăƒ¼ăƒ "
 msgid "Home Feed Preferences"
 msgstr "ăƒ›ăƒ¼ăƒ ăƒ•ă‚£ăƒ¼ăƒ‰ă®è¨­å®"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "ăƒ›ă‚¹ăƒ†ă‚£ăƒ³ă‚°ăƒ—ăƒ­ăƒă‚¤ăƒ€ăƒ¼"
@@ -1901,7 +1907,7 @@ msgstr "ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’ăƒªă‚»ăƒƒăƒˆă™ă‚‹ăŸă‚ă«ă‚ăªăŸă®ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰
 msgid "Input confirmation code for account deletion"
 msgstr "ă‚¢ă‚«ă‚¦ăƒ³ăƒˆå‰é™¤ă®ăŸă‚ă«ç¢ºèªă‚³ăƒ¼ăƒ‰ă‚’å…¥å›"
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr "Blueskyă‚¢ă‚«ă‚¦ăƒ³ăƒˆç”¨ă®ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›ă—ă¦ăă ă•ă„"
 
@@ -1913,7 +1919,7 @@ msgstr "Blueskyă‚¢ă‚«ă‚¦ăƒ³ăƒˆç”¨ă®ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›ă—ă¦ăă ă
 #~ msgid "Input hosting provider address"
 #~ msgstr "ăƒ›ă‚¹ăƒ†ă‚£ăƒ³ă‚°ăƒ—ăƒ­ăƒă‚¤ăƒ€ăƒ¼ă®ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›"
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr "æ‹›å¾…ă‚³ăƒ¼ăƒ‰ă‚’å…¥å›ă—ă¦æ¬¡ă«é€²ă‚€"
 
@@ -1930,8 +1936,8 @@ msgid "Input password for account deletion"
 msgstr "ă‚¢ă‚«ă‚¦ăƒ³ăƒˆå‰é™¤ă®ăŸă‚ă«ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’å…¥å›"
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr "SMSèªè¨¼ă«ç”¨ă„ă‚‹é›»è©±ç•ªå·ă‚’å…¥å›"
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr "SMSèªè¨¼ă«ç”¨ă„ă‚‹é›»è©±ç•ªå·ă‚’å…¥å›"
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1942,8 +1948,8 @@ msgid "Input the username or email address you used at signup"
 msgstr "ă‚µă‚¤ăƒ³ă‚¢ăƒƒăƒ—æ™‚ă«ä½¿ç”¨ă—ăŸăƒ¦ăƒ¼ă‚¶ăƒ¼åă¾ăŸă¯ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›"
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr "ăƒ†ă‚­ă‚¹ăƒˆăƒ¡ăƒƒă‚»ăƒ¼ă‚¸ă§é€ă‚‰ă‚Œă¦ăăŸèªè¨¼ă‚³ăƒ¼ăƒ‰ă‚’å…¥å›ă—ă¦ăă ă•ă„"
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr "ăƒ†ă‚­ă‚¹ăƒˆăƒ¡ăƒƒă‚»ăƒ¼ă‚¸ă§é€ă‚‰ă‚Œă¦ăăŸèªè¨¼ă‚³ăƒ¼ăƒ‰ă‚’å…¥å›ă—ă¦ăă ă•ă„"
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1953,11 +1959,11 @@ msgstr "Blueskyă®Waitlistă«ç™»éŒ²ă™ă‚‹ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›"
 msgid "Input your password"
 msgstr "ă‚ăªăŸă®ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’å…¥å›"
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr "ă‚ăªăŸă®ăƒ¦ăƒ¼ă‚¶ăƒ¼ăƒăƒ³ăƒ‰ăƒ«ă‚’å…¥å›"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr "ç„¡å¹ă¾ăŸă¯ă‚µăƒăƒ¼ăƒˆă•ă‚Œă¦ă„ăªă„æ•稿ă®ăƒ¬ă‚³ăƒ¼ăƒ‰"
 
@@ -1973,12 +1979,12 @@ msgstr "ç„¡å¹ăªăƒ¦ăƒ¼ă‚¶ăƒ¼åă¾ăŸă¯ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰"
 msgid "Invite a Friend"
 msgstr "å‹é”ă‚’æ‹›å¾…"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "æ‹›å¾…ă‚³ăƒ¼ăƒ‰"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "æ‹›å¾…ă‚³ăƒ¼ăƒ‰ăŒç¢ºèªă§ăă¾ă›ă‚“ă€‚æ­£ă—ăå…¥å›ă•ă‚Œă¦ă„ă‚‹ă“ă¨ă‚’確èªă—ă€ă‚‚ă†ä¸€åº¦å®Ÿè¡Œă—ă¦ăă ă•ă„。"
 
@@ -2007,8 +2013,8 @@ msgstr "仕事"
 msgid "Join the waitlist"
 msgstr "Waitlistă«å‚å "
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "Waitlistă«å‚å ă—ă¾ă™ă€‚"
 
@@ -2143,7 +2149,7 @@ msgstr "ă‚ăªăŸă®æ•稿ăŒă„ă„ă­ă•ă‚Œă¾ă—ăŸ"
 msgid "Likes"
 msgstr "ă„ă„ă­"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr "ă“ă®æ•ç¨¿ă‚’ă„ă„ă­ă™ă‚‹"
 
@@ -2195,8 +2201,8 @@ msgstr "ăƒªă‚¹ăƒˆă®ăƒŸăƒ¥ăƒ¼ăƒˆă‚’解除ă—ă¾ă—ăŸ"
 msgid "Lists"
 msgstr "ăƒªă‚¹ăƒˆ"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "æ•ç¨¿ă‚’ă•らă«ăƒ­ăƒ¼ăƒ‰"
 
@@ -2204,7 +2210,7 @@ msgstr "æ•ç¨¿ă‚’ă•らă«ăƒ­ăƒ¼ăƒ‰"
 msgid "Load new notifications"
 msgstr "最新ă®é€çŸ¥ă‚’ăƒ­ăƒ¼ăƒ‰"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2467,7 +2473,7 @@ msgstr "æ–°ă—ă„ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰"
 msgid "New Password"
 msgstr "æ–°ă—ă„ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰"
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr "æ–°ă—ă„æ•稿"
@@ -2503,7 +2509,7 @@ msgstr "æ–°ă—ă„é †ă«è¿”ä¿¡ă‚’è¡¨ç¤º"
 msgid "News"
 msgstr "ăƒ‹ăƒ¥ăƒ¼ă‚¹"
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2787,8 +2793,8 @@ msgstr "ăƒăƒ¼ă‚¸ăŒè¦‹ă¤ă‹ă‚ă¾ă›ă‚“"
 msgid "Page Not Found"
 msgstr "ăƒăƒ¼ă‚¸ăŒè¦‹ă¤ă‹ă‚ă¾ă›ă‚“"
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2824,8 +2830,8 @@ msgid "Pets"
 msgstr "ăƒăƒƒăƒˆ"
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr "電話番å·"
+#~ msgid "Phone number"
+#~ msgstr "電話番å·"
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2853,14 +2859,18 @@ msgstr "å‹•ç”»ă‚’å†ç”Ÿ"
 msgid "Plays the GIF"
 msgstr "GIFă‚’å†ç”Ÿ"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "ăƒăƒ³ăƒ‰ăƒ«ă‚’ăé¸ă³ăă ă•ă„。"
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’é¸æă—ă¦ăă ă•ă„。"
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "変更ă™ă‚‹å‰ă«ăƒ¡ăƒ¼ăƒ«ă‚’確èªă—ă¦ăă ă•ă„。ă“ă‚Œă¯ă€ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒƒăƒ—ăƒ‡ăƒ¼ăƒˆăƒ„ăƒ¼ăƒ«ăŒè¿½å ă•ă‚Œă¦ă„ă‚‹é–“ă®ä¸€æ™‚ç„ăªè¦ä»¶ă§ă‚ă‚ă€ă¾ă‚‚ăªăå‰é™¤ă•ă‚Œă¾ă™ă€‚"
@@ -2870,22 +2880,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr "ă‚¢ăƒ—ăƒªăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă«ă¤ă‘ă‚‹åå‰ă‚’å…¥å›ă—ă¦ăă ă•ă„。ă™ă¹ă¦ă‚¹ăƒăƒ¼ă‚¹ă¨ă—ă¦ă¯ă„ă‘ă¾ă›ă‚“。"
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr "SMSă§ăƒ†ă‚­ă‚¹ăƒˆăƒ¡ăƒƒă‚»ăƒ¼ă‚¸ă‚’å—ă‘å–ă‚Œă‚‹é›»è©±ç•ªå·ă‚’å…¥å›ă—ă¦ăă ă•ă„。"
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr "SMSă§ăƒ†ă‚­ă‚¹ăƒˆăƒ¡ăƒƒă‚»ăƒ¼ă‚¸ă‚’å—ă‘å–ă‚Œă‚‹é›»è©±ç•ªå·ă‚’å…¥å›ă—ă¦ăă ă•ă„。"
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "ă“ă®ă‚¢ăƒ—ăƒªăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă«å›ºæœ‰ă®åå‰ă‚’å…¥å›ă™ă‚‹ă‹ă€ăƒ©ăƒ³ăƒ€ăƒ ă«ç”Ÿæˆă•ă‚ŒăŸåå‰ă‚’使用ă—ă¦ăă ă•ă„。"
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr "SMSă§å—ă‘å–ă£ăŸă‚³ăƒ¼ăƒ‰ă‚’å…¥å›ă—ă¦ăă ă•ă„。"
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr "SMSă§å—ă‘å–ă£ăŸă‚³ăƒ¼ăƒ‰ă‚’å…¥å›ă—ă¦ăă ă•ă„。"
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr "{phoneNumberFormatted}ă«é€ă£ăŸèªè¨¼ă‚³ăƒ¼ăƒ‰ă‚’å…¥å›ă—ă¦ăă ă•ă„。"
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr "{phoneNumberFormatted}ă«é€ă£ăŸèªè¨¼ă‚³ăƒ¼ăƒ‰ă‚’å…¥å›ă—ă¦ăă ă•ă„。"
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă‚’å…¥å›ă—ă¦ăă ă•ă„。"
 
@@ -2925,7 +2935,7 @@ msgctxt "action"
 msgid "Post"
 msgstr "æ•稿"
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "æ•稿"
@@ -2936,7 +2946,7 @@ msgstr "æ•稿"
 #~ msgid "Post"
 #~ msgstr "æ•稿"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr "{0}ă«ă‚ˆă‚‹æ•稿"
 
@@ -2950,7 +2960,7 @@ msgstr "@{0}ă«ă‚ˆă‚‹æ•稿"
 msgid "Post deleted"
 msgstr "æ•ç¨¿ă‚’å‰é™¤"
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "æ•ç¨¿ă‚’é表示"
 
@@ -2962,7 +2972,7 @@ msgstr "æ•稿ă®è¨€èª"
 msgid "Post Languages"
 msgstr "æ•稿ă®è¨€èª"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "æ•稿ăŒè¦‹ă¤ă‹ă‚ă¾ă›ă‚“"
 
@@ -2991,7 +3001,7 @@ msgid "Prioritize Your Follows"
 msgstr "ă‚ăªăŸă®ăƒ•ă‚©ăƒ­ăƒ¼ă‚’å„ªå…ˆ"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "ăƒ—ăƒ©ă‚¤ăƒă‚·ăƒ¼"
 
@@ -3157,7 +3167,7 @@ msgid "Reply Filters"
 msgstr "返信ă®ăƒ•ă‚£ăƒ«ă‚¿ăƒ¼"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr "<0/>ă«è¿”ä¿¡"
@@ -3208,7 +3218,7 @@ msgstr "ăƒªăƒă‚¹ăƒˆă¾ăŸă¯å¼•用"
 msgid "Reposted By"
 msgstr "ăƒªăƒă‚¹ăƒˆă—ăŸăƒ¦ăƒ¼ă‚¶ăƒ¼"
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr "{0}ă«ăƒªăƒă‚¹ăƒˆă•ă‚ŒăŸ"
 
@@ -3216,7 +3226,7 @@ msgstr "{0}ă«ăƒªăƒă‚¹ăƒˆă•ă‚ŒăŸ"
 #~ msgid "Reposted by {0})"
 #~ msgstr "{0}ă«ă‚ˆă‚‹ăƒªăƒă‚¹ăƒˆ"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "<0/>ă«ă‚ˆă‚‹ăƒªăƒă‚¹ăƒˆ"
 
@@ -3224,7 +3234,7 @@ msgstr "<0/>ă«ă‚ˆă‚‹ăƒªăƒă‚¹ăƒˆ"
 msgid "reposted your post"
 msgstr "ă‚ăªăŸă®æ•稿ă¯ăƒªăƒă‚¹ăƒˆă•ă‚Œă¾ă—ăŸ"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr "ă“ă®æ•ç¨¿ă‚’ăƒªăƒă‚¹ăƒˆ"
 
@@ -3234,8 +3244,8 @@ msgid "Request Change"
 msgstr "å¤‰æ›´ă‚’è¦æ±‚"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr "ă‚³ăƒ¼ăƒ‰ă‚’ăƒªă‚¯ă‚¨ă‚¹ăƒˆ"
+#~ msgid "Request code"
+#~ msgstr "ă‚³ăƒ¼ăƒ‰ă‚’ăƒªă‚¯ă‚¨ă‚¹ăƒˆ"
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3246,7 +3256,7 @@ msgstr "ă‚³ăƒ¼ăƒ‰ă‚’ăƒªă‚¯ă‚¨ă‚¹ăƒˆ"
 msgid "Require alt text before posting"
 msgstr "ç”»åƒæ•稿時ă«ALTăƒ†ă‚­ă‚¹ăƒˆă‚’å¿…é ˆă¨ă™ă‚‹"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "ă“ă®ăƒ—ăƒ­ăƒă‚¤ăƒ€ăƒ¼ă«å¿…è¦"
 
@@ -3298,9 +3308,8 @@ msgstr "ă‚¨ăƒ©ăƒ¼ă«ăªă£ăŸæœ€å¾Œă®ă‚¢ă‚¯ă‚·ăƒ§ăƒ³ă‚’ă‚„ă‚ç›´ă™"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3309,16 +3318,16 @@ msgid "Retry"
 msgstr "å†è©¦è¡Œ"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr "å†è©¦è¡Œ"
+#~ msgid "Retry."
+#~ msgstr "å†è©¦è¡Œ"
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr "å‰ă®ăƒăƒ¼ă‚¸ă«æˆ»ă‚‹"
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr "ă‚µăƒ³ăƒ‰ăƒœăƒƒă‚¯ă‚¹ă€‚æ•稿ă¨ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă¯æ°¸ä¹…ç„ăªă‚‚ă®ă§ă¯ă‚ă‚ă¾ă›ă‚“。"
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr "ă‚µăƒ³ăƒ‰ăƒœăƒƒă‚¯ă‚¹ă€‚æ•稿ă¨ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă¯æ°¸ä¹…ç„ăªă‚‚ă®ă§ă¯ă‚ă‚ă¾ă›ă‚“。"
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3431,7 +3440,7 @@ msgstr "既存ă®ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă‹ă‚‰é¸æ"
 msgid "Select option {i} of {numItems}"
 msgstr "{numItems}個中{i}個目ă®ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‚’é¸æ"
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "ă‚µăƒ¼ăƒ“ă‚¹ă‚’é¸æ"
@@ -3469,8 +3478,8 @@ msgid "Select your interests from the options below"
 msgstr "次ă®ă‚ªăƒ—ă‚·ăƒ§ăƒ³ă‹ă‚‰èˆˆå‘³ă®ă‚ă‚‹ă‚‚ă®ă‚’鏿ă—ă¦ăă ă•ă„"
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr "電話番å·ăŒç™»éŒ²ă•ă‚Œă¦ă„ă‚‹å›½ă‚’é¸æ"
+#~ msgid "Select your phone's country"
+#~ msgstr "電話番å·ăŒç™»éŒ²ă•ă‚Œă¦ă„ă‚‹å›½ă‚’é¸æ"
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3553,7 +3562,7 @@ msgstr "ăƒ€ăƒ¼ă‚¯ăƒ†ăƒ¼ăƒă‚’è–„æ—ă„ă‚‚ă®ă«è¨­å®ă—ă¾ă™"
 msgid "Set new password"
 msgstr "æ–°ă—ă„ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’è¨­å®"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr "ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’è¨­å®"
 
@@ -3597,7 +3606,7 @@ msgstr "ăƒ‘ă‚¹ăƒ¯ăƒ¼ăƒ‰ă‚’ăƒªă‚»ăƒƒăƒˆă™ă‚‹ăŸă‚ă®ăƒ›ă‚¹ăƒ†ă‚£ăƒ³ă‚°ăƒ—ăƒ­ăƒ
 #~ msgid "Sets hosting provider to {label}"
 #~ msgstr "ăƒ›ă‚¹ăƒ†ă‚£ăƒ³ă‚°ăƒ—ăƒ­ăƒă‚¤ăƒ€ăƒ¼ă‚’{label}ă«è¨­å®"
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr "Blueskyă®ă‚¯ăƒ©ă‚¤ă‚¢ăƒ³ăƒˆă®ă‚µăƒ¼ăƒăƒ¼ă‚’設å®"
@@ -3653,9 +3662,9 @@ msgstr "{0}ă«ă‚ˆă‚‹åŸ‹ă‚è¾¼ă¿ă‚’表示"
 msgid "Show follows similar to {0}"
 msgstr "{0}ă«ä¼¼ăŸăă™ă™ă‚ă®ăƒ•ă‚©ăƒ­ăƒ¼å€™è£œă‚’è¡¨ç¤º"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr "ă•らă«è¡¨ç¤º"
 
@@ -3808,8 +3817,8 @@ msgid "Skip this flow"
 msgstr "ă“ă®æ‰‹é †ă‚’ă‚¹ă‚­ăƒƒăƒ—ă™ă‚‹"
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr "SMSèªè¨¼"
+#~ msgid "SMS verification"
+#~ msgstr "SMSèªè¨¼"
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3945,7 +3954,7 @@ msgstr "ă‚¿ăƒƒăƒ—ă—ă¦å…¨ä½“ă‚’è¡¨ç¤º"
 msgid "Tech"
 msgstr "ăƒ†ă‚¯ăƒăƒ­ă‚¸ăƒ¼"
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "æ¡ä»¶"
 
@@ -3961,6 +3970,10 @@ msgstr "利用è¦ç´„"
 msgid "Text input field"
 msgstr "ăƒ†ă‚­ă‚¹ăƒˆă®å…¥å›ăƒ•ă‚£ăƒ¼ăƒ«ăƒ‰"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "ă“ă®ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă¯ă€ăƒ–ăƒ­ăƒƒă‚¯è§£é™¤å¾Œă«ă‚ăªăŸă¨ă‚„ă‚å–ă‚ă™ă‚‹ă“ă¨ăŒă§ăă¾ă™ă€‚"
@@ -3977,7 +3990,7 @@ msgstr "著作権ăƒăƒªă‚·ăƒ¼ă¯<0/>ă«ç§»å‹•ă—ă¾ă—ăŸ"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr "æ¬¡ă®æ‰‹é †ă§ă‚ăªăŸă®Blueskyă§ă®ä½“é¨“ă‚’ă‚«ă‚¹ă‚¿ăƒă‚¤ă‚ºă§ăă¾ă™ă€‚"
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "æ•稿ăŒå‰é™¤ă•ă‚ŒăŸå¯èƒ½æ€§ăŒă‚ă‚ă¾ă™ă€‚"
 
@@ -4082,8 +4095,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr "Blueskyă«æ–°è¦ăƒ¦ăƒ¼ă‚¶ăƒ¼ăŒæ®ºåˆ°ă—ă¦ă„ă¾ă™ï¼ă§ăă‚‹ă ă‘æ—©ăă‚¢ă‚«ă‚¦ăƒ³ăƒˆă‚’æœ‰å¹ă«ă§ăă‚‹ă‚ˆă†åªă‚ă¾ă™ă€‚"
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr "ă“ă®é›»è©±ç•ªå·ă¯æ­£ă—ăă‚ă‚ă¾ă›ă‚“ă€‚ç™»éŒ²ă•ă‚Œă¦ă„ă‚‹å›½ă‚’é¸æă—ă€é›»è©±ç•ªå·ă‚’çœç•¥ă›ăă«å…¥å›ă—ă¦ăă ă•ă„ï¼"
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr "ă“ă®é›»è©±ç•ªå·ă¯æ­£ă—ăă‚ă‚ă¾ă›ă‚“ă€‚ç™»éŒ²ă•ă‚Œă¦ă„ă‚‹å›½ă‚’é¸æă—ă€é›»è©±ç•ªå·ă‚’çœç•¥ă›ăă«å…¥å›ă—ă¦ăă ă•ă„ï¼"
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4208,8 +4221,8 @@ msgstr "ăƒ‰ăƒ­ăƒƒăƒ—ăƒ€ă‚¦ăƒ³ă‚’ăƒˆă‚°ăƒ«"
 msgid "Transformations"
 msgstr "変æ›"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "翻訳"
@@ -4231,7 +4244,7 @@ msgstr "ăƒªă‚¹ăƒˆă§ă®ăƒ–ăƒ­ăƒƒă‚¯ă‚’è§£é™¤"
 msgid "Un-mute list"
 msgstr "ăƒªă‚¹ăƒˆă§ă®ăƒŸăƒ¥ăƒ¼ăƒˆă‚’解除"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4270,7 +4283,7 @@ msgstr "ăƒ•ă‚©ăƒ­ăƒ¼ă‚’ă‚„ă‚ă‚‹"
 msgid "Unfollow {0}"
 msgstr "{0}ă®ăƒ•ă‚©ăƒ­ăƒ¼ă‚’è§£é™¤"
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "残念ăªăŒă‚‰ă€ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă‚’作æˆă™ă‚‹ăŸă‚ă®è¦ä»¶ă‚’満ăŸă—ă¦ă„ă¾ă›ă‚“。"
 
@@ -4362,7 +4375,7 @@ msgstr "ăƒªă‚¹ăƒˆă«ă‚ˆă£ă¦ăƒ–ăƒ­ăƒƒă‚¯ä¸­ă®ăƒ¦ăƒ¼ă‚¶ăƒ¼"
 msgid "User Blocks You"
 msgstr "ă‚ăªăŸă‚’ăƒ–ăƒ­ăƒƒă‚¯ă—ă¦ă„ă‚‹ăƒ¦ăƒ¼ă‚¶ăƒ¼"
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "ăƒ¦ăƒ¼ă‚¶ăƒ¼ăƒăƒ³ăƒ‰ăƒ«"
 
@@ -4411,8 +4424,8 @@ msgid "Users in \"{0}\""
 msgstr "{0}ă®ăƒ¦ăƒ¼ă‚¶ăƒ¼"
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr "èªè¨¼ă‚³ăƒ¼ăƒ‰"
+#~ msgid "Verification code"
+#~ msgstr "èªè¨¼ă‚³ăƒ¼ăƒ‰"
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4512,7 +4525,7 @@ msgstr "ç§ăŸă¡ă¯ă‚ăªăŸă®ç”³ă—ç«‹ă¦ă‚’迅速ă«èª¿æŸ»ă—ă¾ă™ă€‚"
 msgid "We'll use this to help customize your experience."
 msgstr "ă“ă‚Œă¯ă‚ăªăŸă®ä½“é¨“ă‚’ă‚«ă‚¹ă‚¿ăƒă‚¤ă‚ºă™ă‚‹ăŸă‚ă«ä½¿ç”¨ă•ă‚Œă¾ă™ă€‚"
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "ç§ăŸă¡ă¯ă‚ăªăŸăŒå‚å ă—ă¦ăă‚Œă‚‹ă“ă¨ă‚’ă¨ă¦ă‚‚楽ă—ă¿ă«ă—ă¦ă„ă¾ă™ï¼"
 
@@ -4576,8 +4589,8 @@ msgid "Writers"
 msgstr "ăƒ©ă‚¤ă‚¿ăƒ¼"
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr "XXXXXX"
+#~ msgid "XXXXXX"
+#~ msgstr "XXXXXX"
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4635,7 +4648,7 @@ msgstr "ä¿å­˜ă•ă‚ŒăŸăƒ•ă‚£ăƒ¼ăƒ‰ăŒă‚ă‚ă¾ă›ă‚“ï¼"
 msgid "You don't have any saved feeds."
 msgstr "ä¿å­˜ă•ă‚ŒăŸăƒ•ă‚£ăƒ¼ăƒ‰ăŒă‚ă‚ă¾ă›ă‚“。"
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "ă‚ăªăŸăŒæ•ç¨¿è€…ă‚’ăƒ–ăƒ­ăƒƒă‚¯ă—ă¦ă„ă‚‹ă‹ă€ă¾ăŸă¯æ•稿者ă«ă‚ˆă£ă¦ă‚ăªăŸă¯ăƒ–ăƒ­ăƒƒă‚¯ă•ă‚Œă¦ă„ă¾ă™ă€‚"
 
@@ -4725,7 +4738,7 @@ msgstr "ă‚ăªăŸă®ă‚¢ă‚«ă‚¦ăƒ³ăƒˆă¯å‰é™¤ă•ă‚Œă¾ă—ăŸ"
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "生年月日"
 
@@ -4737,7 +4750,7 @@ msgstr "ă“ă“ă§é¸æă—ăŸå†…容ă¯ä¿å­˜ă•ă‚Œă¾ă™ăŒă€å¾Œă‹ă‚‰è¨­å®ă§
 msgid "Your default feed is \"Following\""
 msgstr "ă‚ăªăŸă®ăƒ‡ăƒ•ă‚©ăƒ«ăƒˆăƒ•ă‚£ăƒ¼ăƒ‰ă¯ă€ŒFollowingă€ă§ă™"
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4759,7 +4772,7 @@ msgstr "ăƒ¡ăƒ¼ăƒ«ă‚¢ăƒ‰ăƒ¬ă‚¹ă¯ă¾ă ç¢ºèªă•ă‚Œă¦ă„ă¾ă›ă‚“。ă“ă‚Œă¯ă€
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr "Followingăƒ•ă‚£ăƒ¼ăƒ‰ă¯ç©ºă§ă™ï¼ă‚‚ă£ă¨å¤ăă®ăƒ¦ăƒ¼ă‚¶ăƒ¼ă‚’ăƒ•ă‚©ăƒ­ăƒ¼ă—ă¦ă€è¿‘æ³ă‚’確èªă—ă¾ă—ょă†ă€‚"
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "ăƒ•ăƒ«ăƒăƒ³ăƒ‰ăƒ«ă¯"
 
@@ -4804,6 +4817,6 @@ msgstr "ă‚ăªăŸă®ăƒ—ăƒ­ăƒ•ă‚£ăƒ¼ăƒ«"
 msgid "Your reply has been published"
 msgstr "è¿”ä¿¡ă‚’å…¬é–‹ă—ă¾ă—ăŸ"
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "ă‚ăªăŸă®ăƒ¦ăƒ¼ă‚¶ăƒ¼ăƒăƒ³ăƒ‰ăƒ«"
diff --git a/src/locale/locales/ko/messages.po b/src/locale/locales/ko/messages.po
index 86ac07bc6..9d4c3fc9f 100644
--- a/src/locale/locales/ko/messages.po
+++ b/src/locale/locales/ko/messages.po
@@ -343,21 +343,21 @@ msgstr "́˜ˆ́ˆ "
 msgid "Artistic or non-erotic nudity."
 msgstr "́„ ́ •́ ́´́§€ ́•거나 ́˜ˆ́ˆ ́ ́¸ ë…¸́¶œ."
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "뒤로"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr "뒤로"
@@ -370,7 +370,7 @@ msgstr "{interestsText}́— 대한 ê´€́‹¬́‚¬ 기반"
 msgid "Basics"
 msgstr "기본"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "́ƒë…„́›”́¼"
@@ -422,7 +422,7 @@ msgstr "́°¨ë‹¨í•œ 계́ •́€ ë‚´ ́¤ë ˆë“œ́— 답글́„ 달거나 나를 멘́…˜í•
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "́°¨ë‹¨í•œ 계́ •́€ ë‚´ ́¤ë ˆë“œ́— 답글́„ 달거나 나를 멘́…˜í•˜ê±°ë‚˜ 기타 다른 ë°©́‹́œ¼ë¡œ 나́™€ ́ƒí˜¸́‘́©í•  ́ˆ˜ ́—†́µë‹ˆë‹¤. ́°¨ë‹¨í•œ 계́ •́˜ ́½˜í…́¸ ë¥¼ ë³¼ ́ˆ˜ ́—†́œ¼ë©° 해당 계́ •ë„ ë‚´ ́½˜í…́¸ ë¥¼ ë³¼ ́ˆ˜ ́—†ê²Œ ë©ë‹ˆë‹¤."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "́°¨ë‹¨ëœ 게́‹œë¬¼."
 
@@ -655,7 +655,7 @@ msgstr "ë§́¶¤ 피드를 통해 ́‚¬́©́ 경험́„ ê°•í™”í•˜ë” ́•Œê³ ë¦¬́¦˜́„
 msgid "Choose your main feeds"
 msgstr "기본 피드 ́„ íƒ"
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "비밀번호를 ́…력하́„¸́”"
 
@@ -756,6 +756,10 @@ msgstr "́»¤ë®¤ë‹ˆí‹° ê°€́´ë“œë¼́¸"
 msgid "Complete onboarding and start using your account"
 msgstr "́˜¨ë³´ë”© ́™„료 후 계́ • ́‚¬́© ́‹œ́‘"
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr "́µœëŒ€ {MAX_GRAPHEME_LENGTH}́ 길́´ê¹Œ́§€ 글́„ ́‘́„±í•  ́ˆ˜ ́ˆ́µë‹ˆë‹¤"
@@ -811,12 +815,12 @@ msgstr "확́¸ ́½”드"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr "{email}́„(를) 대기́ 명단́— 등ë¡í•©ë‹ˆë‹¤"
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "́—°ê²° ́¤‘…"
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr "́§€́›́— ́—°ë½í•˜ê¸°"
 
@@ -928,8 +932,8 @@ msgid "Could not load list"
 msgstr "리́¤í¸ë¥¼ 불러́˜¬ ́ˆ˜ ́—†́µë‹ˆë‹¤"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr "êµ­ê°€"
+#~ msgid "Country"
+#~ msgstr "êµ­ê°€"
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -941,7 +945,7 @@ msgstr "́ƒˆ 계́ • 만들기"
 msgid "Create a new Bluesky account"
 msgstr "́ƒˆ Bluesky 계́ •́„ 만듭니다"
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "계́ • 만들기"
 
@@ -1055,7 +1059,7 @@ msgstr "́´ 게́‹œë¬¼́„ ́‚­́ œí•˜́‹œê² ́µë‹ˆê¹Œ?"
 msgid "Deleted"
 msgstr "́‚­́ œë¨"
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "́‚­́ œëœ 게́‹œë¬¼."
 
@@ -1115,7 +1119,7 @@ msgstr "표́‹œ ́´ë¦„"
 msgid "Domain verified!"
 msgstr "ë„ë©”́¸́„ 확́¸í–ˆ́µë‹ˆë‹¤."
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr "́´ˆëŒ€ ́½”드가 ́—†ë‚˜́”?"
 
@@ -1257,16 +1261,14 @@ msgstr "ë‚´ 프로필 ́„¤ëª… í¸́§‘"
 msgid "Education"
 msgstr "êµ́œ¡"
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "́´ë©”́¼"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "́´ë©”́¼ ́£¼́†Œ"
@@ -1337,7 +1339,7 @@ msgstr "́‚¬́©í•  ë„ë©”́¸ ́…ë ¥"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "계́ •́„ 만들 때 ́‚¬́©í•œ ́´ë©”́¼́„ ́…력합니다. ́ƒˆ 비밀번호를 ́„¤́ •í•  ́ˆ˜ ́ˆë„ë¡ \"́¬́„¤́ • ́½”드\"를 보내드립니다."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr "́ƒë…„́›”́¼́„ ́…력하́„¸́”"
@@ -1346,7 +1348,7 @@ msgstr "́ƒë…„́›”́¼́„ ́…력하́„¸́”"
 msgid "Enter your email"
 msgstr "́´ë©”́¼́„ ́…력하́„¸́”"
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "́´ë©”́¼ ́£¼́†Œë¥¼ ́…력하́„¸́”"
 
@@ -1359,13 +1361,17 @@ msgid "Enter your new email address below."
 msgstr "́•„ë˜́— ́ƒˆ ́´ë©”́¼ ́£¼́†Œë¥¼ ́…력하́„¸́”."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr "́ „화번호를 ́…력하́„¸́”"
+#~ msgid "Enter your phone number"
+#~ msgstr "́ „화번호를 ́…력하́„¸́”"
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "́‚¬́©́ ́´ë¦„ ë° ë¹„ë°€ë²ˆí˜¸ ́…ë ¥"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "́˜¤ë¥˜:"
@@ -1462,7 +1468,7 @@ msgstr "피드 ́˜¤í”„ë¼́¸"
 msgid "Feed Preferences"
 msgstr "피드 ́„¤́ •"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "피드백"
@@ -1629,7 +1635,7 @@ msgstr "비밀번호 ë¶„́‹¤"
 msgid "Forgot Password"
 msgstr "비밀번호 ë¶„́‹¤"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr "<0/>́—́„œ"
@@ -1679,11 +1685,11 @@ msgstr "다́Œ"
 msgid "Handle"
 msgstr "핸들"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr "문́ œê°€ ́ˆë‚˜́”?"
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "ë„́›€ë§"
@@ -1773,7 +1779,7 @@ msgstr "홈"
 msgid "Home Feed Preferences"
 msgstr "홈 피드 ́„¤́ •"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "호́¤íŒ… ́ œê³µ́"
@@ -1827,11 +1833,11 @@ msgstr "비밀번호 ́¬́„¤́ •́„ ́œ„í•´ ́´ë©”́¼ë¡œ ́ „́†¡ëœ ́½”드를 ́…ë ¥
 msgid "Input confirmation code for account deletion"
 msgstr "계́ • ́‚­́ œë¥¼ ́œ„한 확́¸ ́½”드를 ́…력합니다"
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr "Bluesky 계́ •́— ́‚¬́©í•  ́´ë©”́¼́„ ́…력합니다"
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr "́§„행하기 ́œ„í•´ ́´ˆëŒ€ ́½”드를 ́…력합니다"
 
@@ -1848,8 +1854,8 @@ msgid "Input password for account deletion"
 msgstr "계́ •́„ ́‚­́ œí•˜ê¸° ́œ„í•´ 비밀번호를 ́…력합니다"
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr "SMS ́¸́¦́— ́‚¬́©í•  ́ „화번호를 ́…력합니다"
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr "SMS ́¸́¦́— ́‚¬́©í•  ́ „화번호를 ́…력합니다"
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1860,8 +1866,8 @@ msgid "Input the username or email address you used at signup"
 msgstr "ê°€́… ́‹œ ́‚¬́©í•œ ́‚¬́©́ ́´ë¦„ ë˜ë” ́´ë©”́¼ ́£¼́†Œë¥¼ ́…력합니다"
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr "문́ ë©”́‹œ́§€ë¡œ ́ „́†¡ëœ ́¸́¦ ́½”드를 ́…력합니다"
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr "문́ ë©”́‹œ́§€ë¡œ ́ „́†¡ëœ ́¸́¦ ́½”드를 ́…력합니다"
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1871,11 +1877,11 @@ msgstr "Bluesky 대기́ 명단́— 등ë¡í•˜ë ¤ë©´ ́´ë©”́¼́„ ́…력합니다
 msgid "Input your password"
 msgstr "비밀번호를 ́…력합니다"
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr "́‚¬́©́ 핸들́„ ́…력합니다"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr "́œ í¨í•˜́§€ ́•거나 ́§€́›ë˜́§€ ́•ë” ê²Œ́‹œë¬¼ 기ë¡"
 
@@ -1891,12 +1897,12 @@ msgstr "́˜ëª»ëœ ́‚¬́©́ ́´ë¦„ ë˜ë” 비밀번호"
 msgid "Invite a Friend"
 msgstr "́¹œêµ¬ ́´ˆëŒ€í•˜ê¸°"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "́´ˆëŒ€ ́½”드"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "́´ˆëŒ€ ́½”드가 ́˜¬ë°”르́§€ ́•́µë‹ˆë‹¤. ́½”드를 ́˜¬ë°”르게 ́…력했ë”́§€ 확́¸í•œ 후 다́‹œ ́‹œë„하́„¸́”."
 
@@ -1925,8 +1931,8 @@ msgstr "́±„́©"
 msgid "Join the waitlist"
 msgstr "대기́ 명단 등ë¡"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "대기́ 명단́— 등ë¡í•˜́„¸́”."
 
@@ -2053,7 +2059,7 @@ msgstr "님́´ ë‚´ 게́‹œë¬¼́„ ́¢‹́•„합니다"
 msgid "Likes"
 msgstr "́¢‹́•„́”"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr "́´ 게́‹œë¬¼́„ ́¢‹́•„́” 표́‹œí•©ë‹ˆë‹¤"
 
@@ -2101,8 +2107,8 @@ msgstr "리́¤í¸ ́–¸ë®¤í¸ë¨"
 msgid "Lists"
 msgstr "리́¤í¸"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "ë” ë§́€ 게́‹œë¬¼ 불러́˜¤ê¸°"
 
@@ -2110,7 +2116,7 @@ msgstr "ë” ë§́€ 게́‹œë¬¼ 불러́˜¤ê¸°"
 msgid "Load new notifications"
 msgstr "́ƒˆ ́•Œë¦¼ 불러́˜¤ê¸°"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2361,7 +2367,7 @@ msgstr "́ƒˆ 비밀번호"
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr "́ƒˆ 게́‹œë¬¼"
@@ -2393,7 +2399,7 @@ msgstr "́ƒˆë¡œ́´ ́ˆœ"
 msgid "News"
 msgstr "뉴́¤"
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2669,8 +2675,8 @@ msgstr "í˜́´́§€ë¥¼ ́°¾́„ ́ˆ˜ ́—†́Œ"
 msgid "Page Not Found"
 msgstr "í˜́´́§€ë¥¼ ́°¾́„ ́ˆ˜ ́—†́Œ"
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2706,8 +2712,8 @@ msgid "Pets"
 msgstr "반려ë™ë¬¼"
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr "́ „화번호"
+#~ msgid "Phone number"
+#~ msgstr "́ „화번호"
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2735,14 +2741,18 @@ msgstr "ë™́˜́ƒ ́¬́ƒ"
 msgid "Plays the GIF"
 msgstr "GIF를 ́¬́ƒí•©ë‹ˆë‹¤"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "핸들́„ ́…력하́„¸́”."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "비밀번호를 ́…력하́„¸́”."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "́´ë©”́¼́„ 변경하기 ́ „́— ́´ë©”́¼́„ 확́¸í•´ ́£¼́„¸́”. ́´ë” ́´ë©”́¼ 변경 ë„구가 ́¶”ê°€ë˜ë” ë™́•ˆ ́¼́‹œ́ ́œ¼ë¡œ ́”구ë˜ë” ́‚¬í•­́´ë©° ê³§ ́ œê±°ë  ́˜ˆ́ •́…니다."
@@ -2752,22 +2762,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr "́•± 비밀번호́˜ ́´ë¦„́„ ́…력하́„¸́”. 모든 공백 문́ë” í—ˆ́©ë˜́§€ ́•́µë‹ˆë‹¤."
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr "SMS 문́ ë©”́‹œ́§€ë¥¼ ë°›́„ ́ˆ˜ ́ˆë” íœ´ëŒ€í° ë²ˆí˜¸ë¥¼ ́…력하́„¸́”."
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr "SMS 문́ ë©”́‹œ́§€ë¥¼ ë°›́„ ́ˆ˜ ́ˆë” íœ´ëŒ€í° ë²ˆí˜¸ë¥¼ ́…력하́„¸́”."
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "́´ ́•± 비밀번호́— 대해 ê³ ́œ í•œ ́´ë¦„́„ ́…력하거나 무́‘́œ„로 ́ƒ́„±ëœ ́´ë¦„́„ ́‚¬́©í•©ë‹ˆë‹¤."
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr "SMS로 ë°›́€ ́½”드를 ́…력하́„¸́”."
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr "SMS로 ë°›́€ ́½”드를 ́…력하́„¸́”."
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr "{phoneNumberFormatted}(́œ¼)로 ë³´ë‚´́§„ ́¸́¦ ́½”드를 ́…력하́„¸́”."
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr "{phoneNumberFormatted}(́œ¼)로 ë³´ë‚´́§„ ́¸́¦ ́½”드를 ́…력하́„¸́”."
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "́´ë©”́¼́„ ́…력하́„¸́”."
 
@@ -2802,12 +2812,12 @@ msgctxt "action"
 msgid "Post"
 msgstr "게́‹œí•˜ê¸°"
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "게́‹œë¬¼"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr "{0} 님́˜ 게́‹œë¬¼"
 
@@ -2821,7 +2831,7 @@ msgstr "@{0} 님́˜ 게́‹œë¬¼"
 msgid "Post deleted"
 msgstr "게́‹œë¬¼ ́‚­́ œë¨"
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "게́‹œë¬¼ ́ˆ¨ê¹€"
 
@@ -2833,7 +2843,7 @@ msgstr "게́‹œë¬¼ ́–¸́–´"
 msgid "Post Languages"
 msgstr "게́‹œë¬¼ ́–¸́–´"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "게́‹œë¬¼́„ ́°¾́„ ́ˆ˜ ́—†́Œ"
 
@@ -2862,7 +2872,7 @@ msgid "Prioritize Your Follows"
 msgstr "ë‚´ 팔로́° 먼́ € 표́‹œ"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "ê°œ́¸́ •ë³´"
 
@@ -3024,7 +3034,7 @@ msgid "Reply Filters"
 msgstr "답글 필터"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr "<0/> 님́—게 ë³´ë‚´ë” ë‹µê¸€"
@@ -3071,11 +3081,11 @@ msgstr "́¬ê²Œ́‹œ ë˜ë” 게́‹œë¬¼ ́¸́©"
 msgid "Reposted By"
 msgstr "́¬ê²Œ́‹œí•œ ́‚¬́©́"
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr "{0} 님́´ ́¬ê²Œ́‹œí•¨"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "<0/> 님́´ ́¬ê²Œ́‹œí•¨"
 
@@ -3083,7 +3093,7 @@ msgstr "<0/> 님́´ ́¬ê²Œ́‹œí•¨"
 msgid "reposted your post"
 msgstr "님́´ ë‚´ 게́‹œë¬¼́„ ́¬ê²Œ́‹œí–ˆ́µë‹ˆë‹¤"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr "́´ 게́‹œë¬¼́˜ ́¬ê²Œ́‹œ"
 
@@ -3093,8 +3103,8 @@ msgid "Request Change"
 msgstr "변경 ́”́²­"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr "́½”드 ́”́²­"
+#~ msgid "Request code"
+#~ msgstr "́½”드 ́”́²­"
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3105,7 +3115,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr "게́‹œí•˜ê¸° ́ „ 대́²´ í…́¤í¸ í•„́ˆ˜"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "́´ ́ œê³µ́́—́„œ í•„́ˆ˜"
 
@@ -3157,9 +3167,8 @@ msgstr "́˜¤ë¥˜ê°€ ë°œ́ƒí•œ 마́§€ë§‰ ́‘́—…́„ 다́‹œ ́‹œë„합니다"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3168,16 +3177,16 @@ msgid "Retry"
 msgstr "다́‹œ ́‹œë„"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr "다́‹œ ́‹œë„하기"
+#~ msgid "Retry."
+#~ msgstr "다́‹œ ́‹œë„하기"
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr "́´́ „ í˜́´́§€ë¡œ ëŒ́•„갑니다"
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr "́ƒŒë“œë°•́¤. 글과 계́ •́€ ́˜êµ¬́ ́´́§€ ́•́µë‹ˆë‹¤."
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr "́ƒŒë“œë°•́¤. 글과 계́ •́€ ́˜êµ¬́ ́´́§€ ́•́µë‹ˆë‹¤."
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3286,7 +3295,7 @@ msgstr "기́¡´ 계́ •́—́„œ ́„ íƒ"
 msgid "Select option {i} of {numItems}"
 msgstr "{numItems}ê°œ ́¤‘ {i}번́§¸ ́˜µ́…˜́„ ́„ íƒí•©ë‹ˆë‹¤"
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "́„œë¹„́¤ ́„ íƒ"
@@ -3320,8 +3329,8 @@ msgid "Select your interests from the options below"
 msgstr "́•„ë˜ ́˜µ́…˜́—́„œ ê´€́‹¬́‚¬ë¥¼ ́„ íƒí•˜́„¸́”"
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr "́ „화번호 êµ­ê°€ ́„ íƒ"
+#~ msgid "Select your phone's country"
+#~ msgstr "́ „화번호 êµ­ê°€ ́„ íƒ"
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3400,7 +3409,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "́ƒˆ 비밀번호 ́„¤́ •"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr "비밀번호 ́„¤́ •"
 
@@ -3440,7 +3449,7 @@ msgstr "비밀번호 ́¬́„¤́ •́„ ́œ„한 ́´ë©”́¼́„ ́„¤́ •합니다"
 msgid "Sets hosting provider for password reset"
 msgstr "비밀번호 ́¬́„¤́ •́„ ́œ„한 호́¤íŒ… ́ œê³µ́를 ́„¤́ •합니다"
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr "Bluesky í´ë¼́´́–¸í¸ë¥¼ ́œ„한 ́„œë²„를 ́„¤́ •합니다"
@@ -3496,9 +3505,9 @@ msgstr "{0} ́„베드 표́‹œ"
 msgid "Show follows similar to {0}"
 msgstr "{0} 님과 비́·í•œ 팔로́° 표́‹œ"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr "ë” ë³´ê¸°"
 
@@ -3651,8 +3660,8 @@ msgid "Skip this flow"
 msgstr "́´ 단계 건너뛰기"
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr "SMS ́¸́¦"
+#~ msgid "SMS verification"
+#~ msgstr "SMS ́¸́¦"
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3780,7 +3789,7 @@ msgstr "탭하́—¬ ́ „́²´ í¬ê¸°ë¡œ 봅니다"
 msgid "Tech"
 msgstr "기́ˆ "
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "́´́©́•½ê´€"
 
@@ -3796,6 +3805,10 @@ msgstr "́„œë¹„́¤ ́´́©́•½ê´€"
 msgid "Text input field"
 msgstr "í…́¤í¸ ́…ë ¥ 필드"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "́°¨ë‹΅„ í•´́ œí•˜ë©´ 해당 계́ •́´ 나́™€ ́ƒí˜¸́‘́©í•  ́ˆ˜ ́ˆê²Œ ë©ë‹ˆë‹¤."
@@ -3812,7 +3825,7 @@ msgstr "́ €́‘ê¶Œ ́ •́±…́„ <0/>(́œ¼)로 ́´ë™í–ˆ́µë‹ˆë‹¤"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr "다́Œ ë‹¨ê³„ë” Bluesky 환경́„ ë§́¶¤ ́„¤́ •í•˜ë” ë° ë„́›€́´ ë©ë‹ˆë‹¤."
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "게́‹œë¬¼́´ ́‚­́ œë˜́—ˆ́„ ́ˆ˜ ́ˆ́µë‹ˆë‹¤."
 
@@ -3913,8 +3926,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr "Blueský— ́‹ ê·œ ́‚¬́©́ê°€ 몰리고 ́ˆ́µë‹ˆë‹¤! ́µœëŒ€í•œ 빨리 계́ •́„ 활́„±í™”í•´ 드리겠́µë‹ˆë‹¤."
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr "́˜ëª»ëœ 번호́…니다. 국가를 ́„ íƒí•˜ê³  ́ „́²´ ́ „화번호를 ́…력하́„¸́”."
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr "́˜ëª»ëœ 번호́…니다. 국가를 ́„ íƒí•˜ê³  ́ „́²´ ́ „화번호를 ́…력하́„¸́”."
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4027,8 +4040,8 @@ msgstr "드롭다́´ ́—´ê¸° ë° ë‹«ê¸°"
 msgid "Transformations"
 msgstr "변형"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "번́—­"
@@ -4046,7 +4059,7 @@ msgstr "리́¤í¸ ́°¨ë‹¨ í•´́ œ"
 msgid "Un-mute list"
 msgstr "리́¤í¸ ́–¸ë®¤í¸"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4085,7 +4098,7 @@ msgstr "́–¸íŒ”로́°"
 msgid "Unfollow {0}"
 msgstr "{0} 님́„ ́–¸íŒ”로́°"
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "́•„́‰½́§€ë§Œ 계́ •́„ 만들 ́ˆ˜ ́ˆë” ́”ê±´́„ ́¶©́¡±í•˜́§€ 못했́µë‹ˆë‹¤."
 
@@ -4177,7 +4190,7 @@ msgstr "리́¤í¸ë¡œ ́‚¬́©́ ́°¨ë‹¨ë¨"
 msgid "User Blocks You"
 msgstr "́‚¬́©́ê°€ 나를 ́°¨ë‹¨í•¨"
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "́‚¬́©́ 핸들"
 
@@ -4226,8 +4239,8 @@ msgid "Users in \"{0}\""
 msgstr "\"{0}\"́— ́ˆë” ́‚¬́©́"
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr "́¸́¦ ́½”드"
+#~ msgid "Verification code"
+#~ msgstr "́¸́¦ ́½”드"
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4319,7 +4332,7 @@ msgstr "́´́˜́‹ ́²­́„ ́¦‰́‹œ 검토하겠́µë‹ˆë‹¤."
 msgid "We'll use this to help customize your experience."
 msgstr "́´ë¥¼ 통해 ́‚¬́©́ 환경́„ ë§́¶¤ ́„¤́ •í•  ́ˆ˜ ́ˆ́µë‹ˆë‹¤."
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "당́‹ ê³¼ 함께하게 ë˜́–´ ́ •ë§ ê¸°́˜ë„¤́”!"
 
@@ -4383,8 +4396,8 @@ msgid "Writers"
 msgstr "́‘ê°€"
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr "XXXXXX"
+#~ msgid "XXXXXX"
+#~ msgstr "XXXXXX"
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4430,7 +4443,7 @@ msgstr "́ €́¥ëœ 피드가 ́—†́µë‹ˆë‹¤!"
 msgid "You don't have any saved feeds."
 msgstr "́ €́¥ëœ 피드가 ́—†́µë‹ˆë‹¤."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "́‘́„±́를 ́°¨ë‹¨í–ˆê±°ë‚˜ ́‘́„±́ê°€ 나를 ́°¨ë‹¨í–ˆ́µë‹ˆë‹¤."
 
@@ -4520,7 +4533,7 @@ msgstr "계́ •́„ ́‚­́ œí–ˆ́µë‹ˆë‹¤"
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "́ƒë…„́›”́¼"
 
@@ -4532,7 +4545,7 @@ msgstr "́„ íƒ ́‚¬í•­́€ ́ €́¥ë˜ë©° 나́¤‘́— ́„¤́ •́—́„œ 변경할 ́ˆ˜ ́ˆ́
 msgid "Your default feed is \"Following\""
 msgstr "기본 í”¼ë“œë” \"팔로́° ́¤‘\"́…니다"
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4554,7 +4567,7 @@ msgstr "́´ë©”́¼́´ ́•„́§ ́¸́¦ë˜́§€ ́•́•˜́µë‹ˆë‹¤. ́´ë” ́¤‘́”한 ë³´́•
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr "팔로́° ́¤‘́¸ 피드가 비́–´ ́ˆ́µë‹ˆë‹¤! ë” ë§́€ ́‚¬́©́를 팔로́°í•˜́—¬ 무́¨ ́¼́´ ́¼́–´ë‚˜ê³  ́ˆë”́§€ 확́¸í•˜́„¸́”."
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "ë‚´ ́ „́²´ 핸들:"
 
@@ -4591,6 +4604,6 @@ msgstr "내 프로필"
 msgid "Your reply has been published"
 msgstr "ë‚´ 답글́„ 게́‹œí–ˆ́µë‹ˆë‹¤"
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "ë‚´ ́‚¬́©́ 핸들"
diff --git a/src/locale/locales/pt-BR/messages.po b/src/locale/locales/pt-BR/messages.po
index 3c655a5b5..cd865aa43 100644
--- a/src/locale/locales/pt-BR/messages.po
+++ b/src/locale/locales/pt-BR/messages.po
@@ -347,21 +347,21 @@ msgstr "Arte"
 msgid "Artistic or non-erotic nudity."
 msgstr "Nudez artĂ­stica ou nĂ£o erĂ³tica."
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "Voltar"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr "Voltar"
@@ -374,7 +374,7 @@ msgstr "Com base no seu interesse em {interestsText}"
 msgid "Basics"
 msgstr "BĂ¡sicos"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "AniversĂ¡rio"
@@ -426,7 +426,7 @@ msgstr "Contas bloqueadas nĂ£o podem te responder, mencionar ou interagir com vo
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "Contas bloqueadas nĂ£o podem te responder, mencionar ou interagir com vocĂª. VocĂª nĂ£o verĂ¡ o conteĂºdo deles e eles serĂ£o impedidos de ver o seu."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "Post bloqueado."
 
@@ -663,7 +663,7 @@ msgstr "Escolha os algoritmos que fazem sentido para vocĂª com os feeds personal
 msgid "Choose your main feeds"
 msgstr "Escolha seus feeds principais"
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "Escolha sua senha"
 
@@ -764,6 +764,10 @@ msgstr "Diretrizes da Comunidade"
 msgid "Complete onboarding and start using your account"
 msgstr "Completar e começar a usar sua conta"
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr "Escreva posts de até {MAX_GRAPHEME_LENGTH} caracteres"
@@ -819,12 +823,12 @@ msgstr "CĂ³digo de confirmaĂ§Ă£o"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr "Confirma adiĂ§Ă£o de {email} Ă  lista de espera"
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr "Contatar suporte"
 
@@ -936,8 +940,8 @@ msgid "Could not load list"
 msgstr "NĂ£o foi possĂ­vel carregar a lista"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr "PaĂ­s"
+#~ msgid "Country"
+#~ msgstr "PaĂ­s"
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -949,7 +953,7 @@ msgstr "Criar uma nova conta"
 msgid "Create a new Bluesky account"
 msgstr "Criar uma nova conta do Bluesky"
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "Criar Conta"
 
@@ -1063,7 +1067,7 @@ msgstr "Excluir este post?"
 msgid "Deleted"
 msgstr "ExcluĂ­do"
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "Post excluĂ­do."
 
@@ -1123,7 +1127,7 @@ msgstr "Nome de ExibiĂ§Ă£o"
 msgid "Domain verified!"
 msgstr "DomĂ­nio verificado!"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr "NĂ£o possui um convite?"
 
@@ -1265,16 +1269,14 @@ msgstr "Editar sua descriĂ§Ă£o"
 msgid "Education"
 msgstr "EducaĂ§Ă£o"
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "E-mail"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "Endereço de e-mail"
@@ -1345,7 +1347,7 @@ msgstr "Digite o domĂ­nio que vocĂª deseja usar"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "Digite o e-mail que vocĂª usou para criar a sua conta. NĂ³s lhe enviaremos um \"cĂ³digo de redefiniĂ§Ă£o\" para que vocĂª possa definir uma nova senha."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr "Insira seu aniversĂ¡rio"
@@ -1354,7 +1356,7 @@ msgstr "Insira seu aniversĂ¡rio"
 msgid "Enter your email"
 msgstr "Digite seu e-mail"
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "Digite seu endereço de e-mail"
 
@@ -1367,13 +1369,17 @@ msgid "Enter your new email address below."
 msgstr "Digite seu novo endereço de e-mail abaixo."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr "Digite seu nĂºmero de telefone"
+#~ msgid "Enter your phone number"
+#~ msgstr "Digite seu nĂºmero de telefone"
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "Digite seu nome de usuĂ¡rio e senha"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "Erro:"
@@ -1470,7 +1476,7 @@ msgstr "Feed offline"
 msgid "Feed Preferences"
 msgstr "PreferĂªncias de Feeds"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "ComentĂ¡rios"
@@ -1645,7 +1651,7 @@ msgstr "Esqueci a senha"
 msgid "Forgot Password"
 msgstr "Esqueci a Senha"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr "Por <0/>"
@@ -1695,11 +1701,11 @@ msgstr "PrĂ³ximo"
 msgid "Handle"
 msgstr "UsuĂ¡rio"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr "Precisa de ajuda?"
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "Ajuda"
@@ -1789,7 +1795,7 @@ msgstr "PĂ¡gina Inicial"
 msgid "Home Feed Preferences"
 msgstr "PreferĂªncias da PĂ¡gina Inicial"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "Provedor de hospedagem"
@@ -1843,11 +1849,11 @@ msgstr "Insira o cĂ³digo enviado para o seu e-mail para redefinir sua senha"
 msgid "Input confirmation code for account deletion"
 msgstr "Insira o cĂ³digo de confirmaĂ§Ă£o para excluir sua conta"
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr "Insira o e-mail para a sua conta do Bluesky"
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr "Insira o convite para continuar"
 
@@ -1864,8 +1870,8 @@ msgid "Input password for account deletion"
 msgstr "Insira a senha para excluir a conta"
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr "Insira o nĂºmero de telefone para verificaĂ§Ă£o via SMS"
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr "Insira o nĂºmero de telefone para verificaĂ§Ă£o via SMS"
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1876,8 +1882,8 @@ msgid "Input the username or email address you used at signup"
 msgstr "Insira o usuĂ¡rio ou e-mail que vocĂª cadastrou"
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr "Insira o cĂ³digo de verificaĂ§Ă£o que enviamos para vocĂª"
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr "Insira o cĂ³digo de verificaĂ§Ă£o que enviamos para vocĂª"
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1887,11 +1893,11 @@ msgstr "Insira seu e-mail para entrar na lista de espera do Bluesky"
 msgid "Input your password"
 msgstr "Insira sua senha"
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr "Insira o usuĂ¡rio"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr "Post invĂ¡lido"
 
@@ -1907,12 +1913,12 @@ msgstr "Credenciais invĂ¡lidas"
 msgid "Invite a Friend"
 msgstr "Convide um Amigo"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "Convite"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "Convite invĂ¡lido. Verifique se vocĂª o inseriu corretamente e tente novamente."
 
@@ -1941,8 +1947,8 @@ msgstr "Carreiras"
 msgid "Join the waitlist"
 msgstr "Junte-se Ă  lista de espera"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "Junte-se Ă  lista de espera."
 
@@ -2069,7 +2075,7 @@ msgstr "curtiu seu post"
 msgid "Likes"
 msgstr "Curtidas"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr "Curtidas neste post"
 
@@ -2117,8 +2123,8 @@ msgstr "Lista dessilenciada"
 msgid "Lists"
 msgstr "Listas"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "Carregar mais posts"
 
@@ -2126,7 +2132,7 @@ msgstr "Carregar mais posts"
 msgid "Load new notifications"
 msgstr "Carregar novas notificações"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2377,7 +2383,7 @@ msgstr "Nova senha"
 msgid "New Password"
 msgstr "Nova Senha"
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr "Novo post"
@@ -2409,7 +2415,7 @@ msgstr "Respostas mais recentes primeiro"
 msgid "News"
 msgstr "NotĂ­cias"
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2685,8 +2691,8 @@ msgstr "PĂ¡gina nĂ£o encontrada"
 msgid "Page Not Found"
 msgstr "PĂ¡gina NĂ£o Encontrada"
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2722,8 +2728,8 @@ msgid "Pets"
 msgstr "Pets"
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr "NĂºmero de telefone"
+#~ msgid "Phone number"
+#~ msgstr "NĂºmero de telefone"
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2751,14 +2757,18 @@ msgstr "Reproduzir VĂ­deo"
 msgid "Plays the GIF"
 msgstr "Reproduz o GIF"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "Por favor, escolha seu usuĂ¡rio."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "Por favor, escolha sua senha."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "Por favor, confirme seu e-mail antes de alterĂ¡-lo. Este Ă© um requisito temporĂ¡rio enquanto ferramentas de atualizaĂ§Ă£o de e-mail sĂ£o adicionadas, e em breve serĂ¡ removido."
@@ -2768,22 +2778,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr "Por favor, insira um nome para a sua Senha de Aplicativo."
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr "Por favor, insira um nĂºmero de telefone que possa receber mensagens SMS."
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr "Por favor, insira um nĂºmero de telefone que possa receber mensagens SMS."
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "Por favor, insira um nome Ăºnico para esta Senha de Aplicativo ou use nosso nome gerado automaticamente."
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr "Por favor, digite o cĂ³digo recebido via SMS."
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr "Por favor, digite o cĂ³digo recebido via SMS."
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr "Por favor, digite o cĂ³digo de verificaĂ§Ă£o enviado para {phoneNumberFormatted}."
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr "Por favor, digite o cĂ³digo de verificaĂ§Ă£o enviado para {phoneNumberFormatted}."
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "Por favor, digite o seu e-mail."
 
@@ -2823,12 +2833,12 @@ msgctxt "action"
 msgid "Post"
 msgstr "Postar"
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "Post"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr "Post por {0}"
 
@@ -2842,7 +2852,7 @@ msgstr "Post por @{0}"
 msgid "Post deleted"
 msgstr "Post excluĂ­do"
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "Post oculto"
 
@@ -2854,7 +2864,7 @@ msgstr "Idioma do post"
 msgid "Post Languages"
 msgstr "Idiomas do Post"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "Post nĂ£o encontrado"
 
@@ -2883,7 +2893,7 @@ msgid "Prioritize Your Follows"
 msgstr "Priorizar seus Seguidores"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "Privacidade"
 
@@ -3045,7 +3055,7 @@ msgid "Reply Filters"
 msgstr "Filtros de Resposta"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr "Responder <0/>"
@@ -3092,11 +3102,11 @@ msgstr "Repostar ou citar um post"
 msgid "Reposted By"
 msgstr "Repostado Por"
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr "Repostado por {0}"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "Repostado por <0/>"
 
@@ -3104,7 +3114,7 @@ msgstr "Repostado por <0/>"
 msgid "reposted your post"
 msgstr "repostou seu post"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr "Reposts"
 
@@ -3114,8 +3124,8 @@ msgid "Request Change"
 msgstr "Solicitar AlteraĂ§Ă£o"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr "Solicitar cĂ³digo"
+#~ msgid "Request code"
+#~ msgstr "Solicitar cĂ³digo"
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3126,7 +3136,7 @@ msgstr "Solicitar CĂ³digo"
 msgid "Require alt text before posting"
 msgstr "Exigir texto alternativo antes de postar"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "ObrigatĂ³rio para este provedor"
 
@@ -3178,9 +3188,8 @@ msgstr "Tenta a Ăºltima aĂ§Ă£o, que deu erro"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3189,16 +3198,16 @@ msgid "Retry"
 msgstr "Tente novamente"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr "Tentar novamente."
+#~ msgid "Retry."
+#~ msgstr "Tentar novamente."
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr "Voltar para pĂ¡gina anterior"
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr "SANDBOX. Posts e contas nĂ£o sĂ£o permanentes."
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr "SANDBOX. Posts e contas nĂ£o sĂ£o permanentes."
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3307,7 +3316,7 @@ msgstr "Selecionar de uma conta existente"
 msgid "Select option {i} of {numItems}"
 msgstr "Seleciona opĂ§Ă£o {i} de {numItems}"
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "Selecionar serviço"
@@ -3345,8 +3354,8 @@ msgid "Select your interests from the options below"
 msgstr "Selecione seus interesses"
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr "Selecione o paĂ­s do nĂºmero de telefone"
+#~ msgid "Select your phone's country"
+#~ msgstr "Selecione o paĂ­s do nĂºmero de telefone"
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3425,7 +3434,7 @@ msgstr "Definir o tema escuro para a versĂ£o menos escura"
 msgid "Set new password"
 msgstr "Definir uma nova senha"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr "Definir senha"
 
@@ -3465,7 +3474,7 @@ msgstr "Configura o e-mail para recuperaĂ§Ă£o de senha"
 msgid "Sets hosting provider for password reset"
 msgstr "Configura o provedor de hospedagem para recuperaĂ§Ă£o de senha"
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr "Configura o servidor para o cliente do Bluesky"
@@ -3521,9 +3530,9 @@ msgstr "Mostrar anexos de {0}"
 msgid "Show follows similar to {0}"
 msgstr "Mostrar usuĂ¡rios parecidos com {0}"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr "Mostrar Mais"
 
@@ -3676,8 +3685,8 @@ msgid "Skip this flow"
 msgstr "Pular"
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr "VerificaĂ§Ă£o por SMS"
+#~ msgid "SMS verification"
+#~ msgstr "VerificaĂ§Ă£o por SMS"
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3805,7 +3814,7 @@ msgstr "Toque para ver tudo"
 msgid "Tech"
 msgstr "Tecnologia"
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "Termos"
 
@@ -3821,6 +3830,10 @@ msgstr "Termos de Serviço"
 msgid "Text input field"
 msgstr "Campo de entrada de texto"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "A conta poderĂ¡ interagir com vocĂª apĂ³s o desbloqueio."
@@ -3837,7 +3850,7 @@ msgstr "A PolĂ­tica de Direitos Autorais foi movida para <0/>"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr "Os seguintes passos vĂ£o ajudar a customizar sua experiĂªncia no Bluesky."
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "O post pode ter sido excluĂ­do."
 
@@ -3938,8 +3951,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr "Muitos usuĂ¡rios estĂ£o tentando acessar o Bluesky! Ativaremos sua conta assim que possĂ­vel."
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr "Houve um problema com este nĂºmero. Por favor, escolha um paĂ­s e digite seu nĂºmero de telefone completo!"
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr "Houve um problema com este nĂºmero. Por favor, escolha um paĂ­s e digite seu nĂºmero de telefone completo!"
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4052,8 +4065,8 @@ msgstr "Alternar menu suspenso"
 msgid "Transformations"
 msgstr "Transformações"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "Traduzir"
@@ -4071,7 +4084,7 @@ msgstr "Desbloquear lista"
 msgid "Un-mute list"
 msgstr "Dessilenciar lista"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4110,7 +4123,7 @@ msgstr "Deixar de seguir"
 msgid "Unfollow {0}"
 msgstr "Deixar de seguir {0}"
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "Infelizmente, vocĂª nĂ£o atende aos requisitos para criar uma conta."
 
@@ -4202,7 +4215,7 @@ msgstr "UsuĂ¡rio Bloqueado Por Lista"
 msgid "User Blocks You"
 msgstr "Este UsuĂ¡rio Te Bloqueou"
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "UsuĂ¡rio"
 
@@ -4251,8 +4264,8 @@ msgid "Users in \"{0}\""
 msgstr "UsuĂ¡rios em \"{0}\""
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr "CĂ³digo de verificaĂ§Ă£o"
+#~ msgid "Verification code"
+#~ msgstr "CĂ³digo de verificaĂ§Ă£o"
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4348,7 +4361,7 @@ msgstr "Avaliaremos sua contestaĂ§Ă£o o quanto antes."
 msgid "We'll use this to help customize your experience."
 msgstr "Usaremos isto para customizar a sua experiĂªncia."
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "Estamos muito felizes em recebĂª-lo!"
 
@@ -4412,8 +4425,8 @@ msgid "Writers"
 msgstr "Escritores"
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr "XXXXXX"
+#~ msgid "XXXXXX"
+#~ msgstr "XXXXXX"
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4467,7 +4480,7 @@ msgstr "VocĂª nĂ£o tem feeds salvos!"
 msgid "You don't have any saved feeds."
 msgstr "VocĂª nĂ£o tem feeds salvos."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "VocĂª bloqueou esta conta ou foi bloqueado por ela."
 
@@ -4557,7 +4570,7 @@ msgstr "Sua conta foi excluĂ­da"
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "Sua data de nascimento"
 
@@ -4569,7 +4582,7 @@ msgstr "Sua escolha serĂ¡ salva, mas vocĂª pode trocĂ¡-la nas configurações de
 msgid "Your default feed is \"Following\""
 msgstr "Seu feed inicial Ă© o \"Seguindo\""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4591,7 +4604,7 @@ msgstr "Seu e-mail ainda nĂ£o foi verificado. Esta Ă© uma etapa importante de se
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr "Seu feed inicial estĂ¡ vazio! Siga mais usuĂ¡rios para acompanhar o que estĂ¡ acontecendo."
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "Seu identificador completo serĂ¡"
 
@@ -4628,6 +4641,6 @@ msgstr "Seu perfil"
 msgid "Your reply has been published"
 msgstr "Sua resposta foi publicada"
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "Seu identificador de usuĂ¡rio"
diff --git a/src/locale/locales/uk/messages.po b/src/locale/locales/uk/messages.po
index db6a5b948..6b40f5bbf 100644
--- a/src/locale/locales/uk/messages.po
+++ b/src/locale/locales/uk/messages.po
@@ -401,21 +401,21 @@ msgstr "Đ¥ÑƒĐ´Đ¾Đ¶Đ½Ñ Đ°Đ±Đ¾ Đ½ĐµĐµÑ€Đ¾Ñ‚Đ¸Ñ‡Đ½Đ° Đ¾Đ³Đ¾Đ»ĐµĐ½Ñ–Ñть."
 #~ msgid "Ask apps to limit the visibility of my account"
 #~ msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "Đазад"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr ""
@@ -428,7 +428,7 @@ msgstr ""
 msgid "Basics"
 msgstr "ĐÑĐ½Đ¾Đ²Đ½Ñ–"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "Đ”Đ°Ñ‚Đ° Đ½Đ°Ñ€Đ¾Đ´Đ¶ĐµĐ½Đ½Ñ"
@@ -480,7 +480,7 @@ msgstr "Đ—Đ°Đ±Đ»Đ¾ĐºĐ¾Đ²Đ°Đ½Ñ– Đ¾Đ±Đ»Ñ–ĐºĐ¾Đ²Ñ– Đ·Đ°Đ¿Đ¸Ñи Đ½Đµ Đ¼Đ¾Đ¶ÑƒÑ‚ÑŒ Đ
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "Đ—Đ°Đ±Đ»Đ¾ĐºĐ¾Đ²Đ°Đ½Ñ– Đ¾Đ±Đ»Ñ–ĐºĐ¾Đ²Ñ– Đ·Đ°Đ¿Đ¸Ñи Đ½Đµ Đ¼Đ¾Đ¶ÑƒÑ‚ÑŒ Đ²Đ°Đ¼ Đ²Ñ–Đ´Đ¿Đ¾Đ²Ñ–Đ´Đ°Ñ‚Đ¸, Đ·Đ³Đ°Đ´ÑƒĐ²Đ°Ñ‚Đ¸ Đ²Đ°Ñ Ñƒ ÑĐ²Đ¾Ñ—Ñ… Đ¿Đ¾ÑÑ‚Đ°Ñ…, Ñ– Đ²Đ·Đ°Ñ”Đ¼Đ¾Đ´Ñ–ÑÑ‚Đ¸ Đ· Đ²Đ°Đ¼Đ¸ Đ±ÑƒĐ´ÑŒ-ÑĐºĐ¸Đ¼ Ñ–Đ½ÑˆĐ¸Đ¼ Ñ‡Đ¸Đ½Đ¾Đ¼. Ви Đ½Đµ Đ±ÑƒĐ´ĐµÑ‚Đµ Đ±Đ°Ñ‡Đ¸Ñ‚Đ¸ Ñ—Ñ…Đ½Ñ– Đ¿Đ¾ÑÑ‚Đ¸ Ñ– Đ²Đ¾Đ½Đ¸ Đ½Đµ Đ±ÑƒĐ´ÑƒÑ‚ÑŒ Đ±Đ°Ñ‡Đ¸Ñ‚Đ¸ Đ²Đ°ÑˆÑ–."
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "Đ—Đ°Đ±Đ»Đ¾ĐºĐ¾Đ²Đ°Đ½Đ¸Đ¹ Đ¿Đ¾ÑÑ‚."
 
@@ -729,7 +729,7 @@ msgstr "ĐĐ²Ñ‚Đ¾Ñ€Đ¸ ÑÑ‚Ñ€Ñ–Ñ‡Đ¾Đº Đ¼Đ¾Đ¶ÑƒÑ‚ÑŒ Đ¾Đ±Đ¸Ñ€Đ°Ñ‚Đ¸ Đ±ÑƒĐ´ÑŒ-ÑĐºÑ–
 msgid "Choose your main feeds"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "Đ’ĐºĐ°Đ¶Ñ–Ñ‚ÑŒ Đ¿Đ°Ñ€Đ¾Đ»ÑŒ"
 
@@ -830,6 +830,10 @@ msgstr "ĐŸÑ€Đ°Đ²Đ¸Đ»Đ° ÑĐ¿Ñ–Đ»ÑŒĐ½Đ¾Ñ‚Đ¸"
 msgid "Complete onboarding and start using your account"
 msgstr ""
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr ""
@@ -885,12 +889,12 @@ msgstr "ĐĐ¾Đ´ Đ¿Ñ–Đ´Ñ‚Đ²ĐµÑ€Đ´Đ¶ĐµĐ½Đ½Ñ"
 msgid "Confirms signing up {email} to the waitlist"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "Đ—â€™Ñ”Đ´Đ½Đ°Đ½Đ½Ñ..."
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr ""
 
@@ -1002,8 +1006,8 @@ msgid "Could not load list"
 msgstr "Đе Đ²Đ´Đ°Đ»Đ¾ÑÑ Đ·Đ°Đ²Đ°Đ½Ñ‚Đ°Đ¶Đ¸Ñ‚Đ¸ ÑĐ¿Đ¸ÑĐ¾Đº"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr ""
+#~ msgid "Country"
+#~ msgstr ""
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -1015,7 +1019,7 @@ msgstr "Đ¡Ñ‚Đ²Đ¾Ñ€Đ¸Ñ‚Đ¸ Đ½Đ¾Đ²Đ¸Đ¹ Đ¾Đ±Đ»Ñ–ĐºĐ¾Đ²Đ¸Đ¹ Đ·Đ°Đ¿Đ¸Ñ"
 msgid "Create a new Bluesky account"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "Đ¡Ñ‚Đ²Đ¾Ñ€Đ¸Ñ‚Đ¸ Đ¾Đ±Đ»Ñ–ĐºĐ¾Đ²Đ¸Đ¹ Đ·Đ°Đ¿Đ¸Ñ"
 
@@ -1133,7 +1137,7 @@ msgstr "Đ’Đ¸Đ´Đ°Đ»Đ¸Ñ‚Đ¸ Ñ†ĐµĐ¹ Đ¿Đ¾ÑÑ‚?"
 msgid "Deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "Đ’Đ¸Đ´Đ°Đ»ĐµĐ½Đ¸Đ¹ Đ¿Đ¾ÑÑ‚."
 
@@ -1197,7 +1201,7 @@ msgstr "Đ†Đ¼'Ñ"
 msgid "Domain verified!"
 msgstr "Đ”Đ¾Đ¼ĐµĐ½ Đ¿ĐµÑ€ĐµĐ²Ñ–Ñ€ĐµĐ½Đ¾!"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr ""
 
@@ -1339,16 +1343,14 @@ msgstr ""
 msgid "Education"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "Ел. Đ°Đ´Ñ€ĐµÑа"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "ĐĐ´Ñ€ĐµÑа ĐµĐ»ĐµĐºÑ‚Ñ€Đ¾Đ½Đ½Đ¾Ñ— Đ¿Đ¾ÑˆÑ‚Đ¸"
@@ -1423,7 +1425,7 @@ msgstr "Đ’Đ²ĐµĐ´Ñ–Ñ‚ÑŒ Đ´Đ¾Đ¼ĐµĐ½, ÑĐºĐ¸Đ¹ Đ²Đ¸ Ñ…Đ¾Ñ‡ĐµÑ‚Đµ Đ²Đ¸ĐºĐ¾Ñ€Đ¸ÑÑ‚Đ¾
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "Đ’Đ²ĐµĐ´Ñ–Ñ‚ÑŒ Đ°Đ´Ñ€ĐµÑу ĐµĐ»ĐµĐºÑ‚Ñ€Đ¾Đ½Đ½Đ¾Ñ— Đ¿Đ¾ÑˆÑ‚Đ¸, ÑĐºÑƒ Đ²Đ¸ Đ²Đ¸ĐºĐ¾Ñ€Đ¸ÑÑ‚Đ¾Đ²ÑƒĐ²Đ°Đ»Đ¸ Đ´Đ»Ñ ÑÑ‚Đ²Đ¾Ñ€ĐµĐ½Đ½Ñ Đ¾Đ±Đ»Ñ–ĐºĐ¾Đ²Đ¾Đ³Đ¾ Đ·Đ°Đ¿Đ¸Ñу. ĐœĐ¸ Đ½Đ°Đ´Ñ–ÑˆĐ»ĐµĐ¼Đ¾ Đ²Đ°Đ¼ ĐºĐ¾Đ´ Đ¿Ñ–Đ´Ñ‚Đ²ĐµÑ€Đ´Đ¶ĐµĐ½Đ½Ñ, Ñ‰Đ¾Đ± Đ²Đ¸ Đ¼Đ¾Đ³Đ»Đ¸ Đ²ÑÑ‚Đ°Đ½Đ¾Đ²Đ¸Ñ‚Đ¸ Đ½Đ¾Đ²Đ¸Đ¹ Đ¿Đ°Ñ€Đ¾Đ»ÑŒ."
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr ""
@@ -1432,7 +1434,7 @@ msgstr ""
 msgid "Enter your email"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "Đ’Đ²ĐµĐ´Ñ–Ñ‚ÑŒ Đ°Đ´Ñ€ĐµÑу ĐµĐ»ĐµĐºÑ‚Ñ€Đ¾Đ½Đ½Đ¾Ñ— Đ¿Đ¾ÑˆÑ‚Đ¸"
 
@@ -1445,13 +1447,17 @@ msgid "Enter your new email address below."
 msgstr "Đ’Đ²ĐµĐ´Ñ–Ñ‚ÑŒ Đ½Đ¾Đ²Ñƒ Đ°Đ´Ñ€ĐµÑу ĐµĐ»ĐµĐºÑ‚Ñ€Đ¾Đ½Đ½Đ¾Ñ— Đ¿Đ¾ÑˆÑ‚Đ¸."
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr ""
+#~ msgid "Enter your phone number"
+#~ msgstr ""
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "Đ’Đ²ĐµĐ´Ñ–Ñ‚ÑŒ Đ¿ÑĐµĐ²Đ´Đ¾Đ½Ñ–Đ¼ Ñ‚Đ° Đ¿Đ°Ñ€Đ¾Đ»ÑŒ"
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "ĐŸĐ¾Đ¼Đ¸Đ»ĐºĐ°:"
@@ -1548,7 +1554,7 @@ msgstr "Đ¡Ñ‚Ñ€Ñ–Ñ‡ĐºĐ° Đ½Đµ Đ¿Ñ€Đ°Ñ†ÑÑ”"
 msgid "Feed Preferences"
 msgstr "ĐĐ°Đ»Đ°ÑˆÑ‚ÑƒĐ²Đ°Đ½Đ½Ñ ÑÑ‚Ñ€Ñ–Ñ‡ĐºĐ¸"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "ĐĐ°Đ´Ñ–ÑĐ»Đ°Ñ‚Đ¸ Đ²Ñ–Đ´Đ³ÑƒĐº"
@@ -1735,7 +1741,7 @@ msgstr "Đ—Đ°Đ±ÑƒĐ»Đ¸ Đ¿Đ°Ñ€Đ¾Đ»ÑŒ"
 msgid "Forgot Password"
 msgstr "Đ—Đ°Đ±ÑƒĐ»Đ¸ Đ¿Đ°Ñ€Đ¾Đ»ÑŒ"
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr ""
@@ -1785,11 +1791,11 @@ msgstr "Đ”Đ°Đ»Ñ–"
 msgid "Handle"
 msgstr "ĐŸÑĐµĐ²Đ´Đ¾Đ½Ñ–Đ¼"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "Đ”Đ¾Đ²Ñ–Đ´ĐºĐ°"
@@ -1891,7 +1897,7 @@ msgstr "Đ“Đ¾Đ»Đ¾Đ²Đ½Đ°"
 msgid "Home Feed Preferences"
 msgstr "ĐĐ°Đ»Đ°ÑˆÑ‚ÑƒĐ²Đ°Đ½Đ½Ñ Đ´Đ¾Đ¼Đ°ÑˆĐ½ÑŒĐ¾Ñ— ÑÑ‚Ñ€Ñ–Ñ‡ĐºĐ¸"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "Đ¥Đ¾ÑÑ‚Đ¸Đ½Đ³-Đ¿Ñ€Đ¾Đ²Đ°Đ¹Đ´ĐµÑ€"
@@ -1955,7 +1961,7 @@ msgstr ""
 msgid "Input confirmation code for account deletion"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr ""
 
@@ -1967,7 +1973,7 @@ msgstr ""
 #~ msgid "Input hosting provider address"
 #~ msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr ""
 
@@ -1984,8 +1990,8 @@ msgid "Input password for account deletion"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr ""
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr ""
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1996,8 +2002,8 @@ msgid "Input the username or email address you used at signup"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr ""
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr ""
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -2007,11 +2013,11 @@ msgstr ""
 msgid "Input your password"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr ""
 
@@ -2027,12 +2033,12 @@ msgstr "ĐĐµĐ²Ñ–Ñ€Đ½Đµ Ñ–Đ¼'Ñ ĐºĐ¾Ñ€Đ¸ÑÑ‚ÑƒĐ²Đ°Ñ‡Đ° Đ°Đ±Đ¾ Đ¿Đ°Ñ€Đ¾Đ»ÑŒ"
 msgid "Invite a Friend"
 msgstr "Đ—Đ°Đ¿Ñ€Đ¾ÑĐ¸Ñ‚Đ¸ Đ´Ñ€ÑƒĐ³Đ°"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "ĐĐ¾Đ´ Đ·Đ°Đ¿Ñ€Đ¾ÑˆĐµĐ½Đ½Ñ"
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "ĐĐ¾Đ´ Đ·Đ°Đ¿Ñ€Đ¾ÑˆĐµĐ½Đ½Ñ Đ½Đµ Đ¿Ñ€Đ¸Đ¹Đ½ÑÑ‚Đ¾. ĐŸĐµÑ€ĐµĐºĐ¾Đ½Đ°Đ¹Ñ‚ĐµÑÑ Đ² Đ¹Đ¾Đ³Đ¾ Đ¿Ñ€Đ°Đ²Đ¸Đ»ÑŒĐ½Đ¾Ñті Ñ‚Đ° Đ¿Đ¾Đ²Ñ‚Đ¾Ñ€Ñ–Ñ‚ÑŒ ÑĐ¿Ñ€Đ¾Đ±Ñƒ."
 
@@ -2061,8 +2067,8 @@ msgstr "Đ’Đ°ĐºĐ°Đ½ÑÑ–Ñ—"
 msgid "Join the waitlist"
 msgstr "ĐŸÑ€Đ¸Ñ”Đ´Đ½Đ°Ñ‚Đ¸ÑÑ Đ´Đ¾ Ñ‡ĐµÑ€Đ³Đ¸ Đ¾Ñ‡Ñ–ĐºÑƒĐ²Đ°Đ½Đ½Ñ"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "ĐŸÑ€Đ¸Ñ”Đ´Đ½Đ°Ñ‚Đ¸ÑÑ Đ´Đ¾ Ñ‡ĐµÑ€Đ³Đ¸ Đ¾Ñ‡Ñ–ĐºÑƒĐ²Đ°Đ½Đ½Ñ."
 
@@ -2197,7 +2203,7 @@ msgstr ""
 msgid "Likes"
 msgstr "Đ’Đ¿Đ¾Đ´Đ¾Đ±Đ°Đ½Đ½Ñ"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr ""
 
@@ -2253,8 +2259,8 @@ msgstr ""
 msgid "Lists"
 msgstr "Đ¡Đ¿Đ¸ÑĐºĐ¸"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "Đ—Đ°Đ²Đ°Đ½Ñ‚Đ°Đ¶Đ¸Ñ‚Đ¸ Đ±Ñ–Đ»ÑŒÑˆĐµ Đ¿Đ¾ÑÑ‚Ñ–Đ²"
 
@@ -2262,7 +2268,7 @@ msgstr "Đ—Đ°Đ²Đ°Đ½Ñ‚Đ°Đ¶Đ¸Ñ‚Đ¸ Đ±Ñ–Đ»ÑŒÑˆĐµ Đ¿Đ¾ÑÑ‚Ñ–Đ²"
 msgid "Load new notifications"
 msgstr "Đ—Đ°Đ²Đ°Đ½Ñ‚Đ°Đ¶Đ¸Ñ‚Đ¸ Đ½Đ¾Đ²Ñ– ÑĐ¿Đ¾Đ²Ñ–Ñ‰ĐµĐ½Đ½Ñ"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2529,7 +2535,7 @@ msgstr ""
 msgid "New Password"
 msgstr ""
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr ""
@@ -2565,7 +2571,7 @@ msgstr "Đ¡Đ¿Đ¾Ñ‡Đ°Ñ‚ĐºÑƒ Đ½Đ°Đ¹Đ½Đ¾Đ²Ñ–ÑˆÑ–"
 msgid "News"
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2862,8 +2868,8 @@ msgstr "Đ¡Ñ‚Đ¾Ñ€Ñ–Đ½ĐºÑƒ Đ½Đµ Đ·Đ½Đ°Đ¹Đ´ĐµĐ½Đ¾"
 msgid "Page Not Found"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2899,8 +2905,8 @@ msgid "Pets"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr ""
+#~ msgid "Phone number"
+#~ msgstr ""
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2928,14 +2934,18 @@ msgstr "Đ’Ñ–Đ´Ñ‚Đ²Đ¾Ñ€Đ¸Ñ‚Đ¸ Đ²Ñ–Đ´ĐµĐ¾"
 msgid "Plays the GIF"
 msgstr "Đ’Ñ–Đ´Ñ‚Đ²Đ¾Ñ€ÑÑ” GIF"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "Đ‘ÑƒĐ´ÑŒ лаÑĐºĐ°, Đ¾Đ±ĐµÑ€Ñ–Ñ‚ÑŒ Đ¿ÑĐµĐ²Đ´Đ¾Đ½Ñ–Đ¼."
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "Đ‘ÑƒĐ´ÑŒ лаÑĐºĐ°, Đ¾Đ±ĐµÑ€Ñ–Ñ‚ÑŒ Đ²Đ°Ñˆ Đ¿Đ°Ñ€Đ¾Đ»ÑŒ."
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "Đ‘ÑƒĐ´ÑŒ лаÑĐºĐ°, Đ¿Ñ–Đ´Ñ‚Đ²ĐµÑ€Đ´Ñ–Ñ‚ÑŒ Đ²Đ°ÑˆÑƒ ĐµĐ»ĐµĐºÑ‚Ñ€Đ¾Đ½Đ½Ñƒ Đ°Đ´Ñ€ĐµÑу, Đ¿ĐµÑ€Ñˆ Đ½Ñ–Đ¶ Đ·Đ¼Ñ–Đ½Đ¸Ñ‚Đ¸ Ñ—Ñ—. Це Ñ‚Đ¸Đ¼Ñ‡Đ°ÑĐ¾Đ²Đ° Đ²Đ¸Đ¼Đ¾Đ³Đ° Đ¿Ñ–Đ´ Ñ‡Đ°Ñ Đ´Đ¾Đ´Đ°Đ²Đ°Đ½Đ½Ñ Ñ–Đ½ÑÑ‚Ñ€ÑƒĐ¼ĐµĐ½Ñ‚Ñ–Đ² Đ¾Đ½Đ¾Đ²Đ»ĐµĐ½Đ½Ñ ĐµĐ»ĐµĐºÑ‚Ñ€Đ¾Đ½Đ½Đ¾Ñ— Đ°Đ´Ñ€ĐµÑи, Đ½ĐµĐ·Đ°Đ±Đ°Ñ€Đ¾Đ¼ Ñ—Ñ— Đ²Đ¸Đ´Đ°Đ»Ñть."
@@ -2945,22 +2955,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr ""
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr ""
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "Đ‘ÑƒĐ´ÑŒ лаÑĐºĐ°, Đ²Đ²ĐµĐ´Ñ–Ñ‚ÑŒ ÑƒĐ½Ñ–ĐºĐ°Đ»ÑŒĐ½Ñƒ Đ½Đ°Đ·Đ²Ñƒ Đ´Đ»Ñ Ñ†ÑŒĐ¾Đ³Đ¾ Đ¿Đ°Ñ€Đ¾Đ»Ñ Đ°Đ±Đ¾ Đ²Đ¸ĐºĐ¾Ñ€Đ¸ÑÑ‚Đ¾Đ²ÑƒĐ¹Ñ‚Đµ Đ½Đ°ÑˆÑƒ Đ²Đ¸Đ¿Đ°Đ´ĐºĐ¾Đ²Đ¾ Đ·Đ³ĐµĐ½ĐµÑ€Đ¾Đ²Đ°Đ½Ñƒ."
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr ""
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr ""
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr ""
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "Đ‘ÑƒĐ´ÑŒ лаÑĐºĐ°, Đ²Đ²ĐµĐ´Ñ–Ñ‚ÑŒ Đ°Đ´Ñ€ĐµÑу ел. Đ¿Đ¾ÑˆÑ‚Đ¸."
 
@@ -3000,7 +3010,7 @@ msgctxt "action"
 msgid "Post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr ""
@@ -3011,7 +3021,7 @@ msgstr ""
 #~ msgid "Post"
 #~ msgstr "ĐŸĐ¾ÑÑ‚"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr ""
 
@@ -3025,7 +3035,7 @@ msgstr ""
 msgid "Post deleted"
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "ĐŸĐ¾ÑÑ‚ Đ¿Ñ€Đ¸Ñ…Đ¾Đ²Đ°Đ½Đ¾"
 
@@ -3037,7 +3047,7 @@ msgstr "ĐœĐ¾Đ²Đ° Đ¿Đ¾Ñту"
 msgid "Post Languages"
 msgstr "ĐœĐ¾Đ²Đ¸ Đ¿Đ¾Ñту"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "ĐŸĐ¾ÑÑ‚ Đ½Đµ Đ·Đ½Đ°Đ¹Đ´ĐµĐ½Đ¾"
 
@@ -3066,7 +3076,7 @@ msgid "Prioritize Your Follows"
 msgstr "ĐŸÑ€Ñ–Đ¾Ñ€Đ¸Ñ‚ĐµĐ·ÑƒĐ²Đ°Ñ‚Đ¸ Đ²Đ°ÑˆÑ– Đ¿Ñ–Đ´Đ¿Đ¸ÑĐºĐ¸"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "ĐĐ¾Đ½Ñ„Ñ–Đ´ĐµĐ½Ñ†Ñ–Đ¹Đ½Ñ–Ñть"
 
@@ -3237,7 +3247,7 @@ msgid "Reply Filters"
 msgstr "Đ¯ĐºÑ– Đ²Ñ–Đ´Đ¿Đ¾Đ²Ñ–Đ´Ñ– Đ¿Đ¾ĐºĐ°Đ·ÑƒĐ²Đ°Ñ‚Đ¸"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr ""
@@ -3288,7 +3298,7 @@ msgstr "Đ ĐµĐ¿Đ¾ÑÑ‚Đ¸Ñ‚Đ¸ Đ°Đ±Đ¾ Ñ†Đ¸Ñ‚ÑƒĐ²Đ°Ñ‚Đ¸"
 msgid "Reposted By"
 msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr ""
 
@@ -3296,7 +3306,7 @@ msgstr ""
 #~ msgid "Reposted by {0})"
 #~ msgstr ""
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr ""
 
@@ -3304,7 +3314,7 @@ msgstr ""
 msgid "reposted your post"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr ""
 
@@ -3314,8 +3324,8 @@ msgid "Request Change"
 msgstr "Đ—Đ¼Ñ–Đ½Đ¸Ñ‚Đ¸"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr ""
+#~ msgid "Request code"
+#~ msgstr ""
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3330,7 +3340,7 @@ msgstr ""
 msgid "Require alt text before posting"
 msgstr "Đ’Đ¸Đ¼Đ°Đ³Đ°Ñ‚Đ¸ Đ°Đ»ÑŒÑ‚ĐµÑ€Đ½Đ°Ñ‚Đ¸Đ²Đ½Đ¸Đ¹ Ñ‚ĐµĐºÑÑ‚ Đ´Đ¾ Đ·Đ¾Đ±Ñ€Đ°Đ¶ĐµĐ½ÑŒ Đ¿ĐµÑ€ĐµĐ´ Đ¿ÑƒĐ±Đ»Ñ–ĐºĐ°Ñ†Ñ–Ñ”Ñ"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "Đ’Đ¸Đ¼Đ°Đ³Đ°Ñ”Ñ‚ÑŒÑÑ Ñ†Đ¸Đ¼ Ñ…Đ¾ÑÑ‚Đ¸Đ½Đ³-Đ¿Ñ€Đ¾Đ²Đ°Đ¹Đ´ĐµÑ€Đ¾Đ¼"
 
@@ -3382,9 +3392,8 @@ msgstr ""
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3397,16 +3406,16 @@ msgstr "ĐŸĐ¾Đ²Ñ‚Đ¾Ñ€Đ¸Ñ‚Đ¸ ÑĐ¿Ñ€Đ¾Đ±Ñƒ"
 #~ msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr ""
+#~ msgid "Retry."
+#~ msgstr ""
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr ""
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr ""
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr ""
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3523,7 +3532,7 @@ msgstr "Đ’Đ¸Đ±Ñ€Đ°Ñ‚Đ¸ Ñ–ÑĐ½ÑƒÑÑ‡Đ¸Đ¹ Đ¾Đ±Đ»Ñ–ĐºĐ¾Đ²Đ¸Đ¹ Đ·Đ°Đ¿Đ¸Ñ"
 msgid "Select option {i} of {numItems}"
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "Đ’Đ¸Đ±Ñ€Đ°Ñ‚Đ¸ Ñ…Đ¾ÑÑ‚Đ¸Đ½Đ³-Đ¿Ñ€Đ¾Đ²Đ°Đ¹Đ´ĐµÑ€Đ°"
@@ -3561,8 +3570,8 @@ msgid "Select your interests from the options below"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr ""
+#~ msgid "Select your phone's country"
+#~ msgstr ""
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3645,7 +3654,7 @@ msgstr ""
 msgid "Set new password"
 msgstr "Đ—Đ¼Ñ–Đ½Đ° Đ¿Đ°Ñ€Đ¾Đ»Ñ"
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr ""
 
@@ -3689,7 +3698,7 @@ msgstr ""
 #~ msgid "Sets hosting provider to {label}"
 #~ msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr ""
@@ -3749,9 +3758,9 @@ msgstr "ĐŸĐ¾ĐºĐ°Đ·Đ°Ñ‚Đ¸ Đ²Đ±ÑƒĐ´ÑƒĐ²Đ°Đ½Đ½Ñ Đ· {0}"
 msgid "Show follows similar to {0}"
 msgstr ""
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr ""
 
@@ -3904,8 +3913,8 @@ msgid "Skip this flow"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr ""
+#~ msgid "SMS verification"
+#~ msgstr ""
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -4041,7 +4050,7 @@ msgstr ""
 msgid "Tech"
 msgstr ""
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "Đ£Đ¼Đ¾Đ²Đ¸"
 
@@ -4057,6 +4066,10 @@ msgstr "Đ£Đ¼Đ¾Đ²Đ¸ Đ’Đ¸ĐºĐ¾Ñ€Đ¸ÑÑ‚Đ°Đ½Đ½Ñ"
 msgid "Text input field"
 msgstr "ĐŸĐ¾Đ»Đµ Đ²Đ²Đ¾Đ´Ñƒ Ñ‚ĐµĐºÑту"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "ĐĐ±Đ»Ñ–ĐºĐ¾Đ²Đ¸Đ¹ Đ·Đ°Đ¿Đ¸Ñ Đ·Đ¼Đ¾Đ¶Đµ Đ²Đ·Đ°Ñ”Đ¼Đ¾Đ´Ñ–ÑÑ‚Đ¸ Đ· Đ²Đ°Đ¼Đ¸ Đ¿Ñ–ÑĐ»Ñ Ñ€Đ¾Đ·Đ±Đ»Đ¾ĐºÑƒĐ²Đ°Đ½Đ½Ñ."
@@ -4073,7 +4086,7 @@ msgstr "ĐŸĐ¾Đ»Ñ–Ñ‚Đ¸ĐºÑƒ Đ·Đ°Ñ…Đ¸Ñту Đ°Đ²Ñ‚Đ¾Ñ€ÑÑŒĐºĐ¾Đ³Đ¾ Đ¿Ñ€Đ°Đ²Đ° Đ¿ĐµÑ€
 msgid "The following steps will help customize your Bluesky experience."
 msgstr ""
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "ĐœĐ¾Đ¶Đ»Đ¸Đ²Đ¾ Ñ†ĐµĐ¹ Đ¿Đ¾ÑÑ‚ Đ±ÑƒĐ»Đ¾ Đ²Đ¸Đ´Đ°Đ»ĐµĐ½Đ¾."
 
@@ -4178,8 +4191,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr ""
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr ""
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4304,8 +4317,8 @@ msgstr "Đ Đ¾Đ·ĐºÑ€Đ¸Ñ‚Đ¸/ÑÑ…Đ¾Đ²Đ°Ñ‚Đ¸"
 msgid "Transformations"
 msgstr "Đ ĐµĐ´Đ°Đ³ÑƒĐ²Đ°Đ½Đ½Ñ"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "ĐŸĐµÑ€ĐµĐºĐ»Đ°ÑÑ‚Đ¸"
@@ -4327,7 +4340,7 @@ msgstr "Đ Đ¾Đ·Đ±Đ»Đ¾ĐºÑƒĐ²Đ°Ñ‚Đ¸ ÑĐ¿Đ¸ÑĐ¾Đº"
 msgid "Un-mute list"
 msgstr "ĐŸĐµÑ€ĐµÑÑ‚Đ°Ñ‚Đ¸ Ñ–Đ³Đ½Đ¾Ñ€ÑƒĐ²Đ°Ñ‚Đ¸"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4366,7 +4379,7 @@ msgstr ""
 msgid "Unfollow {0}"
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "Đа Đ¶Đ°Đ»ÑŒ, Đ²Đ¸ Đ½Đµ Đ²Ñ–Đ´Đ¿Đ¾Đ²Ñ–Đ´Đ°Ñ”Ñ‚Đµ Đ²Đ¸Đ¼Đ¾Đ³Đ°Đ¼ Đ´Đ»Ñ ÑÑ‚Đ²Đ¾Ñ€ĐµĐ½Đ½Ñ Đ¾Đ±Đ»Ñ–ĐºĐ¾Đ²Đ¾Đ³Đ¾ Đ·Đ°Đ¿Đ¸Ñу."
 
@@ -4458,7 +4471,7 @@ msgstr ""
 msgid "User Blocks You"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "ĐŸÑĐµĐ²Đ´Đ¾Đ½Ñ–Đ¼"
 
@@ -4511,8 +4524,8 @@ msgid "Users in \"{0}\""
 msgstr "ĐĐ¾Ñ€Đ¸ÑÑ‚ÑƒĐ²Đ°Ñ‡Ñ– Đ² «{0}»"
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr ""
+#~ msgid "Verification code"
+#~ msgstr ""
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4612,7 +4625,7 @@ msgstr ""
 msgid "We'll use this to help customize your experience."
 msgstr ""
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "ĐœĐ¸ Đ´ÑƒĐ¶Đµ Ñ€Đ°Đ´Ñ–, Ñ‰Đ¾ Đ²Đ¸ Đ¿Ñ€Đ¸Ñ”Đ´Đ½Đ°Đ»Đ¸ÑÑ!"
 
@@ -4688,8 +4701,8 @@ msgid "Writers"
 msgstr ""
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr ""
+#~ msgid "XXXXXX"
+#~ msgstr ""
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4747,7 +4760,7 @@ msgstr "Đ£ Đ²Đ°Ñ Đ½ĐµĐ¼Đ°Ñ” Đ·Đ±ĐµÑ€ĐµĐ¶ĐµĐ½Đ¸Ñ… ÑÑ‚Ñ€Ñ–Ñ‡Đ¾Đº!"
 msgid "You don't have any saved feeds."
 msgstr "Đ£ Đ²Đ°Ñ Đ½ĐµĐ¼Đ°Ñ” Đ·Đ±ĐµÑ€ĐµĐ¶ĐµĐ½Đ¸Ñ… ÑÑ‚Ñ€Ñ–Ñ‡Đ¾Đº."
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "Ви Đ·Đ°Đ±Đ»Đ¾ĐºÑƒĐ²Đ°Đ»Đ¸ Đ°Đ²Ñ‚Đ¾Ñ€Đ° Đ°Đ±Đ¾ Đ°Đ²Ñ‚Đ¾Ñ€ Đ·Đ°Đ±Đ»Đ¾ĐºÑƒĐ²Đ°Đ² Đ²Đ°Ñ."
 
@@ -4837,7 +4850,7 @@ msgstr ""
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "Đ’Đ°ÑˆĐ° Đ´Đ°Ñ‚Đ° Đ½Đ°Ñ€Đ¾Đ´Đ¶ĐµĐ½Đ½Ñ"
 
@@ -4849,7 +4862,7 @@ msgstr ""
 msgid "Your default feed is \"Following\""
 msgstr ""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4871,7 +4884,7 @@ msgstr "Đ’Đ°ÑˆĐ° ĐµĐ»ĐµĐºÑ‚Ñ€Đ¾Đ½Đ½Đ° Đ¿Đ¾ÑˆÑ‚Đ° Ñ‰Đµ Đ½Đµ Đ¿Ñ–Đ´Ñ‚Đ²ĐµÑ€Đ´Đ¶ĐµĐ
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "Đ’Đ°Ñˆ Đ¿Đ¾Đ²Đ½Đ¸Đ¹ Đ¿ÑĐµĐ²Đ´Đ¾Đ½Ñ–Đ¼ Đ±ÑƒĐ´Đµ"
 
@@ -4924,6 +4937,6 @@ msgstr "Đ’Đ°Ñˆ Đ¿Ñ€Đ¾Ñ„Ñ–Đ»ÑŒ"
 msgid "Your reply has been published"
 msgstr ""
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "Đ’Đ°Ñˆ Đ¿ÑĐµĐ²Đ´Đ¾Đ½Ñ–Đ¼"
diff --git a/src/locale/locales/zh-CN/messages.po b/src/locale/locales/zh-CN/messages.po
index e4afdb1d8..73c42256c 100644
--- a/src/locale/locales/zh-CN/messages.po
+++ b/src/locale/locales/zh-CN/messages.po
@@ -343,21 +343,21 @@ msgstr "艺术"
 msgid "Artistic or non-erotic nudity."
 msgstr "è‰ºæœ¯ä½œå“æˆ–é色情ç„è£¸ä½“ă€‚"
 
-#: src/view/com/auth/create/CreateAccount.tsx:147
+#: src/view/com/auth/create/CreateAccount.tsx:154
 #: src/view/com/auth/login/ChooseAccountForm.tsx:151
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:174
 #: src/view/com/auth/login/LoginForm.tsx:259
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:179
 #: src/view/com/modals/report/InputIssueDetails.tsx:46
-#: src/view/com/post-thread/PostThread.tsx:437
-#: src/view/com/post-thread/PostThread.tsx:487
-#: src/view/com/post-thread/PostThread.tsx:495
+#: src/view/com/post-thread/PostThread.tsx:471
+#: src/view/com/post-thread/PostThread.tsx:521
+#: src/view/com/post-thread/PostThread.tsx:529
 #: src/view/com/profile/ProfileHeader.tsx:648
 #: src/view/com/util/ViewHeader.tsx:81
 msgid "Back"
 msgstr "è¿”å›"
 
-#: src/view/com/post-thread/PostThread.tsx:445
+#: src/view/com/post-thread/PostThread.tsx:479
 msgctxt "action"
 msgid "Back"
 msgstr "è¿”å›"
@@ -370,7 +370,7 @@ msgstr "基äºä½ å¯¹ {interestsText} 感兴趣"
 msgid "Basics"
 msgstr "基础信æ¯"
 
-#: src/view/com/auth/create/Step1.tsx:246
+#: src/view/com/auth/create/Step1.tsx:250
 #: src/view/com/modals/BirthDateSettings.tsx:73
 msgid "Birthday"
 msgstr "生日"
@@ -422,7 +422,7 @@ msgstr "被å±è”½ç„账户无法在你ç„帖å­ä¸­å›å¤ă€æå你或以其他
 msgid "Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you. You will not see their content and they will be prevented from seeing yours."
 msgstr "被å±è”½ç„账户无法在你ç„帖å­ä¸­å›å¤ă€æå你或以其他方å¼ä¸ä½ äº’å¨ă€‚ä½ å°†ä¸ä¼çœ‹åˆ°ä»–们所å‘ç„å†…å®¹ï¼ŒåŒæ ·ä»–们也无法查看你ç„å†…å®¹ă€‚"
 
-#: src/view/com/post-thread/PostThread.tsx:297
+#: src/view/com/post-thread/PostThread.tsx:324
 msgid "Blocked post."
 msgstr "å·²å±è”½å¸–å­ă€‚"
 
@@ -655,7 +655,7 @@ msgstr "é€‰æ‹©å¯æ”¹è¿›ä½ è‡ªå®ä¹‰ä¿¡æ¯æµç„ç®—æ³•ă€‚"
 msgid "Choose your main feeds"
 msgstr "选择你ç„é¦–é€‰ä¿¡æ¯æµ"
 
-#: src/view/com/auth/create/Step1.tsx:215
+#: src/view/com/auth/create/Step1.tsx:219
 msgid "Choose your password"
 msgstr "选择你ç„密ç "
 
@@ -756,6 +756,10 @@ msgstr "社群准则"
 msgid "Complete onboarding and start using your account"
 msgstr "完æˆå¼•导并开始使用你ç„账户"
 
+#: src/view/com/auth/create/Step3.tsx:73
+msgid "Complete the challenge"
+msgstr ""
+
 #: src/view/com/composer/Composer.tsx:417
 msgid "Compose posts up to {MAX_GRAPHEME_LENGTH} characters in length"
 msgstr "撰写帖å­ç„长度最å¤ä¸º {MAX_GRAPHEME_LENGTH} 个字符"
@@ -811,12 +815,12 @@ msgstr "验è¯ç "
 msgid "Confirms signing up {email} to the waitlist"
 msgstr "确认将 {email} 注册到候补列表"
 
-#: src/view/com/auth/create/CreateAccount.tsx:182
+#: src/view/com/auth/create/CreateAccount.tsx:189
 #: src/view/com/auth/login/LoginForm.tsx:278
 msgid "Connecting..."
 msgstr "è¿æ¥ä¸­..."
 
-#: src/view/com/auth/create/CreateAccount.tsx:202
+#: src/view/com/auth/create/CreateAccount.tsx:209
 msgid "Contact support"
 msgstr "è”系支æŒ"
 
@@ -928,8 +932,8 @@ msgid "Could not load list"
 msgstr "无法å è½½åˆ—表"
 
 #: src/view/com/auth/create/Step2.tsx:91
-msgid "Country"
-msgstr "国家"
+#~ msgid "Country"
+#~ msgstr "国家"
 
 #: src/view/com/auth/HomeLoggedOutCTA.tsx:62
 #: src/view/com/auth/SplashScreen.tsx:71
@@ -941,7 +945,7 @@ msgstr "创建新ç„账户"
 msgid "Create a new Bluesky account"
 msgstr "åˆ›å»ºæ–°ç„ Bluesky 账户"
 
-#: src/view/com/auth/create/CreateAccount.tsx:122
+#: src/view/com/auth/create/CreateAccount.tsx:129
 msgid "Create Account"
 msgstr "创建账户"
 
@@ -1055,7 +1059,7 @@ msgstr "删除这æ¡å¸–å­ï¼Ÿ"
 msgid "Deleted"
 msgstr "已删除"
 
-#: src/view/com/post-thread/PostThread.tsx:289
+#: src/view/com/post-thread/PostThread.tsx:316
 msgid "Deleted post."
 msgstr "已删除帖å­ă€‚"
 
@@ -1115,7 +1119,7 @@ msgstr "显示åç§°"
 msgid "Domain verified!"
 msgstr "域å已认è¯ï¼"
 
-#: src/view/com/auth/create/Step1.tsx:166
+#: src/view/com/auth/create/Step1.tsx:170
 msgid "Don't have an invite code?"
 msgstr "没有邀请ç ï¼Ÿ"
 
@@ -1257,16 +1261,14 @@ msgstr "编辑你ç„账户æè¿°"
 msgid "Education"
 msgstr "教育"
 
-#: src/view/com/auth/create/Step1.tsx:195
-#: src/view/com/auth/create/Step2.tsx:194
-#: src/view/com/auth/create/Step2.tsx:269
+#: src/view/com/auth/create/Step1.tsx:199
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:156
 #: src/view/com/modals/ChangeEmail.tsx:141
 #: src/view/com/modals/Waitlist.tsx:88
 msgid "Email"
 msgstr "电å­é‚®ç®±"
 
-#: src/view/com/auth/create/Step1.tsx:186
+#: src/view/com/auth/create/Step1.tsx:190
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:147
 msgid "Email address"
 msgstr "邮箱地å€"
@@ -1337,7 +1339,7 @@ msgstr "输入你想使用ç„域å"
 msgid "Enter the email you used to create your account. We'll send you a \"reset code\" so you can set a new password."
 msgstr "输入你用äºåˆ›å»ºè´¦æˆ·ç„电å­é‚®ç®±ă€‚我们将å‘ä½ å‘é€é‡ç½®ç ï¼Œä»¥ä¾¿ä½ é‡æ–°è®¾ç½®å¯†ç ă€‚"
 
-#: src/view/com/auth/create/Step1.tsx:247
+#: src/view/com/auth/create/Step1.tsx:251
 #: src/view/com/modals/BirthDateSettings.tsx:74
 msgid "Enter your birth date"
 msgstr "输入你ç„出生日期"
@@ -1346,7 +1348,7 @@ msgstr "输入你ç„出生日期"
 msgid "Enter your email"
 msgstr "输入你ç„电å­é‚®ç®±"
 
-#: src/view/com/auth/create/Step1.tsx:191
+#: src/view/com/auth/create/Step1.tsx:195
 msgid "Enter your email address"
 msgstr "输入你ç„电å­é‚®ç®±"
 
@@ -1359,13 +1361,17 @@ msgid "Enter your new email address below."
 msgstr "请在下方输入你新ç„电å­é‚®ç®±ă€‚"
 
 #: src/view/com/auth/create/Step2.tsx:188
-msgid "Enter your phone number"
-msgstr "è¾“å…¥ä½ ç„æ‰‹æœºå·ç "
+#~ msgid "Enter your phone number"
+#~ msgstr "è¾“å…¥ä½ ç„æ‰‹æœºå·ç "
 
 #: src/view/com/auth/login/Login.tsx:99
 msgid "Enter your username and password"
 msgstr "输入你ç„用户å和密ç "
 
+#: src/view/com/auth/create/Step3.tsx:67
+msgid "Error receiving captcha response."
+msgstr ""
+
 #: src/view/screens/Search/Search.tsx:109
 msgid "Error:"
 msgstr "错误ï¼"
@@ -1462,7 +1468,7 @@ msgstr "ä¿¡æ¯æµå·²ç¦»çº¿"
 msgid "Feed Preferences"
 msgstr "ä¿¡æ¯æµé¦–选项"
 
-#: src/view/shell/desktop/RightNav.tsx:69
+#: src/view/shell/desktop/RightNav.tsx:61
 #: src/view/shell/Drawer.tsx:311
 msgid "Feedback"
 msgstr "å馈"
@@ -1633,7 +1639,7 @@ msgstr "忘记密ç "
 msgid "Forgot Password"
 msgstr "忘记密ç "
 
-#: src/view/com/posts/FeedItem.tsx:189
+#: src/view/com/posts/FeedItem.tsx:186
 msgctxt "from-feed"
 msgid "From <0/>"
 msgstr "æ¥è‡ª <0/>"
@@ -1683,11 +1689,11 @@ msgstr "转到下一个"
 msgid "Handle"
 msgstr "用户识别符"
 
-#: src/view/com/auth/create/CreateAccount.tsx:197
+#: src/view/com/auth/create/CreateAccount.tsx:204
 msgid "Having trouble?"
 msgstr "任何疑问?"
 
-#: src/view/shell/desktop/RightNav.tsx:98
+#: src/view/shell/desktop/RightNav.tsx:90
 #: src/view/shell/Drawer.tsx:321
 msgid "Help"
 msgstr "帮å©"
@@ -1777,7 +1783,7 @@ msgstr "主页"
 msgid "Home Feed Preferences"
 msgstr "ä¸»é¡µä¿¡æ¯æµé¦–选项"
 
-#: src/view/com/auth/create/Step1.tsx:78
+#: src/view/com/auth/create/Step1.tsx:82
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:120
 msgid "Hosting provider"
 msgstr "托管æœå¡æä¾›å•†"
@@ -1831,11 +1837,11 @@ msgstr "输入å‘é€åˆ°ä½ ç”µå­é‚®ç®±ç„验è¯ç ä»¥é‡ç½®å¯†ç "
 msgid "Input confirmation code for account deletion"
 msgstr "输入删除用户ç„验è¯ç "
 
-#: src/view/com/auth/create/Step1.tsx:196
+#: src/view/com/auth/create/Step1.tsx:200
 msgid "Input email for Bluesky account"
 msgstr "输入 Bluesky 账户ç„电å­é‚®ç®±"
 
-#: src/view/com/auth/create/Step1.tsx:154
+#: src/view/com/auth/create/Step1.tsx:158
 msgid "Input invite code to proceed"
 msgstr "输入邀请ç ä»¥ç»§ç»­"
 
@@ -1852,8 +1858,8 @@ msgid "Input password for account deletion"
 msgstr "输入密ç ä»¥åˆ é™¤è´¦æˆ·"
 
 #: src/view/com/auth/create/Step2.tsx:196
-msgid "Input phone number for SMS verification"
-msgstr "输入手机å·ç è¿›è¡ŒçŸ­ä¿¡éªŒè¯"
+#~ msgid "Input phone number for SMS verification"
+#~ msgstr "输入手机å·ç è¿›è¡ŒçŸ­ä¿¡éªŒè¯"
 
 #: src/view/com/auth/login/LoginForm.tsx:230
 msgid "Input the password tied to {identifier}"
@@ -1864,8 +1870,8 @@ msgid "Input the username or email address you used at signup"
 msgstr "输入注册时使用ç„ç”¨æˆ·åæˆ–电å­é‚®ç®±"
 
 #: src/view/com/auth/create/Step2.tsx:271
-msgid "Input the verification code we have texted to you"
-msgstr "输入收到ç„短信验è¯ç "
+#~ msgid "Input the verification code we have texted to you"
+#~ msgstr "输入收到ç„短信验è¯ç "
 
 #: src/view/com/modals/Waitlist.tsx:90
 msgid "Input your email to get on the Bluesky waitlist"
@@ -1875,11 +1881,11 @@ msgstr "输入你ç„电å­é‚®ç®±ä»¥å å…¥ Bluesky 候补列表"
 msgid "Input your password"
 msgstr "输入你ç„密ç "
 
-#: src/view/com/auth/create/Step3.tsx:42
+#: src/view/com/auth/create/Step2.tsx:45
 msgid "Input your user handle"
 msgstr "输入你ç„用户识别符"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:225
+#: src/view/com/post-thread/PostThreadItem.tsx:223
 msgid "Invalid or unsupported post record"
 msgstr "帖å­è®°å½•无效或ä¸å—支æŒ"
 
@@ -1895,12 +1901,12 @@ msgstr "ç”¨æˆ·åæˆ–å¯†ç æ— æ•ˆ"
 msgid "Invite a Friend"
 msgstr "邀请朋å‹"
 
-#: src/view/com/auth/create/Step1.tsx:144
-#: src/view/com/auth/create/Step1.tsx:153
+#: src/view/com/auth/create/Step1.tsx:148
+#: src/view/com/auth/create/Step1.tsx:157
 msgid "Invite code"
 msgstr "邀请ç "
 
-#: src/view/com/auth/create/state.ts:199
+#: src/view/com/auth/create/state.ts:158
 msgid "Invite code not accepted. Check that you input it correctly and try again."
 msgstr "é‚€è¯·ç æ— æ•ˆï¼Œè¯·æ£€æŸ¥ä½ è¾“å…¥ç„邀请ç å¹¶é‡è¯•。"
 
@@ -1929,8 +1935,8 @@ msgstr "工作"
 msgid "Join the waitlist"
 msgstr "å å…¥å€™è¡¥åˆ—表"
 
-#: src/view/com/auth/create/Step1.tsx:170
 #: src/view/com/auth/create/Step1.tsx:174
+#: src/view/com/auth/create/Step1.tsx:178
 msgid "Join the waitlist."
 msgstr "å å…¥å€™è¡¥åˆ—è¡¨ă€‚"
 
@@ -2057,7 +2063,7 @@ msgstr "点èµä½ ç„帖å­"
 msgid "Likes"
 msgstr "点èµ"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:182
+#: src/view/com/post-thread/PostThreadItem.tsx:180
 msgid "Likes on this post"
 msgstr "点èµè¿™æ¡å¸–å­"
 
@@ -2105,8 +2111,8 @@ msgstr "å–æ¶ˆéè—列表"
 msgid "Lists"
 msgstr "列表"
 
-#: src/view/com/post-thread/PostThread.tsx:306
-#: src/view/com/post-thread/PostThread.tsx:314
+#: src/view/com/post-thread/PostThread.tsx:333
+#: src/view/com/post-thread/PostThread.tsx:341
 msgid "Load more posts"
 msgstr "å è½½æ›´å¤å¸–å­"
 
@@ -2114,7 +2120,7 @@ msgstr "å è½½æ›´å¤å¸–å­"
 msgid "Load new notifications"
 msgstr "å è½½æ–°ç„é€çŸ¥"
 
-#: src/view/com/feeds/FeedPage.tsx:190
+#: src/view/com/feeds/FeedPage.tsx:181
 #: src/view/screens/Profile.tsx:440
 #: src/view/screens/ProfileFeed.tsx:494
 #: src/view/screens/ProfileList.tsx:680
@@ -2365,7 +2371,7 @@ msgstr "新密ç "
 msgid "New Password"
 msgstr "新密ç "
 
-#: src/view/com/feeds/FeedPage.tsx:201
+#: src/view/com/feeds/FeedPage.tsx:192
 msgctxt "action"
 msgid "New post"
 msgstr "新帖å­"
@@ -2397,7 +2403,7 @@ msgstr "最新å›å¤ä¼˜å…ˆ"
 msgid "News"
 msgstr "æ–°é—»"
 
-#: src/view/com/auth/create/CreateAccount.tsx:161
+#: src/view/com/auth/create/CreateAccount.tsx:168
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:182
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:192
 #: src/view/com/auth/login/LoginForm.tsx:291
@@ -2673,8 +2679,8 @@ msgstr "无法找到此页é¢"
 msgid "Page Not Found"
 msgstr "无法找到此页é¢"
 
-#: src/view/com/auth/create/Step1.tsx:210
-#: src/view/com/auth/create/Step1.tsx:220
+#: src/view/com/auth/create/Step1.tsx:214
+#: src/view/com/auth/create/Step1.tsx:224
 #: src/view/com/auth/login/LoginForm.tsx:226
 #: src/view/com/auth/login/SetNewPasswordForm.tsx:161
 #: src/view/com/modals/DeleteAccount.tsx:202
@@ -2710,8 +2716,8 @@ msgid "Pets"
 msgstr "宠物"
 
 #: src/view/com/auth/create/Step2.tsx:183
-msgid "Phone number"
-msgstr "手机å·ç "
+#~ msgid "Phone number"
+#~ msgstr "手机å·ç "
 
 #: src/view/com/modals/SelfLabel.tsx:121
 msgid "Pictures meant for adults."
@@ -2739,14 +2745,18 @@ msgstr "播放视频"
 msgid "Plays the GIF"
 msgstr "播放 GIF"
 
-#: src/view/com/auth/create/state.ts:177
+#: src/view/com/auth/create/state.ts:124
 msgid "Please choose your handle."
 msgstr "请设置你ç„ç”¨æˆ·è¯†åˆ«ç¬¦ă€‚"
 
-#: src/view/com/auth/create/state.ts:160
+#: src/view/com/auth/create/state.ts:117
 msgid "Please choose your password."
 msgstr "请设置你ç„密ç ă€‚"
 
+#: src/view/com/auth/create/state.ts:131
+msgid "Please complete the verification captcha."
+msgstr ""
+
 #: src/view/com/modals/ChangeEmail.tsx:67
 msgid "Please confirm your email before changing it. This is a temporary requirement while email-updating tools are added, and it will soon be removed."
 msgstr "更改å‰è¯·å…ˆç¡®è®¤ä½ ç„电å­é‚®ç®±ă€‚这是添å ç”µå­é‚®ç®±æ›´æ–°å·¥å…·ç„ä¸´æ—¶è¦æ±‚,此é™åˆ¶å°†å¾ˆå¿«è¢«ç§»é™¤ă€‚"
@@ -2756,22 +2766,22 @@ msgid "Please enter a name for your app password. All spaces is not allowed."
 msgstr "请输入 App 专用密ç ç„å称,ä¸å…è®¸ä½¿ç”¨ç©ºæ ¼ă€‚"
 
 #: src/view/com/auth/create/Step2.tsx:206
-msgid "Please enter a phone number that can receive SMS text messages."
-msgstr "请输入å¯ä»¥æ¥æ”¶çŸ­ä¿¡ç„手机å·ç ă€‚"
+#~ msgid "Please enter a phone number that can receive SMS text messages."
+#~ msgstr "请输入å¯ä»¥æ¥æ”¶çŸ­ä¿¡ç„手机å·ç ă€‚"
 
 #: src/view/com/modals/AddAppPasswords.tsx:145
 msgid "Please enter a unique name for this App Password or use our randomly generated one."
 msgstr "请输入此 App 专用密ç ç„唯一å称,或使用我们æä¾›ç„éæœºç”Ÿæˆå称。"
 
 #: src/view/com/auth/create/state.ts:170
-msgid "Please enter the code you received by SMS."
-msgstr "请输入你收到ç„短信验è¯ç ă€‚"
+#~ msgid "Please enter the code you received by SMS."
+#~ msgstr "请输入你收到ç„短信验è¯ç ă€‚"
 
 #: src/view/com/auth/create/Step2.tsx:282
-msgid "Please enter the verification code sent to {phoneNumberFormatted}."
-msgstr "请输入å‘é€åˆ° {phoneNumberFormatted} ç„验è¯ç ă€‚"
+#~ msgid "Please enter the verification code sent to {phoneNumberFormatted}."
+#~ msgstr "请输入å‘é€åˆ° {phoneNumberFormatted} ç„验è¯ç ă€‚"
 
-#: src/view/com/auth/create/state.ts:146
+#: src/view/com/auth/create/state.ts:103
 msgid "Please enter your email."
 msgstr "请输入你ç„电å­é‚®ç®±ă€‚"
 
@@ -2806,12 +2816,12 @@ msgctxt "action"
 msgid "Post"
 msgstr "å‘布"
 
-#: src/view/com/post-thread/PostThread.tsx:276
+#: src/view/com/post-thread/PostThread.tsx:303
 msgctxt "description"
 msgid "Post"
 msgstr "å‘布"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:174
+#: src/view/com/post-thread/PostThreadItem.tsx:172
 msgid "Post by {0}"
 msgstr "å‘布者 {0}"
 
@@ -2825,7 +2835,7 @@ msgstr "å‘布者 @{0}"
 msgid "Post deleted"
 msgstr "已删除帖å­"
 
-#: src/view/com/post-thread/PostThread.tsx:427
+#: src/view/com/post-thread/PostThread.tsx:461
 msgid "Post hidden"
 msgstr "å·²éè—帖å­"
 
@@ -2837,7 +2847,7 @@ msgstr "帖å­è¯­è¨€"
 msgid "Post Languages"
 msgstr "帖å­è¯­è¨€"
 
-#: src/view/com/post-thread/PostThread.tsx:479
+#: src/view/com/post-thread/PostThread.tsx:513
 msgid "Post not found"
 msgstr "无法找到帖å­"
 
@@ -2866,7 +2876,7 @@ msgid "Prioritize Your Follows"
 msgstr "关注者优先"
 
 #: src/view/screens/Settings/index.tsx:632
-#: src/view/shell/desktop/RightNav.tsx:80
+#: src/view/shell/desktop/RightNav.tsx:72
 msgid "Privacy"
 msgstr "éç§"
 
@@ -3028,7 +3038,7 @@ msgid "Reply Filters"
 msgstr "å›å¤è¿‡æ»¤å™¨"
 
 #: src/view/com/post/Post.tsx:166
-#: src/view/com/posts/FeedItem.tsx:287
+#: src/view/com/posts/FeedItem.tsx:284
 msgctxt "description"
 msgid "Reply to <0/>"
 msgstr "å›å¤ <0/>"
@@ -3075,11 +3085,11 @@ msgstr "è½¬å‘æˆ–引用帖å­"
 msgid "Reposted By"
 msgstr "转å‘"
 
-#: src/view/com/posts/FeedItem.tsx:207
+#: src/view/com/posts/FeedItem.tsx:204
 msgid "Reposted by {0}"
 msgstr "ç”± {0} 转å‘"
 
-#: src/view/com/posts/FeedItem.tsx:224
+#: src/view/com/posts/FeedItem.tsx:221
 msgid "Reposted by <0/>"
 msgstr "ç”± <0/> 转å‘"
 
@@ -3087,7 +3097,7 @@ msgstr "ç”± <0/> 转å‘"
 msgid "reposted your post"
 msgstr "转å‘ä½ ç„帖å­"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:187
+#: src/view/com/post-thread/PostThreadItem.tsx:185
 msgid "Reposts of this post"
 msgstr "转å‘è¿™æ¡å¸–å­"
 
@@ -3097,8 +3107,8 @@ msgid "Request Change"
 msgstr "è¯·æ±‚å˜æ›´"
 
 #: src/view/com/auth/create/Step2.tsx:219
-msgid "Request code"
-msgstr "请求ç "
+#~ msgid "Request code"
+#~ msgstr "请求ç "
 
 #: src/view/com/modals/ChangePassword.tsx:239
 #: src/view/com/modals/ChangePassword.tsx:241
@@ -3109,7 +3119,7 @@ msgstr "确认ç "
 msgid "Require alt text before posting"
 msgstr "è¦æ±‚å‘å¸ƒå‰æä¾›æ›¿ä»£æ–‡æœ¬"
 
-#: src/view/com/auth/create/Step1.tsx:149
+#: src/view/com/auth/create/Step1.tsx:153
 msgid "Required for this provider"
 msgstr "应æä¾›å•†è¦æ±‚"
 
@@ -3161,9 +3171,8 @@ msgstr "é‡è¯•䏿¬¡å‡ºé”™ç„æ“作"
 
 #: src/screens/Onboarding/StepInterests/index.tsx:221
 #: src/screens/Onboarding/StepInterests/index.tsx:224
-#: src/view/com/auth/create/CreateAccount.tsx:170
-#: src/view/com/auth/create/CreateAccount.tsx:175
-#: src/view/com/auth/create/Step2.tsx:255
+#: src/view/com/auth/create/CreateAccount.tsx:177
+#: src/view/com/auth/create/CreateAccount.tsx:182
 #: src/view/com/auth/login/LoginForm.tsx:268
 #: src/view/com/auth/login/LoginForm.tsx:271
 #: src/view/com/util/error/ErrorMessage.tsx:55
@@ -3172,16 +3181,16 @@ msgid "Retry"
 msgstr "é‡è¯•"
 
 #: src/view/com/auth/create/Step2.tsx:247
-msgid "Retry."
-msgstr "é‡è¯•。"
+#~ msgid "Retry."
+#~ msgstr "é‡è¯•。"
 
 #: src/view/screens/ProfileList.tsx:898
 msgid "Return to previous page"
 msgstr "å›åˆ°ä¸ä¸€é¡µ"
 
 #: src/view/shell/desktop/RightNav.tsx:55
-msgid "SANDBOX. Posts and accounts are not permanent."
-msgstr "沙盒模å¼ă€‚帖å­å’Œè´¦æˆ·ä¸ä¼æ°¸ä¹…ä¿å­˜ă€‚"
+#~ msgid "SANDBOX. Posts and accounts are not permanent."
+#~ msgstr "沙盒模å¼ă€‚帖å­å’Œè´¦æˆ·ä¸ä¼æ°¸ä¹…ä¿å­˜ă€‚"
 
 #: src/view/com/lightbox/Lightbox.tsx:132
 #: src/view/com/modals/CreateOrEditList.tsx:345
@@ -3290,7 +3299,7 @@ msgstr "选择已存在ç„账户"
 msgid "Select option {i} of {numItems}"
 msgstr "ä» {i} 项中选择 {numItems} 项"
 
-#: src/view/com/auth/create/Step1.tsx:99
+#: src/view/com/auth/create/Step1.tsx:103
 #: src/view/com/auth/login/LoginForm.tsx:150
 msgid "Select service"
 msgstr "选择æœå¡"
@@ -3324,8 +3333,8 @@ msgid "Select your interests from the options below"
 msgstr "下é¢é€‰æ‹©ä½ æ„Ÿå…´è¶£ç„选项"
 
 #: src/view/com/auth/create/Step2.tsx:155
-msgid "Select your phone's country"
-msgstr "选择你ç„电è¯åŒºå·"
+#~ msgid "Select your phone's country"
+#~ msgstr "选择你ç„电è¯åŒºå·"
 
 #: src/view/screens/LanguageSettings.tsx:190
 msgid "Select your preferred language for translations in your feed."
@@ -3404,7 +3413,7 @@ msgstr "设置深色模å¼è‡³æ—æ·¡"
 msgid "Set new password"
 msgstr "设置新密ç "
 
-#: src/view/com/auth/create/Step1.tsx:221
+#: src/view/com/auth/create/Step1.tsx:225
 msgid "Set password"
 msgstr "设置密ç "
 
@@ -3444,7 +3453,7 @@ msgstr "设置用äºé‡ç½®å¯†ç ç„电å­é‚®ç®±"
 msgid "Sets hosting provider for password reset"
 msgstr "设置用äºå¯†ç é‡ç½®ç„托管æä¾›å•†ä¿¡æ¯"
 
-#: src/view/com/auth/create/Step1.tsx:100
+#: src/view/com/auth/create/Step1.tsx:104
 #: src/view/com/auth/login/LoginForm.tsx:151
 msgid "Sets server for the Bluesky client"
 msgstr "设置 Bluesky å®¢æˆ·ç«¯ç„æœå¡å™¨"
@@ -3500,9 +3509,9 @@ msgstr "显示æ¥è‡ª {0} ç„嵌入内容"
 msgid "Show follows similar to {0}"
 msgstr "æ˜¾ç¤ºç±»ä¼¼äº {0} ç„关注者"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:539
+#: src/view/com/post-thread/PostThreadItem.tsx:535
 #: src/view/com/post/Post.tsx:197
-#: src/view/com/posts/FeedItem.tsx:363
+#: src/view/com/posts/FeedItem.tsx:360
 msgid "Show More"
 msgstr "显示更å¤"
 
@@ -3655,8 +3664,8 @@ msgid "Skip this flow"
 msgstr "跳过此æµç¨‹"
 
 #: src/view/com/auth/create/Step2.tsx:82
-msgid "SMS verification"
-msgstr "短信验è¯"
+#~ msgid "SMS verification"
+#~ msgstr "短信验è¯"
 
 #: src/screens/Onboarding/index.tsx:40
 msgid "Software Dev"
@@ -3784,7 +3793,7 @@ msgstr "点击查看完整内容"
 msgid "Tech"
 msgstr "ç§‘æ€"
 
-#: src/view/shell/desktop/RightNav.tsx:89
+#: src/view/shell/desktop/RightNav.tsx:81
 msgid "Terms"
 msgstr "æ¡æ¬¾"
 
@@ -3800,6 +3809,10 @@ msgstr "æœå¡æ¡æ¬¾"
 msgid "Text input field"
 msgstr "文本输入字段"
 
+#: src/view/com/auth/create/CreateAccount.tsx:90
+msgid "That handle is already taken."
+msgstr ""
+
 #: src/view/com/profile/ProfileHeader.tsx:262
 msgid "The account will be able to interact with you after unblocking."
 msgstr "解除å±è”½å,该账户将能够ä¸ä½ äº’å¨ă€‚"
@@ -3816,7 +3829,7 @@ msgstr "版æƒè®¸å¯å·²è¿ç§»è‡³ <0/>"
 msgid "The following steps will help customize your Bluesky experience."
 msgstr "以下步骤将帮å©å®åˆ¶ä½ ç„ Bluesky ä½“éªŒă€‚"
 
-#: src/view/com/post-thread/PostThread.tsx:482
+#: src/view/com/post-thread/PostThread.tsx:516
 msgid "The post may have been deleted."
 msgstr "此帖å­ä¼¼ä¹å·²è¢«åˆ é™¤ă€‚"
 
@@ -3917,8 +3930,8 @@ msgid "There's been a rush of new users to Bluesky! We'll activate your account
 msgstr "Bluesky è¿æ¥äº†å¤§é‡æ–°ç”¨æˆ·ï¼æˆ‘们将尽快激活你ç„è´¦æˆ·ă€‚"
 
 #: src/view/com/auth/create/Step2.tsx:55
-msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
-msgstr "电è¯å·ç æœ‰è¯¯ï¼Œè¯·é€‰æ‹©ç”µè¯åŒºå·å¹¶è¾“入完整ç„电è¯å·ç ï¼"
+#~ msgid "There's something wrong with this number. Please choose your country and enter your full phone number!"
+#~ msgstr "电è¯å·ç æœ‰è¯¯ï¼Œè¯·é€‰æ‹©ç”µè¯åŒºå·å¹¶è¾“入完整ç„电è¯å·ç ï¼"
 
 #: src/screens/Onboarding/StepSuggestedAccounts/index.tsx:138
 msgid "These are popular accounts you might like:"
@@ -4031,8 +4044,8 @@ msgstr "切æ¢ä¸‹æ‹‰èœå•"
 msgid "Transformations"
 msgstr "转æ¢"
 
-#: src/view/com/post-thread/PostThreadItem.tsx:686
-#: src/view/com/post-thread/PostThreadItem.tsx:688
+#: src/view/com/post-thread/PostThreadItem.tsx:682
+#: src/view/com/post-thread/PostThreadItem.tsx:684
 #: src/view/com/util/forms/PostDropdownBtn.tsx:125
 msgid "Translate"
 msgstr "翻译"
@@ -4050,7 +4063,7 @@ msgstr "å–æ¶ˆå±è”½åˆ—表"
 msgid "Un-mute list"
 msgstr "å–æ¶ˆéè—列表"
 
-#: src/view/com/auth/create/CreateAccount.tsx:66
+#: src/view/com/auth/create/CreateAccount.tsx:58
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:87
 #: src/view/com/auth/login/Login.tsx:76
 #: src/view/com/auth/login/LoginForm.tsx:118
@@ -4089,7 +4102,7 @@ msgstr "å–å…³"
 msgid "Unfollow {0}"
 msgstr "å–å…³ {0}"
 
-#: src/view/com/auth/create/state.ts:300
+#: src/view/com/auth/create/state.ts:262
 msgid "Unfortunately, you do not meet the requirements to create an account."
 msgstr "å¾ˆé—æ†¾ï¼Œä½ ä¸ç¬¦åˆåˆ›å»ºè´¦æˆ·ç„è¦æ±‚。"
 
@@ -4181,7 +4194,7 @@ msgstr "用户被列表å±è”½"
 msgid "User Blocks You"
 msgstr "用户å±è”½äº†ä½ "
 
-#: src/view/com/auth/create/Step3.tsx:41
+#: src/view/com/auth/create/Step2.tsx:44
 msgid "User handle"
 msgstr "用户识别符"
 
@@ -4230,8 +4243,8 @@ msgid "Users in \"{0}\""
 msgstr "\"{0}\"中ç„用户"
 
 #: src/view/com/auth/create/Step2.tsx:243
-msgid "Verification code"
-msgstr "验è¯ç "
+#~ msgid "Verification code"
+#~ msgstr "验è¯ç "
 
 #: src/view/screens/Settings/index.tsx:910
 msgid "Verify email"
@@ -4323,7 +4336,7 @@ msgstr "我们将迅速审查你ç„ç”³è¯‰ă€‚"
 msgid "We'll use this to help customize your experience."
 msgstr "æˆ‘ä»¬å°†ä½¿ç”¨è¿™äº›ä¿¡æ¯æ¥å¸®å©å®åˆ¶ä½ ç„ä½“éªŒă€‚"
 
-#: src/view/com/auth/create/CreateAccount.tsx:123
+#: src/view/com/auth/create/CreateAccount.tsx:130
 msgid "We're so excited to have you join us!"
 msgstr "我们é常高兴你å å…¥æˆ‘们ï¼"
 
@@ -4387,8 +4400,8 @@ msgid "Writers"
 msgstr "作家"
 
 #: src/view/com/auth/create/Step2.tsx:263
-msgid "XXXXXX"
-msgstr "XXXXXX"
+#~ msgid "XXXXXX"
+#~ msgstr "XXXXXX"
 
 #: src/view/com/composer/select-language/SuggestedLanguage.tsx:77
 #: src/view/screens/PreferencesHomeFeed.tsx:129
@@ -4434,7 +4447,7 @@ msgstr "ä½ ç›®å‰è¿˜æ²¡æœ‰ä»»ä½•ä¿å­˜ç„ä¿¡æ¯æµï¼"
 msgid "You don't have any saved feeds."
 msgstr "ä½ ç›®å‰è¿˜æ²¡æœ‰ä»»ä½•ä¿å­˜ç„ä¿¡æ¯æµă€‚"
 
-#: src/view/com/post-thread/PostThread.tsx:430
+#: src/view/com/post-thread/PostThread.tsx:464
 msgid "You have blocked the author or you have been blocked by the author."
 msgstr "ä½ å·²å±è”½è¯¥ä½œè€…,或你已被该作者å±è”½ă€‚"
 
@@ -4524,7 +4537,7 @@ msgstr "ä½ ç„账户已删除"
 msgid "Your account repository, containing all public data records, can be downloaded as a \"CAR\" file. This file does not include media embeds, such as images, or your private data, which must be fetched separately."
 msgstr ""
 
-#: src/view/com/auth/create/Step1.tsx:234
+#: src/view/com/auth/create/Step1.tsx:238
 msgid "Your birth date"
 msgstr "ä½ ç„生日"
 
@@ -4536,7 +4549,7 @@ msgstr "ä½ ç„选择将被ä¿å­˜ï¼Œä½†å¯ä»¥ç¨ååœ¨è®¾ç½®ä¸­æ›´æ”¹ă€‚"
 msgid "Your default feed is \"Following\""
 msgstr "ä½ ç„é»˜è®¤ä¿¡æ¯æµä¸º\"关注\""
 
-#: src/view/com/auth/create/state.ts:153
+#: src/view/com/auth/create/state.ts:110
 #: src/view/com/auth/login/ForgotPasswordForm.tsx:70
 #: src/view/com/modals/ChangePassword.tsx:54
 msgid "Your email appears to be invalid."
@@ -4558,7 +4571,7 @@ msgstr "ä½ ç„电å­é‚®ç®±å°æœªéªŒè¯ă€‚这是一个é‡è¦ç„安全步骤,我
 msgid "Your following feed is empty! Follow more users to see what's happening."
 msgstr "ä½ ç„å…³æ³¨ä¿¡æ¯æµä¸ºç©ºï¼å…³æ³¨æ›´å¤ç”¨æˆ·å»çœ‹çœ‹ä»–们å‘äº†ä»€ä¹ˆä»€ä¹ˆă€‚"
 
-#: src/view/com/auth/create/Step3.tsx:45
+#: src/view/com/auth/create/Step2.tsx:48
 msgid "Your full handle will be"
 msgstr "ä½ ç„完整用户识别符将修改为"
 
@@ -4595,6 +4608,6 @@ msgstr "ä½ ç„个人资料"
 msgid "Your reply has been published"
 msgstr "ä½ ç„å›å¤å·²å‘é€"
 
-#: src/view/com/auth/create/Step3.tsx:28
+#: src/view/com/auth/create/Step2.tsx:28
 msgid "Your user handle"
 msgstr "ä½ ç„用户识别符"
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index b555a997b..bd3b157bc 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -7,7 +7,6 @@ import {networkRetry} from '#/lib/async/retry'
 import {logger} from '#/logger'
 import * as persisted from '#/state/persisted'
 import {PUBLIC_BSKY_AGENT} from '#/state/queries'
-import {IS_PROD} from '#/lib/constants'
 import {emitSessionDropped} from '../events'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {useCloseAllActiveElements} from '#/state/util'
@@ -36,7 +35,6 @@ export type SessionState = {
 }
 export type StateContext = SessionState & {
   hasSession: boolean
-  isSandbox: boolean
 }
 export type ApiContext = {
   createAccount: (props: {
@@ -84,7 +82,6 @@ const StateContext = React.createContext<StateContext>({
   accounts: [],
   currentAccount: undefined,
   hasSession: false,
-  isSandbox: false,
 })
 
 const ApiContext = React.createContext<ApiContext>({
@@ -610,9 +607,6 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
     () => ({
       ...state,
       hasSession: !!state.currentAccount,
-      isSandbox: state.currentAccount
-        ? !IS_PROD(state.currentAccount?.service)
-        : false,
     }),
     [state],
   )
diff --git a/src/view/com/auth/create/CaptchaWebView.tsx b/src/view/com/auth/create/CaptchaWebView.tsx
new file mode 100644
index 000000000..b0de8b4a4
--- /dev/null
+++ b/src/view/com/auth/create/CaptchaWebView.tsx
@@ -0,0 +1,86 @@
+import React from 'react'
+import {WebView, WebViewNavigation} from 'react-native-webview'
+import {ShouldStartLoadRequest} from 'react-native-webview/lib/WebViewTypes'
+import {StyleSheet} from 'react-native'
+import {CreateAccountState} from 'view/com/auth/create/state'
+
+const ALLOWED_HOSTS = [
+  'bsky.social',
+  'bsky.app',
+  'staging.bsky.app',
+  'staging.bsky.dev',
+  'js.hcaptcha.com',
+  'newassets.hcaptcha.com',
+  'api2.hcaptcha.com',
+]
+
+export function CaptchaWebView({
+  url,
+  stateParam,
+  uiState,
+  onSuccess,
+  onError,
+}: {
+  url: string
+  stateParam: string
+  uiState?: CreateAccountState
+  onSuccess: (code: string) => void
+  onError: () => void
+}) {
+  const redirectHost = React.useMemo(() => {
+    if (!uiState?.serviceUrl) return 'bsky.app'
+
+    return uiState?.serviceUrl &&
+      new URL(uiState?.serviceUrl).host === 'staging.bsky.dev'
+      ? 'staging.bsky.app'
+      : 'bsky.app'
+  }, [uiState?.serviceUrl])
+
+  const wasSuccessful = React.useRef(false)
+
+  const onShouldStartLoadWithRequest = React.useCallback(
+    (event: ShouldStartLoadRequest) => {
+      const urlp = new URL(event.url)
+      return ALLOWED_HOSTS.includes(urlp.host)
+    },
+    [],
+  )
+
+  const onNavigationStateChange = React.useCallback(
+    (e: WebViewNavigation) => {
+      if (wasSuccessful.current) return
+
+      const urlp = new URL(e.url)
+      if (urlp.host !== redirectHost) return
+
+      const code = urlp.searchParams.get('code')
+      if (urlp.searchParams.get('state') !== stateParam || !code) {
+        onError()
+        return
+      }
+
+      wasSuccessful.current = true
+      onSuccess(code)
+    },
+    [redirectHost, stateParam, onSuccess, onError],
+  )
+
+  return (
+    <WebView
+      source={{uri: url}}
+      javaScriptEnabled
+      style={styles.webview}
+      onShouldStartLoadWithRequest={onShouldStartLoadWithRequest}
+      onNavigationStateChange={onNavigationStateChange}
+      scrollEnabled={false}
+    />
+  )
+}
+
+const styles = StyleSheet.create({
+  webview: {
+    flex: 1,
+    backgroundColor: 'transparent',
+    borderRadius: 10,
+  },
+})
diff --git a/src/view/com/auth/create/CaptchaWebView.web.tsx b/src/view/com/auth/create/CaptchaWebView.web.tsx
new file mode 100644
index 000000000..7791a58dd
--- /dev/null
+++ b/src/view/com/auth/create/CaptchaWebView.web.tsx
@@ -0,0 +1,61 @@
+import React from 'react'
+import {StyleSheet} from 'react-native'
+
+// @ts-ignore web only, we will always redirect to the app on web (CORS)
+const REDIRECT_HOST = new URL(window.location.href).host
+
+export function CaptchaWebView({
+  url,
+  stateParam,
+  onSuccess,
+  onError,
+}: {
+  url: string
+  stateParam: string
+  onSuccess: (code: string) => void
+  onError: () => void
+}) {
+  const onLoad = React.useCallback(() => {
+    // @ts-ignore web
+    const frame: HTMLIFrameElement = document.getElementById(
+      'captcha-iframe',
+    ) as HTMLIFrameElement
+
+    try {
+      // @ts-ignore web
+      const href = frame?.contentWindow?.location.href
+      if (!href) return
+      const urlp = new URL(href)
+
+      // This shouldn't happen with CORS protections, but for good measure
+      if (urlp.host !== REDIRECT_HOST) return
+
+      const code = urlp.searchParams.get('code')
+      if (urlp.searchParams.get('state') !== stateParam || !code) {
+        onError()
+        return
+      }
+      onSuccess(code)
+    } catch (e) {
+      // We don't need to handle this
+    }
+  }, [stateParam, onSuccess, onError])
+
+  return (
+    <iframe
+      src={url}
+      style={styles.iframe}
+      id="captcha-iframe"
+      onLoad={onLoad}
+    />
+  )
+}
+
+const styles = StyleSheet.create({
+  iframe: {
+    flex: 1,
+    borderWidth: 0,
+    borderRadius: 10,
+    backgroundColor: 'transparent',
+  },
+})
diff --git a/src/view/com/auth/create/CreateAccount.tsx b/src/view/com/auth/create/CreateAccount.tsx
index 5d452736a..8aefffa6d 100644
--- a/src/view/com/auth/create/CreateAccount.tsx
+++ b/src/view/com/auth/create/CreateAccount.tsx
@@ -13,33 +13,25 @@ import {s} from 'lib/styles'
 import {usePalette} from 'lib/hooks/usePalette'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {useOnboardingDispatch} from '#/state/shell'
-import {useSessionApi} from '#/state/session'
-import {useCreateAccount, submit} from './state'
+import {useCreateAccount, useSubmitCreateAccount} from './state'
 import {useServiceQuery} from '#/state/queries/service'
-import {
-  usePreferencesSetBirthDateMutation,
-  useSetSaveFeedsMutation,
-  DEFAULT_PROD_FEEDS,
-} from '#/state/queries/preferences'
-import {FEEDBACK_FORM_URL, HITSLOP_10, IS_PROD} from '#/lib/constants'
+import {FEEDBACK_FORM_URL, HITSLOP_10} from '#/lib/constants'
 
 import {Step1} from './Step1'
 import {Step2} from './Step2'
 import {Step3} from './Step3'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {TextLink} from '../../util/Link'
+import {getAgent} from 'state/session'
+import {createFullHandle} from 'lib/strings/handles'
 
 export function CreateAccount({onPressBack}: {onPressBack: () => void}) {
   const {screen} = useAnalytics()
   const pal = usePalette('default')
   const {_} = useLingui()
   const [uiState, uiDispatch] = useCreateAccount()
-  const onboardingDispatch = useOnboardingDispatch()
-  const {createAccount} = useSessionApi()
-  const {mutate: setBirthDate} = usePreferencesSetBirthDateMutation()
-  const {mutate: setSavedFeeds} = useSetSaveFeedsMutation()
   const {isTabletOrDesktop} = useWebMediaQueries()
+  const submit = useSubmitCreateAccount(uiState, uiDispatch)
 
   React.useEffect(() => {
     screen('CreateAccount')
@@ -84,33 +76,48 @@ export function CreateAccount({onPressBack}: {onPressBack: () => void}) {
     if (!uiState.canNext) {
       return
     }
-    if (uiState.step < 3) {
-      uiDispatch({type: 'next'})
-    } else {
+
+    if (uiState.step === 2) {
+      uiDispatch({type: 'set-processing', value: true})
       try {
-        await submit({
-          onboardingDispatch,
-          createAccount,
-          uiState,
-          uiDispatch,
-          _,
+        const res = await getAgent().resolveHandle({
+          handle: createFullHandle(uiState.handle, uiState.userDomain),
         })
-        setBirthDate({birthDate: uiState.birthDate})
-        if (IS_PROD(uiState.serviceUrl)) {
-          setSavedFeeds(DEFAULT_PROD_FEEDS)
+
+        if (res.data.did) {
+          uiDispatch({
+            type: 'set-error',
+            value: _(msg`That handle is already taken.`),
+          })
+          return
         }
-      } catch {
-        // dont need to handle here
+      } catch (e) {
+        // Don't need to handle
+      } finally {
+        uiDispatch({type: 'set-processing', value: false})
+      }
+
+      if (!uiState.isCaptchaRequired) {
+        try {
+          await submit()
+        } catch {
+          // dont need to handle here
+        }
+        // We don't need to go to the next page if there wasn't a captcha required
+        return
       }
     }
+
+    uiDispatch({type: 'next'})
   }, [
-    uiState,
+    uiState.canNext,
+    uiState.step,
+    uiState.isCaptchaRequired,
+    uiState.handle,
+    uiState.userDomain,
     uiDispatch,
-    onboardingDispatch,
-    createAccount,
-    setBirthDate,
-    setSavedFeeds,
     _,
+    submit,
   ])
 
   // rendering
diff --git a/src/view/com/auth/create/Step1.tsx b/src/view/com/auth/create/Step1.tsx
index a7abbfaa8..4c7018485 100644
--- a/src/view/com/auth/create/Step1.tsx
+++ b/src/view/com/auth/create/Step1.tsx
@@ -73,6 +73,10 @@ export function Step1({
       />
       <StepHeader uiState={uiState} title={_(msg`Your account`)} />
 
+      {uiState.error ? (
+        <ErrorMessage message={uiState.error} style={styles.error} />
+      ) : undefined}
+
       <View style={s.pb20}>
         <Text type="md-medium" style={[pal.text, s.mb2]}>
           <Trans>Hosting provider</Trans>
@@ -259,9 +263,6 @@ export function Step1({
           )}
         </>
       )}
-      {uiState.error ? (
-        <ErrorMessage message={uiState.error} style={styles.error} />
-      ) : undefined}
     </View>
   )
 }
@@ -269,7 +270,7 @@ export function Step1({
 const styles = StyleSheet.create({
   error: {
     borderRadius: 6,
-    marginTop: 10,
+    marginBottom: 10,
   },
   dateInputButton: {
     borderWidth: 1,
diff --git a/src/view/com/auth/create/Step2.tsx b/src/view/com/auth/create/Step2.tsx
index 2e16b13bb..87d414bb9 100644
--- a/src/view/com/auth/create/Step2.tsx
+++ b/src/view/com/auth/create/Step2.tsx
@@ -1,35 +1,19 @@
 import React from 'react'
-import {
-  ActivityIndicator,
-  StyleSheet,
-  TouchableWithoutFeedback,
-  View,
-} from 'react-native'
-import RNPickerSelect from 'react-native-picker-select'
-import {
-  CreateAccountState,
-  CreateAccountDispatch,
-  requestVerificationCode,
-} from './state'
+import {StyleSheet, View} from 'react-native'
+import {CreateAccountState, CreateAccountDispatch} from './state'
 import {Text} from 'view/com/util/text/Text'
 import {StepHeader} from './StepHeader'
 import {s} from 'lib/styles'
-import {usePalette} from 'lib/hooks/usePalette'
 import {TextInput} from '../util/TextInput'
-import {Button} from '../../util/forms/Button'
+import {createFullHandle} from 'lib/strings/handles'
+import {usePalette} from 'lib/hooks/usePalette'
 import {ErrorMessage} from 'view/com/util/error/ErrorMessage'
-import {isAndroid, isWeb} from 'platform/detection'
-import {Trans, msg} from '@lingui/macro'
+import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
-import parsePhoneNumber from 'libphonenumber-js'
-import {COUNTRY_CODES} from '#/lib/country-codes'
-import {
-  FontAwesomeIcon,
-  FontAwesomeIconStyle,
-} from '@fortawesome/react-native-fontawesome'
-import {HITSLOP_10} from '#/lib/constants'
 
+/** STEP 3: Your user handle
+ * @field User handle
+ */
 export function Step2({
   uiState,
   uiDispatch,
@@ -39,258 +23,34 @@ export function Step2({
 }) {
   const pal = usePalette('default')
   const {_} = useLingui()
-  const {isMobile} = useWebMediaQueries()
-
-  const onPressRequest = React.useCallback(() => {
-    const phoneNumber = parsePhoneNumber(
-      uiState.verificationPhone,
-      uiState.phoneCountry,
-    )
-    if (phoneNumber && phoneNumber.isValid()) {
-      requestVerificationCode({uiState, uiDispatch, _})
-    } else {
-      uiDispatch({
-        type: 'set-error',
-        value: _(
-          msg`There's something wrong with this number. Please choose your country and enter your full phone number!`,
-        ),
-      })
-    }
-  }, [uiState, uiDispatch, _])
-
-  const onPressRetry = React.useCallback(() => {
-    uiDispatch({type: 'set-has-requested-verification-code', value: false})
-  }, [uiDispatch])
-
-  const phoneNumberFormatted = React.useMemo(
-    () =>
-      uiState.hasRequestedVerificationCode
-        ? parsePhoneNumber(
-            uiState.verificationPhone,
-            uiState.phoneCountry,
-          )?.formatInternational()
-        : '',
-    [
-      uiState.hasRequestedVerificationCode,
-      uiState.verificationPhone,
-      uiState.phoneCountry,
-    ],
-  )
-
   return (
     <View>
-      <StepHeader uiState={uiState} title={_(msg`SMS verification`)} />
-
-      {!uiState.hasRequestedVerificationCode ? (
-        <>
-          <View style={s.pb10}>
-            <Text
-              type="md-medium"
-              style={[pal.text, s.mb2]}
-              nativeID="phoneCountry">
-              <Trans>Country</Trans>
-            </Text>
-            <View
-              style={[
-                {position: 'relative'},
-                isAndroid && {
-                  borderWidth: 1,
-                  borderColor: pal.border.borderColor,
-                  borderRadius: 4,
-                },
-              ]}>
-              <RNPickerSelect
-                placeholder={{}}
-                value={uiState.phoneCountry}
-                onValueChange={value =>
-                  uiDispatch({type: 'set-phone-country', value})
-                }
-                items={COUNTRY_CODES.filter(l => Boolean(l.code2)).map(l => ({
-                  label: l.name,
-                  value: l.code2,
-                  key: l.code2,
-                }))}
-                style={{
-                  inputAndroid: {
-                    backgroundColor: pal.view.backgroundColor,
-                    color: pal.text.color,
-                    fontSize: 21,
-                    letterSpacing: 0.5,
-                    fontWeight: '500',
-                    paddingHorizontal: 14,
-                    paddingVertical: 8,
-                    borderRadius: 4,
-                  },
-                  inputIOS: {
-                    backgroundColor: pal.view.backgroundColor,
-                    color: pal.text.color,
-                    fontSize: 14,
-                    letterSpacing: 0.5,
-                    fontWeight: '500',
-                    paddingHorizontal: 14,
-                    paddingVertical: 8,
-                    borderWidth: 1,
-                    borderColor: pal.border.borderColor,
-                    borderRadius: 4,
-                  },
-                  inputWeb: {
-                    // @ts-ignore web only
-                    cursor: 'pointer',
-                    '-moz-appearance': 'none',
-                    '-webkit-appearance': 'none',
-                    appearance: 'none',
-                    outline: 0,
-                    borderWidth: 1,
-                    borderColor: pal.border.borderColor,
-                    backgroundColor: pal.view.backgroundColor,
-                    color: pal.text.color,
-                    fontSize: 14,
-                    letterSpacing: 0.5,
-                    fontWeight: '500',
-                    paddingHorizontal: 14,
-                    paddingVertical: 8,
-                    borderRadius: 4,
-                  },
-                }}
-                accessibilityLabel={_(msg`Select your phone's country`)}
-                accessibilityHint=""
-                accessibilityLabelledBy="phoneCountry"
-              />
-              <View
-                style={{
-                  position: 'absolute',
-                  top: 1,
-                  right: 1,
-                  bottom: 1,
-                  width: 40,
-                  pointerEvents: 'none',
-                  alignItems: 'center',
-                  justifyContent: 'center',
-                }}>
-                <FontAwesomeIcon
-                  icon="chevron-down"
-                  style={pal.text as FontAwesomeIconStyle}
-                />
-              </View>
-            </View>
-          </View>
-
-          <View style={s.pb20}>
-            <Text
-              type="md-medium"
-              style={[pal.text, s.mb2]}
-              nativeID="phoneNumber">
-              <Trans>Phone number</Trans>
-            </Text>
-            <TextInput
-              testID="phoneInput"
-              icon="phone"
-              placeholder={_(msg`Enter your phone number`)}
-              value={uiState.verificationPhone}
-              editable
-              onChange={value =>
-                uiDispatch({type: 'set-verification-phone', value})
-              }
-              accessibilityLabel={_(msg`Email`)}
-              accessibilityHint={_(
-                msg`Input phone number for SMS verification`,
-              )}
-              accessibilityLabelledBy="phoneNumber"
-              keyboardType="phone-pad"
-              autoCapitalize="none"
-              autoComplete="tel"
-              autoCorrect={false}
-              autoFocus={true}
-            />
-            <Text type="sm" style={[pal.textLight, s.mt5]}>
-              <Trans>
-                Please enter a phone number that can receive SMS text messages.
-              </Trans>
-            </Text>
-          </View>
-
-          <View style={isMobile ? {} : {flexDirection: 'row'}}>
-            {uiState.isProcessing ? (
-              <ActivityIndicator />
-            ) : (
-              <Button
-                testID="requestCodeBtn"
-                type="primary"
-                label={_(msg`Request code`)}
-                labelStyle={isMobile ? [s.flex1, s.textCenter, s.f17] : []}
-                style={
-                  isMobile ? {paddingVertical: 12, paddingHorizontal: 20} : {}
-                }
-                onPress={onPressRequest}
-              />
-            )}
-          </View>
-        </>
-      ) : (
-        <>
-          <View style={s.pb20}>
-            <View
-              style={[
-                s.flexRow,
-                s.mb5,
-                s.alignCenter,
-                {justifyContent: 'space-between'},
-              ]}>
-              <Text
-                type="md-medium"
-                style={pal.text}
-                nativeID="verificationCode">
-                <Trans>Verification code</Trans>{' '}
-              </Text>
-              <TouchableWithoutFeedback
-                onPress={onPressRetry}
-                accessibilityLabel={_(msg`Retry.`)}
-                accessibilityHint=""
-                hitSlop={HITSLOP_10}>
-                <View style={styles.touchable}>
-                  <Text
-                    type="md-medium"
-                    style={pal.link}
-                    nativeID="verificationCode">
-                    <Trans>Retry</Trans>
-                  </Text>
-                </View>
-              </TouchableWithoutFeedback>
-            </View>
-            <TextInput
-              testID="codeInput"
-              icon="hashtag"
-              placeholder={_(msg`XXXXXX`)}
-              value={uiState.verificationCode}
-              editable
-              onChange={value =>
-                uiDispatch({type: 'set-verification-code', value})
-              }
-              accessibilityLabel={_(msg`Email`)}
-              accessibilityHint={_(
-                msg`Input the verification code we have texted to you`,
-              )}
-              accessibilityLabelledBy="verificationCode"
-              keyboardType="phone-pad"
-              autoCapitalize="none"
-              autoComplete="one-time-code"
-              textContentType="oneTimeCode"
-              autoCorrect={false}
-              autoFocus={true}
-            />
-            <Text type="sm" style={[pal.textLight, s.mt5]}>
-              <Trans>
-                Please enter the verification code sent to{' '}
-                {phoneNumberFormatted}.
-              </Trans>
-            </Text>
-          </View>
-        </>
-      )}
-
+      <StepHeader uiState={uiState} title={_(msg`Your user handle`)} />
       {uiState.error ? (
         <ErrorMessage message={uiState.error} style={styles.error} />
       ) : undefined}
+      <View style={s.pb10}>
+        <TextInput
+          testID="handleInput"
+          icon="at"
+          placeholder="e.g. alice"
+          value={uiState.handle}
+          editable
+          autoFocus
+          autoComplete="off"
+          autoCorrect={false}
+          onChange={value => uiDispatch({type: 'set-handle', value})}
+          // TODO: Add explicit text label
+          accessibilityLabel={_(msg`User handle`)}
+          accessibilityHint={_(msg`Input your user handle`)}
+        />
+        <Text type="lg" style={[pal.text, s.pl5, s.pt10]}>
+          <Trans>Your full handle will be</Trans>{' '}
+          <Text type="lg-bold" style={pal.text}>
+            @{createFullHandle(uiState.handle, uiState.userDomain)}
+          </Text>
+        </Text>
+      </View>
     </View>
   )
 }
@@ -298,10 +58,6 @@ export function Step2({
 const styles = StyleSheet.create({
   error: {
     borderRadius: 6,
-    marginTop: 10,
-  },
-  // @ts-expect-error: Suppressing error due to incomplete `ViewStyle` type definition in react-native-web, missing `cursor` prop as discussed in https://github.com/necolas/react-native-web/issues/832.
-  touchable: {
-    ...(isWeb && {cursor: 'pointer'}),
+    marginBottom: 10,
   },
 })
diff --git a/src/view/com/auth/create/Step3.tsx b/src/view/com/auth/create/Step3.tsx
index afd21a320..53fdfdde8 100644
--- a/src/view/com/auth/create/Step3.tsx
+++ b/src/view/com/auth/create/Step3.tsx
@@ -1,19 +1,23 @@
 import React from 'react'
-import {StyleSheet, View} from 'react-native'
-import {CreateAccountState, CreateAccountDispatch} from './state'
-import {Text} from 'view/com/util/text/Text'
+import {ActivityIndicator, StyleSheet, View} from 'react-native'
+import {
+  CreateAccountState,
+  CreateAccountDispatch,
+  useSubmitCreateAccount,
+} from './state'
 import {StepHeader} from './StepHeader'
-import {s} from 'lib/styles'
-import {TextInput} from '../util/TextInput'
-import {createFullHandle} from 'lib/strings/handles'
-import {usePalette} from 'lib/hooks/usePalette'
 import {ErrorMessage} from 'view/com/util/error/ErrorMessage'
-import {msg, Trans} from '@lingui/macro'
+import {isWeb} from 'platform/detection'
+import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-/** STEP 3: Your user handle
- * @field User handle
- */
+import {nanoid} from 'nanoid/non-secure'
+import {CaptchaWebView} from 'view/com/auth/create/CaptchaWebView'
+import {useTheme} from 'lib/ThemeContext'
+import {createFullHandle} from 'lib/strings/handles'
+
+const CAPTCHA_PATH = '/gate/signup'
+
 export function Step3({
   uiState,
   uiDispatch,
@@ -21,33 +25,66 @@ export function Step3({
   uiState: CreateAccountState
   uiDispatch: CreateAccountDispatch
 }) {
-  const pal = usePalette('default')
   const {_} = useLingui()
+  const theme = useTheme()
+  const submit = useSubmitCreateAccount(uiState, uiDispatch)
+
+  const [completed, setCompleted] = React.useState(false)
+
+  const stateParam = React.useMemo(() => nanoid(15), [])
+  const url = React.useMemo(() => {
+    const newUrl = new URL(uiState.serviceUrl)
+    newUrl.pathname = CAPTCHA_PATH
+    newUrl.searchParams.set(
+      'handle',
+      createFullHandle(uiState.handle, uiState.userDomain),
+    )
+    newUrl.searchParams.set('state', stateParam)
+    newUrl.searchParams.set('colorScheme', theme.colorScheme)
+
+    console.log(newUrl)
+
+    return newUrl.href
+  }, [
+    uiState.serviceUrl,
+    uiState.handle,
+    uiState.userDomain,
+    stateParam,
+    theme.colorScheme,
+  ])
+
+  const onSuccess = React.useCallback(
+    (code: string) => {
+      setCompleted(true)
+      submit(code)
+    },
+    [submit],
+  )
+
+  const onError = React.useCallback(() => {
+    uiDispatch({
+      type: 'set-error',
+      value: _(msg`Error receiving captcha response.`),
+    })
+  }, [_, uiDispatch])
+
   return (
     <View>
-      <StepHeader uiState={uiState} title={_(msg`Your user handle`)} />
-      <View style={s.pb10}>
-        <TextInput
-          testID="handleInput"
-          icon="at"
-          placeholder={_(msg`e.g. alice`)}
-          value={uiState.handle}
-          editable
-          autoFocus
-          autoComplete="off"
-          autoCorrect={false}
-          onChange={value => uiDispatch({type: 'set-handle', value})}
-          // TODO: Add explicit text label
-          accessibilityLabel={_(msg`User handle`)}
-          accessibilityHint={_(msg`Input your user handle`)}
-        />
-        <Text type="lg" style={[pal.text, s.pl5, s.pt10]}>
-          <Trans>Your full handle will be</Trans>{' '}
-          <Text type="lg-bold" style={pal.text}>
-            @{createFullHandle(uiState.handle, uiState.userDomain)}
-          </Text>
-        </Text>
+      <StepHeader uiState={uiState} title={_(msg`Complete the challenge`)} />
+      <View style={[styles.container, completed && styles.center]}>
+        {!completed ? (
+          <CaptchaWebView
+            url={url}
+            stateParam={stateParam}
+            uiState={uiState}
+            onSuccess={onSuccess}
+            onError={onError}
+          />
+        ) : (
+          <ActivityIndicator size="large" />
+        )}
       </View>
+
       {uiState.error ? (
         <ErrorMessage message={uiState.error} style={styles.error} />
       ) : undefined}
@@ -58,5 +95,20 @@ export function Step3({
 const styles = StyleSheet.create({
   error: {
     borderRadius: 6,
+    marginTop: 10,
+  },
+  // @ts-expect-error: Suppressing error due to incomplete `ViewStyle` type definition in react-native-web, missing `cursor` prop as discussed in https://github.com/necolas/react-native-web/issues/832.
+  touchable: {
+    ...(isWeb && {cursor: 'pointer'}),
+  },
+  container: {
+    minHeight: 500,
+    width: '100%',
+    paddingBottom: 20,
+    overflow: 'hidden',
+  },
+  center: {
+    alignItems: 'center',
+    justifyContent: 'center',
   },
 })
diff --git a/src/view/com/auth/create/StepHeader.tsx b/src/view/com/auth/create/StepHeader.tsx
index af6bf5478..a98b392d8 100644
--- a/src/view/com/auth/create/StepHeader.tsx
+++ b/src/view/com/auth/create/StepHeader.tsx
@@ -11,7 +11,7 @@ export function StepHeader({
   children,
 }: React.PropsWithChildren<{uiState: CreateAccountState; title: string}>) {
   const pal = usePalette('default')
-  const numSteps = uiState.isPhoneVerificationRequired ? 3 : 2
+  const numSteps = 3
   return (
     <View style={styles.container}>
       <View>
diff --git a/src/view/com/auth/create/state.ts b/src/view/com/auth/create/state.ts
index e8a7cd4ed..276eaf924 100644
--- a/src/view/com/auth/create/state.ts
+++ b/src/view/com/auth/create/state.ts
@@ -1,8 +1,7 @@
-import {useReducer} from 'react'
+import {useCallback, useReducer} from 'react'
 import {
   ComAtprotoServerDescribeServer,
   ComAtprotoServerCreateAccount,
-  BskyAgent,
 } from '@atproto/api'
 import {I18nContext, useLingui} from '@lingui/react'
 import {msg} from '@lingui/macro'
@@ -11,10 +10,14 @@ import {getAge} from 'lib/strings/time'
 import {logger} from '#/logger'
 import {createFullHandle} from '#/lib/strings/handles'
 import {cleanError} from '#/lib/strings/errors'
-import {DispatchContext as OnboardingDispatchContext} from '#/state/shell/onboarding'
-import {ApiContext as SessionApiContext} from '#/state/session'
-import {DEFAULT_SERVICE} from '#/lib/constants'
-import parsePhoneNumber, {CountryCode} from 'libphonenumber-js'
+import {useOnboardingDispatch} from '#/state/shell/onboarding'
+import {useSessionApi} from '#/state/session'
+import {DEFAULT_SERVICE, IS_PROD} from '#/lib/constants'
+import {
+  DEFAULT_PROD_FEEDS,
+  usePreferencesSetBirthDateMutation,
+  useSetSaveFeedsMutation,
+} from 'state/queries/preferences'
 
 export type ServiceDescription = ComAtprotoServerDescribeServer.OutputSchema
 const DEFAULT_DATE = new Date(Date.now() - 60e3 * 60 * 24 * 365 * 20) // default to 20 years ago
@@ -29,10 +32,6 @@ export type CreateAccountAction =
   | {type: 'set-invite-code'; value: string}
   | {type: 'set-email'; value: string}
   | {type: 'set-password'; value: string}
-  | {type: 'set-phone-country'; value: CountryCode}
-  | {type: 'set-verification-phone'; value: string}
-  | {type: 'set-verification-code'; value: string}
-  | {type: 'set-has-requested-verification-code'; value: boolean}
   | {type: 'set-handle'; value: string}
   | {type: 'set-birth-date'; value: Date}
   | {type: 'next'}
@@ -49,10 +48,6 @@ export interface CreateAccountState {
   inviteCode: string
   email: string
   password: string
-  phoneCountry: CountryCode
-  verificationPhone: string
-  verificationCode: string
-  hasRequestedVerificationCode: boolean
   handle: string
   birthDate: Date
 
@@ -60,13 +55,14 @@ export interface CreateAccountState {
   canBack: boolean
   canNext: boolean
   isInviteCodeRequired: boolean
-  isPhoneVerificationRequired: boolean
+  isCaptchaRequired: boolean
 }
 
 export type CreateAccountDispatch = (action: CreateAccountAction) => void
 
 export function useCreateAccount() {
   const {_} = useLingui()
+
   return useReducer(createReducer({_}), {
     step: 1,
     error: undefined,
@@ -77,144 +73,126 @@ export function useCreateAccount() {
     inviteCode: '',
     email: '',
     password: '',
-    phoneCountry: 'US',
-    verificationPhone: '',
-    verificationCode: '',
-    hasRequestedVerificationCode: false,
     handle: '',
     birthDate: DEFAULT_DATE,
 
     canBack: false,
     canNext: false,
     isInviteCodeRequired: false,
-    isPhoneVerificationRequired: false,
+    isCaptchaRequired: false,
   })
 }
 
-export async function requestVerificationCode({
-  uiState,
-  uiDispatch,
-  _,
-}: {
-  uiState: CreateAccountState
-  uiDispatch: CreateAccountDispatch
-  _: I18nContext['_']
-}) {
-  const phoneNumber = parsePhoneNumber(
-    uiState.verificationPhone,
-    uiState.phoneCountry,
-  )?.number
-  if (!phoneNumber) {
-    return
-  }
-  uiDispatch({type: 'set-error', value: ''})
-  uiDispatch({type: 'set-processing', value: true})
-  uiDispatch({type: 'set-verification-phone', value: phoneNumber})
-  try {
-    const agent = new BskyAgent({service: uiState.serviceUrl})
-    await agent.com.atproto.temp.requestPhoneVerification({
-      phoneNumber,
-    })
-    uiDispatch({type: 'set-has-requested-verification-code', value: true})
-  } catch (e: any) {
-    logger.error(
-      `Failed to request sms verification code (${e.status} status)`,
-      {message: e},
-    )
-    uiDispatch({type: 'set-error', value: cleanError(e.toString())})
-  }
-  uiDispatch({type: 'set-processing', value: false})
-}
+export function useSubmitCreateAccount(
+  uiState: CreateAccountState,
+  uiDispatch: CreateAccountDispatch,
+) {
+  const {_} = useLingui()
+  const {createAccount} = useSessionApi()
+  const {mutate: setBirthDate} = usePreferencesSetBirthDateMutation()
+  const {mutate: setSavedFeeds} = useSetSaveFeedsMutation()
+  const onboardingDispatch = useOnboardingDispatch()
 
-export async function submit({
-  createAccount,
-  onboardingDispatch,
-  uiState,
-  uiDispatch,
-  _,
-}: {
-  createAccount: SessionApiContext['createAccount']
-  onboardingDispatch: OnboardingDispatchContext
-  uiState: CreateAccountState
-  uiDispatch: CreateAccountDispatch
-  _: I18nContext['_']
-}) {
-  if (!uiState.email) {
-    uiDispatch({type: 'set-step', value: 1})
-    return uiDispatch({
-      type: 'set-error',
-      value: _(msg`Please enter your email.`),
-    })
-  }
-  if (!EmailValidator.validate(uiState.email)) {
-    uiDispatch({type: 'set-step', value: 1})
-    return uiDispatch({
-      type: 'set-error',
-      value: _(msg`Your email appears to be invalid.`),
-    })
-  }
-  if (!uiState.password) {
-    uiDispatch({type: 'set-step', value: 1})
-    return uiDispatch({
-      type: 'set-error',
-      value: _(msg`Please choose your password.`),
-    })
-  }
-  if (
-    uiState.isPhoneVerificationRequired &&
-    (!uiState.verificationPhone || !uiState.verificationCode)
-  ) {
-    uiDispatch({type: 'set-step', value: 2})
-    return uiDispatch({
-      type: 'set-error',
-      value: _(msg`Please enter the code you received by SMS.`),
-    })
-  }
-  if (!uiState.handle) {
-    uiDispatch({type: 'set-step', value: 3})
-    return uiDispatch({
-      type: 'set-error',
-      value: _(msg`Please choose your handle.`),
-    })
-  }
-  uiDispatch({type: 'set-error', value: ''})
-  uiDispatch({type: 'set-processing', value: true})
+  return useCallback(
+    async (verificationCode?: string) => {
+      if (!uiState.email) {
+        uiDispatch({type: 'set-step', value: 1})
+        console.log('no email?')
+        return uiDispatch({
+          type: 'set-error',
+          value: _(msg`Please enter your email.`),
+        })
+      }
+      if (!EmailValidator.validate(uiState.email)) {
+        uiDispatch({type: 'set-step', value: 1})
+        return uiDispatch({
+          type: 'set-error',
+          value: _(msg`Your email appears to be invalid.`),
+        })
+      }
+      if (!uiState.password) {
+        uiDispatch({type: 'set-step', value: 1})
+        return uiDispatch({
+          type: 'set-error',
+          value: _(msg`Please choose your password.`),
+        })
+      }
+      if (!uiState.handle) {
+        uiDispatch({type: 'set-step', value: 2})
+        return uiDispatch({
+          type: 'set-error',
+          value: _(msg`Please choose your handle.`),
+        })
+      }
+      if (uiState.isCaptchaRequired && !verificationCode) {
+        uiDispatch({type: 'set-step', value: 3})
+        return uiDispatch({
+          type: 'set-error',
+          value: _(msg`Please complete the verification captcha.`),
+        })
+      }
+      uiDispatch({type: 'set-error', value: ''})
+      uiDispatch({type: 'set-processing', value: true})
 
-  try {
-    onboardingDispatch({type: 'start'}) // start now to avoid flashing the wrong view
-    await createAccount({
-      service: uiState.serviceUrl,
-      email: uiState.email,
-      handle: createFullHandle(uiState.handle, uiState.userDomain),
-      password: uiState.password,
-      inviteCode: uiState.inviteCode.trim(),
-      verificationPhone: uiState.verificationPhone.trim(),
-      verificationCode: uiState.verificationCode.trim(),
-    })
-  } catch (e: any) {
-    onboardingDispatch({type: 'skip'}) // undo starting the onboard
-    let errMsg = e.toString()
-    if (e instanceof ComAtprotoServerCreateAccount.InvalidInviteCodeError) {
-      errMsg = _(
-        msg`Invite code not accepted. Check that you input it correctly and try again.`,
-      )
-      uiDispatch({type: 'set-step', value: 1})
-    } else if (e.error === 'InvalidPhoneVerification') {
-      uiDispatch({type: 'set-step', value: 2})
-    }
+      try {
+        onboardingDispatch({type: 'start'}) // start now to avoid flashing the wrong view
+        await createAccount({
+          service: uiState.serviceUrl,
+          email: uiState.email,
+          handle: createFullHandle(uiState.handle, uiState.userDomain),
+          password: uiState.password,
+          inviteCode: uiState.inviteCode.trim(),
+          verificationCode: uiState.isCaptchaRequired
+            ? verificationCode
+            : undefined,
+        })
+        setBirthDate({birthDate: uiState.birthDate})
+        if (IS_PROD(uiState.serviceUrl)) {
+          setSavedFeeds(DEFAULT_PROD_FEEDS)
+        }
+      } catch (e: any) {
+        onboardingDispatch({type: 'skip'}) // undo starting the onboard
+        let errMsg = e.toString()
+        if (e instanceof ComAtprotoServerCreateAccount.InvalidInviteCodeError) {
+          errMsg = _(
+            msg`Invite code not accepted. Check that you input it correctly and try again.`,
+          )
+          uiDispatch({type: 'set-step', value: 1})
+        }
 
-    if ([400, 429].includes(e.status)) {
-      logger.warn('Failed to create account', {message: e})
-    } else {
-      logger.error(`Failed to create account (${e.status} status)`, {
-        message: e,
-      })
-    }
+        if ([400, 429].includes(e.status)) {
+          logger.warn('Failed to create account', {message: e})
+        } else {
+          logger.error(`Failed to create account (${e.status} status)`, {
+            message: e,
+          })
+        }
 
-    uiDispatch({type: 'set-processing', value: false})
-    uiDispatch({type: 'set-error', value: cleanError(errMsg)})
-    throw e
-  }
+        const error = cleanError(errMsg)
+        const isHandleError = error.toLowerCase().includes('handle')
+
+        uiDispatch({type: 'set-processing', value: false})
+        uiDispatch({type: 'set-error', value: cleanError(errMsg)})
+        uiDispatch({type: 'set-step', value: isHandleError ? 2 : 1})
+      }
+    },
+    [
+      uiState.email,
+      uiState.password,
+      uiState.handle,
+      uiState.isCaptchaRequired,
+      uiState.serviceUrl,
+      uiState.userDomain,
+      uiState.inviteCode,
+      uiState.birthDate,
+      uiDispatch,
+      _,
+      onboardingDispatch,
+      createAccount,
+      setBirthDate,
+      setSavedFeeds,
+    ],
+  )
 }
 
 export function is13(state: CreateAccountState) {
@@ -269,22 +247,6 @@ function createReducer({_}: {_: I18nContext['_']}) {
       case 'set-password': {
         return compute({...state, password: action.value})
       }
-      case 'set-phone-country': {
-        return compute({...state, phoneCountry: action.value})
-      }
-      case 'set-verification-phone': {
-        return compute({
-          ...state,
-          verificationPhone: action.value,
-          hasRequestedVerificationCode: false,
-        })
-      }
-      case 'set-verification-code': {
-        return compute({...state, verificationCode: action.value.trim()})
-      }
-      case 'set-has-requested-verification-code': {
-        return compute({...state, hasRequestedVerificationCode: action.value})
-      }
       case 'set-handle': {
         return compute({...state, handle: action.value})
       }
@@ -302,18 +264,10 @@ function createReducer({_}: {_: I18nContext['_']}) {
             })
           }
         }
-        let increment = 1
-        if (state.step === 1 && !state.isPhoneVerificationRequired) {
-          increment = 2
-        }
-        return compute({...state, error: '', step: state.step + increment})
+        return compute({...state, error: '', step: state.step + 1})
       }
       case 'back': {
-        let decrement = 1
-        if (state.step === 3 && !state.isPhoneVerificationRequired) {
-          decrement = 2
-        }
-        return compute({...state, error: '', step: state.step - decrement})
+        return compute({...state, error: '', step: state.step - 1})
       }
     }
   }
@@ -328,23 +282,16 @@ function compute(state: CreateAccountState): CreateAccountState {
       !!state.email &&
       !!state.password
   } else if (state.step === 2) {
-    canNext =
-      !state.isPhoneVerificationRequired ||
-      (!!state.verificationPhone &&
-        isValidVerificationCode(state.verificationCode))
-  } else if (state.step === 3) {
     canNext = !!state.handle
+  } else if (state.step === 3) {
+    // Step 3 will automatically redirect as soon as the captcha completes
+    canNext = false
   }
   return {
     ...state,
     canBack: state.step > 1,
     canNext,
     isInviteCodeRequired: !!state.serviceDescription?.inviteCodeRequired,
-    isPhoneVerificationRequired:
-      !!state.serviceDescription?.phoneVerificationRequired,
+    isCaptchaRequired: !!state.serviceDescription?.phoneVerificationRequired,
   }
 }
-
-function isValidVerificationCode(str: string): boolean {
-  return /[0-9]{6}/.test(str)
-}
diff --git a/src/view/com/feeds/FeedPage.tsx b/src/view/com/feeds/FeedPage.tsx
index 9595e77e5..d8da569b1 100644
--- a/src/view/com/feeds/FeedPage.tsx
+++ b/src/view/com/feeds/FeedPage.tsx
@@ -46,7 +46,7 @@ export function FeedPage({
   renderEmptyState: () => JSX.Element
   renderEndOfFeed?: () => JSX.Element
 }) {
-  const {isSandbox, hasSession} = useSession()
+  const {hasSession} = useSession()
   const pal = usePalette('default')
   const {_} = useLingui()
   const navigation = useNavigation()
@@ -119,7 +119,7 @@ export function FeedPage({
             style={[pal.text, {fontWeight: 'bold'}]}
             text={
               <>
-                {isSandbox ? 'SANDBOX' : 'Bluesky'}{' '}
+                Bluesky{' '}
                 {hasNew && (
                   <View
                     style={{
@@ -154,16 +154,7 @@ export function FeedPage({
       )
     }
     return <></>
-  }, [
-    isDesktop,
-    pal.view,
-    pal.text,
-    pal.textLight,
-    hasNew,
-    _,
-    isSandbox,
-    hasSession,
-  ])
+  }, [isDesktop, pal.view, pal.text, pal.textLight, hasNew, _, hasSession])
 
   return (
     <View testID={testID} style={s.h100pct}>
diff --git a/src/view/com/pager/FeedsTabBar.web.tsx b/src/view/com/pager/FeedsTabBar.web.tsx
index 9fe03b7e9..fb52b913a 100644
--- a/src/view/com/pager/FeedsTabBar.web.tsx
+++ b/src/view/com/pager/FeedsTabBar.web.tsx
@@ -37,7 +37,6 @@ export function FeedsTabBar(
 
 function FeedsTabBarPublic() {
   const pal = usePalette('default')
-  const {isSandbox} = useSession()
 
   return (
     <CenteredView sideBorders>
@@ -56,23 +55,7 @@ function FeedsTabBarPublic() {
           type="title-lg"
           href="/"
           style={[pal.text, {fontWeight: 'bold'}]}
-          text={
-            <>
-              {isSandbox ? 'SANDBOX' : 'Bluesky'}{' '}
-              {/*hasNew && (
-                <View
-                  style={{
-                    top: -8,
-                    backgroundColor: colors.blue3,
-                    width: 8,
-                    height: 8,
-                    borderRadius: 4,
-                  }}
-                />
-              )*/}
-            </>
-          }
-          // onPress={emitSoftReset}
+          text="Bluesky "
         />
       </View>
     </CenteredView>
diff --git a/src/view/com/post-thread/PostThread.tsx b/src/view/com/post-thread/PostThread.tsx
index 2b08bc402..434f018fc 100644
--- a/src/view/com/post-thread/PostThread.tsx
+++ b/src/view/com/post-thread/PostThread.tsx
@@ -43,10 +43,13 @@ import {
   usePreferencesQuery,
 } from '#/state/queries/preferences'
 import {useSession} from '#/state/session'
-import {isAndroid, isNative} from '#/platform/detection'
-import {logger} from '#/logger'
+import {isAndroid, isNative, isWeb} from '#/platform/detection'
 import {moderatePost_wrapped as moderatePost} from '#/lib/moderatePost_wrapped'
 
+// FlatList maintainVisibleContentPosition breaks if too many items
+// are prepended. This seems to be an optimal number based on *shrug*.
+const PARENTS_CHUNK_SIZE = 15
+
 const MAINTAIN_VISIBLE_CONTENT_POSITION = {
   // We don't insert any elements before the root row while loading.
   // So the row we want to use as the scroll anchor is the first row.
@@ -165,8 +168,10 @@ function PostThreadLoaded({
   const {isMobile, isTabletOrMobile} = useWebMediaQueries()
   const ref = useRef<ListMethods>(null)
   const highlightedPostRef = useRef<View | null>(null)
-  const [maxVisible, setMaxVisible] = React.useState(100)
-  const [isPTRing, setIsPTRing] = React.useState(false)
+  const [maxParents, setMaxParents] = React.useState(
+    isWeb ? Infinity : PARENTS_CHUNK_SIZE,
+  )
+  const [maxReplies, setMaxReplies] = React.useState(100)
   const treeView = React.useMemo(
     () => !!threadViewPrefs.lab_treeViewEnabled && hasBranchingReplies(thread),
     [threadViewPrefs, thread],
@@ -206,10 +211,18 @@ function PostThreadLoaded({
           // maintainVisibleContentPosition and onContentSizeChange
           // to "hold onto" the correct row instead of the first one.
         } else {
-          // Everything is loaded.
-          arr.push(TOP_COMPONENT)
-          for (const parent of parents) {
-            arr.push(parent)
+          // Everything is loaded
+          let startIndex = Math.max(0, parents.length - maxParents)
+          if (startIndex === 0) {
+            arr.push(TOP_COMPONENT)
+          } else {
+            // When progressively revealing parents, rendering a placeholder
+            // here will cause scrolling jumps. Don't add it unless you test it.
+            // QT'ing this thread is a great way to test all the scrolling hacks:
+            // https://bsky.app/profile/www.mozzius.dev/post/3kjqhblh6qk2o
+          }
+          for (let i = startIndex; i < parents.length; i++) {
+            arr.push(parents[i])
           }
         }
       }
@@ -220,17 +233,18 @@ function PostThreadLoaded({
       if (highlightedPost.ctx.isChildLoading) {
         arr.push(CHILD_SPINNER)
       } else {
-        for (const reply of replies) {
-          arr.push(reply)
+        for (let i = 0; i < replies.length; i++) {
+          arr.push(replies[i])
+          if (i === maxReplies) {
+            arr.push(LOAD_MORE)
+            break
+          }
         }
         arr.push(BOTTOM_COMPONENT)
       }
     }
-    if (arr.length > maxVisible) {
-      arr = arr.slice(0, maxVisible).concat([LOAD_MORE])
-    }
     return arr
-  }, [skeleton, maxVisible, deferParents])
+  }, [skeleton, deferParents, maxParents, maxReplies])
 
   // This is only used on the web to keep the post in view when its parents load.
   // On native, we rely on `maintainVisibleContentPosition` instead.
@@ -258,15 +272,28 @@ function PostThreadLoaded({
     }
   }, [thread])
 
-  const onPTR = React.useCallback(async () => {
-    setIsPTRing(true)
-    try {
-      await onRefresh()
-    } catch (err) {
-      logger.error('Failed to refresh posts thread', {message: err})
+  // On native, we reveal parents in chunks. Although they're all already
+  // loaded and FlatList already has its own virtualization, unfortunately FlatList
+  // has a bug that causes the content to jump around if too many items are getting
+  // prepended at once. It also jumps around if items get prepended during scroll.
+  // To work around this, we prepend rows after scroll bumps against the top and rests.
+  const needsBumpMaxParents = React.useRef(false)
+  const onStartReached = React.useCallback(() => {
+    if (maxParents < skeleton.parents.length) {
+      needsBumpMaxParents.current = true
+    }
+  }, [maxParents, skeleton.parents.length])
+  const bumpMaxParentsIfNeeded = React.useCallback(() => {
+    if (!isNative) {
+      return
+    }
+    if (needsBumpMaxParents.current) {
+      needsBumpMaxParents.current = false
+      setMaxParents(n => n + PARENTS_CHUNK_SIZE)
     }
-    setIsPTRing(false)
-  }, [setIsPTRing, onRefresh])
+  }, [])
+  const onMomentumScrollEnd = bumpMaxParentsIfNeeded
+  const onScrollToTop = bumpMaxParentsIfNeeded
 
   const renderItem = React.useCallback(
     ({item, index}: {item: RowItem; index: number}) => {
@@ -301,7 +328,7 @@ function PostThreadLoaded({
       } else if (item === LOAD_MORE) {
         return (
           <Pressable
-            onPress={() => setMaxVisible(n => n + 50)}
+            onPress={() => setMaxReplies(n => n + 50)}
             style={[pal.border, pal.view, styles.itemContainer]}
             accessibilityLabel={_(msg`Load more posts`)}
             accessibilityHint="">
@@ -345,6 +372,8 @@ function PostThreadLoaded({
         const next = isThreadPost(posts[index - 1])
           ? (posts[index - 1] as ThreadPost)
           : undefined
+        const hasUnrevealedParents =
+          index === 0 && maxParents < skeleton.parents.length
         return (
           <View
             ref={item.ctx.isHighlightedPost ? highlightedPostRef : undefined}
@@ -360,7 +389,9 @@ function PostThreadLoaded({
               hasMore={item.ctx.hasMore}
               showChildReplyLine={item.ctx.showChildReplyLine}
               showParentReplyLine={item.ctx.showParentReplyLine}
-              hasPrecedingItem={!!prev?.ctx.showChildReplyLine}
+              hasPrecedingItem={
+                !!prev?.ctx.showChildReplyLine || hasUnrevealedParents
+              }
               onPostReply={onRefresh}
             />
           </View>
@@ -383,6 +414,8 @@ function PostThreadLoaded({
       onRefresh,
       deferParents,
       treeView,
+      skeleton.parents.length,
+      maxParents,
       _,
     ],
   )
@@ -393,9 +426,10 @@ function PostThreadLoaded({
       data={posts}
       keyExtractor={item => item._reactKey}
       renderItem={renderItem}
-      refreshing={isPTRing}
-      onRefresh={onPTR}
       onContentSizeChange={isNative ? undefined : onContentSizeChangeWeb}
+      onStartReached={onStartReached}
+      onMomentumScrollEnd={onMomentumScrollEnd}
+      onScrollToTop={onScrollToTop}
       maintainVisibleContentPosition={
         isNative ? MAINTAIN_VISIBLE_CONTENT_POSITION : undefined
       }
diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx
index fc13fa0eb..c66947d44 100644
--- a/src/view/com/post-thread/PostThreadItem.tsx
+++ b/src/view/com/post-thread/PostThreadItem.tsx
@@ -27,7 +27,6 @@ import {PostCtrls} from '../util/post-ctrls/PostCtrls'
 import {PostHider} from '../util/moderation/PostHider'
 import {ContentHider} from '../util/moderation/ContentHider'
 import {PostAlerts} from '../util/moderation/PostAlerts'
-import {PostSandboxWarning} from '../util/PostSandboxWarning'
 import {ErrorMessage} from '../util/error/ErrorMessage'
 import {usePalette} from 'lib/hooks/usePalette'
 import {formatCount} from '../util/numeric/format'
@@ -44,6 +43,7 @@ import {Shadow, usePostShadow, POST_TOMBSTONE} from '#/state/cache/post-shadow'
 import {ThreadPost} from '#/state/queries/post-thread'
 import {useSession} from 'state/session'
 import {WhoCanReply} from '../threadgate/WhoCanReply'
+import {LoadingPlaceholder} from '../util/LoadingPlaceholder'
 
 export function PostThreadItem({
   post,
@@ -164,8 +164,6 @@ let PostThreadItemLoaded = ({
     () => countLines(richText?.text) >= MAX_POST_LINES,
   )
   const {currentAccount} = useSession()
-  const hasEngagement = post.likeCount || post.repostCount
-
   const rootUri = record.reply?.root?.uri || post.uri
   const postHref = React.useMemo(() => {
     const urip = new AtUri(post.uri)
@@ -248,7 +246,6 @@ let PostThreadItemLoaded = ({
           testID={`postThreadItem-by-${post.author.handle}`}
           style={[styles.outer, styles.outerHighlighted, pal.border, pal.view]}
           accessible={false}>
-          <PostSandboxWarning />
           <View style={[styles.layout]}>
             <View style={[styles.layoutAvi, {paddingBottom: 8}]}>
               <PreviewableUserAvatar
@@ -357,9 +354,16 @@ let PostThreadItemLoaded = ({
               translatorUrl={translatorUrl}
               needsTranslation={needsTranslation}
             />
-            {hasEngagement ? (
+            {post.repostCount !== 0 || post.likeCount !== 0 ? (
+              // Show this section unless we're *sure* it has no engagement.
               <View style={[styles.expandedInfo, pal.border]}>
-                {post.repostCount ? (
+                {post.repostCount == null && post.likeCount == null && (
+                  // If we're still loading and not sure, assume this post has engagement.
+                  // This lets us avoid a layout shift for the common case (embedded post with likes/reposts).
+                  // TODO: embeds should include metrics to avoid us having to guess.
+                  <LoadingPlaceholder width={50} height={20} />
+                )}
+                {post.repostCount != null && post.repostCount !== 0 ? (
                   <Link
                     style={styles.expandedInfoItem}
                     href={repostsHref}
@@ -374,10 +378,8 @@ let PostThreadItemLoaded = ({
                       {pluralize(post.repostCount, 'repost')}
                     </Text>
                   </Link>
-                ) : (
-                  <></>
-                )}
-                {post.likeCount ? (
+                ) : null}
+                {post.likeCount != null && post.likeCount !== 0 ? (
                   <Link
                     style={styles.expandedInfoItem}
                     href={likesHref}
@@ -392,13 +394,9 @@ let PostThreadItemLoaded = ({
                       {pluralize(post.likeCount, 'like')}
                     </Text>
                   </Link>
-                ) : (
-                  <></>
-                )}
+                ) : null}
               </View>
-            ) : (
-              <></>
-            )}
+            ) : null}
             <View style={[s.pl10, s.pr10, s.pb5]}>
               <PostCtrls
                 big
@@ -438,8 +436,6 @@ let PostThreadItemLoaded = ({
                 ? {marginRight: 4}
                 : {marginLeft: 2, marginRight: 2}
             }>
-            <PostSandboxWarning />
-
             <View
               style={{
                 flexDirection: 'row',
diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/FeedItem.tsx
index 920409ec6..8d0f2bef2 100644
--- a/src/view/com/posts/FeedItem.tsx
+++ b/src/view/com/posts/FeedItem.tsx
@@ -21,7 +21,6 @@ import {PostEmbeds} from '../util/post-embeds'
 import {ContentHider} from '../util/moderation/ContentHider'
 import {PostAlerts} from '../util/moderation/PostAlerts'
 import {RichText} from '../util/text/RichText'
-import {PostSandboxWarning} from '../util/PostSandboxWarning'
 import {PreviewableUserAvatar} from '../util/UserAvatar'
 import {s} from 'lib/styles'
 import {usePalette} from 'lib/hooks/usePalette'
@@ -160,8 +159,6 @@ let FeedItemInner = ({
       href={href}
       noFeedback
       accessible={false}>
-      <PostSandboxWarning />
-
       <View style={{flexDirection: 'row', gap: 10, paddingLeft: 8}}>
         <View style={{width: 52}}>
           {isThreadChild && (
diff --git a/src/view/com/util/PostSandboxWarning.tsx b/src/view/com/util/PostSandboxWarning.tsx
deleted file mode 100644
index b2375c703..000000000
--- a/src/view/com/util/PostSandboxWarning.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react'
-import {StyleSheet, View} from 'react-native'
-import {Text} from './text/Text'
-import {usePalette} from 'lib/hooks/usePalette'
-import {useSession} from '#/state/session'
-
-export function PostSandboxWarning() {
-  const {isSandbox} = useSession()
-  const pal = usePalette('default')
-  if (isSandbox) {
-    return (
-      <View style={styles.container}>
-        <Text
-          type="title-2xl"
-          style={[pal.text, styles.text]}
-          accessible={false}>
-          SANDBOX
-        </Text>
-      </View>
-    )
-  }
-  return null
-}
-
-const styles = StyleSheet.create({
-  container: {
-    position: 'absolute',
-    top: 6,
-    right: 10,
-  },
-  text: {
-    fontWeight: 'bold',
-    opacity: 0.07,
-  },
-})
diff --git a/src/view/screens/Storybook/Icons.tsx b/src/view/screens/Storybook/Icons.tsx
index 73466e077..9d7dc0aa8 100644
--- a/src/view/screens/Storybook/Icons.tsx
+++ b/src/view/screens/Storybook/Icons.tsx
@@ -6,6 +6,7 @@ import {H1} from '#/components/Typography'
 import {Globe_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe'
 import {ArrowTopRight_Stroke2_Corner0_Rounded as ArrowTopRight} from '#/components/icons/ArrowTopRight'
 import {CalendarDays_Stroke2_Corner0_Rounded as CalendarDays} from '#/components/icons/CalendarDays'
+import {Loader} from '#/components/Loader'
 
 export function Icons() {
   const t = useTheme()
@@ -36,6 +37,14 @@ export function Icons() {
         <CalendarDays size="lg" fill={t.atoms.text.color} />
         <CalendarDays size="xl" fill={t.atoms.text.color} />
       </View>
+
+      <View style={[a.flex_row, a.gap_xl]}>
+        <Loader size="xs" fill={t.atoms.text.color} />
+        <Loader size="sm" fill={t.atoms.text.color} />
+        <Loader size="md" fill={t.atoms.text.color} />
+        <Loader size="lg" fill={t.atoms.text.color} />
+        <Loader size="xl" fill={t.atoms.text.color} />
+      </View>
     </View>
   )
 }
diff --git a/src/view/screens/Storybook/Links.tsx b/src/view/screens/Storybook/Links.tsx
index 2828e74bf..3f1806906 100644
--- a/src/view/screens/Storybook/Links.tsx
+++ b/src/view/screens/Storybook/Links.tsx
@@ -19,11 +19,16 @@ export function Links() {
           style={[a.text_md]}>
           External
         </InlineLink>
-        <InlineLink to="https://bsky.social" style={[a.text_md]}>
+        <InlineLink to="https://bsky.social" style={[a.text_md, t.atoms.text]}>
           <H3>External with custom children</H3>
         </InlineLink>
         <InlineLink
           to="https://bsky.social"
+          style={[a.text_md, t.atoms.text_contrast_low]}>
+          External with custom children
+        </InlineLink>
+        <InlineLink
+          to="https://bsky.social"
           warnOnMismatchingTextChild
           style={[a.text_lg]}>
           https://bsky.social
diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx
index 264fef194..c1f498724 100644
--- a/src/view/shell/desktop/RightNav.tsx
+++ b/src/view/shell/desktop/RightNav.tsx
@@ -9,14 +9,13 @@ import {FEEDBACK_FORM_URL, HELP_DESK_URL} from 'lib/constants'
 import {s} from 'lib/styles'
 import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
 import {useLingui} from '@lingui/react'
-import {Trans, msg} from '@lingui/macro'
+import {msg} from '@lingui/macro'
 import {useSession} from '#/state/session'
 
 export function DesktopRightNav({routeName}: {routeName: string}) {
   const pal = usePalette('default')
-  const palError = usePalette('error')
   const {_} = useLingui()
-  const {isSandbox, hasSession, currentAccount} = useSession()
+  const {hasSession, currentAccount} = useSession()
 
   const {isTablet} = useWebMediaQueries()
   if (isTablet) {
@@ -49,13 +48,6 @@ export function DesktopRightNav({routeName}: {routeName: string}) {
               paddingTop: hasSession ? 0 : 18,
             },
           ]}>
-          {isSandbox ? (
-            <View style={[palError.view, styles.messageLine, s.p10]}>
-              <Text type="md" style={[palError.text, s.bold]}>
-                <Trans>SANDBOX. Posts and accounts are not permanent.</Trans>
-              </Text>
-            </View>
-          ) : undefined}
           <View style={[{flexWrap: 'wrap'}, s.flexRow]}>
             {hasSession && (
               <>
diff --git a/web/index.html b/web/index.html
index 42b443bb6..992e69e05 100644
--- a/web/index.html
+++ b/web/index.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <meta name="theme-color">
     <!--
       This viewport works for phones with notches.
       It's optimized for gestures by disabling global zoom.
diff --git a/yarn.lock b/yarn.lock
index d26d09872..a85ea79b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15158,11 +15158,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-libphonenumber-js@^1.10.53:
-  version "1.10.53"
-  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.53.tgz#8dbfe1355ef1a3d8e13b8d92849f7db7ebddc98f"
-  integrity sha512-sDTnnqlWK4vH4AlDQuswz3n4Hx7bIQWTpIcScJX+Sp7St3LXHmfiax/ZFfyYxHmkdCvydOLSuvtAO/XpXiSySw==
-
 lie@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
@@ -16157,10 +16152,10 @@ nanoid@^3.1.23, nanoid@^3.3.1, nanoid@^3.3.6:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
-nanoid@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.0.2.tgz#97588ebc70166d0feaf73ccd2799bb4ceaebf692"
-  integrity sha512-2ustYUX1R2rL/Br5B/FMhi8d5/QzvkJ912rBYxskcpu0myTHzSZfTr1LAS2Sm7jxRUObRrSBFoyzwAhL49aVSg==
+nanoid@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.0.5.tgz#5112efb5c0caf4fc80680d66d303c65233a79fdd"
+  integrity sha512-/Veqm+QKsyMY3kqi4faWplnY1u+VuKO3dD2binyPIybP31DRO29bPF+1mszgLnrR2KqSLceFLBNw0zmvDzN1QQ==
 
 napi-build-utils@^1.0.1:
   version "1.0.2"