@oxyhq/services 6.10.2 → 6.10.4

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

@@ -1 +1 @@
-{"version":3,"file":"useServicesQueries.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/hooks/queries/useServicesQueries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,MAAM,EAAE,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,oFAqB3E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,WAAW,MAAM,GAAG,IAAI,EAAE,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,kFA6BnF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,0EAgBhE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,0EAgB7D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE;;UAY9D,CAAC"}
+{"version":3,"file":"useServicesQueries.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/hooks/queries/useServicesQueries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,2BAA2B,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAK9E;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,MAAM,EAAE,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,oFAqB3E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,WAAW,MAAM,GAAG,IAAI,EAAE,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,kFA6BnF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,0EAgBhE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,0EAgB7D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE;;UAY9D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,GAAI,UAAU;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,gGAgBrE,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"queryClient.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/queryClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,WAAW,EAA4C,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAmEhE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,QAAO,WA6CpC,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACtC,wEAAwE;IACxE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,8DAA8D;IAC9D,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,GACjC,aAAa,WAAW,EACxB,SAAS,gBAAgB,GAAG,IAAI,GAAG,SAAS,KAC3C,uBA+BF,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAU,SAAS,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAa7E,CAAC;AAEF;;GAEG;AACH,YAAY,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"queryClient.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/queryClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,WAAW,EAA4C,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAoEhE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,QAAO,WA6CpC,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACtC,wEAAwE;IACxE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,8DAA8D;IAC9D,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,GACjC,aAAa,WAAW,EACxB,SAAS,gBAAgB,GAAG,IAAI,GAAG,SAAS,KAC3C,uBA+BF,CAAC;AAMF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAU,SAAS,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAa7E,CAAC;AAEF;;GAEG;AACH,YAAY,EAAE,eAAe,EAAE,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"useWebSSO.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useWebSSO.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,UAAU,gBAAgB;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,eAAe;IACvB,iCAAiC;IACjC,QAAQ,EAAE,MAAM,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACrD,2DAA2D;IAC3D,eAAe,EAAE,MAAM,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAC5D,uCAAuC;IACvC,UAAU,EAAE,OAAO,CAAC;IACpB,iDAAiD;IACjD,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED;;GAEG;AACH,iBAAS,YAAY,IAAI,OAAO,CAI/B;AAgBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,EACxB,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,OAAc,GACf,EAAE,gBAAgB,GAAG,eAAe,CAwGpC;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"useWebSSO.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useWebSSO.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,UAAU,gBAAgB;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,eAAe;IACvB,iCAAiC;IACjC,QAAQ,EAAE,MAAM,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACrD,2DAA2D;IAC3D,eAAe,EAAE,MAAM,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAC5D,uCAAuC;IACvC,UAAU,EAAE,OAAO,CAAC;IACpB,iDAAiD;IACjD,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAgCD;;GAEG;AACH,iBAAS,YAAY,IAAI,OAAO,CAI/B;AAgBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,EACxB,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,OAAc,GACf,EAAE,gBAAgB,GAAG,eAAe,CAwHpC;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "6.10.2",
+  "version": "6.10.4",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/index.ts

@@ -63,7 +63,16 @@ export {
   useUserById, useUserByUsername, useUsersBySessions,
   usePrivacySettings, useSessions, useSession,
   useDeviceSessions, useUserDevices, useSecurityInfo,
+  useAccountStorageUsage,
   useSecurityActivity, useRecentSecurityActivity, useInfiniteSecurityActivity,
+  useUserSubscription, useUserPayments, useUserWallet, useUserWalletTransactions,
+} from './ui/hooks/queries';
+
+// Payment / wallet / subscription domain types
+export type {
+  Subscription, SubscriptionPlan, SubscriptionStatus, SubscriptionFeatures,
+  Payment, Wallet, WalletTransaction, WalletTransactionType,
+  WalletTransactionStatus, WalletPagination, WalletTransactionsResponse,
 } from './ui/hooks/queries';
 
 // Mutation hooks

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

@@ -189,16 +189,29 @@ export const useAuthOperations = ({
           deviceFingerprint,
         );
 
-        // Get token for the session
-        try {
-          await oxyServices.getTokenBySession(sessionResponse.sessionId);
-        } catch (tokenError: unknown) {
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          const status = isErrorWithCodeOrStatus(tokenError) ? tokenError.status : undefined;
-          if (status === 404 || errorMessage.includes('404')) {
-            throw new Error(`Session was created but token could not be retrieved. Session ID: ${sessionResponse.sessionId.substring(0, 8)}...`);
+        // Plant the first access token. `/auth/verify` already returns the
+        // freshly-minted access token in its response body, so use it
+        // directly. We must NOT fall back to `GET /session/token/:sessionId`
+        // here for a brand-new sign-in: that route is bearer-protected (C1
+        // hardening) and the client has no bearer yet, so calling it without
+        // a token returns 401 "Invalid or missing authorization header" —
+        // which previously broke the entire new-identity onboarding flow.
+        // Only when the verify response somehow omits the token do we fall
+        // back, and by then `setTokens` has not run so a 401 there is a real
+        // server fault worth surfacing.
+        if (sessionResponse.accessToken) {
+          oxyServices.setTokens(sessionResponse.accessToken, sessionResponse.refreshToken ?? '');
+        } else {
+          try {
+            await oxyServices.getTokenBySession(sessionResponse.sessionId);
+          } catch (tokenError: unknown) {
+            const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
+            const status = isErrorWithCodeOrStatus(tokenError) ? tokenError.status : undefined;
+            if (status === 404 || errorMessage.includes('404')) {
+              throw new Error(`Session was created but token could not be retrieved. Session ID: ${sessionResponse.sessionId.substring(0, 8)}...`);
+            }
+            throw tokenError;
           }
-          throw tokenError;
         }
 
         // Get full user data

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

@@ -16,13 +16,14 @@ export {
   usePrivacySettings,
 } from './useAccountQueries';
 
-// Service query hooks (sessions, devices, security)
+// Service query hooks (sessions, devices, security, storage)
 export {
   useSessions,
   useSession,
   useDeviceSessions,
   useUserDevices,
   useSecurityInfo,
+  useAccountStorageUsage,
 } from './useServicesQueries';
 
 // Security activity query hooks
@@ -32,6 +33,29 @@ export {
   useInfiniteSecurityActivity,
 } from './useSecurityQueries';
 
+// Payment / wallet / subscription query hooks
+export {
+  useUserSubscription,
+  useUserPayments,
+  useUserWallet,
+  useUserWalletTransactions,
+} from './usePaymentQueries';
+
+// Payment / wallet / subscription domain types
+export type {
+  Subscription,
+  SubscriptionPlan,
+  SubscriptionStatus,
+  SubscriptionFeatures,
+  Payment,
+  Wallet,
+  WalletTransaction,
+  WalletTransactionType,
+  WalletTransactionStatus,
+  WalletPagination,
+  WalletTransactionsResponse,
+} from './paymentTypes';
+
 // Query keys and invalidation helpers (for advanced usage)
 export { queryKeys, invalidateAccountQueries, invalidateUserQueries, invalidateSessionQueries } from './queryKeys';
 

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

@@ -0,0 +1,141 @@
+/**
+ * Payment / wallet / subscription domain types.
+ *
+ * These model the JSON shapes the Oxy API actually returns for the
+ * payment-related read endpoints, so the corresponding query hooks
+ * (`useUserSubscription`, `useUserPayments`, `useUserWallet`,
+ * `useUserWalletTransactions`) expose precise types instead of `any`.
+ *
+ * Source of truth (API):
+ *  - Subscription:  GET /subscription/:userId   -> `Subscription` model JSON,
+ *                   or the fallback `{ plan: 'basic' }` when none exists.
+ *  - Payments:      GET /payments/user          -> `Payment[]` (sendSuccess).
+ *  - Wallet:        GET /wallet/:userId         -> `Wallet` (sendSuccess).
+ *  - Transactions:  GET /wallet/transactions/:userId
+ *                   -> `WalletTransactionsResponse` (sendPaginated envelope).
+ *
+ * All `Date` columns are serialized as ISO-8601 strings over the wire.
+ *
+ * Note: `@oxyhq/services` deliberately does NOT re-export these from
+ * `@oxyhq/core`. They live here because they describe the return shape of
+ * the services-layer query hooks; consumers that need core domain types
+ * import those directly from `@oxyhq/core`.
+ */
+
+/** Subscription tier. Mirrors the `plan` enum on the API `Subscription` model. */
+export type SubscriptionPlan = 'basic' | 'pro' | 'business';
+
+/** Lifecycle state of a subscription. */
+export type SubscriptionStatus = 'active' | 'canceled' | 'expired';
+
+/** Feature flags toggled by the active subscription plan. */
+export interface SubscriptionFeatures {
+  analytics: boolean;
+  premiumBadge: boolean;
+  unlimitedFollowing: boolean;
+  higherUploadLimits: boolean;
+  promotedPosts: boolean;
+  businessTools: boolean;
+}
+
+/**
+ * A user's subscription.
+ *
+ * When a user has never subscribed, the API returns the minimal fallback
+ * `{ plan: 'basic' }`; every other field is therefore optional so the type
+ * covers both the persisted document and the fallback.
+ */
+export interface Subscription {
+  plan: SubscriptionPlan;
+  status?: SubscriptionStatus;
+  /** Account this subscription belongs to (absent on the basic fallback). */
+  userId?: string;
+  /** ISO-8601 timestamp the current period started. */
+  startDate?: string;
+  /** ISO-8601 timestamp the current period ends / renews. */
+  endDate?: string;
+  autoRenew?: boolean;
+  paymentMethod?: string;
+  latestInvoice?: string;
+  features?: SubscriptionFeatures;
+  /** ISO-8601 creation timestamp. */
+  createdAt?: string;
+  /** ISO-8601 last-update timestamp. */
+  updatedAt?: string;
+}
+
+/**
+ * A billing / payment history entry, derived from `deposit` and `purchase`
+ * transactions on the API side (`GET /payments/user`).
+ */
+export interface Payment {
+  id: string;
+  userId: string;
+  type: string;
+  amount: number;
+  status: string;
+  description?: string;
+  itemId?: string;
+  itemType?: string;
+  /** ISO-8601 timestamp the payment was created (maps to `createdAt`). */
+  timestamp?: string;
+  /** ISO-8601 timestamp the payment settled, when applicable. */
+  completedAt?: string;
+}
+
+/** FairCoin wallet balance for a user (`GET /wallet/:userId`). */
+export interface Wallet {
+  userId: string;
+  balance: number;
+  /** On-chain withdrawal address, `null` until one is set. */
+  address: string | null;
+}
+
+/** Direction/category of a wallet transaction. */
+export type WalletTransactionType = 'deposit' | 'withdrawal' | 'transfer' | 'purchase';
+
+/** Settlement state of a wallet transaction. */
+export type WalletTransactionStatus = 'pending' | 'completed' | 'failed' | 'cancelled';
+
+/**
+ * A single wallet ledger entry returned by the transaction-history endpoint.
+ *
+ * The populated `userId` / `recipientId` may arrive either as a bare id
+ * string or as a `{ _id, username }` object depending on Mongoose
+ * population, so both shapes are modelled.
+ */
+export interface WalletTransaction {
+  id: string;
+  userId: string | { _id: string; username?: string };
+  type: WalletTransactionType;
+  amount: number;
+  status: WalletTransactionStatus;
+  description?: string;
+  recipientId?: string | { _id: string; username?: string } | null;
+  itemId?: string;
+  itemType?: string;
+  /** ISO-8601 creation timestamp (maps to `createdAt`). */
+  timestamp?: string;
+  /** ISO-8601 settlement timestamp, when applicable. */
+  completedAt?: string;
+}
+
+/** Pagination metadata attached to a paginated list response. */
+export interface WalletPagination {
+  total: number;
+  limit: number;
+  offset: number;
+  hasMore: boolean;
+}
+
+/**
+ * Paginated envelope returned by `GET /wallet/transactions/:userId`.
+ *
+ * The HTTP layer preserves the `{ data, pagination }` shape for paginated
+ * responses (it only unwraps the plain `{ data }` success envelope), so
+ * callers receive the list under `data`.
+ */
+export interface WalletTransactionsResponse {
+  data: WalletTransaction[];
+  pagination: WalletPagination;
+}

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

@@ -65,6 +65,32 @@ export const queryKeys = {
     infinite: (limit: number, eventType?: string) =>
       [...queryKeys.security.all, 'infinite', limit, eventType] as const,
   },
+
+  // Storage usage queries
+  storage: {
+    all: ['storage'] as const,
+    usage: () => [...queryKeys.storage.all, 'usage'] as const,
+  },
+
+  // Payment / wallet / subscription queries
+  payments: {
+    all: ['payments'] as const,
+    subscription: (userId?: string) =>
+      [...queryKeys.payments.all, 'subscription', userId || 'current'] as const,
+    history: (userId?: string) =>
+      [...queryKeys.payments.all, 'history', userId || 'current'] as const,
+    wallet: (userId?: string) =>
+      [...queryKeys.payments.all, 'wallet', userId || 'current'] as const,
+    walletTransactions: (limit?: number, offset?: number, userId?: string) =>
+      [
+        ...queryKeys.payments.all,
+        'wallet',
+        userId || 'current',
+        'transactions',
+        limit,
+        offset,
+      ] as const,
+  },
 } as const;
 
 /**

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

@@ -0,0 +1,136 @@
+import { useQuery } from '@tanstack/react-query';
+import { authenticatedApiCall } from '@oxyhq/core';
+import { queryKeys } from './queryKeys';
+import { useOxy } from '../../context/OxyContext';
+import type {
+  Subscription,
+  Payment,
+  Wallet,
+  WalletTransactionsResponse,
+} from './paymentTypes';
+
+/**
+ * Payment / wallet / subscription query hooks.
+ *
+ * These replace the imperative `oxyServices.*` + `Promise.allSettled` +
+ * `useEffect` pattern used in app screens. Each hook:
+ *  - is gated on `isAuthenticated` (the underlying SDK methods read the
+ *    current user id off the access token and throw when unauthenticated),
+ *  - routes through `authenticatedApiCall` so a stale token is refreshed and
+ *    auth errors are handled consistently (matches `useUserDevices` /
+ *    `usePrivacySettings`),
+ *  - keeps its `queryFn` pure — no store writes, no side effects.
+ *
+ * The wrapped SDK methods (`@oxyhq/core` payment mixin) return `any`; the
+ * generic on `authenticatedApiCall<T>` pins the resolved value to the
+ * precise domain type so consumers get full typing.
+ */
+
+/**
+ * Get the current user's subscription.
+ *
+ * Wraps `oxyServices.getCurrentUserSubscription()`
+ * (`GET /subscription/:userId`). Returns the persisted subscription or the
+ * API's `{ plan: 'basic' }` fallback when the user has never subscribed.
+ */
+export const useUserSubscription = (options?: { enabled?: boolean }) => {
+  const { oxyServices, isAuthenticated, activeSessionId } = useOxy();
+
+  return useQuery({
+    queryKey: queryKeys.payments.subscription(),
+    queryFn: async () => {
+      return authenticatedApiCall<Subscription>(
+        oxyServices,
+        activeSessionId,
+        () => oxyServices.getCurrentUserSubscription(),
+      );
+    },
+    enabled: (options?.enabled !== false) && isAuthenticated,
+    // Subscription state changes rarely; tolerate a longer fresh window.
+    staleTime: 5 * 60 * 1000, // 5 minutes
+    gcTime: 30 * 60 * 1000, // 30 minutes
+  });
+};
+
+/**
+ * Get the current user's payment / billing history.
+ *
+ * Wraps `oxyServices.getUserPayments()` (`GET /payments/user`), which
+ * returns the user's `deposit` and `purchase` transactions newest-first.
+ */
+export const useUserPayments = (options?: { enabled?: boolean }) => {
+  const { oxyServices, isAuthenticated, activeSessionId } = useOxy();
+
+  return useQuery({
+    queryKey: queryKeys.payments.history(),
+    queryFn: async () => {
+      return authenticatedApiCall<Payment[]>(
+        oxyServices,
+        activeSessionId,
+        () => oxyServices.getUserPayments(),
+      );
+    },
+    enabled: (options?.enabled !== false) && isAuthenticated,
+    // Billing history is append-mostly; a short fresh window is fine.
+    staleTime: 2 * 60 * 1000, // 2 minutes
+    gcTime: 30 * 60 * 1000, // 30 minutes
+  });
+};
+
+/**
+ * Get the current user's FairCoin wallet balance.
+ *
+ * Wraps `oxyServices.getCurrentUserWallet()` (`GET /wallet/:userId`).
+ * Balance changes frequently, so the fresh window is intentionally short.
+ */
+export const useUserWallet = (options?: { enabled?: boolean }) => {
+  const { oxyServices, isAuthenticated, activeSessionId } = useOxy();
+
+  return useQuery({
+    queryKey: queryKeys.payments.wallet(),
+    queryFn: async () => {
+      return authenticatedApiCall<Wallet>(
+        oxyServices,
+        activeSessionId,
+        () => oxyServices.getCurrentUserWallet(),
+      );
+    },
+    enabled: (options?.enabled !== false) && isAuthenticated,
+    staleTime: 60 * 1000, // 1 minute (balance moves often)
+    gcTime: 10 * 60 * 1000, // 10 minutes
+  });
+};
+
+/**
+ * Get the current user's wallet transaction history (paginated).
+ *
+ * Wraps `oxyServices.getCurrentUserWalletTransactions(options)`
+ * (`GET /wallet/transactions/:userId`). The API responds with a
+ * `{ data, pagination }` envelope, preserved here as
+ * `WalletTransactionsResponse`.
+ *
+ * @param params - Optional `limit` / `offset` pagination controls. These are
+ *   part of the query key, so distinct pages cache independently.
+ */
+export const useUserWalletTransactions = (
+  params?: { limit?: number; offset?: number },
+  options?: { enabled?: boolean },
+) => {
+  const { oxyServices, isAuthenticated, activeSessionId } = useOxy();
+  const limit = params?.limit;
+  const offset = params?.offset;
+
+  return useQuery({
+    queryKey: queryKeys.payments.walletTransactions(limit, offset),
+    queryFn: async () => {
+      return authenticatedApiCall<WalletTransactionsResponse>(
+        oxyServices,
+        activeSessionId,
+        () => oxyServices.getCurrentUserWalletTransactions({ limit, offset }),
+      );
+    },
+    enabled: (options?.enabled !== false) && isAuthenticated,
+    staleTime: 60 * 1000, // 1 minute (ledger updates frequently)
+    gcTime: 10 * 60 * 1000, // 10 minutes
+  });
+};

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

@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import { authenticatedApiCall } from '@oxyhq/core';
-import type { ClientSession } from '@oxyhq/core';
+import type { AccountStorageUsageResponse, ClientSession } from '@oxyhq/core';
 import { queryKeys } from './queryKeys';
 import { useOxy } from '../../context/OxyContext';
 import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sessionHelpers';
@@ -124,3 +124,28 @@ export const useSecurityInfo = (options?: { enabled?: boolean }) => {
   });
 };
 
+/**
+ * Get account storage usage (server-aggregated usage across assets, mail,
+ * recordings, etc.). Wraps `oxyServices.getAccountStorageUsage()` in a
+ * TanStack query so consumers get caching, background refetch, and a
+ * consistent `isLoading` / `refetch` surface instead of hand-rolled
+ * `useEffect` fetches.
+ */
+export const useAccountStorageUsage = (options?: { enabled?: boolean }) => {
+  const { oxyServices, isAuthenticated, activeSessionId } = useOxy();
+
+  return useQuery<AccountStorageUsageResponse>({
+    queryKey: queryKeys.storage.usage(),
+    queryFn: async () => {
+      return authenticatedApiCall(
+        oxyServices,
+        activeSessionId,
+        () => oxyServices.getAccountStorageUsage()
+      );
+    },
+    enabled: (options?.enabled !== false) && isAuthenticated,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 30 * 60 * 1000,
+  });
+};
+

package/src/ui/hooks/queryClient.ts

@@ -50,6 +50,7 @@ const PERSISTED_QUERY_PREFIXES: ReadonlyArray<string> = [
   'sessions',
   'devices',
   'privacy',
+  'payments',
 ];
 
 /**

package/src/ui/hooks/useWebSSO.ts

@@ -38,6 +38,36 @@ interface UseWebSSOResult {
   isFedCMSupported: boolean;
 }
 
+/**
+ * Module-level guard tracking which (origin + API) signatures have already
+ * had a silent SSO attempt this page load.
+ *
+ * A per-component `useRef` guard resets whenever the provider remounts (route
+ * churn, StrictMode double-invoke, error-boundary recovery), which previously
+ * allowed silent SSO to re-fire and — combined with a routing redirect loop —
+ * produced an accelerating `navigator.credentials.get` retry storm. Keying the
+ * guard on a stable signature instead of the component instance makes silent
+ * SSO fire EXACTLY ONCE per page load regardless of how many times the
+ * provider mounts. The set is intentionally never cleared: a fresh page load
+ * (the only thing that can change the answer) starts a fresh module scope.
+ */
+const silentSSOAttempted = new Set<string>();
+
+/**
+ * Build a stable signature for the silent-SSO run-once guard. Two providers
+ * pointed at the same API from the same origin share one attempt.
+ */
+function ssoSignature(oxyServices: OxyServices): string {
+  const origin = typeof window !== 'undefined' ? window.location.origin : 'no-origin';
+  let baseURL = '';
+  try {
+    baseURL = oxyServices.getBaseURL?.() ?? '';
+  } catch {
+    baseURL = '';
+  }
+  return `${origin}|${baseURL}`;
+}
+
 /**
  * Check if we're running in a web browser environment (not React Native)
  */
@@ -163,7 +193,14 @@ export function useWebSSO({
     }
   }, [oxyServices, onSessionFound, onError, fedCMSupported]);
 
-  // Auto-check SSO on mount (web only, FedCM only, not on auth domain)
+  // Auto-check SSO on mount (web only, FedCM only, not on auth domain).
+  //
+  // Run-once is enforced by TWO guards:
+  //   1. `hasCheckedRef` — cheap per-instance fast-path so effect re-runs
+  //      (from changing deps) within one mount never re-fire.
+  //   2. `silentSSOAttempted` — module-level, survives remounts/StrictMode so
+  //      silent SSO fires exactly once per page load even if the provider
+  //      unmounts and remounts.
   useEffect(() => {
     if (!enabled || !isWebBrowser() || hasCheckedRef.current || isIdentityProvider(authWebUrl)) {
       if (isIdentityProvider(authWebUrl)) {
@@ -172,14 +209,23 @@ export function useWebSSO({
       return;
     }
 
+    const signature = ssoSignature(oxyServices);
+    if (silentSSOAttempted.has(signature)) {
+      // Already attempted this page load (e.g. before a remount) — do not
+      // re-fire. Mark the local fast-path too so subsequent re-renders skip.
+      hasCheckedRef.current = true;
+      return;
+    }
+
     hasCheckedRef.current = true;
+    silentSSOAttempted.add(signature);
 
     if (fedCMSupported) {
       checkSSO();
     } else {
       onSSOUnavailable?.();
     }
-  }, [enabled, checkSSO, fedCMSupported, onSSOUnavailable]);
+  }, [enabled, checkSSO, fedCMSupported, onSSOUnavailable, oxyServices, authWebUrl]);
 
   return {
     checkSSO,