@oxyhq/services 12.2.0 → 13.0.1

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -0,0 +1,261 @@
+import type React from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import {
+  View,
+  ScrollView,
+  ActivityIndicator,
+  Platform,
+  KeyboardAvoidingView,
+} from 'react-native';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { toast, Dialog, useDialogControl } from '@oxyhq/bloom';
+import { useTheme } from '@oxyhq/bloom/theme';
+import { H1, Text } from '@oxyhq/bloom/typography';
+import { Button } from '@oxyhq/bloom/button';
+import { TextField, TextFieldInput } from '@oxyhq/bloom/text-field';
+import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';
+import type { UpdateAccountInput } from '@oxyhq/core';
+import type { BaseScreenProps } from '../types/navigation';
+import Header from '../components/Header';
+import { SettingsIcon } from '../components/SettingsIcon';
+import { useOxy } from '../context/OxyContext';
+import { useI18n } from '../hooks/useI18n';
+
+const DISPLAY_NAME_MAX = 50;
+const BIO_MAX = 160;
+
+const errorMessage = (error: unknown, fallback: string): string =>
+  error instanceof Error && error.message ? error.message : fallback;
+
+/**
+ * Per-account settings: edit the account's profile, jump to member management,
+ * and archive the account (danger zone). Receives the target `accountId` via
+ * navigation props. Self-surface for the caller's own personal account lives in
+ * {@link ManageAccountScreen}; this screen manages a non-personal account in the
+ * graph.
+ */
+const AccountSettingsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, navigate, accountId }) => {
+  const bloomTheme = useTheme();
+  const colors = bloomTheme.colors;
+  const { t } = useI18n();
+  const { oxyServices, canUsePrivateApi, actingAs, setActingAs } = useOxy();
+  const queryClient = useQueryClient();
+
+  const id = typeof accountId === 'string' ? accountId : '';
+
+  const accountQuery = useQuery({
+    queryKey: ['accounts', 'detail', id],
+    queryFn: () => oxyServices.getAccount(id),
+    enabled: canUsePrivateApi && id.length > 0,
+  });
+
+  const node = accountQuery.data ?? null;
+  const permissions = node?.callerMembership?.permissions ?? [];
+  const isImplicitOwner = node ? node.relationship !== 'member' : false;
+  const can = useCallback(
+    (permission: string): boolean => isImplicitOwner || permissions.includes(permission),
+    [isImplicitOwner, permissions],
+  );
+  const canUpdate = can('account:update');
+  const canViewMembers = can('members:read');
+  const canArchive = can('account:delete');
+
+  // Editable fields, seeded lazily from the loaded account once.
+  const [seeded, setSeeded] = useState(false);
+  const [displayName, setDisplayName] = useState('');
+  const [bio, setBio] = useState('');
+
+  // Seed the form from the account during render (no useEffect): the first time
+  // the query resolves we capture its values into local edit state.
+  if (node && !seeded) {
+    const first = node.account?.name?.first ?? '';
+    const last = node.account?.name?.last ?? '';
+    setDisplayName([first, last].filter(Boolean).join(' '));
+    setBio(node.account?.bio ?? '');
+    setSeeded(true);
+  }
+
+  const updateMutation = useMutation({
+    mutationKey: ['accounts', 'update', id],
+    mutationFn: (input: UpdateAccountInput) => oxyServices.updateAccount(id, input),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['accounts', 'detail', id] });
+      queryClient.invalidateQueries({ queryKey: ['accounts'] });
+      toast.success(t('accounts.settings.toasts.saved') || 'Account updated');
+    },
+    onError: (error) => {
+      toast.error(errorMessage(error, t('accounts.settings.toasts.saveFailed') || 'Failed to update account'));
+    },
+  });
+
+  const archiveMutation = useMutation({
+    mutationKey: ['accounts', 'archive', id],
+    mutationFn: () => oxyServices.archiveAccount(id),
+    onSuccess: () => {
+      // If this was the active account, drop back to the personal account.
+      if (actingAs === id) {
+        setActingAs(null);
+      }
+      queryClient.invalidateQueries({ queryKey: ['accounts'] });
+      toast.success(t('accounts.settings.toasts.archived') || 'Account archived');
+      (onClose ?? goBack)?.();
+    },
+    onError: (error) => {
+      toast.error(errorMessage(error, t('accounts.settings.toasts.archiveFailed') || 'Failed to archive account'));
+    },
+  });
+
+  const archiveDialog = useDialogControl();
+
+  const handleSave = useCallback(() => {
+    const trimmed = displayName.trim();
+    const nameParts = trimmed.split(/\s+/).filter(Boolean);
+    const first = nameParts[0] || '';
+    const last = nameParts.length > 1 ? nameParts.slice(1).join(' ') : undefined;
+    updateMutation.mutate({
+      name: { first, last },
+      bio: bio.trim() ? bio.trim() : null,
+    });
+  }, [displayName, bio, updateMutation]);
+
+  const title = t('accounts.settings.title') || 'Account settings';
+
+  const accountHandle = useMemo(() => {
+    const username = node?.account?.username;
+    return username ? `@${username}` : '';
+  }, [node?.account?.username]);
+
+  if (!id) {
+    return (
+      <View className="flex-1 bg-bg">
+        <Header title={title} onBack={goBack} onClose={onClose} showBackButton showCloseButton elevation="subtle" />
+        <View className="flex-1 items-center justify-center px-screen-margin">
+          <Text className="text-body font-body text-text-secondary text-center">
+            {t('accounts.settings.errors.missingAccount') || 'No account selected.'}
+          </Text>
+        </View>
+      </View>
+    );
+  }
+
+  return (
+    <View className="flex-1 bg-bg">
+      <Header title={title} onBack={goBack} onClose={onClose} showBackButton showCloseButton elevation="subtle" />
+
+      <KeyboardAvoidingView
+        className="flex-1"
+        behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+        keyboardVerticalOffset={Platform.OS === 'ios' ? 88 : 0}
+      >
+        <ScrollView
+          className="flex-1"
+          contentContainerClassName="px-screen-margin pt-space-24 pb-space-32 gap-space-24"
+          showsVerticalScrollIndicator={false}
+          keyboardShouldPersistTaps="handled"
+        >
+          {accountQuery.isLoading ? (
+            <View className="items-center py-space-32">
+              <ActivityIndicator color={colors.primary} />
+            </View>
+          ) : (
+            <>
+              <View className="gap-space-8">
+                <H1 className="text-headerBold font-headerBold text-text" numberOfLines={1}>
+                  {accountHandle || title}
+                </H1>
+                <Text className="text-body font-body text-text-secondary">
+                  {t('accounts.settings.subtitle') || 'Manage this account’s profile, members, and access.'}
+                </Text>
+              </View>
+
+              {/* Profile edit */}
+              {canUpdate ? (
+                <View className="gap-space-16 p-space-16 rounded-radius-20 bg-fill">
+                  <TextField>
+                    <TextFieldInput
+                      floatingLabel
+                      label={t('accounts.settings.displayName.label') || 'Display name'}
+                      value={displayName}
+                      onChangeText={setDisplayName}
+                      maxLength={DISPLAY_NAME_MAX}
+                    />
+                  </TextField>
+                  <View className="gap-space-4">
+                    <TextField>
+                      <TextFieldInput
+                        floatingLabel
+                        label={t('accounts.settings.bio.label') || 'Bio (optional)'}
+                        value={bio}
+                        onChangeText={setBio}
+                        maxLength={BIO_MAX}
+                        multiline
+                        numberOfLines={3}
+                        textAlignVertical="top"
+                      />
+                    </TextField>
+                    <Text className="text-caption font-caption text-text-tertiary px-space-4 text-right">
+                      {bio.length}/{BIO_MAX}
+                    </Text>
+                  </View>
+                  <Button
+                    variant="primary"
+                    onPress={handleSave}
+                    disabled={updateMutation.isPending || !displayName.trim()}
+                    loading={updateMutation.isPending}
+                    accessibilityLabel={t('accounts.settings.save') || 'Save changes'}
+                    className="w-full"
+                  >
+                    {t('accounts.settings.save') || 'Save changes'}
+                  </Button>
+                </View>
+              ) : null}
+
+              {/* Members entry */}
+              {canViewMembers ? (
+                <SettingsListGroup title={t('accounts.settings.sections.access') || 'Access'}>
+                  <SettingsListItem
+                    icon={<SettingsIcon name="account-multiple" color={colors.info} />}
+                    title={t('accounts.members.title') || 'Members'}
+                    description={t('accounts.settings.members.subtitle') || 'Invite people and manage roles'}
+                    onPress={() => navigate?.('AccountMembers', { accountId: id })}
+                  />
+                </SettingsListGroup>
+              ) : null}
+
+              {/* Danger zone */}
+              {canArchive ? (
+                <SettingsListGroup title={t('accounts.settings.sections.dangerZone') || 'Danger zone'}>
+                  <SettingsListItem
+                    icon={<SettingsIcon name="archive-arrow-down" color={colors.error} />}
+                    title={t('accounts.settings.archive.title') || 'Archive account'}
+                    description={t('accounts.settings.archive.subtitle') || 'Deactivate this account'}
+                    onPress={() => archiveDialog.open()}
+                  />
+                </SettingsListGroup>
+              ) : null}
+            </>
+          )}
+        </ScrollView>
+      </KeyboardAvoidingView>
+
+      <Dialog
+        control={archiveDialog}
+        title={t('accounts.settings.archive.confirmTitle') || 'Archive account'}
+        description={
+          t('accounts.settings.archive.confirmDescription')
+          || 'Archive this account? It will be deactivated and its members will lose access.'
+        }
+        actions={[
+          {
+            label: t('accounts.settings.archive.title') || 'Archive account',
+            color: 'destructive',
+            onPress: () => archiveMutation.mutate(),
+          },
+          { label: t('common.cancel') || 'Cancel', color: 'cancel' },
+        ]}
+      />
+    </View>
+  );
+};
+
+export default AccountSettingsScreen;

package/src/ui/screens/AccountSwitcherScreen.tsx

@@ -0,0 +1,43 @@
+import type React from 'react';
+import { useCallback } from 'react';
+import { View } from 'react-native';
+import type { BaseScreenProps } from '../types/navigation';
+import Header from '../components/Header';
+import { AccountSwitcherView } from '../components/AccountSwitcher';
+import { useI18n } from '../hooks/useI18n';
+
+/**
+ * Bottom-sheet route wrapper around {@link AccountSwitcherView}. Used when the
+ * switcher is opened as a sheet (e.g. from the `ActiveAccountBanner` cue or the
+ * "Your accounts" entry in ManageAccount) rather than as the header-chip
+ * popover (which uses the `AccountSwitcher` modal directly).
+ */
+const AccountSwitcherScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, navigate }) => {
+  const { t } = useI18n();
+
+  const close = useCallback(() => {
+    (onClose ?? goBack)?.();
+  }, [onClose, goBack]);
+
+  return (
+    <View className="flex-1 bg-bg">
+      <Header
+        title={t('accountSwitcher.title') || 'Switch account'}
+        onBack={goBack}
+        onClose={onClose}
+        showBackButton={!!goBack}
+        showCloseButton={!!onClose}
+        elevation="subtle"
+      />
+      <AccountSwitcherView
+        onClose={close}
+        onAddAccount={() => navigate?.('OxyAuth')}
+        onNavigateManage={() => navigate?.('ManageAccount')}
+        onCreateAccount={() => navigate?.('CreateAccount')}
+        onOpenAccountSettings={(accountId) => navigate?.('AccountSettings', { accountId })}
+      />
+    </View>
+  );
+};
+
+export default AccountSwitcherScreen;

package/src/ui/screens/{CreateManagedAccountScreen.tsx → CreateAccountScreen.tsx}

@@ -6,8 +6,10 @@ import {
   ActivityIndicator,
   ScrollView,
   KeyboardAvoidingView,
+  TouchableOpacity,
 } from 'react-native';
 import { Ionicons } from '@expo/vector-icons';
+import type { AccountKind, CreateAccountInput } from '@oxyhq/core';
 import type { BaseScreenProps } from '../types/navigation';
 import Header from '../components/Header';
 import { useI18n } from '../hooks/useI18n';
@@ -20,20 +22,74 @@ import { toast } from '@oxyhq/bloom';
 
 type UsernameStatus = 'idle' | 'checking' | 'available' | 'taken' | 'invalid';
 
+/** Kind of account this screen can create. `personal` is a signup-minted root and is never created here. */
+type CreatableAccountKind = Exclude<AccountKind, 'personal'>;
+
 const USERNAME_REGEX = /^[a-zA-Z0-9_-]{3,30}$/;
 const DEBOUNCE_MS = 400;
 const USERNAME_MAX = 30;
 const DISPLAY_NAME_MAX = 50;
 const BIO_MAX = 160;
 
-const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
+interface KindOption {
+  value: CreatableAccountKind;
+  icon: React.ComponentProps<typeof Ionicons>['name'];
+}
+
+// The creatable account kinds, matching the API `createAccountSchema` enum.
+// Order places the most common choice (a project / persona) first.
+const KIND_OPTIONS: KindOption[] = [
+  { value: 'project', icon: 'cube-outline' },
+  { value: 'organization', icon: 'business-outline' },
+  { value: 'bot', icon: 'hardware-chip-outline' },
+];
+
+const kindLabel = (
+  t: (key: string, vars?: Record<string, string | number>) => string,
+  kind: CreatableAccountKind,
+): string => {
+  switch (kind) {
+    case 'organization':
+      return t('accounts.kinds.organization.label') || 'Organization';
+    case 'bot':
+      return t('accounts.kinds.bot.label') || 'Bot';
+    default:
+      return t('accounts.kinds.project.label') || 'Project';
+  }
+};
+
+const kindDescription = (
+  t: (key: string, vars?: Record<string, string | number>) => string,
+  kind: CreatableAccountKind,
+): string => {
+  switch (kind) {
+    case 'organization':
+      return t('accounts.kinds.organization.description') || 'A shared team account with members';
+    case 'bot':
+      return t('accounts.kinds.bot.description') || 'A programmatic account with service credentials';
+    default:
+      return t('accounts.kinds.project.description') || 'A separate account you control';
+  }
+};
+
+/**
+ * Create a new account in the unified account graph (an organization, project,
+ * or bot). The caller becomes its owner. Optionally nested under a parent
+ * account via the `parentAccountId` prop. NOT the cryptographic Commons/DID
+ * "identity" — that is a separate concept.
+ */
+const CreateAccountScreen: React.FC<BaseScreenProps> = ({
   onClose,
   goBack,
+  parentAccountId,
 }) => {
   const bloomTheme = useTheme();
-  const { oxyServices, createManagedAccount, setActingAs } = useOxy();
+  const { oxyServices, createAccount, setActingAs } = useOxy();
   const { t } = useI18n();
 
+  const parentId = typeof parentAccountId === 'string' ? parentAccountId : undefined;
+
+  const [kind, setKind] = useState<CreatableAccountKind>('project');
   const [username, setUsername] = useState('');
   const [displayName, setDisplayName] = useState('');
   const [bio, setBio] = useState('');
@@ -51,13 +107,19 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
 
     if (!value || value.length < 3) {
       setUsernameStatus(value.length > 0 ? 'invalid' : 'idle');
-      setUsernameMessage(value.length > 0 ? 'Username must be at least 3 characters' : '');
+      setUsernameMessage(
+        value.length > 0
+          ? (t('accounts.create.username.tooShort') || 'Username must be at least 3 characters')
+          : '',
+      );
       return;
     }
 
     if (!USERNAME_REGEX.test(value)) {
       setUsernameStatus('invalid');
-      setUsernameMessage('Only letters, numbers, hyphens, and underscores');
+      setUsernameMessage(
+        t('accounts.create.username.invalidChars') || 'Only letters, numbers, hyphens, and underscores',
+      );
       return;
     }
 
@@ -68,13 +130,18 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
       try {
         const result = await oxyServices.checkUsernameAvailability(value);
         setUsernameStatus(result.available ? 'available' : 'taken');
-        setUsernameMessage(result.message || (result.available ? 'Username is available' : 'Username is taken'));
+        setUsernameMessage(
+          result.message
+          || (result.available
+            ? (t('accounts.create.username.available') || 'Username is available')
+            : (t('accounts.create.username.taken') || 'Username is taken')),
+        );
       } catch {
         setUsernameStatus('idle');
-        setUsernameMessage('Could not check availability');
+        setUsernameMessage(t('accounts.create.username.checkFailed') || 'Could not check availability');
       }
     }, DEBOUNCE_MS);
-  }, [oxyServices]);
+  }, [oxyServices, t]);
 
   const handleUsernameChange = useCallback((value: string) => {
     const cleaned = value.toLowerCase().replace(/[^a-z0-9_-]/g, '');
@@ -103,27 +170,32 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
       const firstName = nameParts[0] || '';
       const lastName = nameParts.length > 1 ? nameParts.slice(1).join(' ') : undefined;
 
-      const account = await createManagedAccount({
+      const input: CreateAccountInput = {
+        kind,
         username,
         name: { first: firstName, last: lastName },
         bio: bio.trim() || undefined,
-      });
+        ...(parentId ? { parentAccountId: parentId } : null),
+      };
+      const account = await createAccount(input);
 
-      toast.success('Identity created successfully');
+      toast.success(t('accounts.create.toasts.success') || 'Account created');
 
-      // Switch to the new managed account
+      // Switch to the new account
       if (account.accountId) {
         setActingAs(account.accountId);
       }
 
       onClose?.();
     } catch (error) {
-      const message = error instanceof Error ? error.message : 'Failed to create identity';
+      const message = error instanceof Error
+        ? error.message
+        : (t('accounts.create.toasts.failed') || 'Failed to create account');
       toast.error(message);
     } finally {
       setIsCreating(false);
     }
-  }, [canCreate, username, displayName, bio, createManagedAccount, setActingAs, onClose]);
+  }, [canCreate, kind, username, displayName, bio, parentId, createAccount, setActingAs, onClose, t]);
 
   // Status icon + color shown alongside the username field message
   const usernameIsInvalid = usernameStatus === 'taken' || usernameStatus === 'invalid';
@@ -133,10 +205,12 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
       ? bloomTheme.colors.negative
       : bloomTheme.colors.textSecondary;
 
+  const title = t('accounts.create.title') || 'Create account';
+
   return (
     <View className="flex-1 bg-bg">
       <Header
-        title="Create Identity"
+        title={title}
         onBack={goBack}
         onClose={onClose}
         showBackButton={true}
@@ -158,13 +232,57 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
           {/* Big Title */}
           <View className="gap-space-8">
             <H1 className="text-headerBold font-headerBold text-text">
-              Create Identity
+              {title}
             </H1>
             <Text className="text-body font-body text-text-secondary">
-              Create a managed identity that you control. It will have its own profile, posts, and interactions.
+              {t('accounts.create.subtitle')
+                || 'Create an account you control. It will have its own profile, members, and apps.'}
             </Text>
           </View>
 
+          {/* Kind picker */}
+          <View className="gap-space-8">
+            {KIND_OPTIONS.map((option) => {
+              const selected = option.value === kind;
+              return (
+                <TouchableOpacity
+                  key={option.value}
+                  accessibilityRole="radio"
+                  accessibilityState={{ selected }}
+                  accessibilityLabel={kindLabel(t, option.value)}
+                  onPress={() => setKind(option.value)}
+                  activeOpacity={0.7}
+                  className="flex-row items-center gap-space-12 p-space-16 rounded-radius-20"
+                  style={{
+                    backgroundColor: selected ? bloomTheme.colors.primarySubtle : bloomTheme.colors.card,
+                    borderWidth: 1,
+                    borderColor: selected ? bloomTheme.colors.primary : bloomTheme.colors.border,
+                  }}
+                >
+                  <Ionicons
+                    name={option.icon}
+                    size={22}
+                    color={selected ? bloomTheme.colors.primary : bloomTheme.colors.icon}
+                  />
+                  <View className="flex-1">
+                    <Text
+                      className="text-body font-bodyBold"
+                      style={{ color: selected ? bloomTheme.colors.primary : bloomTheme.colors.text }}
+                    >
+                      {kindLabel(t, option.value)}
+                    </Text>
+                    <Text className="text-caption font-caption text-text-secondary">
+                      {kindDescription(t, option.value)}
+                    </Text>
+                  </View>
+                  {selected ? (
+                    <Ionicons name="checkmark-circle" size={20} color={bloomTheme.colors.primary} />
+                  ) : null}
+                </TouchableOpacity>
+              );
+            })}
+          </View>
+
           {/* Form Content */}
           <View className="gap-space-16 p-space-16 rounded-radius-20 bg-fill">
             {/* Username */}
@@ -172,7 +290,7 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
               <TextField isInvalid={usernameIsInvalid}>
                 <TextFieldInput
                   floatingLabel
-                  label="Username"
+                  label={t('accounts.create.username.label') || 'Username'}
                   value={username}
                   onChangeText={handleUsernameChange}
                   isInvalid={usernameIsInvalid}
@@ -204,7 +322,7 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
             <TextField>
               <TextFieldInput
                 floatingLabel
-                label="Display Name"
+                label={t('accounts.create.displayName.label') || 'Display name'}
                 value={displayName}
                 onChangeText={setDisplayName}
                 maxLength={DISPLAY_NAME_MAX}
@@ -216,7 +334,7 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
               <TextField>
                 <TextFieldInput
                   floatingLabel
-                  label="Bio (optional)"
+                  label={t('accounts.create.bio.label') || 'Bio (optional)'}
                   value={bio}
                   onChangeText={setBio}
                   maxLength={BIO_MAX}
@@ -237,10 +355,10 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
             onPress={handleCreate}
             disabled={!canCreate}
             loading={isCreating}
-            accessibilityLabel="Create Identity"
+            accessibilityLabel={title}
             className="w-full"
           >
-            Create Identity
+            {title}
           </Button>
         </ScrollView>
       </KeyboardAvoidingView>
@@ -248,4 +366,4 @@ const CreateManagedAccountScreen: React.FC<BaseScreenProps> = ({
   );
 };
 
-export default CreateManagedAccountScreen;
+export default CreateAccountScreen;

package/src/ui/screens/ManageAccountScreen.tsx

@@ -94,7 +94,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         activeSessionId,
         logout,
         openAvatarPicker,
-        managedAccounts,
+        accounts,
     } = useOxy();
 
     const { data: userFromQuery, isLoading: userLoading } = useCurrentUser({
@@ -667,12 +667,12 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                     />
                 </SettingsListGroup>
 
-                {/* Managed accounts */}
-                {managedAccounts.length > 0 || isAuthenticated ? (
+                {/* Accounts (unified account graph) */}
+                {accounts.length > 0 || isAuthenticated ? (
                     <SettingsListGroup
                         title={
-                            t('accountCenter.sections.managedAccounts')
-                            || 'Managed accounts'
+                            t('accountCenter.sections.accounts')
+                            || 'Accounts'
                         }
                     >
                         <SettingsListItem
@@ -683,23 +683,23 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                                 />
                             }
                             title={
-                                t('accountCenter.items.manageIdentities.title')
-                                || 'Manage identities'
+                                t('accounts.manage.switch.title')
+                                || 'Switch account'
                             }
                             description={
-                                managedAccounts.length > 0
+                                accounts.length > 0
                                     ? (
-                                        t('accountCenter.items.manageIdentities.count', {
-                                            count: managedAccounts.length,
+                                        t('accounts.manage.switch.count', {
+                                            count: accounts.length,
                                         })
-                                        || `${managedAccounts.length} managed ${managedAccounts.length === 1 ? 'identity' : 'identities'}`
+                                        || `${accounts.length} ${accounts.length === 1 ? 'account' : 'accounts'}`
                                     )
                                     : (
-                                        t('accountCenter.items.manageIdentities.empty')
-                                        || 'Sub-accounts you control'
+                                        t('accounts.manage.switch.empty')
+                                        || 'Accounts you own or share'
                                     )
                             }
-                            onPress={() => navigate?.('CreateManagedAccount')}
+                            onPress={() => navigate?.('AccountSwitcher')}
                         />
                         <SettingsListItem
                             icon={
@@ -709,14 +709,14 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                                 />
                             }
                             title={
-                                t('accountCenter.items.createIdentity.title')
-                                || 'Create new identity'
+                                t('accounts.create.title')
+                                || 'Create account'
                             }
                             description={
-                                t('accountCenter.items.createIdentity.subtitle')
-                                || 'Add a managed sub-account'
+                                t('accounts.manage.create.subtitle')
+                                || 'Add an organization, project, or bot'
                             }
-                            onPress={() => navigate?.('CreateManagedAccount')}
+                            onPress={() => navigate?.('CreateAccount')}
                         />
                     </SettingsListGroup>
                 ) : null}