@oxy.so/services 11.2.0-oxy-one.2 → 11.2.0-oxy-one.4

package/src/ui/hooks/queries/queryKeys.ts

@@ -74,7 +74,8 @@ export const queryKeys = {
   // Privacy settings queries
   privacy: {
     all: ['privacy'] as const,
-    settings: (userId?: string) => [...queryKeys.privacy.all, 'settings', userId || 'current'] as const,
+    settings: (userId?: string) =>
+      [...queryKeys.privacy.all, 'settings', userId || 'current'] as const,
     /** The active account's blocked + restricted lists. */
     lists: (userId?: string) => [...queryKeys.privacy.all, 'lists', userId || 'current'] as const,
   },
@@ -84,8 +85,7 @@ export const queryKeys = {
     all: ['security'] as const,
     activity: (limit?: number, offset?: number, eventType?: string) =>
       [...queryKeys.security.all, 'activity', limit, offset, eventType] as const,
-    recent: (limit: number) =>
-      [...queryKeys.security.all, 'recent', limit] as const,
+    recent: (limit: number) => [...queryKeys.security.all, 'recent', limit] as const,
     infinite: (limit: number, eventType?: string) =>
       [...queryKeys.security.all, 'infinite', limit, eventType] as const,
   },
@@ -130,7 +130,8 @@ export const queryKeys = {
   // Oxy Trust reputation (the active account's standing)
   reputation: {
     all: ['reputation'] as const,
-    balance: (userId?: string) => [...queryKeys.reputation.all, 'balance', userId || 'current'] as const,
+    balance: (userId?: string) =>
+      [...queryKeys.reputation.all, 'balance', userId || 'current'] as const,
     transactions: (userId: string | undefined, limit: number, offset = 0) =>
       [...queryKeys.reputation.all, 'transactions', userId || 'current', limit, offset] as const,
     rules: () => [...queryKeys.reputation.all, 'rules'] as const,
@@ -242,4 +243,3 @@ export const invalidateConnectedAppsQueries = (queryClient: QueryClient): void =
 export const invalidateFileQueries = (queryClient: QueryClient): void => {
   queryClient.invalidateQueries({ queryKey: queryKeys.files.all });
 };
-

package/src/ui/hooks/queries/useAccountQueries.ts

@@ -21,7 +21,7 @@ export const useUserProfile = (sessionId: string | null, options?: { enabled?: b
       }
       return await oxyServices.users.bySession(sessionId);
     },
-    enabled: (options?.enabled !== false) && !!sessionId,
+    enabled: options?.enabled !== false && !!sessionId,
     staleTime: 5 * 60 * 1000, // 5 minutes
     gcTime: 30 * 60 * 1000, // 30 minutes
   });
@@ -40,7 +40,7 @@ export const useUserProfiles = (sessionIds: string[], options?: { enabled?: bool
         const results = await oxyServices.users.bySessions([sessionId]);
         return results[0]?.user || null;
       },
-      enabled: (options?.enabled !== false) && !!sessionId,
+      enabled: options?.enabled !== false && !!sessionId,
       staleTime: 5 * 60 * 1000,
       gcTime: 30 * 60 * 1000,
     })),
@@ -78,7 +78,7 @@ export const useCurrentUser = (options?: { enabled?: boolean }) => {
     queryFn: async () => {
       return await oxyServices.users.me();
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,
+    enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
     staleTime: 1 * 60 * 1000, // 1 minute for current user
     gcTime: 30 * 60 * 1000,
   });
@@ -177,7 +177,7 @@ export const useUserById = (userId: string | null, options?: { enabled?: boolean
       }
       return await oxyServices.users.get(userId);
     },
-    enabled: (options?.enabled !== false) && !!userId,
+    enabled: options?.enabled !== false && !!userId,
     staleTime: 5 * 60 * 1000,
     gcTime: 30 * 60 * 1000,
   });
@@ -211,7 +211,7 @@ export const useUserByUsername = (username: string | null, options?: { enabled?:
       const normalizedUsername = username.trim().toLowerCase();
       return await oxyServices.users.byUsername(normalizedUsername);
     },
-    enabled: (options?.enabled !== false) && !!username,
+    enabled: options?.enabled !== false && !!username,
     staleTime: 5 * 60 * 1000,
     gcTime: 30 * 60 * 1000,
     // Enforce the `upsertCachedUser` stale-seed contract from THIS hook rather
@@ -247,7 +247,7 @@ export const useUsersBySessions = (sessionIds: string[], options?: { enabled?: b
       }
       return await oxyServices.users.bySessions(sessionIds);
     },
-    enabled: (options?.enabled !== false) && sessionIds.length > 0,
+    enabled: options?.enabled !== false && sessionIds.length > 0,
     staleTime: 5 * 60 * 1000,
     gcTime: 30 * 60 * 1000,
   });
@@ -264,13 +264,11 @@ export const useConnectedApps = (options?: { enabled?: boolean }) => {
   return useQuery<ConnectedApp[]>({
     queryKey: queryKeys.connectedApps.list(),
     queryFn: async () => {
-      return authenticatedApiCall<ConnectedApp[]>(
-        oxyServices,
-        activeSessionId,
-        () => oxyServices.apps.connected.list()
+      return authenticatedApiCall<ConnectedApp[]>(oxyServices, activeSessionId, () =>
+        oxyServices.apps.connected.list(),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated,
+    enabled: options?.enabled !== false && isAuthenticated,
     staleTime: 30 * 1000, // 30 seconds — short, drives a management UI
     gcTime: 5 * 60 * 1000,
   });
@@ -293,15 +291,12 @@ export const usePrivacySettings = (userId?: string, options?: { enabled?: boolea
         throw new Error('User ID is required');
       }
 
-      return authenticatedApiCall(
-        oxyServices,
-        activeSessionId,
-        () => oxyServices.privacy.settings(targetUserId)
+      return authenticatedApiCall(oxyServices, activeSessionId, () =>
+        oxyServices.privacy.settings(targetUserId),
       );
     },
-    enabled: (options?.enabled !== false) && !!targetUserId,
+    enabled: options?.enabled !== false && !!targetUserId,
     staleTime: 2 * 60 * 1000, // 2 minutes
     gcTime: 10 * 60 * 1000, // 10 minutes
   });
 };
-

package/src/ui/hooks/queries/useFileQueries.ts

@@ -9,11 +9,7 @@
  * infinite scroll, pull-to-refresh, and optimistic upload reconciliation.
  */
 
-import {
-    useInfiniteQuery,
-    type InfiniteData,
-    type QueryClient,
-} from '@tanstack/react-query';
+import { useInfiniteQuery, type InfiniteData, type QueryClient } from '@tanstack/react-query';
 import type { FileMetadata } from '@oxy.so/core';
 import { useOxy } from '../../context/OxyContext';
 import { queryKeys } from './queryKeys';
@@ -23,38 +19,38 @@ export const FILES_PAGE_SIZE = 40;
 
 /** Raw file record as returned by `oxyServices.assets.list` / `assetUpload`. */
 export interface RawUserFile {
-    id: string;
-    originalName?: string;
-    sha256?: string;
-    mime?: string;
-    size?: number;
-    createdAt?: string;
-    metadata?: Record<string, unknown>;
-    variants?: unknown[];
+  id: string;
+  originalName?: string;
+  sha256?: string;
+  mime?: string;
+  size?: number;
+  createdAt?: string;
+  metadata?: Record<string, unknown>;
+  variants?: unknown[];
 }
 
 /** One page of the infinite file list. */
 export interface UserFilesPage {
-    files: FileMetadata[];
-    total: number;
-    hasMore: boolean;
-    nextOffset: number;
+  files: FileMetadata[];
+  total: number;
+  hasMore: boolean;
+  nextOffset: number;
 }
 
 export type UserFilesInfinite = InfiniteData<UserFilesPage>;
 
 /** Normalize a raw API file record into the client `FileMetadata` shape. */
 export function mapRawFileToMetadata(raw: RawUserFile): FileMetadata {
-    return {
-        id: raw.id,
-        filename: raw.originalName ?? raw.sha256 ?? '',
-        contentType: raw.mime ?? '',
-        length: raw.size ?? 0,
-        chunkSize: 0,
-        uploadDate: raw.createdAt ?? '',
-        metadata: raw.metadata ?? {},
-        variants: (raw.variants ?? []) as FileMetadata['variants'],
-    };
+  return {
+    id: raw.id,
+    filename: raw.originalName ?? raw.sha256 ?? '',
+    contentType: raw.mime ?? '',
+    length: raw.size ?? 0,
+    chunkSize: 0,
+    uploadDate: raw.createdAt ?? '',
+    metadata: raw.metadata ?? {},
+    variants: (raw.variants ?? []) as FileMetadata['variants'],
+  };
 }
 
 /**
@@ -63,27 +59,27 @@ export function mapRawFileToMetadata(raw: RawUserFile): FileMetadata {
  * rendered list is `data.pages.flatMap(p => p.files)`.
  */
 export const useUserFilesInfinite = (ownerId?: string) => {
-    const { oxyServices } = useOxy();
-    return useInfiniteQuery<UserFilesPage, Error>({
-        queryKey: queryKeys.files.list(ownerId),
-        queryFn: async ({ pageParam }) => {
-            const offset = typeof pageParam === 'number' ? pageParam : 0;
-            const response = await oxyServices.assets.list({ limit: FILES_PAGE_SIZE, offset });
-            const raw = (response.files ?? []) as RawUserFile[];
-            const files = raw.map(mapRawFileToMetadata);
-            return {
-                files,
-                total: response.total ?? offset + files.length,
-                hasMore: Boolean(response.hasMore),
-                nextOffset: offset + FILES_PAGE_SIZE,
-            };
-        },
-        initialPageParam: 0,
-        getNextPageParam: (lastPage) => (lastPage.hasMore ? lastPage.nextOffset : undefined),
-        enabled: Boolean(ownerId),
-        staleTime: 0,
-        refetchOnWindowFocus: false,
-    });
+  const { oxyServices } = useOxy();
+  return useInfiniteQuery<UserFilesPage, Error>({
+    queryKey: queryKeys.files.list(ownerId),
+    queryFn: async ({ pageParam }) => {
+      const offset = typeof pageParam === 'number' ? pageParam : 0;
+      const response = await oxyServices.assets.list({ limit: FILES_PAGE_SIZE, offset });
+      const raw = (response.files ?? []) as RawUserFile[];
+      const files = raw.map(mapRawFileToMetadata);
+      return {
+        files,
+        total: response.total ?? offset + files.length,
+        hasMore: Boolean(response.hasMore),
+        nextOffset: offset + FILES_PAGE_SIZE,
+      };
+    },
+    initialPageParam: 0,
+    getNextPageParam: (lastPage) => (lastPage.hasMore ? lastPage.nextOffset : undefined),
+    enabled: Boolean(ownerId),
+    staleTime: 0,
+    refetchOnWindowFocus: false,
+  });
 };
 
 // --- Pure cache transforms (optimistic updates) -----------------------------
@@ -94,69 +90,69 @@ export const useUserFilesInfinite = (ownerId?: string) => {
 const fileListKey = (ownerId?: string) => queryKeys.files.list(ownerId);
 
 const mapPages = (
-    data: UserFilesInfinite,
-    fn: (files: FileMetadata[]) => FileMetadata[],
+  data: UserFilesInfinite,
+  fn: (files: FileMetadata[]) => FileMetadata[],
 ): UserFilesInfinite => ({
-    ...data,
-    pages: data.pages.map((page) => ({ ...page, files: fn(page.files) })),
+  ...data,
+  pages: data.pages.map((page) => ({ ...page, files: fn(page.files) })),
 });
 
 /** Prepend an (optimistic) file to the first page. */
 export function prependFileToCache(
-    queryClient: QueryClient,
-    ownerId: string | undefined,
-    file: FileMetadata,
+  queryClient: QueryClient,
+  ownerId: string | undefined,
+  file: FileMetadata,
 ): void {
-    queryClient.setQueryData<UserFilesInfinite>(fileListKey(ownerId), (data) => {
-        if (!data || data.pages.length === 0) return data;
-        return {
-            ...data,
-            pages: data.pages.map((page, index) =>
-                index === 0 ? { ...page, files: [file, ...page.files] } : page,
-            ),
-        };
-    });
+  queryClient.setQueryData<UserFilesInfinite>(fileListKey(ownerId), (data) => {
+    if (!data || data.pages.length === 0) return data;
+    return {
+      ...data,
+      pages: data.pages.map((page, index) =>
+        index === 0 ? { ...page, files: [file, ...page.files] } : page,
+      ),
+    };
+  });
 }
 
 /** Remove a file (by id) from every page. */
 export function removeFileFromCache(
-    queryClient: QueryClient,
-    ownerId: string | undefined,
-    fileId: string,
+  queryClient: QueryClient,
+  ownerId: string | undefined,
+  fileId: string,
 ): void {
-    queryClient.setQueryData<UserFilesInfinite>(fileListKey(ownerId), (data) =>
-        data ? mapPages(data, (files) => files.filter((f) => f.id !== fileId)) : data,
-    );
+  queryClient.setQueryData<UserFilesInfinite>(fileListKey(ownerId), (data) =>
+    data ? mapPages(data, (files) => files.filter((f) => f.id !== fileId)) : data,
+  );
 }
 
 /** Swap an optimistic file (by id) for its persisted counterpart. */
 export function replaceFileInCache(
-    queryClient: QueryClient,
-    ownerId: string | undefined,
-    oldId: string,
-    newFile: FileMetadata,
+  queryClient: QueryClient,
+  ownerId: string | undefined,
+  oldId: string,
+  newFile: FileMetadata,
 ): void {
-    queryClient.setQueryData<UserFilesInfinite>(fileListKey(ownerId), (data) =>
-        data ? mapPages(data, (files) => files.map((f) => (f.id === oldId ? newFile : f))) : data,
-    );
+  queryClient.setQueryData<UserFilesInfinite>(fileListKey(ownerId), (data) =>
+    data ? mapPages(data, (files) => files.map((f) => (f.id === oldId ? newFile : f))) : data,
+  );
 }
 
 /** Shallow-merge a metadata patch into a cached file (e.g. visibility change). */
 export function patchFileMetadataInCache(
-    queryClient: QueryClient,
-    ownerId: string | undefined,
-    fileId: string,
-    metadataPatch: Record<string, unknown>,
+  queryClient: QueryClient,
+  ownerId: string | undefined,
+  fileId: string,
+  metadataPatch: Record<string, unknown>,
 ): void {
-    queryClient.setQueryData<UserFilesInfinite>(fileListKey(ownerId), (data) =>
-        data
-            ? mapPages(data, (files) =>
-                files.map((f) =>
-                    f.id === fileId
-                        ? { ...f, metadata: { ...f.metadata, ...metadataPatch } as FileMetadata['metadata'] }
-                        : f,
-                ),
-            )
-            : data,
-    );
+  queryClient.setQueryData<UserFilesInfinite>(fileListKey(ownerId), (data) =>
+    data
+      ? mapPages(data, (files) =>
+          files.map((f) =>
+            f.id === fileId
+              ? { ...f, metadata: { ...f.metadata, ...metadataPatch } as FileMetadata['metadata'] }
+              : f,
+          ),
+        )
+      : data,
+  );
 }

package/src/ui/hooks/queries/usePaymentQueries.ts

@@ -2,12 +2,7 @@ import { useQuery } from '@tanstack/react-query';
 import { authenticatedApiCall } from '@oxy.so/core';
 import { queryKeys } from './queryKeys';
 import { useOxy } from '../../context/OxyContext';
-import type {
-  Subscription,
-  Payment,
-  Wallet,
-  WalletTransactionsResponse,
-} from './paymentTypes';
+import type { Subscription, Payment, Wallet, WalletTransactionsResponse } from './paymentTypes';
 
 /**
  * Payment / wallet / subscription query hooks.
@@ -40,13 +35,11 @@ export const useUserSubscription = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: queryKeys.payments.subscription(user?.id),
     queryFn: async () => {
-      return authenticatedApiCall<Subscription>(
-        oxyServices,
-        activeSessionId,
-        () => oxyServices.billing.subscription(),
+      return authenticatedApiCall<Subscription>(oxyServices, activeSessionId, () =>
+        oxyServices.billing.subscription(),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
+    enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     // Subscription state changes rarely; tolerate a longer fresh window.
     staleTime: 5 * 60 * 1000, // 5 minutes
     gcTime: 30 * 60 * 1000, // 30 minutes
@@ -65,13 +58,11 @@ export const useUserPayments = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: queryKeys.payments.history(user?.id),
     queryFn: async () => {
-      return authenticatedApiCall<Payment[]>(
-        oxyServices,
-        activeSessionId,
-        () => oxyServices.billing.payments(),
+      return authenticatedApiCall<Payment[]>(oxyServices, activeSessionId, () =>
+        oxyServices.billing.payments(),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
+    enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     // Billing history is append-mostly; a short fresh window is fine.
     staleTime: 2 * 60 * 1000, // 2 minutes
     gcTime: 30 * 60 * 1000, // 30 minutes
@@ -90,13 +81,11 @@ export const useUserWallet = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: queryKeys.payments.wallet(user?.id),
     queryFn: async () => {
-      return authenticatedApiCall<Wallet>(
-        oxyServices,
-        activeSessionId,
-        () => oxyServices.billing.wallet(),
+      return authenticatedApiCall<Wallet>(oxyServices, activeSessionId, () =>
+        oxyServices.billing.wallet(),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
+    enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     staleTime: 60 * 1000, // 1 minute (balance moves often)
     gcTime: 10 * 60 * 1000, // 10 minutes
   });
@@ -124,13 +113,11 @@ export const useUserWalletTransactions = (
   return useQuery({
     queryKey: queryKeys.payments.walletTransactions(limit, offset, user?.id),
     queryFn: async () => {
-      return authenticatedApiCall<WalletTransactionsResponse>(
-        oxyServices,
-        activeSessionId,
-        () => oxyServices.billing.walletTransactions({ limit, offset }),
+      return authenticatedApiCall<WalletTransactionsResponse>(oxyServices, activeSessionId, () =>
+        oxyServices.billing.walletTransactions({ limit, offset }),
       );
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!user?.id,
+    enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     staleTime: 60 * 1000, // 1 minute (ledger updates frequently)
     gcTime: 10 * 60 * 1000, // 10 minutes
   });

package/src/ui/hooks/queries/usePersonalPlans.ts

@@ -5,19 +5,27 @@ import { useOxy } from '../../context/OxyContext';
 /** Public discovery; deliberately outside persisted customer payment queries. */
 export function usePersonalPlans() {
   const { oxyServices } = useOxy();
-  return useQuery({ queryKey: ['personal-plan-catalogue'],
-    queryFn: () => oxyServices.billing.personalPlans(), staleTime: 0 });
+  return useQuery({
+    queryKey: ['personal-plan-catalogue'],
+    queryFn: () => oxyServices.billing.personalPlans(),
+    staleTime: 0,
+  });
 }
 
 /** Account and session partitioning plus a server-side expected-subject fence. */
 export function usePersonalPlanSubscriptions() {
   const { oxyServices, user, isAuthenticated, activeSessionId } = useOxy();
   const accountId = user?.id;
-  return useQuery({ queryKey: ['personal-plan-sources', accountId, activeSessionId],
+  return useQuery({
+    queryKey: ['personal-plan-sources', accountId, activeSessionId],
     queryFn: () => {
       if (!accountId) throw new Error('Authentication required');
-      return authenticatedApiCall(oxyServices, activeSessionId,
-        () => oxyServices.billing.productSubscriptions(accountId));
+      return authenticatedApiCall(oxyServices, activeSessionId, () =>
+        oxyServices.billing.productSubscriptions(accountId),
+      );
     },
-    enabled: isAuthenticated && !!accountId, staleTime: 0, gcTime: 0 });
+    enabled: isAuthenticated && !!accountId,
+    staleTime: 0,
+    gcTime: 0,
+  });
 }

package/src/ui/hooks/queries/useSecurityQueries.ts

@@ -6,22 +6,16 @@ import type { SecurityActivity, SecurityActivityResponse, SecurityEventType } fr
 /**
  * Get user's security activity with pagination
  */
-export const useSecurityActivity = (
-  options?: {
-    limit?: number;
-    offset?: number;
-    eventType?: SecurityEventType;
-    enabled?: boolean;
-  }
-) => {
+export const useSecurityActivity = (options?: {
+  limit?: number;
+  offset?: number;
+  eventType?: SecurityEventType;
+  enabled?: boolean;
+}) => {
   const { oxyServices, activeSessionId } = useOxy();
 
   return useQuery({
-    queryKey: queryKeys.security.activity(
-      options?.limit,
-      options?.offset,
-      options?.eventType
-    ),
+    queryKey: queryKeys.security.activity(options?.limit, options?.offset, options?.eventType),
     queryFn: async () => {
       if (!activeSessionId) {
         throw new Error('No active session');
@@ -30,12 +24,12 @@ export const useSecurityActivity = (
       const response = await oxyServices.devices.securityActivity(
         options?.limit,
         options?.offset,
-        options?.eventType
+        options?.eventType,
       );
 
       return response;
     },
-    enabled: (options?.enabled !== false) && !!activeSessionId,
+    enabled: options?.enabled !== false && !!activeSessionId,
     staleTime: 5 * 60 * 1000, // 5 minutes
     gcTime: 10 * 60 * 1000, // 10 minutes
   });
@@ -68,13 +62,11 @@ export const useRecentSecurityActivity = (limit = 10) => {
  * Each page returns up to `limit` events; `getNextPageParam` walks the
  * `offset` cursor until the API reports `hasMore: false`.
  */
-export const useInfiniteSecurityActivity = (
-  options?: {
-    limit?: number;
-    eventType?: SecurityEventType;
-    enabled?: boolean;
-  }
-) => {
+export const useInfiniteSecurityActivity = (options?: {
+  limit?: number;
+  eventType?: SecurityEventType;
+  enabled?: boolean;
+}) => {
   const { oxyServices, activeSessionId } = useOxy();
   const limit = options?.limit ?? 30;
 
@@ -86,20 +78,15 @@ export const useInfiniteSecurityActivity = (
       }
 
       const offset = typeof pageParam === 'number' ? pageParam : 0;
-      return await oxyServices.devices.securityActivity(
-        limit,
-        offset,
-        options?.eventType
-      );
+      return await oxyServices.devices.securityActivity(limit, offset, options?.eventType);
     },
     initialPageParam: 0,
     getNextPageParam: (lastPage) => {
       if (!lastPage.hasMore) return undefined;
       return lastPage.offset + lastPage.limit;
     },
-    enabled: (options?.enabled !== false) && !!activeSessionId,
+    enabled: options?.enabled !== false && !!activeSessionId,
     staleTime: 5 * 60 * 1000, // 5 minutes
     gcTime: 10 * 60 * 1000, // 10 minutes
   });
 };
-

package/src/ui/hooks/queries/useServicesQueries.ts

@@ -23,15 +23,15 @@ export const useSessions = (userId?: string, options?: { enabled?: boolean }) =>
       if (!activeSessionId) {
         throw new Error('No active session');
       }
-      
+
       const sessions = await fetchSessionsWithFallback(oxyServices, activeSessionId, {
         fallbackDeviceId: undefined,
         fallbackUserId: userId,
       });
-      
+
       return mapSessionsToClient(sessions, activeSessionId);
     },
-    enabled: (options?.enabled !== false) && !!activeSessionId,
+    enabled: options?.enabled !== false && !!activeSessionId,
     staleTime: 2 * 60 * 1000, // 2 minutes (sessions change frequently)
     gcTime: 10 * 60 * 1000, // 10 minutes
   });
@@ -49,8 +49,10 @@ export const useSession = (sessionId: string | null, options?: { enabled?: boole
       if (!sessionId) {
         throw new Error('Session ID is required');
       }
-      
-      const validation = await oxyServices.session.validate(sessionId, { useHeaderValidation: true });
+
+      const validation = await oxyServices.session.validate(sessionId, {
+        useHeaderValidation: true,
+      });
       if (!validation?.valid || !validation.user) {
         throw new Error('Session not found or invalid');
       }
@@ -59,13 +61,14 @@ export const useSession = (sessionId: string | null, options?: { enabled?: boole
       return {
         sessionId,
         deviceId: '', // Device ID not available from validation response
-        expiresAt: validation.expiresAt || new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000).toISOString(),
+        expiresAt:
+          validation.expiresAt || new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000).toISOString(),
         lastActive: validation.lastActivity || now.toISOString(),
         userId: validation.user.id?.toString() ?? '',
         isCurrent: false,
       } as ClientSession;
     },
-    enabled: (options?.enabled !== false) && !!sessionId,
+    enabled: options?.enabled !== false && !!sessionId,
     staleTime: 2 * 60 * 1000,
     gcTime: 10 * 60 * 1000,
   });
@@ -83,10 +86,10 @@ export const useDeviceSessions = (options?: { enabled?: boolean }) => {
       if (!activeSessionId) {
         throw new Error('No active session');
       }
-      
+
       return await oxyServices.devices.sessions(activeSessionId);
     },
-    enabled: (options?.enabled !== false) && !!activeSessionId,
+    enabled: options?.enabled !== false && !!activeSessionId,
     staleTime: 2 * 60 * 1000,
     gcTime: 10 * 60 * 1000,
   });
@@ -101,13 +104,9 @@ export const useUserDevices = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: queryKeys.devices.list(accountQueryScope(activeSessionId)),
     queryFn: async () => {
-      return authenticatedApiCall(
-        oxyServices,
-        activeSessionId,
-        () => oxyServices.devices.list()
-      );
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.devices.list());
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,
+    enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
     staleTime: 5 * 60 * 1000,
     gcTime: 30 * 60 * 1000,
   });
@@ -124,7 +123,7 @@ export const useSecurityInfo = (options?: { enabled?: boolean }) => {
     queryFn: async () => {
       return await oxyServices.devices.securityInfo();
     },
-    enabled: (options?.enabled !== false) && isAuthenticated,
+    enabled: options?.enabled !== false && isAuthenticated,
     staleTime: 5 * 60 * 1000,
     gcTime: 30 * 60 * 1000,
   });
@@ -143,15 +142,10 @@ export const useAccountStorageUsage = (options?: { enabled?: boolean }) => {
   return useQuery<AccountStorageUsageResponse>({
     queryKey: queryKeys.storage.usage(accountQueryScope(activeSessionId)),
     queryFn: async () => {
-      return authenticatedApiCall(
-        oxyServices,
-        activeSessionId,
-        () => oxyServices.assets.usage()
-      );
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.assets.usage());
     },
-    enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,
+    enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
     staleTime: 5 * 60 * 1000,
     gcTime: 30 * 60 * 1000,
   });
 };
-