@oxy.so/services 11.3.0 → 11.4.0

package/lib/typescript/module/ui/hooks/queries/usePersonalPlans.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePersonalPlans.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/hooks/queries/usePersonalPlans.ts"],"names":[],"mappings":"AAIA,iFAAiF;AACjF,wBAAgB,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;aA0B4xO,CAAC;;;;;;;;;UAnB5zO;AAED,kFAAkF;AAClF,wBAAgB,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;YAe3C"}
+{"version":3,"file":"usePersonalPlans.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/hooks/queries/usePersonalPlans.ts"],"names":[],"mappings":"AAIA,iFAAiF;AACjF,wBAAgB,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;aA0Bk1O,CAAC;;;;;;;;;UAnBl3O;AAED,kFAAkF;AAClF,wBAAgB,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;YAe3C"}

package/lib/typescript/module/ui/hooks/useDisplayCurrency.d.ts

@@ -0,0 +1,11 @@
+import { type UserPreferences } from '@oxy.so/core';
+export type DisplayCurrency = NonNullable<UserPreferences['displayCurrency']>;
+export declare const DISPLAY_CURRENCIES: readonly DisplayCurrency[];
+/** Account-scoped server preference. A late save can never replace another account. */
+export declare function useDisplayCurrency(): {
+    currency: DisplayCurrency;
+    selectCurrency: (next: DisplayCurrency) => void;
+    isSaving: boolean;
+    error: Error | null;
+};
+//# sourceMappingURL=useDisplayCurrency.d.ts.map

package/lib/typescript/module/ui/hooks/useDisplayCurrency.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useDisplayCurrency.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useDisplayCurrency.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAO1E,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC;AAC9E,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EAA2B,CAAC;AAYrF,uFAAuF;AACvF,wBAAgB,kBAAkB;;2BA6BF,eAAe;;;EAW9C"}

package/lib/typescript/module/ui/hooks/useDisplayPrice.d.ts

@@ -0,0 +1,6 @@
+/** Display conversion only. Pricing and checkout request bodies retain their source units. */
+export declare function useDisplayPrice(): {
+    currency: import("./useDisplayCurrency.js").DisplayCurrency;
+    formatUsd: (minorUnits: number) => string;
+};
+//# sourceMappingURL=useDisplayPrice.d.ts.map

package/lib/typescript/module/ui/hooks/useDisplayPrice.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useDisplayPrice.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useDisplayPrice.ts"],"names":[],"mappings":"AAMA,8FAA8F;AAC9F,wBAAgB,eAAe;;4BAkBE,MAAM;EActC"}

package/lib/typescript/module/ui/screens/AccountMembersScreen.d.ts

@@ -1,7 +1,7 @@
 import type React from 'react';
 import type { BaseScreenProps } from '../types/navigation.js';
 /**
- * Manage the members of an account (invite by username/email, change roles,
+ * Manage the members of an account (invite by email, change roles,
  * remove, transfer ownership). Gated on the caller's `callerMembership`
  * permissions. Receives the target `accountId` via navigation props.
  */

package/lib/typescript/module/ui/screens/AccountMembersScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountMembersScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/AccountMembersScreen.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAc/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAkB3D;;;;GAIG;AACH,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAscnD,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"AccountMembersScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/AccountMembersScreen.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAc/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAa3D;;;;GAIG;AACH,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAufnD,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/lib/typescript/module/ui/screens/PreferencesScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PreferencesScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/PreferencesScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAOzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;;AAwL3D,wBAA6C"}
+{"version":3,"file":"PreferencesScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/PreferencesScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAQzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;;AAyL3D,wBAA6C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxy.so/services",
-  "version": "11.3.0",
+  "version": "11.4.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -155,14 +155,15 @@
   },
   "dependencies": {
     "@expo/config-plugins": "57.0.9",
-    "@oxy.so/contracts": "4.14.0",
-    "color": "^5.0.3"
+    "@oxy.so/contracts": "4.15.0",
+    "color": "^5.0.3",
+    "@peable.to/sdk": "0.2.7-oxy-one.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^21.2.1",
     "@commitlint/config-conventional": "^21.2.0",
     "@expo/vector-icons": "^15.0.3",
-    "@oxy.so/core": "4.8.0",
+    "@oxy.so/core": "4.9.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^12.0.1",
     "@react-native/babel-preset": "^0.86.2",
@@ -215,7 +216,7 @@
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
     "@oxy.so/bloom": ">=6.2.1 <6.3.0 || >=7.1.2 <7.2.0 || >=7.7.0 <7.8.0 || >=7.13.1 <7.34.0 || >=8.0.0 <8.2.0 || >=9.0.0 <9.1.0 || >=10.0.0",
-    "@oxy.so/core": "4.8.0",
+    "@oxy.so/core": "4.9.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": ">=11.4.1 <13.0.0",
     "@tanstack/query-async-storage-persister": "^5.101",

package/src/index.ts

@@ -453,3 +453,8 @@ export {
   usePersonalPlans,
   usePersonalPlanSubscriptions,
 } from './ui/hooks/queries/usePersonalPlans';
+export { AccountInvitationAcceptance } from './ui/components/AccountInvitationAcceptance';
+
+export { DisplayCurrencySelector } from './ui/components/DisplayCurrencySelector';
+export { useDisplayCurrency } from './ui/hooks/useDisplayCurrency';
+export { useDisplayPrice } from './ui/hooks/useDisplayPrice';

package/src/ui/components/AccountInvitationAcceptance.tsx

@@ -0,0 +1,90 @@
+import { useEffect, useState } from 'react';
+import { View } from 'react-native';
+import { Text } from '@oxy.so/bloom/typography';
+import { Button } from '@oxy.so/bloom/button';
+import type { AccountInvitationPreview } from '@oxy.so/core';
+import { getNormalizedUserHandle } from '@oxy.so/core';
+import { useOxy } from '../context/OxyContext';
+
+/** The link never grants access on navigation, preview, sign-in or account switching. */
+export function AccountInvitationAcceptance({ token }: { token: string }) {
+  return <InvitationContent key={token} token={token} />;
+}
+
+function InvitationContent({ token }: { token: string }) {
+  const { oxyServices, user, canUsePrivateApi, openAccountDialog } = useOxy();
+  const [preview, setPreview] = useState<AccountInvitationPreview | null>(null);
+  const [error, setError] = useState('');
+  const [busy, setBusy] = useState(false);
+  const [accepted, setAccepted] = useState(false);
+  useEffect(() => {
+    let alive = true;
+    setPreview(null);
+    setError('');
+    if (canUsePrivateApi && token) {
+      oxyServices.accounts.invitations
+        .preview(token)
+        .then((value) => {
+          if (alive) setPreview(value);
+        })
+        .catch((reason) => {
+          if (alive) setError(reason instanceof Error ? reason.message : 'Invitation unavailable');
+        });
+    }
+    return () => {
+      alive = false;
+    };
+  }, [oxyServices, canUsePrivateApi, token]);
+
+  const accept = async () => {
+    if (!user || !preview) return;
+    setBusy(true);
+    setError('');
+    try {
+      await oxyServices.accounts.invitations.accept(token, user.id);
+      setAccepted(true);
+    } catch (reason) {
+      setError(reason instanceof Error ? reason.message : 'Could not accept invitation');
+    } finally {
+      setBusy(false);
+    }
+  };
+  return (
+    <View className="gap-space-16 p-space-24">
+      <Text className="text-title font-semibold text-text">Account invitation</Text>
+      {canUsePrivateApi && token && !preview && !error ? (
+        <Text accessibilityRole="progressbar">Loading invitation…</Text>
+      ) : null}
+      {accepted ? (
+        <Text>Invitation accepted. You can now access this account.</Text>
+      ) : (
+        <>
+          {preview ? (
+            <Text>
+              Join {preview.account.displayName ?? preview.account.username} as{' '}
+              {preview.invitation.role}.
+            </Text>
+          ) : null}
+          <Text>
+            Selected account:{' '}
+            {user
+              ? `${user.name?.displayName ?? getNormalizedUserHandle(user) ?? user.id} (${user.email ?? user.id})`
+              : 'Not signed in'}
+          </Text>
+          <Text>
+            The selected account receives access. Its email can differ from the invitation address.
+            No access is granted until you confirm.
+          </Text>
+          <Button disabled={busy} onPress={() => openAccountDialog()}>
+            {user ? 'Change account' : 'Sign in or create account'}
+          </Button>
+          <Button disabled={busy || !user || !preview || user.kind !== 'personal'} onPress={accept}>
+            Confirm and accept
+          </Button>
+        </>
+      )}
+      {error ? <Text accessibilityRole="alert">{error}</Text> : null}
+      {!token ? <Text>This invitation link is incomplete.</Text> : null}
+    </View>
+  );
+}

package/src/ui/components/DisplayCurrencySelector.tsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import { View } from 'react-native';
+import {
+  SegmentedControl,
+  SegmentedControlItem,
+  SegmentedControlItemText,
+} from '@oxy.so/bloom/segmented-control';
+import { Text } from '@oxy.so/bloom/typography';
+import { DISPLAY_CURRENCIES, useDisplayCurrency } from '../hooks/useDisplayCurrency';
+import { useI18n } from '../hooks/useI18n';
+
+export function DisplayCurrencySelector() {
+  const { currency, selectCurrency, isSaving, error } = useDisplayCurrency();
+  const { t } = useI18n();
+  return (
+    <View>
+      <Text>{t('preferences.displayCurrency.label')}</Text>
+      <SegmentedControl
+        type="radio"
+        label={t('preferences.displayCurrency.label')}
+        value={currency}
+        onValueChange={(value) => {
+          const selected = DISPLAY_CURRENCIES.find((item) => item === value);
+          if (selected && !isSaving) selectCurrency(selected);
+        }}
+      >
+        {DISPLAY_CURRENCIES.map((value) => (
+          <SegmentedControlItem key={value} value={value} disabled={isSaving}>
+            <SegmentedControlItemText>{value}</SegmentedControlItemText>
+          </SegmentedControlItem>
+        ))}
+      </SegmentedControl>
+      {error && (
+        <Text accessibilityLiveRegion="polite">{t('preferences.displayCurrency.saveFailed')}</Text>
+      )}
+    </View>
+  );
+}

package/src/ui/components/__tests__/AccountInvitationAcceptance.test.tsx

@@ -0,0 +1,61 @@
+import React from 'react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { AccountInvitationAcceptance } from '../AccountInvitationAcceptance';
+const mockPreview = jest.fn();
+const mockAccept = jest.fn();
+const mockSwitch = jest.fn();
+let mockUser: { id: string; kind: string; email: string; username: string } | null = null;
+const mockServices = { accounts: { invitations: { preview: mockPreview, accept: mockAccept } } };
+jest.mock('../../context/OxyContext', () => ({
+  useOxy: () => ({
+    oxyServices: mockServices,
+    user: mockUser,
+    canUsePrivateApi: !!mockUser,
+    openAccountDialog: mockSwitch,
+  }),
+}));
+beforeEach(() => {
+  jest.clearAllMocks();
+  mockUser = null;
+  mockPreview.mockResolvedValue({
+    invitation: { role: 'editor' },
+    account: { displayName: 'Community' },
+  });
+  mockAccept.mockResolvedValue({ success: true });
+});
+test('sign-in and switching never accept; confirmation names the displayed selected account', async () => {
+  const { rerender } = render(<AccountInvitationAcceptance token="secret" />);
+  fireEvent.click(screen.getByText('Sign in or create account'));
+  expect(mockSwitch).toHaveBeenCalled();
+  expect(mockAccept).not.toHaveBeenCalled();
+  mockUser = { id: 'first', kind: 'personal', username: 'first', email: 'different@example.com' };
+  rerender(<AccountInvitationAcceptance token="secret" />);
+  await screen.findByText('Join Community as editor.');
+  fireEvent.click(screen.getByText('Change account'));
+  expect(mockAccept).not.toHaveBeenCalled();
+  mockUser = { id: 'second', kind: 'personal', username: 'second', email: 'second@example.com' };
+  rerender(<AccountInvitationAcceptance token="secret" />);
+  expect(screen.getByText(/Selected account: second/)).toBeTruthy();
+  fireEvent.click(screen.getByText('Confirm and accept'));
+  await waitFor(() => expect(mockAccept).toHaveBeenCalledWith('secret', 'second'));
+  await screen.findByText('Invitation accepted. You can now access this account.');
+});
+test('a new link resets previous acceptance and does not auto-accept', async () => {
+  mockUser = { id: 'first', kind: 'personal', username: 'first', email: 'first@example.com' };
+  const { rerender } = render(<AccountInvitationAcceptance token="old" />);
+  await screen.findByText('Join Community as editor.');
+  fireEvent.click(screen.getByText('Confirm and accept'));
+  await screen.findByText('Invitation accepted. You can now access this account.');
+  rerender(<AccountInvitationAcceptance token="new" />);
+  await screen.findByText('Join Community as editor.');
+  expect(screen.queryByText('Invitation accepted. You can now access this account.')).toBeNull();
+  expect(mockAccept).toHaveBeenCalledTimes(1);
+});
+test('preview failure leaves confirmation disabled', async () => {
+  mockUser = { id: 'first', kind: 'personal', username: 'first', email: 'first@example.com' };
+  mockPreview.mockRejectedValue(new Error('Invitation expired'));
+  render(<AccountInvitationAcceptance token="expired" />);
+  await screen.findByText('Invitation expired');
+  fireEvent.click(screen.getByText('Confirm and accept'));
+  expect(mockAccept).not.toHaveBeenCalled();
+});

package/src/ui/hooks/useDisplayCurrency.ts

@@ -0,0 +1,64 @@
+import { useSyncExternalStore } from 'react';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { authenticatedApiCall, type UserPreferences } from '@oxy.so/core';
+import { useOxy } from '../context/OxyContext';
+import { useCurrentUser } from './queries/useAccountQueries';
+import { queryKeys } from './queries/queryKeys';
+import { useAuthStore } from '../stores/authStore';
+import { mutationKeys } from './mutations/mutationKeys';
+
+export type DisplayCurrency = NonNullable<UserPreferences['displayCurrency']>;
+export const DISPLAY_CURRENCIES: readonly DisplayCurrency[] = ['USD', 'EUR', 'FAIR'];
+
+let anonymousCurrency: DisplayCurrency = 'USD';
+const anonymousListeners = new Set<() => void>();
+const subscribeAnonymous = (listener: () => void) => {
+  anonymousListeners.add(listener);
+  return () => {
+    anonymousListeners.delete(listener);
+  };
+};
+const anonymousSnapshot = () => anonymousCurrency;
+
+/** Account-scoped server preference. A late save can never replace another account. */
+export function useDisplayCurrency() {
+  const { oxyServices, activeSessionId, isAuthenticated, user } = useOxy();
+  const current = useCurrentUser({ enabled: isAuthenticated });
+  const client = useQueryClient();
+  const anonymous = useSyncExternalStore(
+    subscribeAnonymous,
+    anonymousSnapshot,
+    () => 'USD' as const,
+  );
+  const currency = isAuthenticated
+    ? (current.data?.userPreferences?.displayCurrency ??
+      user?.userPreferences?.displayCurrency ??
+      'USD')
+    : anonymous;
+  const mutation = useMutation({
+    mutationKey: [...mutationKeys.account.updateSettings],
+    mutationFn: async (input: { currency: DisplayCurrency; sessionId: string; userId: string }) => {
+      const updated = await authenticatedApiCall(oxyServices, input.sessionId, () =>
+        oxyServices.users.updateMe({ userPreferences: { displayCurrency: input.currency } }),
+      );
+      if (updated.id !== input.userId) throw new Error('Account changed. Please try again.');
+      return updated;
+    },
+    onSuccess: (updated, input) => {
+      client.setQueryData(queryKeys.accounts.current(input.sessionId), updated);
+      if (useAuthStore.getState().user?.id === input.userId)
+        useAuthStore.getState().setUser(updated);
+    },
+  });
+  function selectCurrency(next: DisplayCurrency) {
+    if (!DISPLAY_CURRENCIES.includes(next)) return;
+    if (!isAuthenticated) {
+      anonymousCurrency = next;
+      for (const listener of anonymousListeners) listener();
+      return;
+    }
+    if (activeSessionId && user?.id)
+      mutation.mutate({ currency: next, sessionId: activeSessionId, userId: user.id });
+  }
+  return { currency, selectCurrency, isSaving: mutation.isPending, error: mutation.error };
+}

package/src/ui/hooks/useDisplayPrice.ts

@@ -0,0 +1,40 @@
+import { useQuery } from '@tanstack/react-query';
+import { useEffect, useState } from 'react';
+import { convertDisplayAmount, readDisplayRates } from '@peable.to/sdk/display';
+import { useDisplayCurrency } from './useDisplayCurrency';
+import { useI18n } from './useI18n';
+
+/** Display conversion only. Pricing and checkout request bodies retain their source units. */
+export function useDisplayPrice() {
+  const { currency } = useDisplayCurrency();
+  const { t } = useI18n();
+  const [now, setNow] = useState(Date.now);
+  const rates = useQuery({
+    queryKey: ['display-currency', 'faircoin-indexed-price'],
+    queryFn: ({ signal }) => readDisplayRates({ signal }),
+    enabled: currency !== 'USD',
+    staleTime: 30_000,
+    gcTime: 0,
+    retry: false,
+    refetchInterval: 60_000,
+    refetchOnWindowFocus: 'always',
+  });
+  useEffect(() => {
+    const timer = setInterval(() => setNow(Date.now()), 1000);
+    return () => clearInterval(timer);
+  }, []);
+  function formatUsd(minorUnits: number) {
+    const display = convertDisplayAmount({
+      units: String(minorUnits),
+      currency: 'USD',
+      displayCurrency: currency,
+      rates: rates.isError ? null : rates.data,
+      now,
+    });
+    if (!display) return t('preferences.displayCurrency.unavailable', { currency });
+    return currency === 'USD'
+      ? display
+      : t('preferences.displayCurrency.approximate', { amount: display });
+  }
+  return { currency, formatUsd };
+}

package/src/ui/screens/AccountMembersScreen.tsx

@@ -30,13 +30,8 @@ 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 username/email, change roles,
+ * Manage the members of an account (invite by email, change roles,
  * remove, transfer ownership). Gated on the caller's `callerMembership`
  * permissions. Receives the target `accountId` via navigation props.
  */
@@ -86,6 +81,27 @@ 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))],
@@ -126,6 +142,7 @@ 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]);
 
@@ -137,24 +154,20 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
   const inviteMutation = useMutation({
     mutationKey: ['accounts', 'members', 'invite', id],
     mutationFn: (input: { usernameOrEmail: string; role: AssignableRole }) =>
-      oxyServices.accounts.members.invite(id, input),
+      oxyServices.accounts.invitations.create(id, {
+        email: input.usernameOrEmail,
+        role: input.role,
+      }),
     onSuccess: () => {
       setInviteIdentifier('');
       setInviteRole('editor');
       setInviteError(null);
       invalidateMembers();
-      toast.success(t('accounts.members.toasts.added') || 'Member added');
+      toast.success('Invitation sent');
     },
     onError: (error) => {
-      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'),
-      );
+      invalidateMembers();
+      toast.error(errorMessage(error, 'Could not send invitation'));
     },
   });
 
@@ -207,14 +220,12 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
   const handleInvite = useCallback(() => {
     const usernameOrEmail = inviteIdentifier.trim();
     if (!usernameOrEmail) {
-      setInviteError(
-        t('accounts.members.errors.identifierRequired') || 'Enter a username or email to invite',
-      );
+      setInviteError('Enter an email to invite');
       return;
     }
     setInviteError(null);
     inviteMutation.mutate({ usernameOrEmail, role: inviteRole });
-  }, [inviteIdentifier, inviteRole, inviteMutation, t]);
+  }, [inviteIdentifier, inviteRole, inviteMutation]);
 
   const handleChangeRole = useCallback(
     (member: AccountMember, role: AccountRole) => {
@@ -282,13 +293,11 @@ 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">
-            {t('accounts.members.invite.title') || 'Add a member'}
-          </Text>
+          <Text className="text-body font-semibold text-text">{'Invite a member'}</Text>
           <TextField isInvalid={!!inviteError}>
             <TextFieldInput
               floatingLabel
-              label={t('accounts.members.invite.identifierLabel') || 'Username or email'}
+              label={'Email'}
               value={inviteIdentifier}
               onChangeText={(value) => {
                 setInviteIdentifier(value);
@@ -332,14 +341,49 @@ const AccountMembersScreen: React.FC<BaseScreenProps> = ({ onClose, goBack, acco
             onPress={handleInvite}
             disabled={inviteMutation.isPending || !inviteIdentifier.trim()}
             loading={inviteMutation.isPending}
-            accessibilityLabel={t('accounts.members.invite.submit') || 'Add member'}
+            accessibilityLabel={'Send invitation'}
             className="w-full"
           >
-            {t('accounts.members.invite.submit') || 'Add member'}
+            {'Send invitation'}
           </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/PreferencesScreen.tsx

@@ -5,6 +5,7 @@ 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';
@@ -158,6 +159,7 @@ 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'}