@oxyhq/services 22.1.0 → 22.3.0

package/lib/module/ui/components/FollowButton.js

@@ -28,7 +28,7 @@ const isMultiMode = props => 'userIds' in props && Array.isArray(props.userIds);
 const FollowButtonInner = /*#__PURE__*/memo(function FollowButtonInner({
   userId,
   oxyServices,
-  initiallyFollowing = false,
+  initiallyFollowing,
   size = 'medium',
   onFollowChange,
   style,
@@ -42,17 +42,18 @@ const FollowButtonInner = /*#__PURE__*/memo(function FollowButtonInner({
   } = useTheme();
   const {
     isFollowing,
+    isKnown,
     isLoading,
     toggleFollow,
-    setFollowStatus,
-    fetchStatus
-  } = useFollowForButton(userId, oxyServices);
+    resolveStatus
+  } = useFollowForButton(userId, oxyServices, initiallyFollowing);
   const handlePress = useCallback(async event => {
     if (preventParentActions && event?.preventDefault) {
       event.preventDefault();
       event.stopPropagation?.();
     }
-    if (disabled || isLoading) return;
+    // Ignore presses while a mutation is in flight or the status is still unknown.
+    if (disabled || isLoading || !isKnown) return;
     try {
       await toggleFollow();
       onFollowChange?.(!isFollowing);
@@ -60,32 +61,36 @@ const FollowButtonInner = /*#__PURE__*/memo(function FollowButtonInner({
       const error = err instanceof Error ? err : new Error(String(err));
       toast.error(error.message || 'Failed to update follow status');
     }
-  }, [disabled, isLoading, toggleFollow, onFollowChange, isFollowing, preventParentActions]);
-  useEffect(() => {
-    if (userId && !isFollowing && initiallyFollowing) {
-      setFollowStatus(initiallyFollowing);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [userId, initiallyFollowing]);
+  }, [disabled, isLoading, isKnown, toggleFollow, onFollowChange, isFollowing, preventParentActions]);
+
+  // Enqueue a batched status fetch ONLY when the status is genuinely unknown
+  // (not seeded from `initiallyFollowing`, not already resolved). All buttons
+  // that enqueue in the same commit coalesce into a single bulk request; known/
+  // seeded ids never fetch. Once resolved, `isKnown` flips true and this no-ops.
   useEffect(() => {
-    if (userId) fetchStatus();
-  }, [userId, fetchStatus]);
-  const showSpinner = showLoadingState && isLoading;
+    if (!isKnown) resolveStatus();
+  }, [isKnown, resolveStatus]);
+
+  // While the status is genuinely unknown (being resolved), present a NEUTRAL,
+  // non-interactive state rather than a definitive "Follow".
+  const isBusy = isLoading || !isKnown;
+  const showFollowing = isKnown && isFollowing;
+  const showSpinner = showLoadingState && isBusy;
   return /*#__PURE__*/_jsx(Button, {
-    variant: isFollowing ? 'secondary' : 'primary',
+    variant: showFollowing ? 'secondary' : 'primary',
     size: size,
     onPress: () => {
       void handlePress();
     },
-    disabled: disabled || isLoading,
+    disabled: disabled || isBusy,
     style: style,
     textStyle: textStyle,
     icon: showSpinner ? /*#__PURE__*/_jsx(Loading, {
       variant: "inline",
       size: "small",
-      color: isFollowing ? colors.text : colors.primaryForeground
+      color: showFollowing ? colors.text : colors.primaryForeground
     }) : undefined,
-    children: showSpinner ? undefined : isFollowing ? 'Following' : 'Follow'
+    children: showSpinner ? undefined : isKnown ? isFollowing ? 'Following' : 'Follow' : undefined
   });
 });
 const FollowButtonMultiInner = /*#__PURE__*/memo(function FollowButtonMultiInner({

package/lib/module/ui/components/FollowButton.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useCallback","useMemo","useState","memo","useOxy","toast","Button","Loading","useFollow","useFollowForButton","useFollowStore","useTheme","useShallow","jsx","_jsx","DEFAULT_FOLLOW_ALL_LABEL","DEFAULT_FOLLOWED_ALL_LABEL","isMultiMode","props","Array","isArray","userIds","FollowButtonInner","userId","oxyServices","initiallyFollowing","size","onFollowChange","style","textStyle","disabled","showLoadingState","preventParentActions","colors","isFollowing","isLoading","toggleFollow","setFollowStatus","fetchStatus","handlePress","event","preventDefault","stopPropagation","err","error","Error","String","message","showSpinner","variant","onPress","icon","color","text","primaryForeground","undefined","children","FollowButtonMultiInner","initiallyAllFollowing","followAllLabel","followedAllLabel","onBulkFollow","onBulkUnfollow","follow","followAllUsers","unfollowAllUsers","isAnyLoading","initialFollowStatuses","state","statuses","uid","Object","prototype","hasOwnProperty","call","followingUsers","hasKnownNotFollowing","some","storeAllFollowing","allFollowing","fetchAllStatuses","isSubmitting","setIsSubmitting","userIdsKey","join","result","allAlreadyFollowing","followedCount","results","length","every","entry","alreadyFollowing","anyFollowed","success","FollowButton","canUsePrivateApi","user","currentUser","currentUserId","id","trim","rawUserIds","multiUserIds","seen","Set","cleaned","raw","has","add","push","targetUserId"],"sourceRoot":"../../../../src","sources":["ui/components/FollowButton.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","useCallback","useMemo","useState","memo","useOxy","toast","Button","Loading","useFollow","useFollowForButton","useFollowStore","useTheme","useShallow","jsx","_jsx","DEFAULT_FOLLOW_ALL_LABEL","DEFAULT_FOLLOWED_ALL_LABEL","isMultiMode","props","Array","isArray","userIds","FollowButtonInner","userId","oxyServices","initiallyFollowing","size","onFollowChange","style","textStyle","disabled","showLoadingState","preventParentActions","colors","isFollowing","isKnown","isLoading","toggleFollow","resolveStatus","handlePress","event","preventDefault","stopPropagation","err","error","Error","String","message","isBusy","showFollowing","showSpinner","variant","onPress","icon","color","text","primaryForeground","undefined","children","FollowButtonMultiInner","initiallyAllFollowing","followAllLabel","followedAllLabel","onBulkFollow","onBulkUnfollow","follow","followAllUsers","unfollowAllUsers","isAnyLoading","initialFollowStatuses","state","statuses","uid","Object","prototype","hasOwnProperty","call","followingUsers","hasKnownNotFollowing","some","storeAllFollowing","allFollowing","fetchAllStatuses","isSubmitting","setIsSubmitting","userIdsKey","join","result","allAlreadyFollowing","followedCount","results","length","every","entry","alreadyFollowing","anyFollowed","success","FollowButton","canUsePrivateApi","user","currentUser","currentUserId","id","trim","rawUserIds","multiUserIds","seen","Set","cleaned","raw","has","add","push","targetUserId"],"sourceRoot":"../../../../src","sources":["ui/components/FollowButton.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/components/OxyAuthChooser.js

@@ -54,6 +54,7 @@ import { MaterialCommunityIcons } from '@expo/vector-icons';
 import QRCode from 'react-native-qrcode-svg';
 import { Avatar } from '@oxyhq/bloom/avatar';
 import { Button } from '@oxyhq/bloom/button';
+import { toast } from '@oxyhq/bloom';
 import { Text } from '@oxyhq/bloom/typography';
 import { useTheme, BloomColorScope, APP_COLOR_NAMES, APP_COLOR_PRESETS } from '@oxyhq/bloom/theme';
 import { isOxyRpOrigin } from '@oxyhq/core';
@@ -65,7 +66,7 @@ import { getCommonsAcquisitionUrl } from "../utils/commonsStoreLinks.js";
 import { authChooserStyles as styles } from "./oxyAuthChooserStyles.js";
 
 /** Diameter of a row avatar. */
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ROW_AVATAR_SIZE = 40;
 /** High-contrast QR colors — intentionally fixed (NOT themed) for scan reliability. */
 const QR_PLATE_BG = '#FFFFFF';
@@ -111,46 +112,51 @@ const OxyAuthChooser = ({
   } = useI18n();
   const queryClient = useQueryClient();
 
-  // A credential minted for `oxy.so` can only be asserted there (or a loopback
-  // dev host) — this is a hard WebAuthn RP-ID boundary, not feature detection,
-  // so it is the ONLY gate on the passkey affordances. `isOxyRpOrigin()` is
-  // `false` on native by construction (no `location`), so no separate native
-  // check is needed.
-  const passkeyAvailable = useMemo(() => isOxyRpOrigin(), []);
+  // A credential minted for `oxy.so` can only be ASSERTED there (or a loopback
+  // dev host) — a hard WebAuthn RP-ID boundary the browser enforces, not
+  // feature detection. On a first-party Oxy web origin the ceremony runs
+  // directly ('direct'). On any OTHER web origin (b2) it can't run locally, so
+  // the passkey action instead opens a popup at the auth.oxy.so passkey hub —
+  // where the SAME ceremony IS first-party — and relays the resulting session
+  // back via `AccountDialogController.startPasskeyHubSignIn` ('hub'). Native
+  // has neither: Commons owns identity there ('none'). `isOxyRpOrigin()` reads
+  // `location` once and is stable for the component's lifetime.
+  const passkeyMode = useMemo(() => {
+    if (!isWebBrowser()) return 'none';
+    return isOxyRpOrigin() ? 'direct' : 'hub';
+  }, []);
+  const passkeyAvailable = passkeyMode !== 'none';
   const [signInPasskeyPending, setSignInPasskeyPending] = useState(false);
-  const [signInPasskeyError, setSignInPasskeyError] = useState(null);
   const handleSignInWithPasskey = useCallback(async () => {
     if (signInPasskeyPending) return;
     setSignInPasskeyPending(true);
-    setSignInPasskeyError(null);
     try {
       await signInWithPasskey();
       onComplete?.();
     } catch (error) {
       // A cancelled/failed ceremony keeps the view open so the user can retry
-      // or fall back to the QR — surface a concise message, never swallow.
-      setSignInPasskeyError(error instanceof Error && error.message ? error.message : 'Passkey sign-in failed.');
+      // or fall back to the QR — surface the reason as a toast (owner mandate:
+      // errors never render inline inside the dialog), never swallow.
+      toast.error(error instanceof Error && error.message ? error.message : t('accountSwitcher.toasts.passkeySignInFailed') || 'Passkey sign-in failed.');
     } finally {
       setSignInPasskeyPending(false);
     }
-  }, [signInPasskeyPending, signInWithPasskey, onComplete]);
+  }, [signInPasskeyPending, signInWithPasskey, onComplete, t]);
   const [createPasskeyPending, setCreatePasskeyPending] = useState(false);
-  const [createPasskeyError, setCreatePasskeyError] = useState(null);
   const handleCreateWithPasskey = useCallback(async username => {
     if (createPasskeyPending) return;
     setCreatePasskeyPending(true);
-    setCreatePasskeyError(null);
     try {
       await registerWithPasskey({
         username
       });
       onComplete?.();
     } catch (error) {
-      setCreatePasskeyError(error instanceof Error && error.message ? error.message : 'Account creation failed.');
+      toast.error(error instanceof Error && error.message ? error.message : t('signup.toasts.passkeyCreateFailed') || 'Account creation failed.');
     } finally {
       setCreatePasskeyPending(false);
     }
-  }, [createPasskeyPending, registerWithPasskey, onComplete]);
+  }, [createPasskeyPending, registerWithPasskey, onComplete, t]);
 
   // Bind the headless controller. `getSnapshot` returns a stable reference
   // between changes, so it is `useSyncExternalStore`-safe. Guard the no-provider
@@ -162,6 +168,28 @@ const OxyAuthChooser = ({
     view
   } = snapshot;
 
+  // Sign-in device-flow failures land on `snapshot.signIn` asynchronously (poll /
+  // socket / popup cancel). Toast at the controller notification site — never an
+  // inline banner in the QR view (owner mandate, same contract as account-switch).
+  useEffect(() => {
+    if (!controller) return;
+    let lastToastedSignInError = null;
+    const maybeToastSignInError = () => {
+      const {
+        signIn
+      } = controller.getSnapshot();
+      if (signIn.phase === 'error' && signIn.error && signIn.error !== lastToastedSignInError) {
+        lastToastedSignInError = signIn.error;
+        toast.error(signIn.error || t('accountSwitcher.toasts.signInFailed') || 'Sign-in failed. Please try again.');
+      }
+      if (signIn.phase !== 'error') {
+        lastToastedSignInError = null;
+      }
+    };
+    maybeToastSignInError();
+    return controller.subscribe(maybeToastSignInError);
+  }, [controller, t]);
+
   // Web: "Sign in with Oxy" auto-starts the instant the sign-in entry is
   // reached — no button tap needed. `signInWithOxy()` tries the shared
   // keychain first (silently, native-only) then falls to the QR handoff,
@@ -185,19 +213,24 @@ const OxyAuthChooser = ({
     setSwitching(true);
     try {
       await controller.switchTo(accountId);
-      // A switch succeeds unless the controller recorded an error. On success
-      // reload the app's account graph and drop cached account-scoped data so
-      // the new active identity re-fetches — the same side effects the
-      // context's own `switchToAccount` performs.
-      if (!controller.getSnapshot().error) {
-        void refreshAccounts();
-        queryClient.invalidateQueries();
-        onComplete?.();
+      // `switchTo` never throws — it records a failure on the controller's
+      // snapshot. Read it back at the point the switch settles and surface it
+      // as a toast (event-driven, at the failure site — NOT an inline banner
+      // and NOT a snapshot-reaction). On success reload the app's account
+      // graph and drop cached account-scoped data so the new active identity
+      // re-fetches — the same side effects the context's own
+      // `switchToAccount` performs.
+      if (controller.getSnapshot().error) {
+        toast.error(t('accountSwitcher.toasts.switchFailed') || 'There was a problem switching accounts. Please try again.');
+        return;
       }
+      void refreshAccounts();
+      queryClient.invalidateQueries();
+      onComplete?.();
     } finally {
       setSwitching(false);
     }
-  }, [controller, switching, snapshot.activeAccountId, onComplete, refreshAccounts, queryClient]);
+  }, [controller, switching, snapshot.activeAccountId, onComplete, refreshAccounts, queryClient, t]);
   const handleManage = useCallback(() => {
     onComplete?.();
     showBottomSheet?.('ManageAccount');
@@ -227,9 +260,13 @@ const OxyAuthChooser = ({
       t: t,
       onRetry: () => void controller.showQr(),
       passkeyAvailable: passkeyAvailable,
-      onSignInWithPasskey: () => void handleSignInWithPasskey(),
-      passkeyPending: signInPasskeyPending,
-      passkeyError: signInPasskeyError,
+      onSignInWithPasskey: passkeyMode === 'direct' ? () => void handleSignInWithPasskey() : () => void controller.startPasskeyHubSignIn()
+      // The hub-popup flow's pending state is `snapshot.signIn` (already
+      // rendered elsewhere in this view) — only the DIRECT ceremony uses this
+      // component-local pending flag. A ceremony FAILURE is surfaced as a
+      // toast by `handleSignInWithPasskey`, never inline.
+      ,
+      passkeyPending: passkeyMode === 'direct' ? signInPasskeyPending : false,
       onCreateAccount: () => controller.startSignup()
     });
   }
@@ -239,10 +276,10 @@ const OxyAuthChooser = ({
       theme: theme,
       t: t,
       oxyServices: oxyServices,
-      passkeyAvailable: passkeyAvailable,
+      passkeyMode: passkeyMode,
       onCreateWithPasskey: handleCreateWithPasskey,
       createPending: createPasskeyPending,
-      createError: createPasskeyError,
+      onOpenHub: () => void controller.startPasskeyHubSignIn(),
       onBackToSignIn: () => controller.setView('signin')
     });
   }
@@ -261,33 +298,6 @@ const OxyAuthChooser = ({
 // Accounts view
 // ---------------------------------------------------------------------------
 
-/**
- * Inline error banner for `snapshot.error` (the account-list / switch-failure
- * error — distinct from `snapshot.signIn.error`, which `QrView` already
- * renders). `AccountsView` and `SignInView` previously swallowed it: a
- * blocked/failed switch left the user with no feedback outside the QR view.
- */
-const ErrorBanner = ({
-  error,
-  theme
-}) => {
-  if (!error) return null;
-  return /*#__PURE__*/_jsxs(View, {
-    style: [styles.errorBanner, {
-      backgroundColor: theme.colors.negativeSubtle
-    }],
-    children: [/*#__PURE__*/_jsx(MaterialCommunityIcons, {
-      name: "alert-circle-outline",
-      size: 18,
-      color: theme.colors.error
-    }), /*#__PURE__*/_jsx(Text, {
-      style: [styles.errorBannerText, {
-        color: theme.colors.error
-      }],
-      children: error
-    })]
-  });
-};
 const AccountsView = ({
   snapshot,
   theme,
@@ -311,10 +321,7 @@ const AccountsView = ({
   }
   return /*#__PURE__*/_jsxs(View, {
     style: styles.rows,
-    children: [/*#__PURE__*/_jsx(ErrorBanner, {
-      error: snapshot.error,
-      theme: theme
-    }), snapshot.accounts.map(account => /*#__PURE__*/_jsx(AccountRow, {
+    children: [snapshot.accounts.map(account => /*#__PURE__*/_jsx(AccountRow, {
       account: account,
       theme: theme,
       switching: snapshot.switchingAccountId === account.accountId,
@@ -440,10 +447,7 @@ const SignInView = ({
   onCreateAccount
 }) => /*#__PURE__*/_jsxs(View, {
   style: styles.signInBlock,
-  children: [/*#__PURE__*/_jsx(ErrorBanner, {
-    error: snapshot.error,
-    theme: theme
-  }), snapshot.accounts.length > 0 ? /*#__PURE__*/_jsxs(View, {
+  children: [snapshot.accounts.length > 0 ? /*#__PURE__*/_jsxs(View, {
     style: styles.rows,
     children: [snapshot.accounts.map(account => /*#__PURE__*/_jsx(AccountRow, {
       account: account,
@@ -544,7 +548,6 @@ const QrView = ({
   passkeyAvailable,
   onSignInWithPasskey,
   passkeyPending,
-  passkeyError,
   onCreateAccount
 }) => {
   const {
@@ -552,25 +555,21 @@ const QrView = ({
     commonsAvailability
   } = snapshot;
   const [showQrAnyway, setShowQrAnyway] = useState(false);
-  const passkeyLink = passkeyAvailable && signIn.phase !== 'authorized' ? /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Pressable, {
-      onPress: onSignInWithPasskey,
-      disabled: passkeyPending,
-      accessibilityRole: "button",
-      style: styles.footerLink,
-      testID: "passkey-signin-link",
-      children: /*#__PURE__*/_jsx(Text, {
-        style: [styles.linkText, {
-          color: theme.colors.textSecondary
-        }],
-        children: passkeyPending ? t('accountSwitcher.passkeySigningIn') || 'Signing in…' : t('accountSwitcher.useIdentityOnDevice') || 'No Commons? Use a passkey on this device instead'
-      })
-    }), passkeyError ? /*#__PURE__*/_jsx(Text, {
-      style: [styles.errorText, {
-        color: theme.colors.error
+
+  // A ceremony FAILURE is surfaced as a toast by `handleSignInWithPasskey` — the
+  // link itself never renders an inline error (owner mandate).
+  const passkeyLink = passkeyAvailable && signIn.phase !== 'authorized' ? /*#__PURE__*/_jsx(Pressable, {
+    onPress: onSignInWithPasskey,
+    disabled: passkeyPending,
+    accessibilityRole: "button",
+    style: styles.footerLink,
+    testID: "passkey-signin-link",
+    children: /*#__PURE__*/_jsx(Text, {
+      style: [styles.linkText, {
+        color: theme.colors.textSecondary
       }],
-      children: passkeyError
-    }) : null]
+      children: passkeyPending ? t('accountSwitcher.passkeySigningIn') || 'Signing in…' : t('accountSwitcher.useIdentityOnDevice') || 'No Commons? Use a passkey on this device instead'
+    })
   }) : null;
 
   // Native, Commons confirmed NOT installed: a same-device QR is a dead
@@ -607,14 +606,11 @@ const QrView = ({
     });
   }
   if (signIn.phase === 'error') {
+    // The failure reason is toasted by the controller subscription above — no
+    // inline error copy here (owner mandate).
     return /*#__PURE__*/_jsxs(View, {
       style: styles.centeredBlock,
-      children: [/*#__PURE__*/_jsx(Text, {
-        style: [styles.errorText, {
-          color: theme.colors.error
-        }],
-        children: signIn.error || 'Sign-in failed. Please try again.'
-      }), /*#__PURE__*/_jsx(Button, {
+      children: [/*#__PURE__*/_jsx(Button, {
         variant: "secondary",
         onPress: onRetry,
         style: styles.secondaryButton,
@@ -671,7 +667,7 @@ const QrView = ({
 // ---------------------------------------------------------------------------
 
 /** Debounced username-availability check over the existing SDK method. */
-function useUsernameAvailability(oxyServices) {
+function useUsernameAvailability(oxyServices, t) {
   const [status, setStatus] = useState('idle');
   const timerRef = useRef(null);
   const requestSeqRef = useRef(0);
@@ -689,10 +685,13 @@ function useUsernameAvailability(oxyServices) {
         setStatus(result.available ? 'available' : 'taken');
       }).catch(() => {
         if (seq !== requestSeqRef.current) return;
-        setStatus('idle'); // network/error — don't block on a stale verdict
+        // Reset the (now stale) verdict rather than block on it, and surface
+        // the failure as a toast — never an inline error inside the dialog.
+        setStatus('idle');
+        toast.error(t('accounts.create.username.checkFailed') || 'Could not check availability');
       });
     }, 400);
-  }, [oxyServices]);
+  }, [oxyServices, t]);
   return {
     status,
     check
@@ -732,17 +731,17 @@ const SignUpView = ({
   theme,
   t,
   oxyServices,
-  passkeyAvailable,
+  passkeyMode,
   onCreateWithPasskey,
   createPending,
-  createError,
+  onOpenHub,
   onBackToSignIn
 }) => {
   const [username, setUsername] = useState('');
   const {
     status: usernameStatus,
     check: checkUsername
-  } = useUsernameAvailability(oxyServices);
+  } = useUsernameAvailability(oxyServices, t);
   const canSubmit = username.trim().length >= 3 && usernameStatus === 'available' && !createPending;
 
   // Native — Commons owns identity creation. Mirrors the QR view's own
@@ -770,7 +769,7 @@ const SignUpView = ({
   // passkey creation is the de-emphasized alternative underneath for someone
   // who doesn't want to install anything — secondary button, introduced by
   // its own "No Commons?" framing, same subordination as the QR view's link.
-  if (passkeyAvailable) {
+  if (passkeyMode === 'direct') {
     return /*#__PURE__*/_jsxs(View, {
       style: styles.signInBlock,
       children: [/*#__PURE__*/_jsx(Text, {
@@ -816,12 +815,7 @@ const SignUpView = ({
         status: usernameStatus,
         theme: theme,
         t: t
-      }), createError ? /*#__PURE__*/_jsx(Text, {
-        style: [styles.errorText, {
-          color: theme.colors.error
-        }],
-        children: createError
-      }) : null, /*#__PURE__*/_jsx(Button, {
+      }), /*#__PURE__*/_jsx(Button, {
         variant: "secondary",
         onPress: () => void onCreateWithPasskey(username.trim()),
         disabled: !canSubmit,
@@ -836,16 +830,23 @@ const SignUpView = ({
     });
   }
 
-  // Web, non-Oxy origin: passkey creation here requires the cross-origin hub
-  // relay (b2), which has not shipped yet — an honest message beats a button
-  // that would fail.
+  // Web, non-Oxy origin (b2): passkey creation can't run locally here — the
+  // same WebAuthn RP-ID boundary as sign-in — so this opens the SAME
+  // auth.oxy.so passkey hub popup `QrView`'s "No Commons?" link uses.
+  // Completing EITHER a sign-in OR a fresh sign-up there relays the resulting
+  // session back via the SAME poll/socket engine `showQr` drives.
   return /*#__PURE__*/_jsxs(View, {
     style: styles.centeredBlock,
     children: [/*#__PURE__*/_jsx(Text, {
       style: [styles.mutedText, {
         color: theme.colors.textSecondary
       }],
-      children: t('signup.notAvailableHere') || "Account creation isn't available in this app yet — create your identity with Commons, or visit oxy.so to sign up with a passkey."
+      children: t('signup.hubExplainer') || 'Create your Oxy ID in a secure window, then come right back.'
+    }), /*#__PURE__*/_jsx(Button, {
+      variant: "primary",
+      onPress: onOpenHub,
+      style: styles.primaryButton,
+      children: t('signup.continueInWindow') || 'Continue in a new window'
     }), /*#__PURE__*/_jsx(SignInFooterLink, {
       theme: theme,
       t: t,