@oxy.so/services 12.4.0 → 12.5.0

package/src/ui/components/authChooser/types.ts

@@ -1,3 +1,4 @@
+import { APP_COLOR_NAMES } from '@oxy.so/bloom/color-presets';
 /**
  * Shared types + per-account color resolution for the auth chooser's views.
  *
@@ -8,12 +9,7 @@
  */
 
 import type { AccountStorageUsageResponse } from '@oxy.so/core';
-import {
-  APP_COLOR_NAMES,
-  APP_COLOR_PRESETS,
-  type AppColorName,
-  type useTheme,
-} from '@oxy.so/bloom/theme';
+import { APP_COLOR_PRESETS, type useTheme } from '@oxy.so/bloom/theme';
 import type { AccountDialogMenuSection } from '../../navigation/accountDialogManager';
 import type { useI18n } from '../../hooks/useI18n';
 
@@ -132,14 +128,19 @@ export interface SignInAlternatives {
  * renders in EVERY consumer regardless of NativeWind availability.
  */
 export function resolveAccentHex(color: string | null, fallback: string): string {
-  const preset = toPreset(color);
-  return preset ? APP_COLOR_PRESETS[preset].hex : fallback;
-}
+  const normalized = color?.trim().toLowerCase();
+  if (!normalized) return fallback;
+
+  if (/^#[0-9a-f]{3}$/i.test(normalized)) {
+    return `#${normalized[1]}${normalized[1]}${normalized[2]}${normalized[2]}${normalized[3]}${normalized[3]}`;
+  }
+  if (/^#[0-9a-f]{6}$/i.test(normalized)) return normalized;
 
-/** Narrow a stored color string to a known `AppColorName`, or `undefined`. */
-export function toPreset(color: string | null): AppColorName | undefined {
-  if (!color) return undefined;
-  return (APP_COLOR_NAMES as readonly string[]).includes(color)
-    ? (color as AppColorName)
-    : undefined;
+  // `amber` was the retired name for `yellow`; existing user records are
+  // migrated, but inboxes can still render cached account data during rollout.
+  const preset = normalized === 'amber' ? 'yellow' : normalized;
+  if (APP_COLOR_NAMES.includes(preset as (typeof APP_COLOR_NAMES)[number])) {
+    return APP_COLOR_PRESETS[preset as (typeof APP_COLOR_NAMES)[number]].hex;
+  }
+  return fallback;
 }

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -1,9 +1,4 @@
 import type React from 'react';
-import {
-  ORGANIZATION_NAME_MAX_LENGTH,
-  organizationNameCheck,
-  checkContract,
-} from '@oxy.so/contracts/client';
 import { OrganizationSettings } from '../components/organizations/OrganizationSettings';
 import { useCallback, useMemo, useState } from 'react';
 import { View } from 'react-native';
@@ -16,10 +11,11 @@ import { Button } from '@oxy.so/bloom/button';
 import { TextField, TextFieldInput } from '@oxy.so/bloom/text-field';
 import { GroupedSection, GroupedSectionItem } from '@oxy.so/bloom/grouped-section';
 import {
-  DISPLAY_NAME_INVALID_MESSAGE,
+  accountNameInvalidKey,
+  accountNameInvalidMessage,
+  accountNameMaxLength,
   getNormalizedUserHandle,
-  isValidDisplayName,
-  MAX_DISPLAY_NAME_LENGTH,
+  isValidAccountName,
   type UpdateAccountInput,
 } from '@oxy.so/core';
 import type { BaseScreenProps } from '../types/navigation';
@@ -29,7 +25,6 @@ import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import { clearedFieldsFromAccountUpdate, upsertCachedUser } from '../hooks/queries/userCache';
 
-const DISPLAY_NAME_MAX = MAX_DISPLAY_NAME_LENGTH;
 const BIO_MAX = 160;
 
 const errorMessage = (error: unknown, fallback: string): string =>
@@ -158,22 +153,12 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
         setDisplayNameError('');
         return;
       }
-      if (node?.account.kind === 'organization') {
-        setDisplayNameError(
-          checkContract(organizationNameCheck, trimmed) !== null
-            ? ''
-            : t('organizationDirectory.invalidName'),
-        );
-        return;
-      }
-      const nameParts = trimmed.split(/\s+/).filter(Boolean);
-      const first = nameParts[0] || '';
-      const last = nameParts.length > 1 ? nameParts.slice(1).join(' ') : '';
-      const invalidPart = [first, last].find((part) => part && !isValidDisplayName(part));
+      const kind = node?.account.kind;
       setDisplayNameError(
-        invalidPart
-          ? t('accounts.settings.displayName.invalidChars') || DISPLAY_NAME_INVALID_MESSAGE
-          : '',
+        isValidAccountName(trimmed, kind)
+          ? ''
+          : t(`accounts.settings.displayName.${accountNameInvalidKey(kind)}`) ||
+              accountNameInvalidMessage(kind),
       );
     },
     [node?.account.kind, t],
@@ -235,11 +220,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
                       value={displayName}
                       onChangeText={handleDisplayNameChange}
                       isInvalid={Boolean(displayNameError)}
-                      maxLength={
-                        node?.account.kind === 'organization'
-                          ? ORGANIZATION_NAME_MAX_LENGTH
-                          : DISPLAY_NAME_MAX
-                      }
+                      maxLength={accountNameMaxLength(node?.account.kind)}
                     />
                   </TextField>
                   {displayNameError ? (

package/src/ui/screens/CreateAccountScreen.tsx

@@ -1,10 +1,5 @@
 import type React from 'react';
 import type { OrganizationType } from '@oxy.so/contracts';
-import {
-  ORGANIZATION_NAME_MAX_LENGTH,
-  organizationNameCheck,
-  checkContract,
-} from '@oxy.so/contracts/client';
 import { OrganizationDirectorySearch } from '../components/organizations/OrganizationDirectorySearch';
 import { OrganizationTypePicker } from '../components/organizations/OrganizationTypePicker';
 import { useState, useCallback, useRef, useEffect } from 'react';
@@ -13,10 +8,11 @@ import Ionicons from '../icons/Ionicons';
 import type { AccountCategoryId, AccountKind, CreateAccountInput } from '@oxy.so/core';
 import {
   accountCategoryLabel,
-  DISPLAY_NAME_INVALID_MESSAGE,
-  isValidDisplayName,
+  accountNameInvalidKey,
+  accountNameInvalidMessage,
+  accountNameMaxLength,
+  isValidAccountName,
   MAX_ACCOUNT_CATEGORIES,
-  MAX_DISPLAY_NAME_LENGTH,
   SELECTABLE_ACCOUNT_CATEGORY_IDS,
 } from '@oxy.so/core';
 import {
@@ -61,7 +57,6 @@ type UsernameStatus = 'idle' | 'checking' | 'available' | 'taken' | 'invalid';
 type CreatableAccountKind = Extract<AccountKind, 'organization' | 'project' | 'bot'>;
 
 const DEBOUNCE_MS = 400;
-const DISPLAY_NAME_MAX = MAX_DISPLAY_NAME_LENGTH;
 const BIO_MAX = 160;
 
 interface KindOption {
@@ -286,22 +281,11 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
         setDisplayNameError('');
         return;
       }
-      if (kind === 'organization') {
-        setDisplayNameError(
-          checkContract(organizationNameCheck, trimmed) !== null
-            ? ''
-            : t('organizationDirectory.invalidName'),
-        );
-        return;
-      }
-      const nameParts = trimmed.split(/\s+/);
-      const firstName = nameParts[0] || '';
-      const lastName = nameParts.length > 1 ? nameParts.slice(1).join(' ') : '';
-      const invalidPart = [firstName, lastName].find((part) => part && !isValidDisplayName(part));
       setDisplayNameError(
-        invalidPart
-          ? t('accounts.create.displayName.invalidChars') || DISPLAY_NAME_INVALID_MESSAGE
-          : '',
+        isValidAccountName(trimmed, kind)
+          ? ''
+          : t(`accounts.create.displayName.${accountNameInvalidKey(kind)}`) ||
+              accountNameInvalidMessage(kind),
       );
     },
     [kind, t],
@@ -548,9 +532,7 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
                     value={displayName}
                     onChangeText={handleDisplayNameChange}
                     isInvalid={Boolean(displayNameError)}
-                    maxLength={
-                      kind === 'organization' ? ORGANIZATION_NAME_MAX_LENGTH : DISPLAY_NAME_MAX
-                    }
+                    maxLength={accountNameMaxLength(kind)}
                   />
                 </TextField>
                 {displayNameError ? (

package/src/ui/screens/EditProfileFieldScreen.tsx

@@ -22,7 +22,7 @@ import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
 import { useOxy } from '../context/oxyRuntimeContext';
 import { useProfileEditing } from '../hooks/useProfileEditing';
 import { toast } from '@oxy.so/bloom/toast';
-import { DISPLAY_NAME_INVALID_MESSAGE, isValidDisplayName } from '@oxy.so/core';
+import { accountNameInvalidKey, accountNameInvalidMessage, isValidAccountName } from '@oxy.so/core';
 import { getLinkTitle, getLinkDescription, linksToListItems } from './linkFormat';
 
 /**
@@ -217,6 +217,12 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
     fieldType === 'username',
   );
 
+  // The name policy is the account's kind's: an organization a person switched
+  // into is named by the title policy, not held to a person's.
+  const kind = user?.kind;
+  const invalidNameMessage =
+    t(`editProfile.items.displayName.${accountNameInvalidKey(kind)}`) ||
+    accountNameInvalidMessage(kind);
   // Get field configuration based on fieldType
   const fieldConfig = useMemo((): FieldConfig => {
     switch (fieldType) {
@@ -233,9 +239,7 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
               placeholder:
                 t('editProfile.items.displayName.firstNamePlaceholder') || 'Enter first name',
               validation: (value) =>
-                isValidDisplayName(value)
-                  ? undefined
-                  : t('editProfile.items.displayName.invalidChars') || DISPLAY_NAME_INVALID_MESSAGE,
+                isValidAccountName(value, kind) ? undefined : invalidNameMessage,
             },
             {
               key: 'lastName',
@@ -244,9 +248,7 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
                 t('editProfile.items.displayName.lastNamePlaceholder') ||
                 'Enter last name (optional)',
               validation: (value) =>
-                isValidDisplayName(value)
-                  ? undefined
-                  : t('editProfile.items.displayName.invalidChars') || DISPLAY_NAME_INVALID_MESSAGE,
+                isValidAccountName(value, kind) ? undefined : invalidNameMessage,
             },
           ],
         };
@@ -360,7 +362,7 @@ const EditProfileFieldScreen: React.FC<EditProfileFieldScreenProps> = ({
           fields: [],
         };
     }
-  }, [fieldType, t]);
+  }, [fieldType, t, kind, invalidNameMessage]);
 
   // Field change handler
   const handleFieldChange = useCallback(