@oxy.so/services 12.4.0 → 12.6.0

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

@@ -1 +1 @@
-{"version":3,"file":"useI18n.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useI18n.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;GAYG;AACH,wBAAgB,OAAO;aAWN,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;;EAI9D"}
+{"version":3,"file":"useI18n.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useI18n.ts"],"names":[],"mappings":"AAWA,2FAA2F;AAC3F,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;AAExF;;;;;;;;;;;;GAYG;AACH,wBAAgB,OAAO;;;EActB"}

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

@@ -1 +1 @@
-{"version":3,"file":"AccountSettingsScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/AccountSettingsScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAwB/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAa3D;;;;;;GAMG;AACH,QAAA,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAiRpD,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"AccountSettingsScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/AccountSettingsScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAoB/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAY3D;;;;;;GAMG;AACH,QAAA,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAmQpD,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA8B/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAsF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA6dlD,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AA0B/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAqF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAgdlD,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"EditProfileFieldScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/EditProfileFieldScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAI9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAuB3D;;GAEG;AACH,MAAM,MAAM,gBAAgB,GACxB,aAAa,GACb,UAAU,GACV,KAAK,GACL,OAAO,GACP,SAAS,GACT,UAAU,GACV,UAAU,GACV,WAAW,GACX,OAAO,CAAC;AA4BZ,UAAU,2BAA4B,SAAQ,eAAe;IAC3D,6BAA6B;IAC7B,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAC9B;;AAyoBD,wBAAkD"}
+{"version":3,"file":"EditProfileFieldScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/EditProfileFieldScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAI9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAuB3D;;GAEG;AACH,MAAM,MAAM,gBAAgB,GACxB,aAAa,GACb,UAAU,GACV,KAAK,GACL,OAAO,GACP,SAAS,GACT,UAAU,GACV,UAAU,GACV,WAAW,GACX,OAAO,CAAC;AA4BZ,UAAU,2BAA4B,SAAQ,eAAe;IAC3D,6BAA6B;IAC7B,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAC9B;;AA2oBD,wBAAkD"}

package/lib/typescript/module/ui/utils/deviceSessionTitle.d.ts

@@ -1,5 +1,5 @@
 import { type DeviceLinkedSession } from '@oxy.so/core';
-type Translate = (key: string, vars?: Record<string, string | number>) => string;
+import type { Translate } from '../hooks/useI18n.js';
 /**
  * The title of one row in "Sessions & devices".
  *
@@ -14,5 +14,4 @@ type Translate = (key: string, vars?: Record<string, string | number>) => string
  * response does carry. Never the string "undefined".
  */
 export declare function deviceSessionTitle(session: Pick<DeviceLinkedSession, 'deviceName' | 'isCurrent' | 'user'>, t: Translate): string;
-export {};
 //# sourceMappingURL=deviceSessionTitle.d.ts.map

package/lib/typescript/module/ui/utils/deviceSessionTitle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceSessionTitle.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/deviceSessionTitle.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEjF,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;AAEjF;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,YAAY,GAAG,WAAW,GAAG,MAAM,CAAC,EACvE,CAAC,EAAE,SAAS,GACX,MAAM,CAQR"}
+{"version":3,"file":"deviceSessionTitle.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/deviceSessionTitle.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAkB,CAAC;AAElD;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,YAAY,GAAG,WAAW,GAAG,MAAM,CAAC,EACvE,CAAC,EAAE,SAAS,GACX,MAAM,CAQR"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxy.so/services",
-  "version": "12.4.0",
+  "version": "12.6.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -151,7 +151,7 @@
     "prepublishOnly": "node ../../scripts/assert-bun-publish.mjs && bun run typescript && bun run test && bun run build"
   },
   "dependencies": {
-    "@oxy.so/contracts": "^5.1.0",
+    "@oxy.so/contracts": "^5.3.0",
     "color": "^5.0.3",
     "@peable.to/sdk": "0.4.1"
   },
@@ -160,7 +160,7 @@
     "@commitlint/config-conventional": "^21.2.0",
     "@expo/app-integrity": "~58.0.2",
     "@expo/vector-icons": "^15.0.3",
-    "@oxy.so/core": "6.1.0",
+    "@oxy.so/core": "6.4.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^12.0.1",
     "@react-native/babel-preset": "^0.88.0",
@@ -175,7 +175,7 @@
     "@types/jest": "^30.0.0",
     "@types/node": "^20.19.43",
     "@types/react": "*",
-    "@oxy.so/bloom": "^11.1.1",
+    "@oxy.so/bloom": "12.0.0",
     "copyfiles": "^2.4.1",
     "expo-clipboard": "~58.0.3",
     "expo-constants": "~58.0.12",
@@ -210,12 +210,12 @@
     "expo-video": "~58.0.11"
   },
   "//@oxy.so/bloom": "Bloom 11.1.0 adds the shared grouped sections, usage card, subscription plans, frame appearance and overlay navigation APIs used by this SDK. First-party Bloom peers remain open above this tested minimum.",
-  "//@oxy.so/core": "Core 6.1.0 supplies `oxy.auth.email.{startChange,change,remove}` and `oxy.auth.password.remove`, which the sign-in & security panels call, and their translations. Keep one Core instance per app; raise this floor with the root catalogue when new runtime APIs are required.",
+  "//@oxy.so/core": "Core 6.4.0 supplies the `follow.*` strings the follow buttons read for every verb and language; 6.1.0 the `oxy.auth.email.{startChange,change,remove}` and `oxy.auth.password.remove` the sign-in & security panels call. Keep one Core instance per app; raise this floor with the root catalogue when new runtime APIs are required.",
   "peerDependencies": {
     "@expo/app-integrity": ">=56.0.0 <59.0.0",
     "@expo/vector-icons": "^15.0.3",
     "@oxy.so/bloom": ">=11.1.0",
-    "@oxy.so/core": "^6.1.0",
+    "@oxy.so/core": "^6.4.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

@@ -344,11 +344,8 @@ export {
   FOLLOW_ACTION_LEAVES_ACTIVE,
 } from './ui/components/followRules';
 export type { FollowDuration, FollowMenuItem } from './ui/components/followRules';
-export type {
-  FollowTargetButtonProps,
-  FollowVerb,
-  FollowLabels,
-} from './ui/components/FollowTargetButton';
+export type { FollowTargetButtonProps } from './ui/components/FollowTargetButton';
+export type { FollowVerb, FollowLabels } from './ui/components/followLabels';
 export { useFollowTarget } from './ui/hooks/useFollowTarget';
 export type { UseFollowTargetResult } from './ui/hooks/useFollowTarget';
 export {

package/src/ui/client.ts

@@ -23,12 +23,14 @@ export type { OxyAuthPromptProps } from './components/OxyAuthPrompt';
 export { LogoIcon } from './components/logo/LogoIcon';
 export { LogoText } from './components/logo/LogoText';
 export { default as FollowButton } from './components/FollowButton';
-export { FollowTargetButton } from './components/FollowTargetButton';
 export type {
-  FollowTargetButtonProps,
-  FollowVerb,
-  FollowLabels,
-} from './components/FollowTargetButton';
+  FollowButtonProps,
+  SingleFollowButtonProps,
+  MultiFollowButtonProps,
+} from './components/FollowButton';
+export { FollowTargetButton } from './components/FollowTargetButton';
+export type { FollowTargetButtonProps } from './components/FollowTargetButton';
+export type { FollowVerb, FollowLabels } from './components/followLabels';
 export { default as ProfileButton } from './components/ProfileButton';
 export type { ProfileButtonProps } from './components/ProfileButton';
 export { default as PeableButton } from './components/PeableButton';

package/src/ui/components/FollowButton.tsx

@@ -8,10 +8,9 @@ import { useFollow, useFollowForButton } from '../hooks/useFollow';
 import { useFollowStore } from '../stores/followStore';
 import type { OxyServices, BulkFollowResult, BulkUnfollowResult } from '@oxy.so/core';
 import { useShallow } from 'zustand/react/shallow';
+import { useI18n } from '../hooks/useI18n';
 import { describeFollowAllButton, describeFollowButton } from './followButtonAccessibility';
-
-const DEFAULT_FOLLOW_ALL_LABEL = 'Follow all';
-const DEFAULT_FOLLOWED_ALL_LABEL = 'Following';
+import { type FollowLabels, type FollowVerb, useFollowLabels } from './followLabels';
 
 /** Props shared by both single- and multi-user follow modes. */
 interface FollowButtonBaseProps {
@@ -35,6 +34,16 @@ export interface SingleFollowButtonProps extends FollowButtonBaseProps {
    * still follows the state.
    */
   username?: string;
+  /**
+   * The word for following this account: a fediverse community reads
+   * "Join"/"Joined". Translated, like every default label here.
+   */
+  verb?: FollowVerb;
+  /**
+   * Overrides for a verb the vocabulary does not carry. This button shows
+   * `idle` and `active`; a user follow has no pending or switched-off state.
+   */
+  labels?: Partial<FollowLabels>;
   userIds?: never;
 }
 
@@ -42,7 +51,9 @@ export interface SingleFollowButtonProps extends FollowButtonBaseProps {
 export interface MultiFollowButtonProps extends FollowButtonBaseProps {
   userIds: string[];
   initiallyAllFollowing?: boolean;
+  /** Default: "Follow all", translated. */
   followAllLabel?: string;
+  /** Default: "Following", translated. */
   followedAllLabel?: string;
   onBulkFollow?: (result: BulkFollowResult) => void;
   onBulkUnfollow?: (result: BulkUnfollowResult) => void;
@@ -63,6 +74,8 @@ const FollowButtonInner = memo(function FollowButtonInner({
   oxyServices,
   initiallyFollowing,
   username,
+  verb = 'follow',
+  labels,
   size = 'md',
   onFollowChange,
   style,
@@ -71,6 +84,8 @@ const FollowButtonInner = memo(function FollowButtonInner({
   showLoadingState = true,
   preventParentActions = true,
 }: SingleFollowButtonProps & { oxyServices: OxyServices }) {
+  const { t } = useI18n();
+  const text = useFollowLabels(verb, labels);
   const { isFollowing, isKnown, isLoading, toggleFollow, resolveStatus } = useFollowForButton(
     userId,
     oxyServices,
@@ -91,10 +106,19 @@ const FollowButtonInner = memo(function FollowButtonInner({
         if (accepted) onFollowChange?.(!isFollowing);
       } catch (err: unknown) {
         const error = err instanceof Error ? err : new Error(String(err));
-        toast.error(error.message || 'Failed to update follow status');
+        toast.error(error.message || t('follow.errors.update'));
       }
     },
-    [disabled, isLoading, isKnown, toggleFollow, onFollowChange, isFollowing, preventParentActions],
+    [
+      disabled,
+      isLoading,
+      isKnown,
+      toggleFollow,
+      onFollowChange,
+      isFollowing,
+      preventParentActions,
+      t,
+    ],
   );
 
   // Enqueue a batched status fetch ONLY when the status is genuinely unknown
@@ -110,12 +134,10 @@ const FollowButtonInner = memo(function FollowButtonInner({
   const isBusy = isLoading || !isKnown;
   const showFollowing = isKnown && isFollowing;
   const showSpinner = showLoadingState && isBusy;
-  const { accessibilityLabel, accessibilityHint } = describeFollowButton({
-    isKnown,
-    isFollowing: showFollowing,
-    isPending: isLoading,
-    username,
-  });
+  const { accessibilityLabel, accessibilityHint } = describeFollowButton(
+    { isKnown, isFollowing: showFollowing, isPending: isLoading, username, verb, labels: text },
+    t,
+  );
 
   return (
     <BloomFollowButton
@@ -128,7 +150,8 @@ const FollowButtonInner = memo(function FollowButtonInner({
       disabled={disabled || isBusy}
       style={style}
       textStyle={textStyle}
-      label={isKnown || showSpinner ? 'Follow' : ''}
+      label={isKnown || showSpinner ? text.idle : ''}
+      followingLabel={text.active}
       accessibilityLabel={accessibilityLabel}
       accessibilityHint={accessibilityHint}
     />
@@ -139,8 +162,8 @@ const FollowButtonMultiInner = memo(function FollowButtonMultiInner({
   userIds,
   initiallyAllFollowing = false,
   size = 'md',
-  followAllLabel = DEFAULT_FOLLOW_ALL_LABEL,
-  followedAllLabel = DEFAULT_FOLLOWED_ALL_LABEL,
+  followAllLabel: followAllLabelProp,
+  followedAllLabel: followedAllLabelProp,
   onFollowChange,
   onBulkFollow,
   onBulkUnfollow,
@@ -150,6 +173,9 @@ const FollowButtonMultiInner = memo(function FollowButtonMultiInner({
   showLoadingState = true,
   preventParentActions = true,
 }: MultiFollowButtonProps) {
+  const { t } = useI18n();
+  const followAllLabel = followAllLabelProp ?? t('follow.all.idle');
+  const followedAllLabel = followedAllLabelProp ?? t('follow.verbs.follow.active');
   const follow = useFollow(userIds);
   const followAllUsers = 'followAllUsers' in follow ? follow.followAllUsers : undefined;
   const unfollowAllUsers = 'unfollowAllUsers' in follow ? follow.unfollowAllUsers : undefined;
@@ -209,7 +235,7 @@ const FollowButtonMultiInner = memo(function FollowButtonMultiInner({
           onBulkUnfollow?.(result);
         } catch (err: unknown) {
           const error = err instanceof Error ? err : new Error(String(err));
-          toast.error(error.message || 'Failed to update follow status');
+          toast.error(error.message || t('follow.errors.update'));
         } finally {
           setIsSubmitting(false);
         }
@@ -236,7 +262,7 @@ const FollowButtonMultiInner = memo(function FollowButtonMultiInner({
         onBulkFollow?.(result);
       } catch (err: unknown) {
         const error = err instanceof Error ? err : new Error(String(err));
-        toast.error(error.message || 'Failed to update follow status');
+        toast.error(error.message || t('follow.errors.update'));
       } finally {
         setIsSubmitting(false);
       }
@@ -251,17 +277,21 @@ const FollowButtonMultiInner = memo(function FollowButtonMultiInner({
       onBulkFollow,
       onBulkUnfollow,
       preventParentActions,
+      t,
     ],
   );
 
   const showSpinner = showLoadingState && isLoading;
-  const { accessibilityLabel, accessibilityHint } = describeFollowAllButton({
-    allFollowing,
-    isPending: Boolean(isLoading),
-    count: userIds.length,
-    followAllLabel,
-    followedAllLabel,
-  });
+  const { accessibilityLabel, accessibilityHint } = describeFollowAllButton(
+    {
+      allFollowing,
+      isPending: Boolean(isLoading),
+      count: userIds.length,
+      followAllLabel,
+      followedAllLabel,
+    },
+    t,
+  );
 
   return (
     <BloomFollowButton

package/src/ui/components/FollowTargetButton.tsx

@@ -22,6 +22,8 @@
  * small vocabulary of defaults and a full override, rather than a lookup keyed
  * on kind — a kind→verb table in this package would need a release every time
  * an application invents a kind, which is exactly the coupling #809 removes.
+ * The vocabulary and its translated words live in `followLabels`, shared with
+ * `FollowButton`.
  *
  * ## Relationship to the legacy `FollowButton`
  *
@@ -58,55 +60,28 @@ import {
   type FollowDuration,
   type FollowMenuItem,
 } from './followRules';
-
-/**
- * The small vocabulary of verbs the ecosystem actually uses. An application
- * whose verb is not here passes `labels` instead — the escape hatch exists so
- * this union never has to grow to accommodate one product's wording.
- */
-export type FollowVerb = 'follow' | 'subscribe' | 'join' | 'watch';
-
-export interface FollowLabels {
-  /** Not following yet. */
-  idle: string;
-  /** Following, and this application acts on it. */
-  active: string;
-  /** Asked, waiting for the other side to accept. */
-  pending: string;
-  /** Following globally, but switched off in this application. */
-  disabled: string;
-}
-
-const VERB_LABELS: Record<FollowVerb, FollowLabels> = {
-  follow: { idle: 'Follow', active: 'Following', pending: 'Requested', disabled: 'Off here' },
-  subscribe: {
-    idle: 'Subscribe',
-    active: 'Subscribed',
-    pending: 'Requested',
-    disabled: 'Off here',
-  },
-  join: { idle: 'Join', active: 'Joined', pending: 'Requested', disabled: 'Off here' },
-  watch: { idle: 'Watch', active: 'Watching', pending: 'Requested', disabled: 'Off here' },
-};
+import { type FollowLabels, type FollowVerb, useFollowLabels } from './followLabels';
+import { useI18n } from '../hooks/useI18n';
 
 const HOUR = 60 * 60;
 
 /**
  * Defaults chosen for the cases a timed follow is actually for: a live event
  * tonight, a story running this week. Not a general-purpose duration picker —
- * an application that needs one passes its own.
+ * an application that needs one passes its own. Labels are catalog keys, read
+ * at render in the app's language.
  */
-const DEFAULT_DURATIONS: FollowDuration[] = [
-  { label: '24 hours', seconds: 24 * HOUR },
-  { label: '72 hours', seconds: 72 * HOUR },
-  { label: 'A week', seconds: 7 * 24 * HOUR },
-];
+const DEFAULT_DURATIONS = [
+  { key: 'follow.durations.day', seconds: 24 * HOUR },
+  { key: 'follow.durations.threeDays', seconds: 72 * HOUR },
+  { key: 'follow.durations.week', seconds: 7 * 24 * HOUR },
+] as const;
 
 export interface FollowTargetButtonProps {
   /** The registered target's id. Registration is separate — see the SDK. */
   targetId: string;
   verb?: FollowVerb;
-  /** Full override, for a verb the vocabulary above does not carry. */
+  /** Full override, for a verb the vocabulary does not carry. */
   labels?: Partial<FollowLabels>;
   size?: 'sm' | 'md' | 'lg';
   style?: StyleProp<ViewStyle>;
@@ -118,7 +93,8 @@ export interface FollowTargetButtonProps {
   showOptions?: boolean;
   /**
    * Offer timed follows. Pass `false` where a temporary follow makes no sense —
-   * a store you buy from, an account you know.
+   * a store you buy from, an account you know. Default: 24 hours, 72 hours and
+   * a week, translated.
    */
   durations?: FollowDuration[] | false;
   /**
@@ -156,7 +132,7 @@ export const FollowTargetButton = memo(function FollowTargetButton({
   style,
   disabled = false,
   showOptions = true,
-  durations = DEFAULT_DURATIONS,
+  durations,
   applicationName,
   initialStatus,
   onChange,
@@ -164,13 +140,18 @@ export const FollowTargetButton = memo(function FollowTargetButton({
   const { status, isFollowing, isUnknown, isPending, follow, unfollow, disableHere, enableHere } =
     useFollowTarget(targetId, { initialStatus });
 
+  const { t } = useI18n();
+  const text = useFollowLabels(verb, labels);
+
+  const timedChoices = useMemo<FollowDuration[] | false>(
+    () => durations ?? DEFAULT_DURATIONS.map(({ key, seconds }) => ({ label: t(key), seconds })),
+    [durations, t],
+  );
+
   const reportMutationFailure = useCallback(() => {
-    const message =
-      useFollowTargetStore.getState().errors[targetId] ?? 'Could not update follow status';
+    const message = useFollowTargetStore.getState().errors[targetId] ?? t('follow.errors.update');
     toast.error(message);
-  }, [targetId]);
-
-  const text = useMemo(() => ({ ...VERB_LABELS[verb], ...labels }), [verb, labels]);
+  }, [targetId, t]);
 
   const label = useMemo(() => {
     if (status.globalState === 'requested') return text.pending;
@@ -224,9 +205,9 @@ export const FollowTargetButton = memo(function FollowTargetButton({
       // The confirmation is the point: a follow that ends on its own is a
       // promise, and a user who does not see it made will not believe it.
       // Which is also why it must not appear when the promise was not made.
-      toast.success(`Following for ${durationLabel.toLowerCase()}`);
+      toast.success(t('follow.menu.forDuration', { label: text.active, duration: durationLabel }));
     },
-    [follow, onChange, reportMutationFailure],
+    [follow, onChange, reportMutationFailure, t, text.active],
   );
 
   const menuItems = useMemo(
@@ -236,18 +217,22 @@ export const FollowTargetButton = memo(function FollowTargetButton({
         applicationMode: status.applicationMode,
         hasRelationship: Boolean(status.relationshipId),
         isPending,
-        durations,
+        durations: timedChoices,
         idleVerb: text.idle,
-        applicationName: applicationName ?? 'this app',
+        applicationName: applicationName ?? t('follow.menu.thisApp'),
+        verb,
+        t,
       }),
     [
       isFollowing,
       status.applicationMode,
       status.relationshipId,
       isPending,
-      durations,
+      timedChoices,
       text.idle,
       applicationName,
+      verb,
+      t,
     ],
   );
 
@@ -304,6 +289,8 @@ export const FollowTargetButton = memo(function FollowTargetButton({
     return <View style={style}>{primary}</View>;
   }
 
+  const optionsLabel = t('follow.menu.options', { label });
+
   return (
     <View style={[{ flexDirection: 'row', alignItems: 'center', gap: 4 }, style]}>
       {primary}
@@ -321,11 +308,11 @@ export const FollowTargetButton = memo(function FollowTargetButton({
             size={size === 'lg' ? 'lg' : 'sm'}
             icon={<ChevronDown width={16} />}
             disabled={disabled || isUnknown}
-            accessibilityLabel={`${label} options`}
-            accessibilityHint="Opens follow options"
+            accessibilityLabel={optionsLabel}
+            accessibilityHint={t('follow.menu.optionsHint')}
           />
         </DropdownMenuTrigger>
-        <DropdownMenuContent label={`${label} options`}>
+        <DropdownMenuContent label={optionsLabel}>
           {menuItems.map((item) => (
             <DropdownMenuItem key={item.key} onPress={() => runItem(item)}>
               {item.label}

package/src/ui/components/OxyConsentScreen.tsx

@@ -27,7 +27,7 @@ import { Avatar } from '@oxy.so/bloom/avatar';
 import { Button, LinkButton } from '@oxy.so/bloom/button';
 import { Text } from '@oxy.so/bloom/typography';
 import { useTheme } from '@oxy.so/bloom/theme';
-import { useI18n } from '../hooks/useI18n';
+import { type Translate, useI18n } from '../hooks/useI18n';
 import { LogoIcon } from './logo/LogoIcon';
 
 /** The requesting application, resolved by the caller (never user-supplied raw). */
@@ -133,8 +133,6 @@ const SCOPE_LABEL_KEYS: Readonly<Record<string, string>> = {
   'federation:write': 'consent.scopes.federationWrite',
 };
 
-type Translate = ReturnType<typeof useI18n>['t'];
-
 /** One permission row of the "Permissions requested" list. */
 interface PermissionRow {
   /** Stable list key / testID suffix — the first scope that produced this row. */

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

@@ -9,6 +9,7 @@
  */
 import React from 'react';
 import { render } from '@testing-library/react';
+import { translate } from '@oxy.so/core';
 import {
   describeFollowAllButton,
   describeFollowButton,
@@ -52,6 +53,7 @@ jest.mock('../../hooks/useFollow', () => ({
 
 jest.mock('../../context/oxyRuntimeContext', () => ({
   useOxy: () => ({ oxyServices: {}, canUsePrivateApi: true, user: { id: 'viewer' } }),
+  useOptionalOxy: () => null,
 }));
 
 let mockTarget = {
@@ -73,8 +75,16 @@ jest.mock('../../hooks/useFollowTarget', () => ({
 import { FollowButton } from '../FollowButton';
 import { FollowTargetButton } from '../FollowTargetButton';
 
+const t = (key: string, vars?: Record<string, string | number>) => translate('en-US', key, vars);
+
 describe('describeFollowButton', () => {
-  const known = { isKnown: true, isPending: false, username: 'nate' };
+  const known = {
+    isKnown: true,
+    isPending: false,
+    username: 'nate',
+    verb: 'follow' as const,
+    labels: { idle: 'Follow', active: 'Following' },
+  };
 
   it.each([
     [{ ...known, isFollowing: true }, 'Following @nate', 'Unfollows @nate'],
@@ -94,7 +104,7 @@ describe('describeFollowButton', () => {
       undefined,
     ],
   ])('%o reads "%s"', (input, label, hint) => {
-    expect(describeFollowButton(input)).toEqual(
+    expect(describeFollowButton(input, t)).toEqual(
       hint ? { accessibilityLabel: label, accessibilityHint: hint } : { accessibilityLabel: label },
     );
   });
@@ -112,22 +122,22 @@ describe('describeFollowAllButton', () => {
 
   it('names the state and counts the accounts in the hint', () => {
     expect(
-      describeFollowAllButton({ ...labels, allFollowing: false, isPending: false, count: 3 }),
+      describeFollowAllButton({ ...labels, allFollowing: false, isPending: false, count: 3 }, t),
     ).toEqual({
       accessibilityLabel: 'Follow all',
       accessibilityHint: 'Follows all 3 accounts',
     });
     expect(
-      describeFollowAllButton({ ...labels, allFollowing: true, isPending: false, count: 1 }),
+      describeFollowAllButton({ ...labels, allFollowing: true, isPending: false, count: 1 }, t),
     ).toEqual({
       accessibilityLabel: 'Following',
-      accessibilityHint: 'Unfollows all 1 account',
+      accessibilityHint: 'Unfollows 1 account',
     });
   });
 
   it('drops the hint while the bulk write is in flight', () => {
     expect(
-      describeFollowAllButton({ ...labels, allFollowing: true, isPending: true, count: 3 }),
+      describeFollowAllButton({ ...labels, allFollowing: true, isPending: true, count: 3 }, t),
     ).toEqual({
       accessibilityLabel: 'Following',
     });
@@ -178,6 +188,22 @@ describe('FollowButton hands Bloom a name that follows the state', () => {
     });
   });
 
+  it('reads its verb: "Join" and "Joined", named and hinted to match', () => {
+    mockFollowState = { isFollowing: false, isKnown: true, isLoading: false };
+    render(<FollowButton userId="c-id" username="fediverse" verb="join" />);
+    expect(lastBloomProps()).toMatchObject({
+      label: 'Join',
+      followingLabel: 'Joined',
+      accessibilityLabel: 'Join @fediverse',
+    });
+    mockFollowState = { isFollowing: true, isKnown: true, isLoading: false };
+    render(<FollowButton userId="c-id" username="fediverse" verb="join" />);
+    expect(lastBloomProps()).toMatchObject({
+      accessibilityLabel: 'Joined @fediverse',
+      accessibilityHint: 'Leaves @fediverse',
+    });
+  });
+
   it('names the "Follow all" button by its state too', () => {
     mockMulti = { allFollowing: true, isAnyLoading: false };
     render(<FollowButton userIds={['a', 'b']} />);

package/src/ui/components/__tests__/followTargetButton.test.ts

@@ -28,7 +28,7 @@ import {
 
 const DURATIONS = [
   { label: '24 hours', seconds: 86400 },
-  { label: 'A week', seconds: 604800 },
+  { label: 'a week', seconds: 604800 },
 ];
 
 const base = {
@@ -97,6 +97,12 @@ describe('buildFollowMenuItems', () => {
       expect(buildFollowMenuItems(following)[0].label).toBe('Don’t show in Mention');
     });
 
+    it('words "everywhere" with the button’s verb', () => {
+      expect(buildFollowMenuItems({ ...following, verb: 'join' })[1].label).toBe(
+        'Leave everywhere',
+      );
+    });
+
     it('offers turning it back on once it is off here', () => {
       const items = buildFollowMenuItems({ ...following, applicationMode: 'disabled' });
       expect(keys(items)).toEqual(['enable-here', 'unfollow-everywhere']);

package/src/ui/components/authChooser/__tests__/profileColors.test.ts

@@ -0,0 +1,13 @@
+import { resolveAccentHex } from '../types';
+import { APP_COLOR_PRESETS } from '@oxy.so/bloom/color-presets';
+
+jest.mock('@oxy.so/bloom/theme', () => jest.requireActual('@oxy.so/bloom/color-presets'));
+
+it('preserves the account identity for every app using the shared chooser', () => {
+  expect(resolveAccentHex('grove', '#fff')).toBe(APP_COLOR_PRESETS.grove.hex);
+  expect(resolveAccentHex('amber', '#fff')).toBe(APP_COLOR_PRESETS.yellow.hex);
+  expect(resolveAccentHex('#ABC', '#fff')).toBe('#aabbcc');
+  expect(resolveAccentHex('#123456', '#fff')).toBe('#123456');
+  expect(resolveAccentHex(null, '#fff')).toBe('#fff');
+  expect(resolveAccentHex('unknown', '#fff')).toBe('#fff');
+});