@oxy.so/services 4.0.4 → 4.0.5

package/src/ui/components/OxyAuthChooser.tsx

@@ -169,30 +169,40 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({ onComplete }) => {
   const handleActivate = useCallback(
     async (contextId: string) => {
       if (!controller) return;
-      // Another switch or removal is already changing this device: the press is
-      // dropped, not queued — and it is not a failure to report.
-      if (controller.isDeviceMutationInFlight()) return;
-      // Already live: activating it again bumps nothing server-side, so treat
-      // the press as "yes, this one" and close.
-      if (contextId === controller.getSnapshot().activeContext?.contextId) {
-        onComplete?.();
-        return;
-      }
-      // The controller's own verdict on the SWITCH — never `snapshot.error`,
-      // which the directory re-read after a successful switch can also set.
-      // Reading that as "the switch failed" left the dialog open on a false
-      // error with the previous account's queries still cached.
-      const switched = await controller.activateContext(contextId).catch(() => false);
-      if (!switched) {
-        toast.error(t('accountSwitcher.toasts.activateFailed'));
-        return;
+      // The controller decides what choosing a row MEANS. Signed in it is a
+      // switch; signed out it is "Continue as @handle" — the same sign-in
+      // "Continue with Oxy" runs. The signed-out case is why this is not a
+      // host-side "already active → close": the device can list an identity
+      // (Commons') as active while THIS app holds no session, and closing on it
+      // left the app signed out behind a sheet that looked done (#1375 item 20).
+      const outcome = await controller.chooseContext(contextId).catch(() => 'failed' as const);
+      switch (outcome) {
+        // Another switch or removal is already changing this device: the press
+        // is dropped, not queued — and it is not a failure to report.
+        case 'busy':
+          return;
+        // The sign-in flow owns the rest: its own view while it runs, and the
+        // dialog's close (through `onSignedIn`) when it completes.
+        case 'signing-in':
+          return;
+        // Already live: activating it again bumps nothing server-side, so treat
+        // the press as "yes, this one" and close.
+        case 'current':
+          onComplete?.();
+          return;
+        // The controller's own verdict on the SWITCH — never `snapshot.error`,
+        // which the directory re-read after a successful switch can also set.
+        case 'failed':
+          toast.error(t('accountSwitcher.toasts.activateFailed'));
+          return;
+        case 'switched':
+          // The subject changed, so every account-scoped query is now about
+          // somebody else. The runtime resets its own caches between the bearer
+          // commit and the notify; this drops the Query cache the same way.
+          queryClient.invalidateQueries();
+          onComplete?.();
+          return;
       }
-      // The subject changed, so every account-scoped query is now about
-      // somebody else. The runtime resets its own caches between the bearer
-      // commit and the notify; this drops the Query cache the same way the
-      // account switch did.
-      queryClient.invalidateQueries();
-      onComplete?.();
     },
     [controller, onComplete, queryClient, t],
   );

package/src/ui/components/authChooser/SignInEntryView.tsx

@@ -13,6 +13,12 @@
  *
  * Existing accounts still render ABOVE the CTA: "continue as one of these" is a
  * choice of WHO, not of HOW.
+ *
+ * Signed in (the "Add another account" entry), a row is an account to switch
+ * to, and the current one carries its check. Signed out, nothing here is
+ * current: the device may still list an identity it holds (Commons' shared
+ * one), but THIS app has no session, so each row reads "Continue as @handle"
+ * and choosing it signs in (OxyHQ/oxy#1375 items 20 and 21).
  */
 
 import type React from 'react';
@@ -90,6 +96,13 @@ const SignInEntryView: React.FC<SignInEntryViewProps> = ({
               key={context.contextId}
               context={context}
               operatedBy={operatedBy}
+              continueAsLabel={
+                snapshot.hasSession
+                  ? null
+                  : t('signin.chooser.continueAs', {
+                      name: context.handle ? `@${context.handle}` : context.displayName,
+                    })
+              }
               theme={theme}
               activating={snapshot.activatingContextId === context.contextId}
               disabled={snapshot.activatingContextId !== null}

package/src/ui/components/authChooser/primitives.tsx

@@ -96,19 +96,31 @@ export const Dividerish: React.FC<{ theme: Theme; label: string }> = ({ theme, l
  * directory), not from the theme and not from whoever is signed in. This surface
  * is where a device holding two people is most visible, and it is reached while
  * signed out — so there is no "current user" whose colour could stand in.
+ *
+ * `continueAsLabel` is the signed-out form. The device can list an identity
+ * (and even mark it active) while this app holds no session, so a check there
+ * would claim a sign-in that has not happened. Given a label, the row never
+ * reads as current: its first line is "Continue as @handle", the account's
+ * name moves to the second line, and it ends in a chevron like any other row.
  */
 export const AccountRow: React.FC<{
   context: SwitcherContextRow;
   /** The person this account is reached through, when that is not obvious. */
   operatedBy: string | null;
+  /** Signed out: the row's "Continue as @handle" line. `null` when signed in. */
+  continueAsLabel?: string | null;
   theme: Theme;
   activating: boolean;
   disabled: boolean;
   onPress: () => void;
-}> = ({ context, operatedBy, theme, activating, disabled, onPress }) => {
+}> = ({ context, operatedBy, continueAsLabel = null, theme, activating, disabled, onPress }) => {
   const accent = resolveAccentHex(context.color, theme.colors.primary);
   const rowDisabled = disabled || !context.canActivate;
-  const secondary = operatedBy ?? (context.handle ? `@${context.handle}` : null);
+  const current = continueAsLabel === null && context.isActive;
+  const primary = continueAsLabel ?? context.displayName;
+  const secondary =
+    operatedBy ??
+    (continueAsLabel !== null ? context.displayName : context.handle ? `@${context.handle}` : null);
 
   return (
     <BloomColorScope colorPreset={toPreset(context.color)} asChild>
@@ -116,7 +128,7 @@ export const AccountRow: React.FC<{
         style={[
           styles.accountRow,
           {
-            borderColor: context.isActive ? accent : theme.colors.border,
+            borderColor: current ? accent : theme.colors.border,
             backgroundColor: theme.colors.card,
           },
           rowDisabled && !activating ? styles.rowDisabled : null,
@@ -124,10 +136,10 @@ export const AccountRow: React.FC<{
         onPress={onPress}
         disabled={rowDisabled}
         accessibilityRole="button"
-        accessibilityState={{ selected: context.isActive, disabled: rowDisabled }}
-        accessibilityLabel={context.displayName}
+        accessibilityState={{ selected: current, disabled: rowDisabled }}
+        accessibilityLabel={primary}
       >
-        <View style={[styles.avatarRing, { borderColor: context.isActive ? accent : 'transparent' }]}>
+        <View style={[styles.avatarRing, { borderColor: current ? accent : 'transparent' }]}>
           <Avatar
             source={context.avatarUrl ?? undefined}
             variant="thumb"
@@ -137,7 +149,7 @@ export const AccountRow: React.FC<{
         </View>
         <View style={styles.rowMeta}>
           <Text style={[styles.rowName, { color: theme.colors.text }]} numberOfLines={1}>
-            {context.displayName}
+            {primary}
           </Text>
           {secondary ? (
             <Text style={[styles.rowHandle, { color: theme.colors.textSecondary }]} numberOfLines={1}>
@@ -147,7 +159,7 @@ export const AccountRow: React.FC<{
         </View>
         {activating ? (
           <MaterialCommunityIcons name="loading" size={20} color={accent} />
-        ) : context.isActive ? (
+        ) : current ? (
           <MaterialCommunityIcons name="check-circle" size={20} color={accent} />
         ) : (
           <MaterialCommunityIcons name="chevron-right" size={20} color={theme.colors.textSecondary} />

package/src/ui/hooks/accountDialogSnapshot.ts

@@ -15,6 +15,7 @@ import type { AccountDialogSnapshot } from '@oxy.so/core';
 export const EMPTY_ACCOUNT_DIALOG_SNAPSHOT: AccountDialogSnapshot = {
   view: 'accounts',
   backView: null,
+  hasSession: false,
   directory: null,
   activeContext: null,
   activatingContextId: null,