@oxyhq/services 6.9.45 → 6.10.1

package/src/ui/components/payment/paymentStyles.ts

@@ -1,5 +1,4 @@
 import { StyleSheet, Platform } from 'react-native';
-import { fontFamilies } from '../../styles';
 import type { PaymentColors } from './types';
 
 export const createPaymentStyles = (colors: PaymentColors) => StyleSheet.create({
@@ -24,7 +23,6 @@ export const createPaymentStyles = (colors: PaymentColors) => StyleSheet.create(
         fontWeight: '600',
         color: colors.text,
         marginBottom: 12,
-        fontFamily: fontFamilies.interSemiBold,
     },
     errorContainer: {
         flex: 1,
@@ -54,7 +52,6 @@ export const createPaymentStyles = (colors: PaymentColors) => StyleSheet.create(
         marginBottom: 8,
     },
     summaryCardMainTitle: {
-        fontFamily: fontFamilies.interBold,
         fontWeight: 'bold',
         fontSize: 28,
         color: colors.text,
@@ -95,7 +92,6 @@ export const createPaymentStyles = (colors: PaymentColors) => StyleSheet.create(
         color: colors.text,
         textAlign: 'center',
         marginBottom: 8,
-        fontFamily: fontFamilies.interBold,
     },
     summaryCardAmountDescription: {
         fontSize: 14,
@@ -146,7 +142,6 @@ export const createPaymentStyles = (colors: PaymentColors) => StyleSheet.create(
         marginBottom: 8,
     },
     cardPaymentMainTitle: {
-        fontFamily: fontFamilies.interBold,
         fontWeight: 'bold',
         fontSize: 28,
         color: colors.text,
@@ -215,7 +210,6 @@ export const createPaymentStyles = (colors: PaymentColors) => StyleSheet.create(
         marginBottom: 8,
     },
     oxyPayMainTitle: {
-        fontFamily: fontFamilies.interBold,
         fontWeight: 'bold',
         fontSize: 28,
         color: colors.text,
@@ -262,7 +256,6 @@ export const createPaymentStyles = (colors: PaymentColors) => StyleSheet.create(
         marginBottom: 8,
     },
     faircoinMainTitle: {
-        fontFamily: fontFamilies.interBold,
         fontWeight: 'bold',
         fontSize: 28,
         color: '#1b1f0a',
@@ -373,7 +366,6 @@ export const createPaymentStyles = (colors: PaymentColors) => StyleSheet.create(
         marginBottom: 8,
     },
     successMainTitle: {
-        fontFamily: fontFamilies.interBold,
         fontWeight: 'bold',
         fontSize: 28,
         color: colors.success || '#4BB543',

package/src/ui/components/styles/overlay.tsx

@@ -28,26 +28,35 @@ export const isAnimatedValue = (
   it: number | string | Animated.AnimatedInterpolation<number | string>
 ): it is Animated.Value => it instanceof Animated.Value;
 
-export default function overlay<T extends Animated.Value | number>(
-  elevation: T,
+// Overloaded signatures so each call site gets the right return type
+// without the conditional-type narrowing that TS cannot infer inside the
+// implementation body.
+function overlay(
+  elevation: number,
+  surfaceColor?: string
+): string;
+function overlay(
+  elevation: Animated.Value,
+  surfaceColor?: string
+): Animated.AnimatedInterpolation<number | string>;
+function overlay(
+  elevation: Animated.Value | number,
   surfaceColor = '#121212'
-): T extends number ? string : Animated.AnimatedInterpolation<number | string> {
+): string | Animated.AnimatedInterpolation<number | string> {
   if (isAnimatedValue(elevation)) {
     const inputRange = [0, 1, 2, 3, 8, 24];
 
-    // @ts-expect-error: TS doesn't seem to refine the type correctly
     return elevation.interpolate({
       inputRange,
-      outputRange: inputRange.map((elevation) => {
-        return calculateColor(surfaceColor, elevation);
-      }),
+      outputRange: inputRange.map((e) => calculateColor(surfaceColor, e)),
     });
   }
 
-  // @ts-expect-error: TS doesn't seem to refine the type correctly
   return calculateColor(surfaceColor, elevation);
 }
 
+export default overlay;
+
 function calculateColor(surfaceColor: string, elevation = 1) {
   let overlayTransparency: number;
   if (elevation >= 1 && elevation <= 24) {

package/src/ui/components/theming.tsx

@@ -100,7 +100,6 @@ export const useInternalTheme = (
       bodyMedium: themeObj.fonts.body,
       bodySmall: themeObj.fonts.body,
       default: {
-        fontFamily: themeObj.fonts.body.fontFamily || undefined,
         fontWeight: themeObj.fonts.body.fontWeight || 'normal',
         letterSpacing: 0,
       },

package/src/ui/components/types.tsx

@@ -57,7 +57,8 @@ export type InternalTheme = {
       level4: string;
       level5: string;
     };
-    // Legacy properties for backward compatibility
+    // MD2 fallback color slots — TextField/Icon/TouchableRipple read these
+    // first and fall back to MD3 names when the host theme only provides MD3.
     text?: string;
     disabled?: string;
     placeholder?: string;
@@ -79,7 +80,7 @@ export type InternalTheme = {
     bodyMedium: TextStyle;
     bodySmall: TextStyle;
     default: TextStyle;
-    // Legacy property for backward compatibility
+    // MD2 fallback — `AnimatedText` reads this when the theme isn't MD3.
     regular?: TextStyle;
   };
 };

package/src/ui/context/OxyContext.tsx

@@ -14,7 +14,7 @@ import type { User, ApiError, SessionLoginResponse } from '@oxyhq/core';
 import type { ManagedAccount, CreateManagedAccountInput } from '@oxyhq/core';
 import { KeyManager } from '@oxyhq/core';
 import type { ClientSession } from '@oxyhq/core';
-import { toast } from '../../lib/sonner';
+import { toast } from '@oxyhq/bloom';
 import { useAuthStore, type AuthState } from '../stores/authStore';
 import { useShallow } from 'zustand/react/shallow';
 import { useSessionSocket } from '../hooks/useSessionSocket';
@@ -612,7 +612,6 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     activeSessionId,
     currentDeviceId,
     refreshSessions: refreshSessionsWithUser,
-    logout,
     clearSessionState,
     baseURL: oxyServices.getBaseURL(),
     getAccessToken: () => oxyServices.getAccessToken(),
@@ -800,7 +799,23 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
 export const OxyContextProvider = OxyProvider;
 
-const noop = () => Promise.resolve() as any;
+/**
+ * Loading-state stub used when `useOxy()` is called outside an OxyProvider.
+ * All async methods reject with a clear error so misuse is caught early
+ * instead of silently no-oping and leaving the UI in a bad state.
+ */
+const PROVIDER_MISSING_ERROR_MESSAGE =
+  'OxyProvider is not mounted. Wrap your app in <OxyProvider> before calling useOxy() methods.';
+
+const rejectMissingProvider = <T,>(): Promise<T> =>
+  Promise.reject(new Error(PROVIDER_MISSING_ERROR_MESSAGE));
+
+// A stub OxyServices instance so the public type contract is preserved.
+// Calling network methods on it before a provider mounts will fail with
+// a descriptive baseURL — preferable to a null-pointer crash at the call site.
+const LOADING_STATE_OXY_SERVICES = new OxyServices({
+  baseURL: 'about:blank',
+});
 
 const LOADING_STATE: OxyContextState = {
   user: null,
@@ -812,32 +827,32 @@ const LOADING_STATE: OxyContextState = {
   isStorageReady: false,
   error: null,
   currentLanguage: 'en',
-  currentLanguageMetadata: {} as any,
+  currentLanguageMetadata: null,
   currentLanguageName: 'English',
   currentNativeLanguageName: 'English',
   hasIdentity: () => Promise.resolve(false),
   getPublicKey: () => Promise.resolve(null),
-  signIn: noop,
-  handlePopupSession: noop,
-  logout: noop,
-  logoutAll: noop,
-  switchSession: noop,
-  removeSession: noop,
-  refreshSessions: noop,
-  setLanguage: noop,
+  signIn: () => rejectMissingProvider<User>(),
+  handlePopupSession: () => rejectMissingProvider<void>(),
+  logout: () => rejectMissingProvider<void>(),
+  logoutAll: () => rejectMissingProvider<void>(),
+  switchSession: () => rejectMissingProvider<void>(),
+  removeSession: () => rejectMissingProvider<void>(),
+  refreshSessions: () => rejectMissingProvider<void>(),
+  setLanguage: () => rejectMissingProvider<void>(),
   getDeviceSessions: () => Promise.resolve([]),
-  logoutAllDeviceSessions: noop,
-  updateDeviceName: noop,
-  clearSessionState: noop,
-  clearAllAccountData: noop,
+  logoutAllDeviceSessions: () => rejectMissingProvider<void>(),
+  updateDeviceName: () => rejectMissingProvider<void>(),
+  clearSessionState: () => rejectMissingProvider<void>(),
+  clearAllAccountData: () => rejectMissingProvider<void>(),
   storageKeyPrefix: 'oxy_session',
-  oxyServices: null as any,
+  oxyServices: LOADING_STATE_OXY_SERVICES,
   openAvatarPicker: () => {},
   actingAs: null,
   managedAccounts: [],
   setActingAs: () => {},
-  refreshManagedAccounts: noop,
-  createManagedAccount: noop,
+  refreshManagedAccounts: () => rejectMissingProvider<void>(),
+  createManagedAccount: () => rejectMissingProvider<ManagedAccount>(),
 };
 
 export const useOxy = (): OxyContextState => {

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

@@ -132,8 +132,7 @@ export const useAuthOperations = ({
         }
 
         // Generate a local session ID using cryptographically secure randomness
-        const cryptoModule = 'expo-crypto';
-        const Crypto = await import(/* webpackIgnore: true */ cryptoModule);
+        const Crypto = await import('expo-crypto');
         const localSessionId = `offline_${Crypto.getRandomUUID()}`;
         const localDeviceId = `device_${Crypto.getRandomUUID()}`;
         const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(); // 7 days

package/src/ui/hooks/index.ts

@@ -1,6 +1,13 @@
 export { useFollow, useFollowerCounts } from './useFollow';
-export { useFileDownloadUrl, setOxyFileUrlInstance } from './useFileDownloadUrl';
-export { useThemeStyles } from './useThemeStyles';
-export { useThemeColors } from './useThemeColors';
+export { useFileDownloadUrl } from './useFileDownloadUrl';
 export { useAsyncAction, executeWithToast } from './useAsyncAction';
-export { useSettingToggle, useSettingToggles } from './useSettingToggle';
+export { useSettingToggle, useSettingToggles } from './useSettingToggle';
+export { useMutationStatus, type MutationStatus } from './useMutationStatus';
+export { useOnlineStatus } from './useOnlineStatus';
+export { mutationKeys } from './mutations/mutationKeys';
+export {
+  attachQueryPersistence,
+  clearQueryCache,
+  createQueryClient,
+  type AttachPersistenceResult,
+} from './queryClient';

package/src/ui/hooks/mutations/mutationFactory.ts

@@ -12,7 +12,7 @@
 import type { QueryClient, UseMutationOptions } from '@tanstack/react-query';
 import type { User } from '@oxyhq/core';
 import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../queries/queryKeys';
-import { toast } from '../../../lib/sonner';
+import { toast } from '@oxyhq/bloom';
 import { useAuthStore } from '../../stores/authStore';
 
 /**
@@ -21,6 +21,11 @@ import { useAuthStore } from '../../stores/authStore';
 export interface ProfileMutationConfig<TData, TVariables> {
   /** The mutation function that makes the API call */
   mutationFn: (variables: TVariables) => Promise<TData>;
+  /**
+   * Stable mutation key for the offline queue. Required so TanStack Query
+   * can correlate paused mutations across refetches/resume cycles.
+   */
+  mutationKey: readonly unknown[];
   /** Query keys to cancel before mutation */
   cancelQueryKeys?: unknown[][];
   /** Function to apply optimistic update to the user data */
@@ -45,6 +50,7 @@ export interface ProfileMutationConfig<TData, TVariables> {
  * @example
  * ```ts
  * const updateProfile = createProfileMutation({
+ *   mutationKey: mutationKeys.account.updateProfile,
  *   mutationFn: (updates) => oxyServices.updateProfile(updates),
  *   optimisticUpdate: (user, updates) => updates,
  *   errorMessage: 'Failed to update profile',
@@ -58,6 +64,7 @@ export function createProfileMutation<TVariables>(
 ): UseMutationOptions<User, Error, TVariables, { previousUser?: User }> {
   const {
     mutationFn,
+    mutationKey,
     cancelQueryKeys = [],
     optimisticUpdate,
     errorMessage = 'Operation failed',
@@ -69,6 +76,7 @@ export function createProfileMutation<TVariables>(
   } = config;
 
   return {
+    mutationKey: [...mutationKey],
     mutationFn,
 
     onMutate: async (variables) => {
@@ -151,6 +159,11 @@ export function createProfileMutation<TVariables>(
 export interface GenericMutationConfig<TData, TVariables, TContext> {
   /** The mutation function */
   mutationFn: (variables: TVariables) => Promise<TData>;
+  /**
+   * Stable mutation key for the offline queue. Required so TanStack Query
+   * can correlate paused mutations across refetches/resume cycles.
+   */
+  mutationKey: readonly unknown[];
   /** Query key for optimistic data */
   queryKey: unknown[];
   /** Function to create optimistic data */
@@ -172,6 +185,7 @@ export function createGenericMutation<TData, TVariables>(
 ): UseMutationOptions<TData, Error, TVariables, { previous?: TData }> {
   const {
     mutationFn,
+    mutationKey,
     queryKey,
     optimisticData,
     errorMessage = 'Operation failed',
@@ -180,6 +194,7 @@ export function createGenericMutation<TData, TVariables>(
   } = config;
 
   return {
+    mutationKey: [...mutationKey],
     mutationFn,
 
     onMutate: async (variables) => {

package/src/ui/hooks/mutations/mutationKeys.ts

@@ -0,0 +1,28 @@
+/**
+ * Stable mutation key factories.
+ *
+ * Mutations that may be queued while offline MUST declare a stable
+ * `mutationKey`. When the network comes back, TanStack Query resumes
+ * paused mutations grouped by key — so the keys here should be stable
+ * across renders and across reloads when persistence is enabled.
+ */
+
+export const mutationKeys = {
+  // Account-related writes
+  account: {
+    updateProfile: ['mutation', 'account', 'updateProfile'] as const,
+    uploadAvatar: ['mutation', 'account', 'uploadAvatar'] as const,
+    updateSettings: ['mutation', 'account', 'updateSettings'] as const,
+    updatePrivacySettings: ['mutation', 'account', 'updatePrivacySettings'] as const,
+    uploadFile: ['mutation', 'account', 'uploadFile'] as const,
+  },
+
+  // Session / device writes
+  session: {
+    switch: ['mutation', 'session', 'switch'] as const,
+    logout: ['mutation', 'session', 'logout'] as const,
+    logoutAll: ['mutation', 'session', 'logoutAll'] as const,
+    updateDeviceName: ['mutation', 'session', 'updateDeviceName'] as const,
+    removeDevice: ['mutation', 'session', 'removeDevice'] as const,
+  },
+} as const;