@oxyhq/services 6.6.1 → 6.7.0

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

@@ -1 +1 @@
-{"version":3,"file":"useAssets.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useAssets.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACL,KAAK,EAGL,mBAAmB,EACpB,MAAM,aAAa,CAAC;AAKrB,eAAO,MAAM,mBAAmB,GAAI,UAAU,WAAW,SAExD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;mBA6BZ,IAAI,aACC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAC7B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;oBAqDb,MAAM,OACV,MAAM,cACC,MAAM,YACR,MAAM,KACf,OAAO,CAAC,IAAI,CAAC;sBAsCL,MAAM,OACV,MAAM,cACC,MAAM,YACR,MAAM,KACf,OAAO,CAAC,IAAI,CAAC;sBA2BL,MAAM,YACL,MAAM,cACJ,MAAM,KACjB,OAAO,CAAC,MAAM,CAAC;wBAc2B,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC;2BAmBzD,MAAM,UACR,OAAO,KACb,OAAO,CAAC,IAAI,CAAC;uBAoB4B,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;2BAgBlB,MAAM;;;;;;;CAuCvD,CAAC"}
+{"version":3,"file":"useAssets.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useAssets.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACL,KAAK,EAGL,mBAAmB,EACpB,MAAM,aAAa,CAAC;AAKrB,eAAO,MAAM,mBAAmB,GAAI,UAAU,WAAW,SAExD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;mBA6BZ,IAAI,aACC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAC7B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;oBAoDb,MAAM,OACV,MAAM,cACC,MAAM,YACR,MAAM,KACf,OAAO,CAAC,IAAI,CAAC;sBAsCL,MAAM,OACV,MAAM,cACC,MAAM,YACR,MAAM,KACf,OAAO,CAAC,IAAI,CAAC;sBA2BL,MAAM,YACL,MAAM,cACJ,MAAM,KACjB,OAAO,CAAC,MAAM,CAAC;wBAc2B,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC;2BAmBzD,MAAM,UACR,OAAO,KACb,OAAO,CAAC,IAAI,CAAC;uBAoB4B,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;2BAgBlB,MAAM;;;;;;;CAuCvD,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"useAvatarPicker.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useAvatarPicker.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,UAAU,sBAAsB;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;CAC3F;AAED,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,eAAe,EACf,eAAe,EACf,WAAW,EACX,eAAe,GAChB,EAAE,sBAAsB;;EAgCxB"}
+{"version":3,"file":"useAvatarPicker.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useAvatarPicker.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAItD,UAAU,sBAAsB;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;CAC3F;AAED,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,eAAe,EACf,eAAe,EACf,WAAW,EACX,eAAe,GAChB,EAAE,sBAAsB;;EAiCxB"}

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

@@ -12,8 +12,11 @@ export interface UseFileDownloadUrlResult {
 /**
  * Hook to resolve a file's download URL asynchronously.
  *
- * Prefers `getFileDownloadUrlAsync` and falls back to the synchronous
- * `getFileDownloadUrl` helper if the async call fails.
+ * Prefers the provided `oxyServices` instance, falls back to the module-level
+ * singleton set via `setOxyFileUrlInstance`.
+ *
+ * Uses `getFileDownloadUrlAsync` first, falling back to the synchronous
+ * `getFileDownloadUrl` if the async call fails.
  */
-export declare const useFileDownloadUrl: (fileId?: string | null, options?: UseFileDownloadUrlOptions) => UseFileDownloadUrlResult;
+export declare const useFileDownloadUrl: (fileIdOrServices?: string | OxyServices | null, fileIdOrOptions?: string | UseFileDownloadUrlOptions | null, maybeOptions?: UseFileDownloadUrlOptions) => UseFileDownloadUrlResult;
 //# sourceMappingURL=useFileDownloadUrl.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useFileDownloadUrl.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useFileDownloadUrl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,eAAO,MAAM,qBAAqB,GAAI,UAAU,WAAW,SAE1D,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CACrB;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,SAAS,MAAM,GAAG,IAAI,EACtB,UAAU,yBAAyB,KAClC,wBAoFF,CAAC"}
+{"version":3,"file":"useFileDownloadUrl.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/useFileDownloadUrl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,eAAO,MAAM,qBAAqB,GAAI,UAAU,WAAW,SAE1D,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CACrB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,GAC7B,mBAAmB,MAAM,GAAG,WAAW,GAAG,IAAI,EAC9C,kBAAkB,MAAM,GAAG,yBAAyB,GAAG,IAAI,EAC3D,eAAe,yBAAyB,KACvC,wBA6FF,CAAC"}

package/lib/typescript/module/ui/stores/accountStore.d.ts

@@ -1,12 +1,6 @@
 import type { OxyServices } from '@oxyhq/core';
-export interface QuickAccount {
-    sessionId: string;
-    userId?: string;
-    username: string;
-    displayName: string;
-    avatar?: string;
-    avatarUrl?: string;
-}
+import type { QuickAccount } from '@oxyhq/core';
+export type { QuickAccount };
 interface AccountState {
     accounts: Record<string, QuickAccount>;
     accountOrder: string[];
@@ -30,5 +24,4 @@ export declare const useAccounts: () => QuickAccount[];
 export declare const useAccountLoading: () => boolean;
 export declare const useAccountError: () => string | null;
 export declare const useAccountLoadingSession: (sessionId: string) => boolean;
-export {};
 //# sourceMappingURL=accountStore.d.ts.map

package/lib/typescript/module/ui/stores/accountStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accountStore.d.ts","sourceRoot":"","sources":["../../../../../src/ui/stores/accountStore.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,WAAW,YAAY;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,YAAY;IAElB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACvC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,YAAY,EAAE,CAAC;IAG9B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAG/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAGrB,WAAW,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IAC5C,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IAC3E,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,gBAAgB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAG9C,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAGjE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAGzC,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,CAAC,EAAE,YAAY,EAAE,EAAE,aAAa,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAG5I,KAAK,EAAE,MAAM,IAAI,CAAC;CACrB;AA4CD,eAAO,MAAM,eAAe,2EAmMzB,CAAC;AAGJ,eAAO,MAAM,WAAW,QAAO,YAAY,EAE1C,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAAwC,CAAC;AACvE,eAAO,MAAM,eAAe,qBAAsC,CAAC;AACnE,eAAO,MAAM,wBAAwB,GAAI,WAAW,MAAM,YACE,CAAC"}
+{"version":3,"file":"accountStore.d.ts","sourceRoot":"","sources":["../../../../../src/ui/stores/accountStore.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,UAAU,YAAY;IAElB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACvC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,YAAY,EAAE,CAAC;IAG9B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAG/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAGrB,WAAW,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IAC5C,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IAC3E,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,gBAAgB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAG9C,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,iBAAiB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAGjE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAGzC,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,gBAAgB,CAAC,EAAE,YAAY,EAAE,EAAE,aAAa,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAG5I,KAAK,EAAE,MAAM,IAAI,CAAC;CACrB;AAYD,eAAO,MAAM,eAAe,2EAwMzB,CAAC;AAGJ,eAAO,MAAM,WAAW,QAAO,YAAY,EAE1C,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAAwC,CAAC;AACvE,eAAO,MAAM,eAAe,qBAAsC,CAAC;AACnE,eAAO,MAAM,wBAAwB,GAAI,WAAW,MAAM,YACE,CAAC"}

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

@@ -1,15 +1,5 @@
 import type { OxyServices, User } from '@oxyhq/core';
 import { QueryClient } from '@tanstack/react-query';
-/**
- * Updates file visibility to public for avatar use.
- * Handles errors gracefully, only logging non-404 errors.
- *
- * @param fileId - The file ID to update visibility for
- * @param oxyServices - OxyServices instance
- * @param contextName - Optional context name for logging
- * @returns Promise that resolves when visibility is updated (or skipped)
- */
-export declare function updateAvatarVisibility(fileId: string | undefined, oxyServices: OxyServices, contextName?: string): Promise<void>;
 /**
  * Refreshes avatar in accountStore with cache-busted URL to force image reload.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"avatarUtils.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/avatarUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,WAAW,EAAE,WAAW,EACxB,WAAW,GAAE,MAAsB,GAClC,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,GACvB,IAAI,CAON;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,MAAM,GAAG,IAAI,EAC9B,WAAW,EAAE,WAAW,EACxB,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CA2Bf"}
+{"version":3,"file":"avatarUtils.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/avatarUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,GACvB,IAAI,CAON;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EACtB,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,MAAM,GAAG,IAAI,EAC9B,WAAW,EAAE,WAAW,EACxB,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CA2Bf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "6.6.1",
+  "version": "6.7.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -51,15 +51,14 @@
   "author": "OxyHQ",
   "license": "MIT",
   "engines": {
-    "node": ">=18.0.0",
-    "npm": ">=9.0.0"
+    "node": ">=18.0.0"
   },
   "homepage": "https://oxy.so",
   "scripts": {
     "typescript": "tsc --skipLibCheck --noEmit",
     "lint": "biome lint --error-on-warnings ./src",
-    "build": "npx react-native-builder-bob build && npm run copy-assets && npm run copy-dts && npm run delete-dts.js && npm run delete-debug-view",
-    "build:js": "npx react-native-builder-bob build --target commonjs && npx react-native-builder-bob build --target module && npm run copy-assets",
+    "build": "bun x react-native-builder-bob build && bun run copy-assets && bun run copy-dts && bun run delete-dts.js && bun run delete-debug-view",
+    "build:js": "bun x react-native-builder-bob build --target commonjs && bun x react-native-builder-bob build --target module && bun run copy-assets",
     "test": "jest --passWithNoTests",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
@@ -67,8 +66,8 @@
     "copy-dts": "copyfiles -u 1 \"src/**/*.d.ts\" lib/typescript",
     "delete-debug-view": "rm -rf ./lib/commonjs/components/bottomSheetDebugView ./lib/module/components/bottomSheetDebugView ./lib/typescript/components/bottomSheetDebugView || true",
     "delete-dts.js": "find ./lib/commonjs -name '*.d.js*' -delete && find ./lib/module -name '*.d.js*' -delete",
-    "release": "rm -rf lib && npm run build && release-it",
-    "prepublishOnly": "npm run typescript && npm test && npm run build"
+    "release": "rm -rf lib && bun run build && release-it",
+    "prepublishOnly": "bun run typescript && bun run test && bun run build"
   },
   "dependencies": {
     "@lottiefiles/dotlottie-react": "^0.13.5",

package/src/index.ts

@@ -92,6 +92,8 @@ export { useFileFiltering } from './ui/hooks/useFileFiltering';
 export type { ViewMode, SortBy, SortOrder } from './ui/hooks/useFileFiltering';
 
 // UI components
+export { default as Avatar } from './ui/components/Avatar';
+export type { AvatarProps } from './ui/components/Avatar';
 export { OxySignInButton } from './ui/components/OxySignInButton';
 export { OxyLogo, FollowButton } from './ui';
 

package/src/ui/components/Avatar.tsx

@@ -1,5 +1,5 @@
 import type React from 'react';
-import { memo, useMemo } from 'react';
+import { memo, useMemo, useState, useEffect } from 'react';
 import { View, Text, Image, StyleSheet, type StyleProp, type ViewStyle, type ImageStyle, type TextStyle, ActivityIndicator, Platform } from 'react-native';
 import { useThemeColors } from '../styles';
 import { fontFamilies } from '../styles/fonts';
@@ -148,6 +148,14 @@ const Avatar: React.FC<AvatarProps> = ({
     isLoading = false,
 }) => {
     const colors = useThemeColors(theme);
+    const [imageError, setImageError] = useState(false);
+
+    // Reset error state when uri changes
+    useEffect(() => {
+        if (uri) {
+            setImageError(false);
+        }
+    }, [uri]);
 
     const displayText = useMemo(
         () => text || (name ? getInitials(name) : ''),
@@ -221,8 +229,8 @@ const Avatar: React.FC<AvatarProps> = ({
         );
     }
 
-    // Image avatar
-    if (uri) {
+    // Image avatar (with fallback to initials on error)
+    if (uri && !imageError) {
         return (
             <View
                 style={[
@@ -236,6 +244,7 @@ const Avatar: React.FC<AvatarProps> = ({
                     source={{ uri }}
                     style={[styles.image, containerStyle, imageStyle]}
                     resizeMode="cover"
+                    onError={() => setImageError(true)}
                 />
             </View>
         );

package/src/ui/components/ProfileCard.tsx

@@ -37,7 +37,7 @@ const ProfileCard: React.FC<ProfileCardProps> = ({
     const secondaryBackgroundColor = themeStyles.secondaryBackgroundColor;
     const primaryColor = '#0066CC';
 
-    const avatarUrl = useFileDownloadUrl(user?.avatar, { variant: 'thumb' }).url || undefined;
+    const avatarUrl = useFileDownloadUrl(oxyServices, user?.avatar, { variant: 'thumb' }).url || undefined;
 
     return (
         <View style={styles.headerSection}>

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

@@ -91,12 +91,11 @@ export const useUploadAvatar = () => {
   return useMutation({
     mutationFn: async (file: { uri: string; type?: string; name?: string; size?: number }) => {
       return authenticatedApiCall<User>(oxyServices, activeSessionId, async () => {
-        // Upload file first
-        const uploadResult = await oxyServices.assetUpload(file as any, 'public');
-        const fileId = uploadResult?.file?.id || uploadResult?.id || uploadResult;
+        const uploadResult = await oxyServices.assetUpload(file, 'public');
+        const fileId = uploadResult?.file?.id;
 
         if (!fileId || typeof fileId !== 'string') {
-          throw new Error('Failed to get file ID from upload result');
+          throw new Error('Upload succeeded but response did not contain a file ID');
         }
 
         // Update profile with file ID
@@ -336,7 +335,7 @@ export const useUploadFile = () => {
       return authenticatedApiCall<UploadResult>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.assetUpload(file as any, visibility, metadata, onProgress)
+        () => oxyServices.assetUpload(file, visibility, metadata, onProgress)
       );
     },
   });

package/src/ui/hooks/useAssets.ts

@@ -58,8 +58,7 @@ export const useAssets = () => {
       clearErrors();
       setUploading(true);
       
-      // Upload file (progress tracking simplified for now)
-      const result = await oxyInstance.assetUpload(file as any, undefined, metadata);
+      const result = await oxyInstance.assetUpload(file, undefined, metadata);
 
       // Update progress with final status
       if (result?.file) {

package/src/ui/hooks/useAvatarPicker.ts

@@ -12,7 +12,8 @@ import { translate } from '@oxyhq/core';
 import type { QueryClient } from '@tanstack/react-query';
 import { toast } from '../../lib/sonner';
 import type { RouteName } from '../navigation/routes';
-import { updateAvatarVisibility, updateProfileWithAvatar } from '../utils/avatarUtils';
+import { updateAvatarVisibility } from '@oxyhq/core';
+import { updateProfileWithAvatar } from '../utils/avatarUtils';
 
 interface UseAvatarPickerOptions {
   oxyServices: OxyServices;
@@ -51,8 +52,9 @@ export function useAvatarPicker({
               queryClient
             );
             toast.success(translate(currentLanguage ?? undefined, 'editProfile.toasts.avatarUpdated') || 'Avatar updated');
-          } catch (e: any) {
-            toast.error(e.message || translate(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed') || 'Failed to update avatar');
+          } catch (e: unknown) {
+            const message = e instanceof Error ? e.message : undefined;
+            toast.error(message || translate(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed') || 'Failed to update avatar');
           }
         },
       },

package/src/ui/hooks/useFileDownloadUrl.ts

@@ -21,13 +21,34 @@ export interface UseFileDownloadUrlResult {
 /**
  * Hook to resolve a file's download URL asynchronously.
  *
- * Prefers `getFileDownloadUrlAsync` and falls back to the synchronous
- * `getFileDownloadUrl` helper if the async call fails.
+ * Prefers the provided `oxyServices` instance, falls back to the module-level
+ * singleton set via `setOxyFileUrlInstance`.
+ *
+ * Uses `getFileDownloadUrlAsync` first, falling back to the synchronous
+ * `getFileDownloadUrl` if the async call fails.
  */
 export const useFileDownloadUrl = (
-  fileId?: string | null,
-  options?: UseFileDownloadUrlOptions
+  fileIdOrServices?: string | OxyServices | null,
+  fileIdOrOptions?: string | UseFileDownloadUrlOptions | null,
+  maybeOptions?: UseFileDownloadUrlOptions
 ): UseFileDownloadUrlResult => {
+  // Support two call signatures:
+  // 1. useFileDownloadUrl(oxyServices, fileId, options)  — preferred
+  // 2. useFileDownloadUrl(fileId, options)               — legacy (uses singleton)
+  let services: OxyServices | null;
+  let fileId: string | null | undefined;
+  let options: UseFileDownloadUrlOptions | undefined;
+
+  if (fileIdOrServices instanceof OxyServices) {
+    services = fileIdOrServices;
+    fileId = typeof fileIdOrOptions === 'string' ? fileIdOrOptions : null;
+    options = maybeOptions;
+  } else {
+    services = oxyInstance;
+    fileId = typeof fileIdOrServices === 'string' ? fileIdOrServices : null;
+    options = typeof fileIdOrOptions === 'object' && fileIdOrOptions !== null ? fileIdOrOptions as UseFileDownloadUrlOptions : undefined;
+  }
+
   const [url, setUrl] = useState<string | null>(null);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Error | null>(null);
@@ -40,8 +61,7 @@ export const useFileDownloadUrl = (
       return;
     }
 
-    if (!oxyInstance) {
-      // Fail silently but don't crash the UI – caller can decide what to do with null URL.
+    if (!services) {
       setUrl(null);
       setLoading(false);
       setError(new Error('OxyServices instance not configured for useFileDownloadUrl'));
@@ -49,40 +69,33 @@ export const useFileDownloadUrl = (
     }
 
     let cancelled = false;
+    const instance = services;
 
     const load = async () => {
       setLoading(true);
       setError(null);
 
-      // Store instance in local variable for TypeScript null checking
-      const instance = oxyInstance;
-      if (!instance) {
-        setLoading(false);
-        setError(new Error('OxyServices instance not configured for useFileDownloadUrl'));
-        return;
-      }
-
       try {
         const { variant, expiresIn } = options || {};
         let resolvedUrl: string | null = null;
 
         if (typeof instance.getFileDownloadUrlAsync === 'function') {
-          resolvedUrl = await instance.getFileDownloadUrlAsync(fileId, variant, expiresIn);
+          resolvedUrl = await instance.getFileDownloadUrlAsync(fileId!, variant, expiresIn);
         }
 
         if (!resolvedUrl && typeof instance.getFileDownloadUrl === 'function') {
-          resolvedUrl = instance.getFileDownloadUrl(fileId, variant, expiresIn);
+          resolvedUrl = instance.getFileDownloadUrl(fileId!, variant, expiresIn);
         }
 
         if (!cancelled) {
           setUrl(resolvedUrl || null);
         }
-      } catch (err: any) {
+      } catch (err: unknown) {
         // Fallback to sync URL on error where possible
         try {
           if (typeof instance.getFileDownloadUrl === 'function') {
             const { variant, expiresIn } = options || {};
-            const fallbackUrl = instance.getFileDownloadUrl(fileId, variant, expiresIn);
+            const fallbackUrl = instance.getFileDownloadUrl(fileId!, variant, expiresIn);
             if (!cancelled) {
               setUrl(fallbackUrl || null);
               setError(err instanceof Error ? err : new Error(String(err)));
@@ -90,7 +103,7 @@ export const useFileDownloadUrl = (
             return;
           }
         } catch {
-          // ignore secondary failure, we'll surface the original error below
+          // ignore secondary failure
         }
 
         if (!cancelled) {
@@ -108,11 +121,7 @@ export const useFileDownloadUrl = (
     return () => {
       cancelled = true;
     };
-  }, [fileId, options?.variant, options?.expiresIn]);
+  }, [fileId, services, options?.variant, options?.expiresIn]);
 
   return { url, loading, error };
 };
-
-
-
-

package/src/ui/screens/WelcomeNewUserScreen.tsx

@@ -13,7 +13,7 @@ import GroupedPillButtons from '../components/internal/GroupedPillButtons';
 import { useI18n } from '../hooks/useI18n';
 import { useOxy } from '../context/OxyContext';
 import { useUpdateProfile } from '../hooks/mutations/useAccountMutations';
-import { updateAvatarVisibility } from '../utils/avatarUtils';
+import { updateAvatarVisibility } from '@oxyhq/core';
 
 const GAP = 12;
 const INNER_GAP = 8;

package/src/ui/stores/accountStore.ts

@@ -1,15 +1,10 @@
 import { create } from 'zustand';
 import { shallow } from 'zustand/shallow';
 import type { OxyServices } from '@oxyhq/core';
+import { buildAccountsArray, createQuickAccount } from '@oxyhq/core';
+import type { QuickAccount } from '@oxyhq/core';
 
-export interface QuickAccount {
-    sessionId: string;
-    userId?: string; // User ID for deduplication
-    username: string;
-    displayName: string;
-    avatar?: string;
-    avatarUrl?: string; // Cached avatar URL to prevent recalculation
-}
+export type { QuickAccount };
 
 interface AccountState {
     // Account data
@@ -54,38 +49,6 @@ const initialState = {
     error: null,
 };
 
-// Helper: Build accounts array from accounts map and order
-const buildAccountsArray = (accounts: Record<string, QuickAccount>, order: string[]): QuickAccount[] => {
-    const result: QuickAccount[] = [];
-    for (const id of order) {
-        const account = accounts[id];
-        if (account) result.push(account);
-    }
-    return result;
-};
-
-// Helper: Create QuickAccount from user data
-const createQuickAccount = (sessionId: string, userData: any, existingAccount?: QuickAccount, oxyServices?: OxyServices): QuickAccount => {
-    const displayName = userData.name?.full || userData.name?.first || userData.username || 'Account';
-    const userId = userData.id || userData._id?.toString();
-    
-    // Preserve existing avatarUrl if avatar hasn't changed (prevents image reload)
-    let avatarUrl: string | undefined;
-    if (existingAccount && existingAccount.avatar === userData.avatar && existingAccount.avatarUrl) {
-        avatarUrl = existingAccount.avatarUrl; // Reuse existing URL
-    } else if (userData.avatar && oxyServices) {
-        avatarUrl = oxyServices.getFileDownloadUrl(userData.avatar, 'thumb');
-    }
-    
-    return {
-        sessionId,
-        userId,
-        username: userData.username || '',
-        displayName,
-        avatar: userData.avatar,
-        avatarUrl,
-    };
-};
 
 export const useAccountStore = create<AccountState>((set, get) => ({
     ...initialState,
@@ -116,7 +79,7 @@ export const useAccountStore = create<AccountState>((set, get) => ({
                     existing.avatarUrl === newAccount.avatarUrl;
             });
         
-        if (sameAccounts) return {} as any;
+        if (sameAccounts) return {} as Partial<AccountState>;
         
         return { accounts: accountMap, accountOrder: order, accountsArray };
     }),
@@ -127,7 +90,7 @@ export const useAccountStore = create<AccountState>((set, get) => ({
             // Update existing
             const existing = state.accounts[account.sessionId];
             if (existing.avatar === account.avatar && existing.avatarUrl === account.avatarUrl) {
-                return {} as any; // No change
+                return {} as Partial<AccountState>; // No change
             }
             const newAccounts = { ...state.accounts, [account.sessionId]: account };
             return {
@@ -147,11 +110,11 @@ export const useAccountStore = create<AccountState>((set, get) => ({
     
     updateAccount: (sessionId, updates) => set((state) => {
         const existing = state.accounts[sessionId];
-        if (!existing) return {} as any;
+        if (!existing) return {} as Partial<AccountState>;
         
         const updated = { ...existing, ...updates };
         if (existing.avatar === updated.avatar && existing.avatarUrl === updated.avatarUrl) {
-            return {} as any; // No change
+            return {} as Partial<AccountState>; // No change
         }
         
         const newAccounts = { ...state.accounts, [sessionId]: updated };
@@ -162,7 +125,7 @@ export const useAccountStore = create<AccountState>((set, get) => ({
     }),
     
     removeAccount: (sessionId) => set((state) => {
-        if (!state.accounts[sessionId]) return {} as any;
+        if (!state.accounts[sessionId]) return {} as Partial<AccountState>;
         
         const { [sessionId]: _removed, ...rest } = state.accounts;
         const newOrder = state.accountOrder.filter(id => id !== sessionId);
@@ -175,7 +138,7 @@ export const useAccountStore = create<AccountState>((set, get) => ({
     }),
     
     moveAccountToTop: (sessionId) => set((state) => {
-        if (!state.accounts[sessionId]) return {} as any;
+        if (!state.accounts[sessionId]) return {} as Partial<AccountState>;
         
         const filtered = state.accountOrder.filter(id => id !== sessionId);
         const newOrder = [sessionId, ...filtered];
@@ -242,7 +205,12 @@ export const useAccountStore = create<AccountState>((set, get) => ({
                 for (const { sessionId, user: userData } of batchResults) {
                     if (userData && !accountMap.has(sessionId)) {
                         const existing = existingMap.get(sessionId);
-                        accountMap.set(sessionId, createQuickAccount(sessionId, userData, existing, oxyServices));
+                        accountMap.set(sessionId, createQuickAccount(
+                            sessionId,
+                            userData,
+                            existing,
+                            (fileId, variant) => oxyServices.getFileDownloadUrl(fileId, variant)
+                        ));
                     }
                 }
                 

package/src/ui/utils/avatarUtils.ts

@@ -5,38 +5,9 @@ import { useAuthStore } from '../stores/authStore';
 import { QueryClient } from '@tanstack/react-query';
 import { queryKeys, invalidateUserQueries, invalidateAccountQueries } from '../hooks/queries/queryKeys';
 
-/**
- * Updates file visibility to public for avatar use.
- * Handles errors gracefully, only logging non-404 errors.
- * 
- * @param fileId - The file ID to update visibility for
- * @param oxyServices - OxyServices instance
- * @param contextName - Optional context name for logging
- * @returns Promise that resolves when visibility is updated (or skipped)
- */
-export async function updateAvatarVisibility(
-  fileId: string | undefined,
-  oxyServices: OxyServices,
-  contextName: string = 'AvatarUtils'
-): Promise<void> {
-  // Skip if temporary asset ID or no file ID
-  if (!fileId || fileId.startsWith('temp-')) {
-    return;
-  }
-
-  try {
-    await oxyServices.assetUpdateVisibility(fileId, 'public');
-    // Visibility update is logged by the API
-  } catch (visError: any) {
-    // Silently handle errors - 404 means asset doesn't exist yet (which is OK)
-    // Other errors are logged by the API, so no need to log here
-    // Function continues gracefully regardless of visibility update success
-  }
-}
-
 /**
  * Refreshes avatar in accountStore with cache-busted URL to force image reload.
- * 
+ *
  * @param sessionId - The session ID for the account to update
  * @param avatarFileId - The new avatar file ID
  * @param oxyServices - OxyServices instance to generate download URL
@@ -99,4 +70,3 @@ export async function updateProfileWithAvatar(
 
   return data;
 }
-

package/src/ui/utils/fileManagement.ts

@@ -3,7 +3,7 @@ import type { FileMetadata } from '@oxyhq/core';
 import { File as ExpoFile } from 'expo-file-system';
 import { toast } from '../../lib/sonner';
 import type { RouteName } from '../navigation/routes';
-import { updateAvatarVisibility } from './avatarUtils';
+import { updateAvatarVisibility } from '@oxyhq/core';
 
 /**
  * Format file size in bytes to human-readable string