@oxy.so/services 11.4.0 → 11.6.0

package/src/ui/boot/__tests__/coldBootNoIdpRedirect.test.ts

@@ -63,6 +63,22 @@ function makeEmptyAuthStore(): AuthStateStore {
   } as unknown as AuthStateStore;
 }
 
+/** An auth store holding this origin's device credential. */
+function makeCredentialAuthStore(): AuthStateStore {
+  return {
+    load: jest.fn(
+      async (): Promise<PersistedAuthState | null> => ({ deviceId: 'd1', deviceSecret: 's1' }),
+    ),
+    save: jest.fn(async () => undefined),
+    clear: jest.fn(async () => undefined),
+  } as unknown as AuthStateStore;
+}
+
+/** Put an OAuth return (`?code=`) on the address bar, as the IdP's redirect does. */
+function landWithAuthorizationCode(): void {
+  window.history.replaceState(null, '', '/?code=auth-code&state=auth-state');
+}
+
 interface Harness {
   options: RunProviderColdBootOptions;
   commitSession: jest.Mock;
@@ -120,6 +136,7 @@ describe('runProviderColdBoot — no SDK-initiated IdP navigation (#691 phase 7b
     mockTryCompleteOAuthReturn.mockClear();
     mockTryCompleteOAuthReturn.mockImplementation(async () => false);
     globalThis.sessionStorage?.clear();
+    window.history.replaceState(null, '', '/');
   });
 
   it('resolves a domain with no local credential SIGNED OUT instead of bouncing to the IdP', async () => {
@@ -160,7 +177,7 @@ describe('runProviderColdBoot — no SDK-initiated IdP navigation (#691 phase 7b
         return { kind: 'session', via: session.via, session } as const;
       },
     );
-    const { options, commitSession } = makeHarness();
+    const { options, commitSession } = makeHarness({ authStore: makeCredentialAuthStore() });
 
     await runProviderColdBoot(options);
 
@@ -176,6 +193,7 @@ describe('runProviderColdBoot — no SDK-initiated IdP navigation (#691 phase 7b
       // A popup-mode app lands here whenever the browser blocked the popup and
       // `startWebOAuthSignIn` fell back to a full-page redirect.
       mockTryCompleteOAuthReturn.mockImplementation(async () => true);
+      landWithAuthorizationCode();
       const { options, markAuthResolved, setTokenReady } = makeHarness();
 
       await runProviderColdBoot(options);
@@ -190,6 +208,7 @@ describe('runProviderColdBoot — no SDK-initiated IdP navigation (#691 phase 7b
 
     it('runs the return leg even on a boot that finds no session', async () => {
       stubSignedOutBoot();
+      landWithAuthorizationCode();
       const { options } = makeHarness();
 
       await runProviderColdBoot(options);
@@ -199,6 +218,7 @@ describe('runProviderColdBoot — no SDK-initiated IdP navigation (#691 phase 7b
 
     it('commits the OAuth return as a deliberate sign-in', async () => {
       mockTryCompleteOAuthReturn.mockImplementation(async () => true);
+      landWithAuthorizationCode();
       const { options } = makeHarness();
 
       await runProviderColdBoot(options);
@@ -225,14 +245,22 @@ describe('runProviderColdBoot — no SDK-initiated IdP navigation (#691 phase 7b
   });
 });
 
+// Each case lands with an OAuth return on the URL — the boot that must classify
+// before it does anything — so "nothing ran first" is a real claim. The web
+// origin with nothing to restore, which resolves before classification, is
+// covered on its own below.
 describe('registered cold-boot classification', () => {
   beforeEach(() => {
     mockRunSessionColdBoot.mockReset();
     mockTryCompleteOAuthReturn.mockReset();
     mockTryCompleteOAuthReturn.mockResolvedValue(false);
+    landWithAuthorizationCode();
+  });
+  afterEach(() => {
+    window.history.replaceState(null, '', '/');
   });
   it('external classification bypasses prior secrets, shared device and identity pin work', async () => {
-    const { options } = makeHarness();
+    const { options } = makeHarness({ authStore: makeCredentialAuthStore() });
     (options.oxyServices.apps.getPublic as jest.Mock).mockResolvedValue({
       id: 'external',
       name: 'External',
@@ -298,8 +326,9 @@ describe('registered cold-boot classification', () => {
 
 it('an unresponsive registry resolves signed-out without a late privileged continuation', async () => {
   jest.useFakeTimers();
+  landWithAuthorizationCode();
   try {
-    const { options } = makeHarness();
+    const { options } = makeHarness({ authStore: makeCredentialAuthStore() });
     let release!: (app: unknown) => void;
     (options.oxyServices.apps.getPublic as jest.Mock).mockImplementation(
       () =>
@@ -327,5 +356,139 @@ it('an unresponsive registry resolves signed-out without a late privileged conti
     expect(mockTryCompleteOAuthReturn).not.toHaveBeenCalled();
   } finally {
     jest.useRealTimers();
+    window.history.replaceState(null, '', '/');
   }
 });
+
+/**
+ * A web origin with nothing to restore — no warm token, no device secret, no
+ * OAuth return on the URL — ends signed out on either lane, so its routing does
+ * not wait on the registry round trip. Everything that would USE a credential
+ * still waits for the verdict.
+ */
+describe('web origin with nothing to restore', () => {
+  const official = {
+    id: 'registered-app',
+    name: 'Registered App',
+    type: 'first_party',
+    isOfficial: true,
+    isInternal: false,
+    scopes: [],
+  };
+
+  beforeEach(() => {
+    mockRunSessionColdBoot.mockReset();
+    mockTryCompleteOAuthReturn.mockReset();
+    mockTryCompleteOAuthReturn.mockResolvedValue(false);
+    window.history.replaceState(null, '', '/');
+  });
+
+  function pendingRegistry(options: RunProviderColdBootOptions): (app: unknown) => void {
+    let release!: (app: unknown) => void;
+    (options.oxyServices.apps.getPublic as jest.Mock).mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          release = resolve;
+        }),
+    );
+    return (app) => release(app);
+  }
+
+  it('resolves auth before the registry answers, and still classifies with no cache', async () => {
+    const { options, markAuthResolved } = makeHarness();
+    const onClassified = jest.fn();
+    const release = pendingRegistry(options);
+
+    const boot = runProviderColdBoot({ ...options, onClassified });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    expect(markAuthResolved).toHaveBeenCalled();
+    expect(options.oxyServices.apps.getPublic).toHaveBeenCalledWith(CLIENT_ID, { cache: false });
+    expect(onClassified).not.toHaveBeenCalled();
+
+    release(official);
+    await boot;
+
+    expect(onClassified).toHaveBeenCalledWith('device');
+    expect(mockRunSessionColdBoot).not.toHaveBeenCalled();
+    expect(mockTryCompleteOAuthReturn).not.toHaveBeenCalled();
+    expect(options.syncDeviceCredentialToHost).not.toHaveBeenCalled();
+    expect(options.commitSession).not.toHaveBeenCalled();
+  });
+
+  it('a failed classification after the early resolution restores nothing', async () => {
+    const { options, markAuthResolved } = makeHarness();
+    (options.oxyServices.apps.getPublic as jest.Mock).mockRejectedValue(new Error('offline'));
+
+    await runProviderColdBoot(options);
+
+    expect(markAuthResolved).toHaveBeenCalled();
+    expect(mockRunSessionColdBoot).not.toHaveBeenCalled();
+    expect(options.syncDeviceCredentialToHost).not.toHaveBeenCalled();
+  });
+
+  it('an origin holding a device secret still waits for the verdict before using it', async () => {
+    stubSignedOutBoot();
+    const { options, markAuthResolved } = makeHarness({ authStore: makeCredentialAuthStore() });
+    const release = pendingRegistry(options);
+
+    const boot = runProviderColdBoot(options);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    expect(markAuthResolved).not.toHaveBeenCalled();
+    expect(mockRunSessionColdBoot).not.toHaveBeenCalled();
+    expect(options.syncDeviceCredentialToHost).not.toHaveBeenCalled();
+
+    release(official);
+    await boot;
+
+    expect(mockRunSessionColdBoot).toHaveBeenCalledTimes(1);
+    expect(markAuthResolved).toHaveBeenCalled();
+  });
+
+  it('an origin holding a device secret classified external never uses it', async () => {
+    const { options } = makeHarness({ authStore: makeCredentialAuthStore() });
+    (options.oxyServices.apps.getPublic as jest.Mock).mockResolvedValue({
+      ...official,
+      type: 'third_party',
+      isOfficial: false,
+    });
+
+    await runProviderColdBoot(options);
+
+    expect(mockRunSessionColdBoot).not.toHaveBeenCalled();
+    expect(options.syncDeviceCredentialToHost).not.toHaveBeenCalled();
+    expect(options.authStore.save).not.toHaveBeenCalled();
+    expect(options.authStore.clear).not.toHaveBeenCalled();
+  });
+
+  it('an OAuth return on the URL waits for the verdict', async () => {
+    landWithAuthorizationCode();
+    const { options, markAuthResolved } = makeHarness();
+    const release = pendingRegistry(options);
+
+    const boot = runProviderColdBoot(options);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    expect(markAuthResolved).not.toHaveBeenCalled();
+    expect(options.authStore.load).not.toHaveBeenCalled();
+
+    release(official);
+    await boot;
+    expect(mockTryCompleteOAuthReturn).toHaveBeenCalledTimes(1);
+    window.history.replaceState(null, '', '/');
+  });
+
+  it('identity mode always waits for the verdict', async () => {
+    stubSignedOutBoot();
+    const { options, markAuthResolved } = makeHarness({ sessionMode: 'identity' });
+    const release = pendingRegistry(options);
+
+    const boot = runProviderColdBoot(options);
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    expect(markAuthResolved).not.toHaveBeenCalled();
+
+    release(official);
+    await boot;
+    expect(markAuthResolved).toHaveBeenCalled();
+  });
+});

package/src/ui/boot/runProviderColdBoot.ts

@@ -14,6 +14,28 @@ import { isWebBrowser } from '../utils/isWebBrowser';
 import { isNetConnectivityExplicitlyOffline } from '../utils/netConnectivity';
 import type { CommitInput } from '../context/oxyContextTypes';
 
+/**
+ * Whether the URL carries an OAuth return (`?code=` or `?error=`) for
+ * `tryCompleteOAuthReturn` to consume. Reads the address bar only.
+ */
+function hasOAuthReturnOnUrl(): boolean {
+  const search = (globalThis as { location?: { search?: string } }).location?.search;
+  if (!search) return false;
+  const params = new URLSearchParams(search);
+  return params.has('code') || params.has('error');
+}
+
+/**
+ * Whether this origin's own store holds anything a web boot could restore from:
+ * a warm access token to plant or a device secret to mint with. A presence
+ * check only — nothing read here is used, sent or synced before the
+ * classification allows it.
+ */
+async function hasRestorableState(store: AuthStateStore): Promise<boolean> {
+  const persisted = await store.load();
+  return Boolean(persisted?.accessToken || persisted?.deviceSecret);
+}
+
 /** How long the cold boot waits for the post-boot SessionClient handoff (ms). */
 export const SESSION_HANDOFF_DEADLINE_MS = 6000;
 
@@ -139,10 +161,33 @@ export async function runProviderColdBoot(opts: RunProviderColdBootOptions): Pro
   setTokenReady(false);
 
   try {
-    // Classification precedes every local-secret, shared-credential and identity
-    // probe. Unavailable registry metadata fails closed, including offline boot.
-    const lane = await (opts.resolveSessionLane?.() ??
-      resolveApplicationSessionLane(oxyServices, clientId));
+    // Classification precedes every USE of a local secret, the shared credential
+    // and the identity key. Unavailable registry metadata fails closed, including
+    // offline boot. It starts now, before anything else, so its round trip
+    // overlaps the local work below.
+    const classification = (async () =>
+      opts.resolveSessionLane?.() ?? resolveApplicationSessionLane(oxyServices, clientId))();
+    // Observed so a rejection that lands before it is awaited is not reported as
+    // unhandled; every path below still awaits it and sees the rejection.
+    classification.catch(() => undefined);
+
+    // The verdict decides HOW a session is restored, never WHETHER there is one.
+    // A web origin with nothing to restore and no OAuth return on the URL ends
+    // signed out on either lane, so routing need not wait a network round trip
+    // for an answer that cannot change the outcome. The classification still
+    // completes below and still gates every later sign-in
+    // (`ensureDeviceSessionLane` shares this same in-flight lookup).
+    if (!identityBound && isWebBrowser() && !hasOAuthReturnOnUrl()) {
+      if (!(await hasRestorableState(authStore))) {
+        markAuthResolved();
+        const lane = await classification;
+        await opts.onClassified?.(lane);
+        if (lane === 'oauth') setTokenReady(true);
+        return;
+      }
+    }
+
+    const lane = await classification;
     await opts.onClassified?.(lane);
     if (identityBound && lane !== 'device') return;
     // The redirect transport's RETURN leg. An app reaches it whenever the browser

package/src/ui/components/organizations/OrganizationClaimReview.tsx

@@ -2,10 +2,8 @@ import { useState } from 'react';
 import { ActivityIndicator, View } from 'react-native';
 import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { isHttpRequestError } from '@oxy.so/core';
-import {
-  organizationClaimReviewSchema,
-  type OrganizationClaimReview as OrganizationClaimReviewInput,
-} from '@oxy.so/contracts';
+import type { OrganizationClaimReview as OrganizationClaimReviewInput } from '@oxy.so/contracts';
+import { organizationClaimReviewCheck, parseContract } from '@oxy.so/contracts/client';
 import { Button } from '@oxy.so/bloom/button';
 import { SettingsListGroup, SettingsListItem } from '@oxy.so/bloom/settings-list';
 import { TextField, TextFieldInput } from '@oxy.so/bloom/text-field';
@@ -123,7 +121,7 @@ function ReviewDetail({ claimId, onClose }: { claimId: string; onClose: () => vo
         throw new Error('Independent staff review is required');
       return oxyServices.organizations.reviewClaim(
         claimId,
-        organizationClaimReviewSchema.parse({ decision, evidenceReference: evidence }),
+        parseContract(organizationClaimReviewCheck, { decision, evidenceReference: evidence }),
       );
     },
     onError: (error) => {

package/src/ui/components/organizations/OrganizationDirectorySearch.tsx

@@ -1,12 +1,13 @@
 import { useEffect, useState } from 'react';
 import { ActivityIndicator, View } from 'react-native';
 import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import type { Organization, OrganizationType } from '@oxy.so/contracts';
 import {
-  createOrganizationSchema,
-  organizationClaimInputSchema,
-  type Organization,
-  type OrganizationType,
-} from '@oxy.so/contracts';
+  createOrganizationCheck,
+  organizationClaimInputCheck,
+  parseContract,
+  checkContract,
+} from '@oxy.so/contracts/client';
 import { Avatar } from '@oxy.so/bloom/avatar';
 import { Button } from '@oxy.so/bloom/button';
 import { SettingsListGroup, SettingsListItem } from '@oxy.so/bloom/settings-list';
@@ -56,7 +57,7 @@ export function OrganizationDirectorySearch({
         throw new Error('An active organization and personal session are required');
       return oxyServices.organizations.claim(
         selected.accountId,
-        organizationClaimInputSchema.parse({ evidenceReference: evidence }),
+        parseContract(organizationClaimInputCheck, { evidenceReference: evidence }),
       );
     },
     onSuccess: () => queryClient.invalidateQueries({ queryKey: ['oxy', 'organizations'] }),
@@ -65,7 +66,7 @@ export function OrganizationDirectorySearch({
     mutationFn: () => {
       if (!personalReady) throw new Error('A personal session is required');
       return oxyServices.organizations.create(
-        createOrganizationSchema.parse({ name: search.trim(), organizationType: type }),
+        parseContract(createOrganizationCheck, { name: search.trim(), organizationType: type }),
       );
     },
     onSuccess: (organization) => {
@@ -210,8 +211,10 @@ export function OrganizationDirectorySearch({
             loading={create.isPending}
             onPress={() => {
               if (
-                !createOrganizationSchema.safeParse({ name: search.trim(), organizationType: type })
-                  .success
+                checkContract(createOrganizationCheck, {
+                  name: search.trim(),
+                  organizationType: type,
+                }) === null
               ) {
                 setValidationError(true);
                 return;

package/src/ui/components/organizations/OrganizationSettings.tsx

@@ -1,11 +1,8 @@
 import { useState } from 'react';
 import { ActivityIndicator, View } from 'react-native';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import {
-  updateOrganizationSchema,
-  type Organization,
-  type OrganizationType,
-} from '@oxy.so/contracts';
+import type { Organization, OrganizationType, UpdateOrganization } from '@oxy.so/contracts';
+import { updateOrganizationCheck, checkContract } from '@oxy.so/contracts/client';
 import { Button } from '@oxy.so/bloom/button';
 import { toast } from '@oxy.so/bloom/toast';
 import { SettingsListGroup } from '@oxy.so/bloom/settings-list';
@@ -62,7 +59,7 @@ function OrganizationForm({ organization }: { organization: Organization }) {
   const [type, setType] = useState<OrganizationType>(organization.organizationType);
   const [invalid, setInvalid] = useState(false);
   const save = useMutation({
-    mutationFn: (input: ReturnType<typeof updateOrganizationSchema.parse>) => {
+    mutationFn: (input: UpdateOrganization) => {
       if (!canUsePrivateApi) throw new Error('An authenticated session is required');
       return oxyServices.organizations.update(organization.accountId, input);
     },
@@ -113,14 +110,14 @@ function OrganizationForm({ organization }: { organization: Organization }) {
           disabled={save.isPending || !canUsePrivateApi}
           loading={save.isPending}
           onPress={() => {
-            const input = updateOrganizationSchema.safeParse({
+            const input = checkContract(updateOrganizationCheck, {
               legalName: legalName.trim() || null,
               websiteUrl: website.trim() || null,
               countryCode: country.trim().toUpperCase() || null,
               organizationType: type,
             });
-            setInvalid(!input.success);
-            if (input.success) save.mutate(input.data);
+            setInvalid(input === null);
+            if (input) save.mutate(input);
           }}
         >
           {t('organizationDirectory.save')}

package/src/ui/components/organizations/OrganizationTypePicker.tsx

@@ -1,4 +1,5 @@
-import { ORGANIZATION_TYPES, type OrganizationType } from '@oxy.so/contracts';
+import type { OrganizationType } from '@oxy.so/contracts';
+import { ORGANIZATION_TYPES } from '@oxy.so/contracts/client';
 import { SettingsListGroup, SettingsListItem } from '@oxy.so/bloom/settings-list';
 import { Text } from '@oxy.so/bloom/typography';
 import { useI18n } from '../../hooks/useI18n';

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

@@ -19,7 +19,8 @@ import { CodeBlock } from '@oxy.so/bloom/code';
 import { useTheme } from '@oxy.so/bloom/theme';
 import { toast } from '@oxy.so/bloom/toast';
 import { Text } from '@oxy.so/bloom/typography';
-import { TOTP_DIGITS, type TotpEnrollResponse } from '@oxy.so/contracts';
+import type { TotpEnrollResponse } from '@oxy.so/contracts';
+import { TOTP_DIGITS } from '@oxy.so/contracts/client';
 import { useQueryClient } from '@tanstack/react-query';
 import { useOxy } from '../../context/OxyContext';
 import { useSignInMethods } from '../../hooks/queries/useAuthMethods';

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

@@ -0,0 +1,116 @@
+/**
+ * "Choose an account" after an email was proven — the email holds several
+ * accounts, and the code or the link just proved the mailbox they share.
+ *
+ * Presentational, and the same rounded list as `OxyAccountPicker`: each row is
+ * the account's name and `@handle` on the left, its avatar and a chevron on the
+ * right. The host signs the chosen account in (`oxy.auth.email.choose`).
+ */
+
+import type React from 'react';
+import { Fragment, useState } from 'react';
+import { ScrollView } from 'react-native';
+import { Pressable, View } from 'react-native-css/components';
+import { Avatar } from '@oxy.so/bloom/avatar';
+import { RiArrowRightSLine } from '@oxy.so/bloom/icons/RiArrowRightSLine';
+import { SpinnerIcon } from '@oxy.so/bloom/loading';
+import { useTheme } from '@oxy.so/bloom/theme';
+import { Text } from '@oxy.so/bloom/typography';
+import type { EmailSignInAccountOption } from '@oxy.so/contracts';
+import { getNormalizedUserHandle } from '@oxy.so/core';
+import { useOxy } from '../../context/OxyContext';
+
+/** The list scrolls past this height (`max-h-96`). */
+const LIST_MAX_HEIGHT = 384;
+const AVATAR_SIZE = 40;
+
+export interface OxyEmailAccountChoiceProps {
+  accounts: EmailSignInAccountOption[];
+  onChoose: (account: EmailSignInAccountOption) => void;
+  /** The account being signed in, whose row shows it is busy. */
+  pendingId?: string | null;
+  /** Disables every row while a choice is in flight. */
+  disabled?: boolean;
+}
+
+export const OxyEmailAccountChoice: React.FC<OxyEmailAccountChoiceProps> = ({
+  accounts,
+  onChoose,
+  pendingId = null,
+  disabled = false,
+}) => {
+  const theme = useTheme();
+  const { oxyServices } = useOxy();
+  const [hovered, setHovered] = useState<number | null>(null);
+
+  /** The hairline under row `index`, hidden while either neighbour is hovered. */
+  const divider = (index: number) =>
+    index === accounts.length - 1 ? null : hovered === index || hovered === index + 1 ? (
+      <View className="h-px mx-[8px]" />
+    ) : (
+      <View className="h-px mx-[8px] bg-border opacity-50" />
+    );
+
+  return (
+    <View
+      className="bg-fill-secondary rounded-[22px] overflow-hidden"
+      testID="email-account-choice"
+    >
+      <ScrollView style={{ maxHeight: LIST_MAX_HEIGHT }} contentContainerStyle={{ padding: 8 }}>
+        {accounts.map((account, index) => {
+          const handle = getNormalizedUserHandle({ username: account.username });
+          const name = account.displayName ?? (handle ? `@${handle}` : account.id);
+          const busy = pendingId === account.id;
+          return (
+            <Fragment key={account.id}>
+              <Pressable
+                className={`flex-row items-center gap-[12px] rounded-[14px] p-[8px] ${hovered === index && !disabled ? 'bg-fill' : ''} ${disabled && !busy ? 'opacity-50' : ''}`}
+                onPress={() => onChoose(account)}
+                onHoverIn={() => setHovered(index)}
+                onHoverOut={() => setHovered((value) => (value === index ? null : value))}
+                disabled={disabled}
+                accessibilityRole="button"
+                accessibilityLabel={name}
+                accessibilityState={{ disabled, busy }}
+                testID={`email-account-${account.id}`}
+              >
+                <View className="flex-1 min-w-0">
+                  <Text
+                    className="text-body text-text"
+                    style={{ fontWeight: '500' }}
+                    numberOfLines={1}
+                  >
+                    {name}
+                  </Text>
+                  {account.displayName && handle ? (
+                    <Text className="text-bodySmall text-text-secondary" numberOfLines={1}>
+                      @{handle}
+                    </Text>
+                  ) : null}
+                </View>
+                <View className="flex-row items-center gap-[8px] shrink-0">
+                  <Avatar
+                    source={
+                      account.avatar
+                        ? oxyServices.assets.publicUrl(account.avatar, 'thumb')
+                        : undefined
+                    }
+                    variant="thumb"
+                    name={name}
+                    size={AVATAR_SIZE}
+                  />
+                  {busy ? (
+                    <SpinnerIcon size={20} color={theme.colors.primary} />
+                  ) : (
+                    <RiArrowRightSLine size="sm" fill={theme.colors.textSecondary} />
+                  )}
+                </View>
+              </Pressable>
+              {divider(index)}
+            </Fragment>
+          );
+        })}
+      </ScrollView>
+    </View>
+  );
+};

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

@@ -19,9 +19,9 @@ import { Button } from '@oxy.so/bloom/button';
 import { Loading } from '@oxy.so/bloom/loading';
 import { useTheme } from '@oxy.so/bloom/theme';
 import { Text } from '@oxy.so/bloom/typography';
-import { deriveIdentityLinkCode } from '@oxy.so/core/crypto';
 import type { IdentityLinkCreateResponse } from '@oxy.so/contracts';
 import { useOxy } from '../../context/OxyContext';
+import { loadIdentityCrypto } from '../../utils/identityCrypto';
 import { useSignInMethods } from '../../hooks/queries/useAuthMethods';
 import { useI18n } from '../../hooks/useI18n';
 import { OxyAuthScreen, OxyAuthScreenHeader } from './OxyAuthScreen';
@@ -99,6 +99,8 @@ export const OxyLinkCommonsPanel: React.FC<OxyLinkCommonsPanelProps> = ({ onLink
         const state = await oxyServices.identity.links.get(link.linkId);
         if (stopped) return;
         if (state.status === 'signed' && state.publicKey) {
+          const { deriveIdentityLinkCode } = await loadIdentityCrypto();
+          if (stopped) return;
           setStep({
             name: 'matching',
             link,

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

@@ -11,7 +11,7 @@ import { StyleSheet } from 'react-native';
 import { Field } from '@oxy.so/bloom/field';
 import { Switch } from '@oxy.so/bloom/switch';
 import { toast } from '@oxy.so/bloom/toast';
-import { PASSWORD_MAX_LENGTH, PASSWORD_MIN_LENGTH } from '@oxy.so/contracts';
+import { PASSWORD_MAX_LENGTH, PASSWORD_MIN_LENGTH } from '@oxy.so/contracts/client';
 import { useQueryClient } from '@tanstack/react-query';
 import { useOxy } from '../../context/OxyContext';
 import { useSignInMethods } from '../../hooks/queries/useAuthMethods';