@oxyhq/services 13.0.1 → 13.0.3

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

@@ -1 +1 @@
-{"version":3,"file":"WelcomeNewUserScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/WelcomeNewUserScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiD3D;;;;;GAKG;AACH,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAkTvE,CAAC;AAkFF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"WelcomeNewUserScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/WelcomeNewUserScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAiD3D;;;;;GAKG;AACH,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAqTvE,CAAC;AAkFF,eAAe,oBAAoB,CAAC"}

package/lib/typescript/module/ui/screens/trust/TrustAboutScreen.d.ts

@@ -1,5 +1,5 @@
 import type React from 'react';
-import type { BaseScreenProps } from '../../types/navigation';
+import type { BaseScreenProps } from '../../types/navigation.js';
 declare const TrustAboutScreen: React.FC<BaseScreenProps>;
 export default TrustAboutScreen;
 //# sourceMappingURL=TrustAboutScreen.d.ts.map

package/lib/typescript/module/ui/screens/trust/TrustAboutScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrustAboutScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustAboutScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,QAAA,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA+D/C,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"TrustAboutScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustAboutScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAAwB,CAAC;AAI9D,QAAA,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA+D/C,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/lib/typescript/module/ui/screens/trust/TrustCenterScreen.d.ts

@@ -1,5 +1,5 @@
 import type React from 'react';
-import type { BaseScreenProps } from '../../types/navigation';
+import type { BaseScreenProps } from '../../types/navigation.js';
 declare const TrustCenterScreen: React.FC<BaseScreenProps>;
 export default TrustCenterScreen;
 //# sourceMappingURL=TrustCenterScreen.d.ts.map

package/lib/typescript/module/ui/screens/trust/TrustCenterScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrustCenterScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustCenterScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA6OhD,CAAC;AAgBF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"TrustCenterScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustCenterScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAAwB,CAAC;AAQ9D,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA8OhD,CAAC;AAgBF,eAAe,iBAAiB,CAAC"}

package/lib/typescript/module/ui/screens/trust/TrustFAQScreen.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { BaseScreenProps } from '../../types/navigation';
+import type { BaseScreenProps } from '../../types/navigation.js';
 declare const _default: React.NamedExoticComponent<BaseScreenProps>;
 export default _default;
 //# sourceMappingURL=TrustFAQScreen.d.ts.map

package/lib/typescript/module/ui/screens/trust/TrustFAQScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrustFAQScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustFAQScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;;AA2G9D,wBAA0C"}
+{"version":3,"file":"TrustFAQScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustFAQScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAAwB,CAAC;;AA2G9D,wBAA0C"}

package/lib/typescript/module/ui/screens/trust/TrustLeaderboardScreen.d.ts

@@ -1,5 +1,5 @@
 import type React from 'react';
-import type { BaseScreenProps } from '../../types/navigation';
+import type { BaseScreenProps } from '../../types/navigation.js';
 declare const TrustLeaderboardScreen: React.FC<BaseScreenProps>;
 export default TrustLeaderboardScreen;
 //# sourceMappingURL=TrustLeaderboardScreen.d.ts.map

package/lib/typescript/module/ui/screens/trust/TrustLeaderboardScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrustLeaderboardScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustLeaderboardScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAgB/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAa9D,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAwJrD,CAAC;AA0CF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"TrustLeaderboardScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustLeaderboardScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAgB/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAAwB,CAAC;AAa9D,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAwJrD,CAAC;AA0CF,eAAe,sBAAsB,CAAC"}

package/lib/typescript/module/ui/screens/trust/TrustRewardsScreen.d.ts

@@ -1,5 +1,5 @@
 import type React from 'react';
-import type { BaseScreenProps } from '../../types/navigation';
+import type { BaseScreenProps } from '../../types/navigation.js';
 declare const TrustRewardsScreen: React.FC<BaseScreenProps>;
 export default TrustRewardsScreen;
 //# sourceMappingURL=TrustRewardsScreen.d.ts.map

package/lib/typescript/module/ui/screens/trust/TrustRewardsScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrustRewardsScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustRewardsScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AA0E9D,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAgYjD,CAAC;AAkIF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"TrustRewardsScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustRewardsScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAAwB,CAAC;AA0E9D,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAkYjD,CAAC;AAkIF,eAAe,kBAAkB,CAAC"}

package/lib/typescript/module/ui/screens/trust/TrustRulesScreen.d.ts

@@ -1,5 +1,5 @@
 import type React from 'react';
-import type { BaseScreenProps } from '../../types/navigation';
+import type { BaseScreenProps } from '../../types/navigation.js';
 declare const TrustRulesScreen: React.FC<BaseScreenProps>;
 export default TrustRulesScreen;
 //# sourceMappingURL=TrustRulesScreen.d.ts.map

package/lib/typescript/module/ui/screens/trust/TrustRulesScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrustRulesScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustRulesScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAiB9D,QAAA,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAwF/C,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"TrustRulesScreen.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/screens/trust/TrustRulesScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAAwB,CAAC;AAiB9D,QAAA,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAwF/C,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/lib/typescript/module/ui/server.d.ts

@@ -34,6 +34,6 @@ export declare const toast: (() => void) & {
     loading: () => void;
     dismiss: () => void;
 };
-export { handleAuthError, isInvalidSessionError, isTimeoutOrNetworkError, extractErrorMessage, } from './utils/errorHandlers';
-export type { HandleAuthErrorOptions } from './utils/errorHandlers';
+export { handleAuthError, isInvalidSessionError, isTimeoutOrNetworkError, extractErrorMessage, } from './utils/errorHandlers.js';
+export type { HandleAuthErrorOptions } from './utils/errorHandlers.js';
 //# sourceMappingURL=server.d.ts.map

package/lib/typescript/module/ui/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/ui/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,eAAO,MAAM,WAAW,YAAgB,CAAC;AACzC,eAAO,MAAM,eAAe,YAAgB,CAAC;AAC7C,eAAO,MAAM,OAAO,YAAgB,CAAC;AACrC,eAAO,MAAM,MAAM,YAAgB,CAAC;AACpC,eAAO,MAAM,YAAY,YAAgB,CAAC;AAC1C,eAAO,MAAM,YAAY,YAAgB,CAAC;AAC1C,eAAO,MAAM,UAAU,YAAgB,CAAC;AACxC,eAAO,MAAM,UAAU,YAAW,CAAC;AACnC,eAAO,MAAM,OAAO,YAAgB,CAAC;AAGrC,eAAO,MAAM,MAAM,UAAW,CAAC;AAG/B,eAAO,MAAM,OAAO,UAAW,CAAC;AAChC,eAAO,MAAM,SAAS,UAAW,CAAC;AAClC,eAAO,MAAM,UAAU;;;CAA0B,CAAC;AAGlD,eAAO,MAAM,aAAa,YAAgB,CAAC;AAG3C,eAAO,MAAM,YAAY,UAAW,CAAC;AACrC,eAAO,MAAM,eAAe,UAAW,CAAC;AAGxC,eAAO,MAAM,KAAK;;;;;;;CAUjB,CAAC;AAGF,OAAO,EACH,eAAe,EACf,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,GACtB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/ui/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,eAAO,MAAM,WAAW,YAAgB,CAAC;AACzC,eAAO,MAAM,eAAe,YAAgB,CAAC;AAC7C,eAAO,MAAM,OAAO,YAAgB,CAAC;AACrC,eAAO,MAAM,MAAM,YAAgB,CAAC;AACpC,eAAO,MAAM,YAAY,YAAgB,CAAC;AAC1C,eAAO,MAAM,YAAY,YAAgB,CAAC;AAC1C,eAAO,MAAM,UAAU,YAAgB,CAAC;AACxC,eAAO,MAAM,UAAU,YAAW,CAAC;AACnC,eAAO,MAAM,OAAO,YAAgB,CAAC;AAGrC,eAAO,MAAM,MAAM,UAAW,CAAC;AAG/B,eAAO,MAAM,OAAO,UAAW,CAAC;AAChC,eAAO,MAAM,SAAS,UAAW,CAAC;AAClC,eAAO,MAAM,UAAU;;;CAA0B,CAAC;AAGlD,eAAO,MAAM,aAAa,YAAgB,CAAC;AAG3C,eAAO,MAAM,YAAY,UAAW,CAAC;AACrC,eAAO,MAAM,eAAe,UAAW,CAAC;AAGxC,eAAO,MAAM,KAAK;;;;;;;CAUjB,CAAC;AAGF,OAAO,EACH,eAAe,EACf,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,GACtB,MAAM,0BAAuB,CAAC;AAC/B,YAAY,EAAE,sBAAsB,EAAE,MAAM,0BAAuB,CAAC"}

package/lib/typescript/module/ui/types/fileManagement.d.ts

@@ -1,4 +1,4 @@
-import type { BaseScreenProps } from './navigation';
+import type { BaseScreenProps } from './navigation.js';
 import type { FileMetadata } from '@oxyhq/core';
 export type OnConfirmFileSelection = (files: FileMetadata[]) => void;
 export interface FileManagementScreenProps extends BaseScreenProps {

package/lib/typescript/module/ui/types/fileManagement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileManagement.d.ts","sourceRoot":"","sources":["../../../../../src/ui/types/fileManagement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;AAErE,MAAM,WAAW,yBAA0B,SAAQ,eAAe;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAExC,kBAAkB,CAAC,EAAE,sBAAsB,CAAC;IAE5C,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACtD;;;OAGG;IACH,WAAW,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACL;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;AAC3E,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AACvD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC"}
+{"version":3,"file":"fileManagement.d.ts","sourceRoot":"","sources":["../../../../../src/ui/types/fileManagement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAc,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;AAErE,MAAM,WAAW,yBAA0B,SAAQ,eAAe;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAExC,kBAAkB,CAAC,EAAE,sBAAsB,CAAC;IAE5C,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACtD;;;OAGG;IACH,WAAW,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACL;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,GAAG,OAAO,CAAC;AAC3E,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AACvD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC"}

package/lib/typescript/module/ui/types/navigation.d.ts

@@ -1,6 +1,6 @@
 import type { ReactNode, RefObject } from 'react';
 import type { QueryClient } from '@tanstack/react-query';
-import type { RouteName } from '../navigation/routes';
+import type { RouteName } from '../navigation/routes.js';
 export interface StepController {
     canGoBack: () => boolean;
     goBack: () => void;

package/lib/typescript/module/ui/types/navigation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../../../../src/ui/types/navigation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAItD,MAAM,WAAW,cAAc;IAC3B,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,MAAM,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAE5B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACxE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAG9C,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IAGlC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAGjE,aAAa,CAAC,EAAE,SAAS,CAAC;IAG1B,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAGnD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IAMtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B"}
+{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../../../../src/ui/types/navigation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAsB,CAAC;AAItD,MAAM,WAAW,cAAc;IAC3B,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,MAAM,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAE5B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACxE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAG9C,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IAGlC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAGjE,aAAa,CAAC,EAAE,SAAS,CAAC;IAG1B,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAGnD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IAMtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B"}

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

@@ -1,5 +1,5 @@
 import type { AssetUploadInput, FileMetadata, RNFileDescriptor } from '@oxyhq/core';
-import type { RouteName } from '../navigation/routes';
+import type { RouteName } from '../navigation/routes.js';
 /**
  * Extended File interface that includes a `uri` property for mobile preview support.
  * React Native file pickers return URI-based references that need to be preserved

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

@@ -1 +1 @@
-{"version":3,"file":"fileManagement.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/fileManagement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;GAIG;AACH,UAAU,WAAY,SAAQ,IAAI;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAO5E;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMpD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CASvD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gCAAgC,CAClD,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAAC,CA4DhD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EACf,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,GACjE,MAAM,CA8BR;AAED;;GAEG;AACH,wBAAsB,aAAa,CAC/B,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EAEd,WAAW,EAAE,GAAG,EAChB,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,gBAGjD;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACxE,2BAA2B;IAE3B,WAAW,EAAE,GAAG,CAAC;IACjB,mDAAmD;IACnD,qBAAqB,EAAE;QACnB,WAAW,EAAE,CAAC,OAAO,EAAE;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;KAClE,CAAC;IACF,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,gCAAgC;IAChC,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACvC,oFAAoF;IACpF,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,IAAI,CA8ChF"}
+{"version":3,"file":"fileManagement.d.ts","sourceRoot":"","sources":["../../../../../src/ui/utils/fileManagement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAsB,CAAC;AAGtD;;;;GAIG;AACH,UAAU,WAAY,SAAQ,IAAI;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAO5E;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMpD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CASvD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gCAAgC,CAClD,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAAC,CA4DhD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,MAAM,EACf,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,GACjE,MAAM,CA8BR;AAED;;GAEG;AACH,wBAAsB,aAAa,CAC/B,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EAEd,WAAW,EAAE,GAAG,EAChB,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,gBAGjD;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACxE,2BAA2B;IAE3B,WAAW,EAAE,GAAG,CAAC;IACjB,mDAAmD;IACnD,qBAAqB,EAAE;QACnB,WAAW,EAAE,CAAC,OAAO,EAAE;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;KAClE,CAAC;IACF,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,gCAAgC;IAChC,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACvC,oFAAoF;IACpF,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,IAAI,CA8ChF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "13.0.1",
+  "version": "13.0.3",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -106,31 +106,32 @@
     }
   },
   "dependencies": {
-    "@oxyhq/contracts": "0.6.0"
+    "@oxyhq/contracts": "0.7.0"
   },
   "devDependencies": {
+    "@oxyhq/core": "^5.1.1",
     "nativewind": "5.0.0-preview.3",
     "react-native-css": "^3.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@types/react": "*",
     "copyfiles": "^2.4.1",
-    "react-native-keyboard-controller": "1.21.6",
+    "react-native-keyboard-controller": "1.21.13",
     "react-native-qrcode-svg": "^6.3.0",
     "socket.io-client": "^4.8.1",
     "typescript": "^5.9.2",
-    "zustand": "^5.0.9",
+    "zustand": "^5.0.14",
     "@biomejs/biome": "^1.9.4",
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-conventional": "^17.6.5",
     "@react-native-community/netinfo": "^11.4.1",
-    "@react-native/babel-preset": "^0.77.0",
+    "@react-native/babel-preset": "^0.86.0",
     "@release-it/conventional-changelog": "^10.0.2",
-    "@tanstack/query-async-storage-persister": "^5.100",
-    "@tanstack/query-sync-storage-persister": "^5.100",
-    "@tanstack/react-query": "^5.100",
-    "@tanstack/react-query-persist-client": "^5.100",
+    "@tanstack/query-async-storage-persister": "^5.101",
+    "@tanstack/query-sync-storage-persister": "^5.101",
+    "@tanstack/react-query": "^5.101",
+    "@tanstack/react-query-persist-client": "^5.101",
     "@testing-library/jest-dom": "^6.4.2",
-    "@types/color": "^4.2.0",
+    "@types/color": "^4.2.1",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.19.9",
     "expo-file-system": "~56.0.7",
@@ -141,24 +142,24 @@
     "husky": "^4.3.8",
     "jest": "~29.7.0",
     "lint-staged": "^15.2.4",
-    "react-native-builder-bob": "^0.40.16",
+    "react-native-builder-bob": "^0.43.0",
     "react-native-gesture-handler": "~2.31.2",
-    "react-native-reanimated": "4.3.1",
-    "react-native-safe-area-context": "~5.7.0",
-    "react-native-svg": "15.15.4",
+    "react-native-reanimated": "4.5.0",
+    "react-native-safe-area-context": "~5.8.0",
+    "react-native-svg": "15.15.5",
     "release-it": "^19.0.6",
     "ts-jest": "^29.4.0"
   },
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
     "@oxyhq/bloom": ">=0.16.0",
-    "@oxyhq/core": "^4.0.0",
+    "@oxyhq/core": "5.1.1",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
-    "@tanstack/query-async-storage-persister": "^5.100",
-    "@tanstack/query-sync-storage-persister": "^5.100",
-    "@tanstack/react-query": "^5.100",
-    "@tanstack/react-query-persist-client": "^5.100",
+    "@tanstack/query-async-storage-persister": "^5.101",
+    "@tanstack/query-sync-storage-persister": "^5.101",
+    "@tanstack/react-query": "^5.101",
+    "@tanstack/react-query-persist-client": "^5.101",
     "@types/react": "*",
     "@types/react-native": "*",
     "expo": ">=56.0.0",
@@ -175,7 +176,7 @@
     "react-native-keyboard-controller": ">=1.21.0",
     "react-native-qrcode-svg": "^6.3.0",
     "react-native-reanimated": ">=4.3.0",
-    "react-native-safe-area-context": "~5.7.0",
+    "react-native-safe-area-context": "~5.8.0",
     "react-native-svg": ">=15.15.0",
     "socket.io-client": "^4.8.0",
     "zustand": "^5.0.0",

package/src/index.ts

@@ -205,11 +205,6 @@ export type { FollowButtonProps, SingleFollowButtonProps, MultiFollowButtonProps
 export { LogoIcon } from './ui/components/logo/LogoIcon';
 export { LogoText } from './ui/components/logo/LogoText';
 
-// Subtle "active account" context cue for the account graph (not Commons/DID).
-// Shows which account is active when the user has switched into a non-personal
-// account; reads as the current account, not as delegation.
-export { default as ActiveAccountBanner } from './ui/components/ActiveAccountBanner';
-
 // Unified account menu (device-only switcher — popover on web, sheet on native)
 export { default as AccountMenu } from './ui/components/AccountMenu';
 export type { AccountMenuProps, AccountMenuAnchor } from './ui/components/AccountMenu';

package/src/ui/components/AccountMenuButton.tsx

@@ -22,14 +22,12 @@ const isWeb = Platform.OS === 'web';
 
 /**
  * Avatar entry-point that opens the unified {@link AccountSwitcher}. Reads the
- * EFFECTIVE active account from `useOxy().activeAccount` — never receives user
- * data via props.
+ * active account from `useOxy().user` — never receives user data via props.
  *
- * The chip reflects the account the user is currently switched into (an org /
- * project / bot / shared account) exactly as it reflects their personal account:
- * a switch makes the whole app — including this header avatar — become that
- * account. `activeAccount` falls back to the personal user when no switch is
- * active, so the chip always shows the current account.
+ * The chip reflects the current account: in the real-session switch model,
+ * switching into an org / project / bot / shared account makes the whole app —
+ * including this header avatar — become that account, so `user` IS the current
+ * account and the chip always shows it.
  *
  * Renders a small avatar chip (top-right friendly). Click → opens the switcher
  * (device sign-ins + account graph). Pure component: owns only the open-state
@@ -41,7 +39,7 @@ const AccountMenuButton: React.FC<AccountMenuButtonProps> = ({
     onNavigateManage,
     onAddAccount,
 }) => {
-    const { activeAccount, oxyServices, isAuthenticated } = useOxy();
+    const { user, oxyServices, isAuthenticated } = useOxy();
     const { t, locale } = useI18n();
     const [open, setOpen] = useState(false);
     const [anchor, setAnchor] = useState<AccountMenuAnchor | null>(null);
@@ -77,9 +75,9 @@ const AccountMenuButton: React.FC<AccountMenuButtonProps> = ({
         }
     }, [measureAnchor, open]);
 
-    const displayName = getAccountDisplayName(activeAccount, locale);
-    const avatarUri = activeAccount?.avatar
-        ? oxyServices.getFileDownloadUrl(activeAccount.avatar, 'thumb')
+    const displayName = getAccountDisplayName(user, locale);
+    const avatarUri = user?.avatar
+        ? oxyServices.getFileDownloadUrl(user.avatar, 'thumb')
         : undefined;
 
     const accessibilityLabel = isAuthenticated

package/src/ui/components/AccountSwitcher.tsx

@@ -111,12 +111,12 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
     const {
         activeSessionId,
         switchSession,
+        switchToAccount,
         removeSession,
         logout,
         logoutAll,
         accounts,
-        actingAs,
-        setActingAs,
+        user,
         oxyServices,
     } = useOxy();
     const { t, locale } = useI18n();
@@ -125,6 +125,7 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
     const { accounts: deviceAccounts } = useDeviceAccounts();
 
     const [busySessionId, setBusySessionId] = useState<string | null>(null);
+    const [switchingAccountId, setSwitchingAccountId] = useState<string | null>(null);
     const [removingSessionId, setRemovingSessionId] = useState<string | null>(null);
     const [signingOut, setSigningOut] = useState(false);
     const [signingOutAll, setSigningOutAll] = useState(false);
@@ -140,19 +141,37 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
         return [...current, ...others];
     }, [deviceAccounts]);
 
-    const isSwitching = busySessionId !== null;
+    const isSwitching = busySessionId !== null || switchingAccountId !== null;
     const actionDisabled = isSwitching || signingOut || signingOutAll;
 
+    // Account ids that are already signed in as REAL device sessions. After a
+    // `switchToAccount` the target becomes a device session (and the personal
+    // account always is one), so it would otherwise appear BOTH as a device row
+    // (Section A) and a graph row (Section B). We dedupe by hiding such accounts
+    // from the graph — they show in Section A, where the active one is flagged
+    // current.
+    const deviceUserIds = useMemo<Set<string>>(
+        () => new Set(deviceAccounts.map((account) => account.user.id).filter((id): id is string => Boolean(id))),
+        [deviceAccounts],
+    );
+
     // --- Account graph (Section B) ---
+    // The switchable graph minus accounts that are already device sessions
+    // (deduped into Section A). This is the set Section B renders and searches.
+    const graphAccounts = useMemo<AccountNode[]>(
+        () => accounts.filter((node) => !deviceUserIds.has(node.accountId)),
+        [accounts, deviceUserIds],
+    );
+
     const filtered = useMemo<AccountNode[]>(() => {
         const q = query.trim().toLowerCase();
-        if (!q) return accounts;
-        return accounts.filter((node) => {
+        if (!q) return graphAccounts;
+        return graphAccounts.filter((node) => {
             const name = getAccountDisplayName(node.account, locale).toLowerCase();
             const username = (node.account?.username ?? '').toLowerCase();
             return name.includes(q) || username.includes(q);
         });
-    }, [accounts, query, locale]);
+    }, [graphAccounts, query, locale]);
 
     const yourAccounts = useMemo(
         () => toTree(filtered.filter((node) => node.relationship !== 'member')),
@@ -165,11 +184,8 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
 
     const handleSwitchDevice = useCallback(async (sessionId: string) => {
         if (busySessionId) return;
-        // Tapping the already-active sign-in returns to that sign-in's own
-        // personal account (clearing any account-graph switch). When already on
-        // the personal account this just closes.
+        // Tapping the already-active sign-in just closes — it IS the current account.
         if (sessionId === activeSessionId) {
-            if (actingAs !== null) setActingAs(null);
             onClose();
             return;
         }
@@ -177,9 +193,6 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
         try {
             await onBeforeSessionChange?.();
             await switchSession(sessionId);
-            // The active sign-in changed; any account-graph switch belonged to the
-            // previous sign-in, so the new sign-in starts on its personal account.
-            if (actingAs !== null) setActingAs(null);
             toast.success(t('accountSwitcher.toasts.switchSuccess') || 'Switched account');
             onClose();
         } catch (error) {
@@ -190,7 +203,7 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
         } finally {
             setBusySessionId(null);
         }
-    }, [activeSessionId, busySessionId, actingAs, setActingAs, switchSession, t, onClose, onBeforeSessionChange]);
+    }, [activeSessionId, busySessionId, switchSession, t, onClose, onBeforeSessionChange]);
 
     const handleRemoveDevice = useCallback(async (sessionId: string) => {
         if (sessionId === activeSessionId || removingSessionId) return;
@@ -238,18 +251,40 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
         }
     }, [signingOutAll, logoutAll, t, onClose, onBeforeSessionChange]);
 
-    const handleSelectAccount = useCallback((node: AccountNode) => {
-        // The personal (self) account = no delegation (acting-as null).
-        setActingAs(node.relationship === 'self' ? null : node.accountId);
-        onClose();
-    }, [setActingAs, onClose]);
+    const handleSelectAccount = useCallback(async (node: AccountNode) => {
+        if (switchingAccountId) return;
+        // Already the active account → just close (it would also be deduped from
+        // the graph, but guard defensively).
+        if (node.accountId === user?.id) {
+            onClose();
+            return;
+        }
+        setSwitchingAccountId(node.accountId);
+        try {
+            await onBeforeSessionChange?.();
+            // Switching INTO a graph account is a REAL session switch — the whole
+            // app becomes that account (no delegation header).
+            await switchToAccount(node.accountId);
+            toast.success(t('accountSwitcher.toasts.switchSuccess') || 'Switched account');
+            onClose();
+        } catch (error) {
+            if (!isDev()) {
+                loggerUtil.warn('Switch account failed', { component: 'AccountSwitcher' }, error as unknown);
+            }
+            toast.error(t('accountSwitcher.toasts.switchFailed') || 'Failed to switch account');
+        } finally {
+            setSwitchingAccountId(null);
+        }
+    }, [switchingAccountId, user?.id, switchToAccount, t, onClose, onBeforeSessionChange]);
 
     const renderAccountNode = useCallback((node: AccountNode, isChild: boolean) => {
         const displayName = getAccountDisplayName(node.account, locale);
         const username = node.account?.username ? `@${node.account.username}` : null;
-        const active = node.relationship === 'self'
-            ? actingAs === null
-            : actingAs === node.accountId;
+        // Current account = the active session's user. After a real-session
+        // switch `user` IS this account (such accounts are normally deduped out of
+        // the graph, but the check stays correct/defensive if one lingers).
+        const active = node.accountId === user?.id;
+        const isNodeSwitching = switchingAccountId === node.accountId;
         const role = node.callerMembership?.role;
         const avatarUri = node.account?.avatar
             ? oxyServices.getFileDownloadUrl(node.account.avatar, 'thumb')
@@ -267,11 +302,13 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
                 accessibilityLabel={displayName}
                 accessibilityState={{ selected: active }}
                 onPress={() => handleSelectAccount(node)}
+                disabled={isSwitching}
                 activeOpacity={0.6}
                 style={[
                     styles.accountRow,
                     isChild && styles.childRow,
                     active && { backgroundColor: colors.primarySubtle },
+                    isSwitching && !isNodeSwitching && styles.rowDisabled,
                 ]}
             >
                 <Avatar uri={avatarUri} name={displayName} size={isChild ? 28 : 34} />
@@ -305,10 +342,14 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
                         <Ionicons name="settings-outline" size={16} color={colors.textSecondary} />
                     </TouchableOpacity>
                 ) : null}
-                {active ? <Ionicons name="checkmark" size={20} color={colors.primary} /> : null}
+                {isNodeSwitching ? (
+                    <ActivityIndicator color={colors.primary} size="small" />
+                ) : active ? (
+                    <Ionicons name="checkmark" size={20} color={colors.primary} />
+                ) : null}
             </TouchableOpacity>
         );
-    }, [actingAs, colors, handleSelectAccount, locale, onOpenAccountSettings, oxyServices, t]);
+    }, [user?.id, switchingAccountId, isSwitching, colors, handleSelectAccount, locale, onOpenAccountSettings, oxyServices, t]);
 
     const renderTree = useCallback((entries: TreeEntry[]) => (
         entries.map((entry) => (
@@ -333,11 +374,9 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
             {deviceRows.map((row) => {
                 const isBusy = busySessionId === row.sessionId;
                 const isRemoving = removingSessionId === row.sessionId;
-                // The active sign-in is THE current account only when no
-                // account-graph switch is in effect; otherwise a switched-into
-                // account is current and this row reads as the signed-in (but not
-                // active) account — tappable to return to it.
-                const isCurrentAccount = row.isActive && actingAs === null;
+                // The active device session IS the current account — there is no
+                // separate acting-as concept; switching makes `user` that account.
+                const isCurrentAccount = row.isActive;
                 return (
                     <TouchableOpacity
                         key={`device-${row.sessionId}`}
@@ -371,11 +410,6 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
                             <ActivityIndicator color={colors.primary} size="small" />
                         ) : isCurrentAccount ? (
                             <Ionicons name="checkmark" size={20} color={colors.primary} />
-                        ) : row.isActive ? (
-                            // Active sign-in while switched into another account:
-                            // no current-checkmark, no sign-out (can't sign out the
-                            // active session here) — tap the row to return to it.
-                            null
                         ) : isRemoving ? (
                             <ActivityIndicator color={colors.textSecondary} size="small" />
                         ) : (
@@ -420,12 +454,12 @@ export const AccountSwitcherView: React.FC<AccountSwitcherActions> = ({
                 </Text>
             </TouchableOpacity>
 
-            {/* Section B — account graph */}
-            {accounts.length > 0 ? (
+            {/* Section B — account graph (switchable accounts not already a device session) */}
+            {graphAccounts.length > 0 ? (
                 <>
                     <Divider color={colors.border} spacing={4} />
 
-                    {accounts.length > 6 ? (
+                    {graphAccounts.length > 6 ? (
                         <View style={[styles.searchBox, { backgroundColor: colors.card, borderColor: colors.border }]}>
                             <Ionicons name="search" size={16} color={colors.textSecondary} />
                             <TextInput