@oxy.so/services 11.4.0 → 11.6.0

package/src/ui/components/signIn/OxySignInPanel.tsx

@@ -16,6 +16,8 @@
  *                 (the start response does not say which, by design); meanwhile
  *                 the screen asks whether the link was opened in this browser,
  *                 and signs in when it was.
+ *   choose        the email holds several accounts, and the code or the link just
+ *                 proved it: which one signs in (a username never gets here).
  *   password      the alternative for an account that has one.
  *   second-factor the authenticator's code, or a backup code, when the account has one.
  *
@@ -34,15 +36,19 @@ import { useTheme } from '@oxy.so/bloom/theme';
 import { toast } from '@oxy.so/bloom/toast';
 import { Text } from '@oxy.so/bloom/typography';
 import type { SwitcherContextRow } from '@oxy.so/core/session';
+import type {
+  EmailSignInAccountOption,
+  EmailSignInStepResult,
+  LoginResult,
+} from '@oxy.so/contracts';
 import {
   EMAIL_CODE_LENGTH,
   EMAIL_SIGNIN_LONG_CODE_LENGTH,
   SIGN_IN_ERROR_CODES,
   TOTP_DIGITS,
+  isEmailSignInChooseAccount,
   isSecondFactorRequired,
-  type LoginResult,
-  type SignInStepResult,
-} from '@oxy.so/contracts';
+} from '@oxy.so/contracts/client';
 import { useQueryClient } from '@tanstack/react-query';
 import { useOxy } from '../../context/OxyContext';
 import { useAccountDialogSnapshot } from '../../hooks/accountDialogSnapshot';
@@ -56,6 +62,7 @@ import { SIGN_IN_SLIDES } from './artwork';
 import { InlineCommonsQr } from './InlineCommonsQr';
 import { OxyAccountPicker } from './OxyAccountPicker';
 import { OxyAuthScreen, OxyAuthScreenHeader, OxyAuthSplit, OxyAuthTerms } from './OxyAuthScreen';
+import { OxyEmailAccountChoice } from './OxyEmailAccountChoice';
 import {
   AccountFlowAction,
   AccountFlowCodeField,
@@ -94,6 +101,13 @@ const SIGN_IN_FLOW_KEY = 'signin';
 type Step =
   | { name: 'start' }
   | { name: 'check-email'; identifier: string; requestId: string; requestSecret: string }
+  | {
+      name: 'choose';
+      identifier: string;
+      requestId: string;
+      requestSecret: string;
+      accounts: EmailSignInAccountOption[];
+    }
   | { name: 'password'; identifier: string }
   | { name: 'second-factor'; challengeId: string; identifier: string };
 
@@ -153,6 +167,7 @@ export const OxySignInPanel: React.FC<OxySignInPanelProps> = ({
   const [useBackupCode, setUseBackupCode] = useState(saved?.useBackupCode ?? false);
   const [longCode, setLongCode] = useState(saved?.longCode ?? false);
   const [pending, setPending] = useState(false);
+  const [choosingId, setChoosingId] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
   const [notice, setNotice] = useState<string | null>(null);
   const [rateLimitSeconds, setRateLimitSeconds] = useState(0);
@@ -225,8 +240,25 @@ export const OxySignInPanel: React.FC<OxySignInPanelProps> = ({
   // One sign-in ends once: the typed code and the opened link can race.
   const finishingRef = useRef(false);
   const finish = useCallback(
-    async (result: SignInStepResult, from: string): Promise<void> => {
+    async (
+      result: EmailSignInStepResult,
+      from: string,
+      request?: { requestId: string; requestSecret: string },
+    ): Promise<void> => {
       if (finishingRef.current) return;
+      if (isEmailSignInChooseAccount(result)) {
+        if (!request) return;
+        setError(null);
+        setNotice(null);
+        setStep({
+          name: 'choose',
+          identifier: from,
+          requestId: request.requestId,
+          requestSecret: request.requestSecret,
+          accounts: result.accounts,
+        });
+        return;
+      }
       if (isSecondFactorRequired(result)) {
         setError(null);
         setSecondFactorCode('');
@@ -301,7 +333,7 @@ export const OxySignInPanel: React.FC<OxySignInPanelProps> = ({
         requestSecret: request.requestSecret,
         code: typed.trim(),
       })
-      .then((result) => finish(result, request.identifier))
+      .then((result) => finish(result, request.identifier, request))
       .catch((reason: unknown) => {
         setCode('');
         fail(reason);
@@ -309,6 +341,27 @@ export const OxySignInPanel: React.FC<OxySignInPanelProps> = ({
       .finally(() => setPending(false));
   };
 
+  const chooseAccount = (account: EmailSignInAccountOption) => {
+    if (step.name !== 'choose' || blocked) return;
+    const request = step;
+    const name = account.username ?? request.identifier;
+    setError(null);
+    setPending(true);
+    setChoosingId(account.id);
+    oxyServices.auth.email
+      .choose({
+        requestId: request.requestId,
+        requestSecret: request.requestSecret,
+        userId: account.id,
+      })
+      .then((result) => finish(result, name))
+      .catch(fail)
+      .finally(() => {
+        setPending(false);
+        setChoosingId(null);
+      });
+  };
+
   const submitPassword = () => {
     if (step.name !== 'password' || blocked) return;
     if (!password) {
@@ -369,7 +422,7 @@ export const OxySignInPanel: React.FC<OxySignInPanelProps> = ({
       try {
         const result = await oxyServices.auth.email.collect({ requestId, requestSecret });
         if (!('status' in result)) {
-          await finishRef.current(result, requestIdentifier);
+          await finishRef.current(result, requestIdentifier, { requestId, requestSecret });
           return;
         }
         if (stopped) return;
@@ -550,6 +603,40 @@ export const OxySignInPanel: React.FC<OxySignInPanelProps> = ({
       );
       break;
     }
+    case 'choose': {
+      const request = step;
+      form = (
+        <OxyAuthScreen className={splits ? 'md:max-w-none' : undefined}>
+          <OxyAuthScreenHeader
+            title={t('signin.emailAccounts.title')}
+            description={t('signin.emailAccounts.description', {
+              identifier: request.identifier,
+            })}
+          />
+          <OxyEmailAccountChoice
+            accounts={request.accounts}
+            onChoose={chooseAccount}
+            pendingId={choosingId}
+            disabled={blocked}
+          />
+          {error ? (
+            <AccountFlowNotice type="error" testID="signin-choose-error">
+              {error}
+            </AccountFlowNotice>
+          ) : null}
+          {rateLimitNotice}
+          <View style={styles.links}>
+            <SubtleLink
+              label={t('signin.checkEmail.differentAccount')}
+              onPress={backToIdentifier}
+              disabled={pending}
+              testID="signin-different-account"
+            />
+          </View>
+        </OxyAuthScreen>
+      );
+      break;
+    }
     case 'password': {
       const request = step;
       form = (

package/src/ui/components/signIn/OxySignUpPanel.tsx

@@ -15,11 +15,8 @@ import type React from 'react';
 import { useEffect, useState } from 'react';
 import { Linking, Platform } from 'react-native';
 import { toast } from '@oxy.so/bloom/toast';
-import {
-  SIGN_IN_ERROR_CODES,
-  emailAddressSchema,
-  type EmailVerificationConfirmResponse,
-} from '@oxy.so/contracts';
+import type { EmailVerificationConfirmResponse } from '@oxy.so/contracts';
+import { SIGN_IN_ERROR_CODES, emailAddressCheck, checkContract } from '@oxy.so/contracts/client';
 import { useOxy } from '../../context/OxyContext';
 import { useAccountDialogSnapshot } from '../../hooks/accountDialogSnapshot';
 import { useI18n } from '../../hooks/useI18n';
@@ -126,13 +123,13 @@ export const OxySignUpPanel: React.FC<OxySignUpPanelProps> = ({
   };
 
   const submitEmail = () => {
-    const parsed = emailAddressSchema.safeParse(email);
-    if (!parsed.success) {
+    const address = checkContract(emailAddressCheck, email);
+    if (address === null) {
       setError(t('signup.email.invalid'));
       return;
     }
-    setEmail(parsed.data);
-    run(() => sendCode(parsed.data));
+    setEmail(address);
+    run(() => sendCode(address));
   };
 
   // The code step reports this promise's failure in place.

package/src/ui/components/signIn/ReauthStep.tsx

@@ -8,12 +8,8 @@
 
 import type React from 'react';
 import { useState } from 'react';
-import {
-  EMAIL_CODE_LENGTH,
-  TOTP_DIGITS,
-  type ReauthAction,
-  type ReauthProof,
-} from '@oxy.so/contracts';
+import type { ReauthAction, ReauthProof } from '@oxy.so/contracts';
+import { EMAIL_CODE_LENGTH, TOTP_DIGITS } from '@oxy.so/contracts/client';
 import { useOxy } from '../../context/OxyContext';
 import { useI18n } from '../../hooks/useI18n';
 import { SubtleLink } from '../authChooser/primitives';

package/src/ui/components/signIn/accountFlowParts.tsx

@@ -18,6 +18,7 @@ import { useTheme } from '@oxy.so/bloom/theme';
 import { TextField, TextFieldHint, TextFieldInput, TextFieldLabel } from '@oxy.so/bloom/text-field';
 import { Text } from '@oxy.so/bloom/typography';
 import { WizardProgress } from '@oxy.so/bloom/wizard';
+import type { EmailVerificationConfirmResponse } from '@oxy.so/contracts';
 import {
   EMAIL_CODE_LENGTH,
   EMAIL_SIGNIN_LONG_CODE_ALPHABET,
@@ -25,8 +26,7 @@ import {
   EMAIL_VERIFICATION_ERROR_CODES,
   SIGN_IN_ERROR_CODES,
   normalizeEmailSignInCode,
-  type EmailVerificationConfirmResponse,
-} from '@oxy.so/contracts';
+} from '@oxy.so/contracts/client';
 import { useOxy } from '../../context/OxyContext';
 import { useI18n } from '../../hooks/useI18n';
 import type { Translate } from '../authChooser/types';
@@ -85,6 +85,8 @@ export function describeSignInError(error: unknown, t: Translate): string {
       return t('signin.errors.originNotAllowed');
     case SIGN_IN_ERROR_CODES.usernameTaken:
       return t('signup.username.taken');
+    case SIGN_IN_ERROR_CODES.emailAccountsFull:
+      return t('signin.errors.emailAccountsFull');
     case EMAIL_VERIFICATION_ERROR_CODES.codeInvalid:
       return t('emailCode.errors.codeInvalid');
     case EMAIL_VERIFICATION_ERROR_CODES.tooManyAttempts:

package/src/ui/context/OxyContext.tsx

@@ -29,7 +29,6 @@ import type {
   AccountDialogController,
   AccountDialogView,
 } from '@oxy.so/core/session';
-import { KeyManager } from '@oxy.so/core/crypto';
 import {
   refreshDeviceSecretArm,
   establishIdentitySession,
@@ -60,6 +59,7 @@ import {
   type RequestOAuthConsentOptions,
 } from '../oauth/explicitOAuthConsent';
 import { isWebBrowser } from '../utils/isWebBrowser';
+import { loadIdentityCrypto } from '../utils/identityCrypto';
 import { resolveDeliveryPlatform } from '../utils/deliveryPlatform';
 import { runProviderColdBoot } from '../boot/runProviderColdBoot';
 import { resolveApplicationSessionLane } from '../oauth/applicationSessionLane';
@@ -696,6 +696,7 @@ export const OxyRuntimeProvider: React.FC<OxyRuntimeProviderProps> = ({
         try {
           // The same keys the refresh handler's second arm signs with: the
           // identity-bound client's own key, or the cross-app shared identity.
+          const { KeyManager } = await loadIdentityCrypto();
           return identity ? await KeyManager.hasIdentity() : await KeyManager.hasSharedIdentity();
         } catch {
           return false;
@@ -1495,9 +1496,12 @@ export const OxyRuntimeProvider: React.FC<OxyRuntimeProviderProps> = ({
   // — a locked keychain must never be misreported as "no identity". `hasIdentity`
   // still resolves `false` and `getPublicKey` still resolves `null` for a genuine
   // absence.
-  const hasIdentity = useCallback(async (): Promise<boolean> => KeyManager.hasIdentity(), []);
+  const hasIdentity = useCallback(
+    async (): Promise<boolean> => (await loadIdentityCrypto()).KeyManager.hasIdentity(),
+    [],
+  );
   const getPublicKey = useCallback(
-    async (): Promise<string | null> => KeyManager.getPublicKey(),
+    async (): Promise<string | null> => (await loadIdentityCrypto()).KeyManager.getPublicKey(),
     [],
   );
 

package/src/ui/context/hooks/useAuthOperations.ts

@@ -8,9 +8,9 @@ import type { LogoutResult } from '../oxyContextTypes';
 import { DeviceManager } from '@oxy.so/core/session';
 import { fetchSessionsWithFallback } from '../../utils/sessionHelpers';
 import { handleAuthError, isInvalidSessionError } from '../../utils/errorHandlers';
+import { loadIdentityCrypto } from '../../utils/identityCrypto';
 import type { StorageInterface } from '../../utils/storageHelpers';
 import type { OxyServices } from '@oxy.so/core';
-import { SignatureService } from '@oxy.so/core/crypto';
 
 export interface UseAuthOperationsOptions {
   oxyServices: OxyServices;
@@ -126,6 +126,7 @@ export const useAuthOperations = ({
       // in local storage as 'oxy_biometric_enabled' and can be checked there.
 
       // Sign the challenge
+      const { SignatureService } = await loadIdentityCrypto();
       const { challenge: signature, timestamp } = await SignatureService.signChallenge(challenge);
 
       let fullUser: User;

package/src/ui/oauth/applicationSessionLane.ts

@@ -1,8 +1,8 @@
-import { publicApplicationSchema } from '@oxy.so/contracts';
+import { publicApplicationCheck, parseContract } from '@oxy.so/contracts/client';
 import type { OxyServices } from '@oxy.so/core';
 
 export function classifyApplicationSessionLane(metadata: unknown): 'device' | 'oauth' {
-  const application = publicApplicationSchema.parse(metadata);
+  const application = parseContract(publicApplicationCheck, metadata);
   return application.type === 'third_party' && !application.isOfficial && !application.isInternal
     ? 'oauth'
     : 'device';

package/src/ui/screens/AccountMembersScreen.tsx

@@ -30,8 +30,13 @@ const ASSIGNABLE_ROLES: AssignableRole[] = ['admin', 'editor', 'developer', 'bil
 const errorMessage = (error: unknown, fallback: string): string =>
   error instanceof Error && error.message ? error.message : fallback;
 
+const isUserNotFound = (error: unknown): boolean => {
+  const message = error instanceof Error ? error.message.toLowerCase() : '';
+  return message.includes('user not found') || message.includes('not found');
+};
+
 /**
- * Manage the members of an account (invite by email, change roles,
+ * Manage the members of an account (invite by username/email, change roles,
  * remove, transfer ownership). Gated on the caller's `callerMembership`
  * permissions. Receives the target `accountId` via navigation props.
  */
@@ -81,27 +86,6 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
     queryFn: () => oxyServices.accounts.members.list(id),
     enabled: canUsePrivateApi && id.length > 0 && canRead,
   });
-  const invitationsQuery = useQuery({
-    queryKey: ['account-invitations', id],
-    queryFn: () => oxyServices.accounts.invitations.list(id),
-    enabled: canUsePrivateApi && !!id && canRead,
-  });
-  const invitationAction = useMutation({
-    mutationFn: async ({
-      invitationId,
-      action,
-    }: {
-      invitationId: string;
-      action: 'resend' | 'cancel';
-    }) => {
-      if (action === 'resend') await oxyServices.accounts.invitations.resend(id, invitationId);
-      else await oxyServices.accounts.invitations.cancel(id, invitationId);
-    },
-    onSuccess: () => {
-      void invitationsQuery.refetch();
-    },
-    onError: (error) => toast.error(errorMessage(error, 'Could not update invitation')),
-  });
   const members = useMemo<AccountMember[]>(() => membersQuery.data ?? [], [membersQuery.data]);
   const memberUserIds = useMemo(
     () => [...new Set(members.map((member) => member.memberUserId).filter((id) => id.length > 0))],
@@ -142,7 +126,6 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
     // tables — mirror the SDK's per-account prefix sweep so every cached member
     // list refetches, not only the account that was mutated.
     queryClient.invalidateQueries({ queryKey: ['accounts', 'members'] });
-    queryClient.invalidateQueries({ queryKey: ['account-invitations', id] });
     queryClient.invalidateQueries({ queryKey: ['accounts', 'detail', id] });
   }, [queryClient, id]);
 
@@ -154,20 +137,24 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
   const inviteMutation = useMutation({
     mutationKey: ['accounts', 'members', 'invite', id],
     mutationFn: (input: { usernameOrEmail: string; role: AssignableRole }) =>
-      oxyServices.accounts.invitations.create(id, {
-        email: input.usernameOrEmail,
-        role: input.role,
-      }),
+      oxyServices.accounts.members.invite(id, input),
     onSuccess: () => {
       setInviteIdentifier('');
       setInviteRole('editor');
       setInviteError(null);
       invalidateMembers();
-      toast.success('Invitation sent');
+      toast.success(t('accounts.members.toasts.added') || 'Member added');
     },
     onError: (error) => {
-      invalidateMembers();
-      toast.error(errorMessage(error, 'Could not send invitation'));
+      if (isUserNotFound(error)) {
+        const message = t('accounts.members.errors.userNotFound') || 'User not found';
+        setInviteError(message);
+        toast.error(message);
+        return;
+      }
+      toast.error(
+        errorMessage(error, t('accounts.members.toasts.addFailed') || 'Failed to add member'),
+      );
     },
   });
 
@@ -220,12 +207,14 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
   const handleInvite = useCallback(() => {
     const usernameOrEmail = inviteIdentifier.trim();
     if (!usernameOrEmail) {
-      setInviteError('Enter an email to invite');
+      setInviteError(
+        t('accounts.members.errors.identifierRequired') || 'Enter a username or email to invite',
+      );
       return;
     }
     setInviteError(null);
     inviteMutation.mutate({ usernameOrEmail, role: inviteRole });
-  }, [inviteIdentifier, inviteRole, inviteMutation]);
+  }, [inviteIdentifier, inviteRole, inviteMutation, t]);
 
   const handleChangeRole = useCallback(
     (member: AccountMember, role: AccountRole) => {
@@ -293,11 +282,13 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
       {/* Invite form */}
       {canInvite ? (
         <View className="gap-space-12 p-space-16 rounded-radius-20 bg-fill">
-          <Text className="text-body font-semibold text-text">{'Invite a member'}</Text>
+          <Text className="text-body font-semibold text-text">
+            {t('accounts.members.invite.title') || 'Add a member'}
+          </Text>
           <TextField isInvalid={!!inviteError}>
             <TextFieldInput
               floatingLabel
-              label={'Email'}
+              label={t('accounts.members.invite.identifierLabel') || 'Username or email'}
               value={inviteIdentifier}
               onChangeText={(value) => {
                 setInviteIdentifier(value);
@@ -341,49 +332,14 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
             onPress={handleInvite}
             disabled={inviteMutation.isPending || !inviteIdentifier.trim()}
             loading={inviteMutation.isPending}
-            accessibilityLabel={'Send invitation'}
+            accessibilityLabel={t('accounts.members.invite.submit') || 'Add member'}
             className="w-full"
           >
-            {'Send invitation'}
+            {t('accounts.members.invite.submit') || 'Add member'}
           </Button>
         </View>
       ) : null}
 
-      {canRead ? (
-        <View className="gap-space-12">
-          <Text className="text-body font-semibold text-text">Pending invitations</Text>
-          {invitationsQuery.isError ? <Text>Could not load invitations.</Text> : null}
-          {(invitationsQuery.data ?? []).map((invitation) => (
-            <View key={invitation.id} className="gap-space-8 p-space-16 rounded-radius-20 bg-fill">
-              <Text>
-                {invitation.email} · {roleLabel(invitation.role)} · {invitation.status}
-              </Text>
-              <Text>Expires {new Date(invitation.expiresAt).toLocaleDateString()}</Text>
-              {canInvite ? (
-                <Button
-                  disabled={invitationAction.isPending}
-                  onPress={() =>
-                    invitationAction.mutate({ invitationId: invitation.id, action: 'resend' })
-                  }
-                >
-                  Resend
-                </Button>
-              ) : null}
-              {canRemove ? (
-                <Button
-                  disabled={invitationAction.isPending}
-                  onPress={() =>
-                    invitationAction.mutate({ invitationId: invitation.id, action: 'cancel' })
-                  }
-                >
-                  Cancel invitation
-                </Button>
-              ) : null}
-            </View>
-          ))}
-        </View>
-      ) : null}
-
       {/* Member list */}
       {canRead ? (
         <View className="gap-space-8">

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -1,5 +1,9 @@
 import type React from 'react';
-import { ORGANIZATION_NAME_MAX_LENGTH, organizationNameSchema } from '@oxy.so/contracts';
+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, ActivityIndicator } from 'react-native';
@@ -152,7 +156,7 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
       }
       if (node?.account.kind === 'organization') {
         setDisplayNameError(
-          organizationNameSchema.safeParse(trimmed).success
+          checkContract(organizationNameCheck, trimmed) !== null
             ? ''
             : t('organizationDirectory.invalidName'),
         );

package/src/ui/screens/CreateAccountScreen.tsx

@@ -1,9 +1,10 @@
 import type React from 'react';
+import type { OrganizationType } from '@oxy.so/contracts';
 import {
   ORGANIZATION_NAME_MAX_LENGTH,
-  organizationNameSchema,
-  type OrganizationType,
-} from '@oxy.so/contracts';
+  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';
@@ -21,12 +22,12 @@ import {
 import {
   applyBotUsernameSuffix,
   stripDisallowedUsernameCharacters,
-  usernameSchemaForAccountKind,
+  usernameCheckForAccountKind,
   BOT_USERNAME_INVALID_MESSAGE,
   USERNAME_INVALID_MESSAGE,
   USERNAME_MAX_LENGTH,
   USERNAME_MIN_LENGTH,
-} from '@oxy.so/contracts';
+} from '@oxy.so/contracts/client';
 import type { BaseScreenProps } from '../types/navigation';
 import { useI18n } from '../hooks/useI18n';
 import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
@@ -196,9 +197,9 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, paren
       // somebody who typed `a.b` to append `bot` sends them to be refused a second
       // time. The issue is read to choose between two LOCALIZED strings rather than
       // shown directly — the schema's message is English, and this screen is not.
-      const parsed = usernameSchemaForAccountKind(forKind).safeParse(value);
-      if (!parsed.success) {
-        const failedTheLabel = parsed.error.issues[0]?.message === BOT_USERNAME_INVALID_MESSAGE;
+      const checked = usernameCheckForAccountKind(forKind)(value, []);
+      if (!checked.ok) {
+        const failedTheLabel = checked.issue.message === BOT_USERNAME_INVALID_MESSAGE;
         setUsernameStatus('invalid');
         setUsernameMessage(
           failedTheLabel
@@ -282,7 +283,7 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, paren
       }
       if (kind === 'organization') {
         setDisplayNameError(
-          organizationNameSchema.safeParse(trimmed).success
+          checkContract(organizationNameCheck, trimmed) !== null
             ? ''
             : t('organizationDirectory.invalidName'),
         );

package/src/ui/screens/PreferencesScreen.tsx

@@ -5,7 +5,6 @@ import { Switch } from '@oxy.so/bloom/switch';
 import { useTheme } from '@oxy.so/bloom/theme';
 import type { UserPreferences } from '@oxy.so/core';
 import { getNativeLanguageName } from '@oxy.so/core';
-import { DisplayCurrencySelector } from '../components/DisplayCurrencySelector';
 import type { BaseScreenProps } from '../types/navigation';
 import { SettingsIcon } from '../components/SettingsIcon';
 import { useI18n } from '../hooks/useI18n';
@@ -159,7 +158,6 @@ const PreferencesScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, navigat
         </SettingsListGroup>
 
         <SettingsListGroup title={t('preferences.sections.region') || 'Region'}>
-          <DisplayCurrencySelector />
           <SettingsListItem
             icon={<SettingsIcon name="clock-outline" color={bloomTheme.colors.info} />}
             title={t('preferences.items.timezone.title') || 'Timezone'}

package/src/ui/utils/identityCrypto.ts

@@ -0,0 +1,10 @@
+/**
+ * The self-custody identity (`@oxy.so/core/crypto`: secp256k1, bip39, the AEAD
+ * cipher — ~32 KB gzipped on web), loaded where a key or signature is used.
+ *
+ * Importing it statically put it in every app's startup JavaScript, although a
+ * reader without an identity key never touches it before first paint. Core's
+ * `crypto` entry installs its polyfill before anything else, so loading it
+ * late keeps the order every key operation relies on.
+ */
+export const loadIdentityCrypto = () => import('@oxy.so/core/crypto');