@oxyhq/services 22.9.0 → 22.10.0

package/lib/commonjs/index.js

@@ -141,6 +141,12 @@ Object.defineProperty(exports, "RequireOxyAuth", {
     return _RequireOxyAuth.RequireOxyAuth;
   }
 });
+Object.defineProperty(exports, "SurfaceHeaderAction", {
+  enumerable: true,
+  get: function () {
+    return _SurfaceHeaderAction.SurfaceHeaderAction;
+  }
+});
 Object.defineProperty(exports, "closeAccountDialog", {
   enumerable: true,
   get: function () {
@@ -537,6 +543,12 @@ Object.defineProperty(exports, "useStorage", {
     return _useStorage.useStorage;
   }
 });
+Object.defineProperty(exports, "useSurfaceHeader", {
+  enumerable: true,
+  get: function () {
+    return _useSurfaceHeader.useSurfaceHeader;
+  }
+});
 Object.defineProperty(exports, "useSwitchSession", {
   enumerable: true,
   get: function () {
@@ -713,6 +725,8 @@ var _CreateAccountScreen = _interopRequireDefault(require("./ui/screens/CreateAc
 var _AccountMembersScreen = _interopRequireDefault(require("./ui/screens/AccountMembersScreen.js"));
 var _AccountSettingsScreen = _interopRequireDefault(require("./ui/screens/AccountSettingsScreen.js"));
 var _bottomSheetManager = require("./ui/navigation/bottomSheetManager.js");
+var _useSurfaceHeader = require("./ui/hooks/useSurfaceHeader.js");
+var _SurfaceHeaderAction = require("./ui/components/SurfaceHeaderAction.js");
 var _accountDialogManager = require("./ui/navigation/accountDialogManager.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
@@ -805,13 +819,14 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 // wall before the device-first cold boot resolves. Opens the ONE account dialog.
 
 // Sidebar account trigger. Pressing `ProfileButton` opens the unified
-// `OxyAccountDialog` (the single account switcher + sign-in surface) via
+// `OxyAccountDialogScreen` (the single account switcher + sign-in surface) via
 // `useOxy().openAccountDialog`.
 
-// The account switcher/sign-in/sign-up chooser WITHOUT dialog chrome —
-// `OxyAccountDialog` wraps this in Bloom's `<Dialog>` for the normal in-app
-// surface; exported directly so a bare host (e.g. a future auth.oxy.so hub
-// page) can mount the exact same chooser with its own completion strategy.
+// The account switcher/sign-in/sign-up chooser WITHOUT dialog chrome — the
+// surface stack presents `OxyAccountDialogScreen` (which renders this) into
+// Bloom's `<Dialog>` for the normal in-app surface; exported directly so a bare
+// host (e.g. a future auth.oxy.so hub page) can mount the exact same chooser
+// with its own completion strategy.
 
 // Unified switchable-accounts hook — the single source of everything the user
 // can switch into: device sign-ins AND linked graph accounts (owned orgs +
@@ -828,6 +843,10 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 // Bottom-sheet navigation
 // ---------------------------------------------------------------------------
 
+// Surface nav header — a surface screen declares its title/subtitle (+ any
+// action slot) into the Dialog's OWN navigation header. Screens render no header
+// of their own.
+
 // ---------------------------------------------------------------------------
 // Unified account dialog — imperative entry points
 // ---------------------------------------------------------------------------

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_reactNative","_OxyProvider","_interopRequireDefault","_OxyContext","_useAuth","_FontLoader","_authStore","_accountStore","_assetStore","_useAssets","_useFileDownloadUrl","_useFollow","_useStorage","_useAccountQueries","_useServicesQueries","_useSecurityQueries","_useAuthMethods","_usePaymentQueries","_useAccountMutations","_useServicesMutations","_mutationFactory","_mutationKeys","_queryKeys","_userCache","_useMutationStatus","_useOnlineStatus","_useOxyEvent","_errorHandlers","_useFileFiltering","_OxySignInButton","_OxyAuthPrompt","_OxyOAuthCallback","_OxyConsentScreen","_RequireOxyAuth","_FollowButton","_OxyPayButton","_LogoIcon","_LogoText","_ProfileButton","_OxyAuthChooser","_useSwitchableAccounts","_ProfileScreen","_ManageAccountScreen","_NotificationsScreen","_PreferencesScreen","_ConnectedAppsScreen","_CreateAccountScreen","_AccountMembersScreen","_AccountSettingsScreen","_bottomSheetManager","_accountDialogManager","e","__esModule","default","setPlatformOS","Platform","OS"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","_reactNative","_OxyProvider","_interopRequireDefault","_OxyContext","_useAuth","_FontLoader","_authStore","_accountStore","_assetStore","_useAssets","_useFileDownloadUrl","_useFollow","_useStorage","_useAccountQueries","_useServicesQueries","_useSecurityQueries","_useAuthMethods","_usePaymentQueries","_useAccountMutations","_useServicesMutations","_mutationFactory","_mutationKeys","_queryKeys","_userCache","_useMutationStatus","_useOnlineStatus","_useOxyEvent","_errorHandlers","_useFileFiltering","_OxySignInButton","_OxyAuthPrompt","_OxyOAuthCallback","_OxyConsentScreen","_RequireOxyAuth","_FollowButton","_OxyPayButton","_LogoIcon","_LogoText","_ProfileButton","_OxyAuthChooser","_useSwitchableAccounts","_ProfileScreen","_ManageAccountScreen","_NotificationsScreen","_PreferencesScreen","_ConnectedAppsScreen","_CreateAccountScreen","_AccountMembersScreen","_AccountSettingsScreen","_bottomSheetManager","_useSurfaceHeader","_SurfaceHeaderAction","_accountDialogManager","e","__esModule","default","setPlatformOS","Platform","OS"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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D,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AApS9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAIA,IAAAG,mBAAa,EAACC,qBAAQ,CAACC,EAAgB,CAAC;;AAExC;AACA;AACA;;AAOA;AACA;AACA;;AAGA;AACA;AACA;;AAgBA;AACA;AACA;;AAOA;AACA;AACA;;AAgCA;;AAeA;AACA;AACA;;AA2BA;;AAGA;AACA;AACA;AACA;AACA;AACA;;AAeA;AACA;AACA;AACA;AACA;;AAIA;;AAMA;AACA;AACA;;AASA;AACA;AACA;;AAIA;AACA;AACA;;AAkBA;AACA;AACA;AACA;AACA;;AAUA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;;AAIA;AACA;AACA;AACA;AACA;AACA;;AAIA;;AAOA;;AAKA;AACA;AACA;;AAIA;AACA;AACA;;AAIA;AACA;AACA;AACA","ignoreList":[]}

package/lib/commonjs/ui/components/{OxyAccountDialog.js → OxyAccountDialogScreen.js}

@@ -6,17 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 var _reactNative = require("react-native");
-var _vectorIcons = require("@expo/vector-icons");
-var _typography = require("@oxyhq/bloom/typography");
-var _theme = require("@oxyhq/bloom/theme");
 var _OxyContext = require("../context/OxyContext.js");
 var _useI18n = require("../hooks/useI18n.js");
+var _useSurfaceHeader = require("../hooks/useSurfaceHeader.js");
 var _OxyAuthChooser = _interopRequireDefault(require("./OxyAuthChooser.js"));
-var _LogoIcon = require("./logo/LogoIcon.js");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
- * OxyAccountDialog — the ONE unified account dialog BODY for `@oxyhq/services`.
+ * OxyAccountDialogScreen — the ONE unified account dialog BODY for `@oxyhq/services`.
  *
  * The header (title/subtitle per view + back button) around the headless chooser
  * logic, which lives in `OxyAuthChooser` — the account switcher, sign-in,
@@ -51,12 +48,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * `@oxyhq/core`. Closing routes through `useOxy().closeAccountDialog`, which
  * dismisses the surface and runs its exit animation.
  */
-const OxyAccountDialog = () => {
+const OxyAccountDialogScreen = () => {
   const {
     accountDialogController: controller,
     closeAccountDialog
   } = (0, _OxyContext.useOxy)();
-  const theme = (0, _theme.useTheme)();
   const {
     t
   } = (0, _useI18n.useI18n)();
@@ -67,95 +63,33 @@ const OxyAccountDialog = () => {
   const subscribe = (0, _react.useCallback)(listener => controller ? controller.subscribe(listener) : () => undefined, [controller]);
   const getSnapshot = (0, _react.useCallback)(() => controller ? controller.getSnapshot() : EMPTY_SNAPSHOT, [controller]);
   const snapshot = (0, _react.useSyncExternalStore)(subscribe, getSnapshot, getSnapshot);
-  if (!controller) {
-    return null;
-  }
   const {
     view
   } = snapshot;
   const showBack = view === 'qr' || view === 'signup' || view === 'add' && snapshot.accounts.length > 0;
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(DialogHeader, {
-      snapshot: snapshot,
-      theme: theme,
-      t: t,
-      showBack: showBack,
-      onBack: () => controller.setView('accounts'),
-      onClose: closeAccountDialog
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ScrollView, {
-      style: styles.body,
-      contentContainerStyle: styles.bodyContent,
-      showsVerticalScrollIndicator: false,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_OxyAuthChooser.default, {
-        onComplete: closeAccountDialog
-      })
-    })]
-  });
-};
-
-// ---------------------------------------------------------------------------
-// Header
-// ---------------------------------------------------------------------------
-
-const DialogHeader = ({
-  snapshot,
-  theme,
-  t,
-  showBack,
-  onBack,
-  onClose
-}) => {
+  const goToAccounts = (0, _react.useCallback)(() => controller?.setView('accounts'), [controller]);
   const {
     title,
     subtitle
-  } = headerCopy(snapshot.view, snapshot.accounts.length, t);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
-    style: styles.header,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
-      style: styles.headerBar,
-      children: [showBack ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
-        onPress: onBack,
-        style: [styles.iconButton, {
-          backgroundColor: theme.colors.backgroundSecondary
-        }],
-        accessibilityRole: "button",
-        accessibilityLabel: t('common.actions.back') || 'Back',
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.MaterialCommunityIcons, {
-          name: "chevron-left",
-          size: 22,
-          color: theme.colors.textSecondary
-        })
-      }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-        style: styles.iconButton
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_LogoIcon.LogoIcon, {
-        height: 34,
-        color: theme.colors.primary
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
-        onPress: onClose,
-        style: [styles.iconButton, {
-          backgroundColor: theme.colors.backgroundSecondary
-        }],
-        accessibilityRole: "button",
-        accessibilityLabel: t('common.actions.close') || 'Close',
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.MaterialCommunityIcons, {
-          name: "close",
-          size: 20,
-          color: theme.colors.textSecondary
-        })
-      })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
-      style: [styles.title, {
-        color: theme.colors.text
-      }],
-      numberOfLines: 1,
-      children: title
-    }), subtitle ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
-      style: [styles.subtitle, {
-        color: theme.colors.textSecondary
-      }],
-      numberOfLines: 2,
-      children: subtitle
-    }) : null]
+  } = headerCopy(view, snapshot.accounts.length, t);
+
+  // The account dialog uses the SHARED Dialog nav header like every other screen
+  // (the base): the large in-content title/subtitle that collapses into the nav
+  // bar on scroll (default `largeTitle`), its per-view copy, and a per-view back
+  // that returns to the account list (the Dialog renders the frosted back/close).
+  (0, _useSurfaceHeader.useSurfaceHeader)({
+    title,
+    subtitle: subtitle ?? undefined,
+    onBack: showBack ? goToAccounts : undefined
+  });
+  if (!controller) {
+    return null;
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+    style: styles.bodyContent,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_OxyAuthChooser.default, {
+      onComplete: closeAccountDialog
+    })
   });
 };
 
@@ -207,44 +141,10 @@ const EMPTY_SNAPSHOT = {
   commonsAvailability: 'unknown'
 };
 const styles = _reactNative.StyleSheet.create({
-  header: {
-    alignItems: 'center',
-    marginBottom: 12
-  },
-  headerBar: {
-    width: '100%',
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-    marginBottom: 8
-  },
-  iconButton: {
-    width: 32,
-    height: 32,
-    borderRadius: 16,
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  title: {
-    fontSize: 22,
-    fontWeight: '800',
-    letterSpacing: -0.4,
-    textAlign: 'center',
-    marginTop: 6
-  },
-  subtitle: {
-    fontSize: 14,
-    lineHeight: 19,
-    textAlign: 'center',
-    marginTop: 4
-  },
-  body: {
-    width: '100%'
-  },
   bodyContent: {
     paddingTop: 4,
     paddingBottom: 4
   }
 });
-var _default = exports.default = OxyAccountDialog;
-//# sourceMappingURL=OxyAccountDialog.js.map
+var _default = exports.default = OxyAccountDialogScreen;
+//# sourceMappingURL=OxyAccountDialogScreen.js.map

package/lib/commonjs/ui/components/OxyAccountDialogScreen.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_reactNative","_OxyContext","_useI18n","_useSurfaceHeader","_OxyAuthChooser","_interopRequireDefault","_jsxRuntime","e","__esModule","default","OxyAccountDialogScreen","accountDialogController","controller","closeAccountDialog","useOxy","t","useI18n","subscribe","useCallback","listener","undefined","getSnapshot","EMPTY_SNAPSHOT","snapshot","useSyncExternalStore","view","showBack","accounts","length","goToAccounts","setView","title","subtitle","headerCopy","useSurfaceHeader","onBack","jsx","View","style","styles","bodyContent","children","onComplete","accountCount","activeAccountId","loading","error","switchingAccountId","signIn","phase","authorizeCode","qrPayload","expiresAt","commonsAvailability","StyleSheet","create","paddingTop","paddingBottom","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAccountDialogScreen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/components/OxyAuthChooser.js

@@ -10,6 +10,7 @@ var _vectorIcons = require("@expo/vector-icons");
 var _reactNativeQrcodeSvg = _interopRequireDefault(require("react-native-qrcode-svg"));
 var _avatar = require("@oxyhq/bloom/avatar");
 var _button = require("@oxyhq/bloom/button");
+var _settingsList = require("@oxyhq/bloom/settings-list");
 var _bloom = require("@oxyhq/bloom");
 var _typography = require("@oxyhq/bloom/typography");
 var _theme = require("@oxyhq/bloom/theme");
@@ -28,8 +29,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  *
  * A thin React Native binding over the headless `AccountDialogController` in
  * `@oxyhq/core` (bound via `useSyncExternalStore`) — the same data/state
- * machine {@link OxyAccountDialog} renders, extracted so it can be mounted in
- * TWO places: wrapped in Bloom's `<Dialog>` by `OxyAccountDialog` (the normal
+ * machine {@link OxyAccountDialogScreen} renders, extracted so it can be mounted in
+ * TWO places: wrapped in Bloom's `<Dialog>` by `OxyAccountDialogScreen` (the normal
  * in-app surface), and mounted bare by a future auth.oxy.so hub page for the
  * cross-origin passkey popup (b2) — same chooser, two hosts, two completion
  * strategies via the `onComplete` prop. Neither host duplicates view logic.
@@ -71,6 +72,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  */
 
 /** Diameter of a row avatar. */const ROW_AVATAR_SIZE = 40;
+/** Diameter of the prominent current-account avatar in the collapsed header. */
+const HEADER_AVATAR_SIZE = 48;
 /** High-contrast QR colors — intentionally fixed (NOT themed) for scan reliability. */
 const QR_PLATE_BG = '#FFFFFF';
 const QR_FOREGROUND = '#000000';
@@ -94,7 +97,7 @@ function toPreset(color) {
   return _theme.APP_COLOR_NAMES.includes(color) ? color : undefined;
 }
 /**
- * The account switcher + sign-in/sign-up chooser. Mounted by `OxyAccountDialog`
+ * The account switcher + sign-in/sign-up chooser. Mounted by `OxyAccountDialogScreen`
  * (wrapped in Bloom's `<Dialog>`) today; mountable bare by any future host that
  * supplies its own `onComplete`.
  */
@@ -301,12 +304,28 @@ const OxyAuthChooser = ({
 // Accounts view
 // ---------------------------------------------------------------------------
 
+/**
+ * The signed-in switcher, in the Google account-menu shape:
+ *  - COLLAPSED (default): the active account is prominent at the top (avatar +
+ *    name + email) with a trailing expand chevron, and a "Manage your Oxy
+ *    account" outline button directly under it. Nothing else.
+ *  - EXPANDED: the same header + button, then the full account list (current
+ *    first with a check-circle, every other switchable account, "Add another
+ *    account", and "Manage accounts on this device").
+ *
+ * Collapse state is a plain `useState` toggled in the header's press handler —
+ * no `useEffect`, no derived-from-props sync. When there is only ONE account
+ * (nothing to switch to) the chevron is hidden and the "Add another account" +
+ * "Manage accounts on this device" items render inline, so those affordances
+ * stay reachable without a pointless expand toggle.
+ */
 const AccountsView = ({
   snapshot,
   theme,
   t,
   handlers
 }) => {
+  const [expanded, setExpanded] = (0, _react.useState)(false);
   if (snapshot.loading && snapshot.accounts.length === 0) {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
       style: _oxyAuthChooserStyles.authChooserStyles.centeredBlock,
@@ -322,49 +341,127 @@ const AccountsView = ({
       })]
     });
   }
+  const switchingDisabled = snapshot.switchingAccountId !== null;
+  const current = snapshot.accounts.find(account => account.isCurrent) ?? snapshot.accounts[0];
+  const hasOtherAccounts = snapshot.accounts.some(account => account.accountId !== current?.accountId);
+  // Current account first, then the rest — the expanded list order.
+  const orderedAccounts = current ? [current, ...snapshot.accounts.filter(account => account.accountId !== current.accountId)] : snapshot.accounts;
+  // Multi-account: reveal the list only when expanded. Single-account: no expand
+  // affordance, so surface add/manage inline.
+  const showList = hasOtherAccounts ? expanded : true;
+  const renderAccountItem = account => {
+    const accent = resolveAccentHex(account.color, theme.colors.primary);
+    const isSwitching = snapshot.switchingAccountId === account.accountId;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_settingsList.SettingsListItem, {
+      icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+        style: [_oxyAuthChooserStyles.authChooserStyles.avatarRing, {
+          borderColor: account.isCurrent ? accent : 'transparent'
+        }],
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_avatar.Avatar, {
+          source: account.avatarUrl ?? undefined,
+          variant: "thumb",
+          name: account.displayName,
+          size: ROW_AVATAR_SIZE
+        })
+      }),
+      title: account.displayName,
+      description: account.email ?? undefined,
+      onPress: () => handlers.onSwitch(account.accountId),
+      disabled: switchingDisabled,
+      accessibilityLabel: account.displayName,
+      showChevron: false,
+      rightElement: isSwitching ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.MaterialCommunityIcons, {
+        name: "loading",
+        size: 20,
+        color: accent
+      }) : account.isCurrent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.MaterialCommunityIcons, {
+        name: "check-circle",
+        size: 20,
+        color: accent
+      }) : undefined
+    }, account.accountId);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
     style: _oxyAuthChooserStyles.authChooserStyles.rows,
-    children: [snapshot.accounts.map(account => /*#__PURE__*/(0, _jsxRuntime.jsx)(AccountRow, {
-      account: account,
-      theme: theme,
-      switching: snapshot.switchingAccountId === account.accountId,
-      disabled: snapshot.switchingAccountId !== null,
-      onPress: () => handlers.onSwitch(account.accountId)
-    }, account.accountId)), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Pressable, {
-      style: [_oxyAuthChooserStyles.authChooserStyles.addRow, {
-        borderColor: theme.colors.border
-      }],
-      onPress: handlers.onAdd,
-      accessibilityRole: "button",
-      accessibilityLabel: t('signin.addAccountTitle') || 'Add another account',
+    children: [current ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Pressable, {
+      style: _oxyAuthChooserStyles.authChooserStyles.currentAccountRow,
+      onPress: hasOtherAccounts ? () => setExpanded(value => !value) : undefined,
+      disabled: hasOtherAccounts ? switchingDisabled : true,
+      accessibilityRole: hasOtherAccounts ? 'button' : undefined,
+      accessibilityState: hasOtherAccounts ? {
+        expanded
+      } : undefined,
+      accessibilityLabel: current.displayName,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-        style: [_oxyAuthChooserStyles.authChooserStyles.addBadge, {
-          borderColor: theme.colors.border
+        style: [_oxyAuthChooserStyles.authChooserStyles.avatarRing, {
+          borderColor: resolveAccentHex(current.color, theme.colors.primary)
         }],
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.MaterialCommunityIcons, {
-          name: "plus",
-          size: 20,
-          color: theme.colors.textSecondary
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_avatar.Avatar, {
+          source: current.avatarUrl ?? undefined,
+          variant: "thumb",
+          name: current.displayName,
+          size: HEADER_AVATAR_SIZE
         })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
-        style: [_oxyAuthChooserStyles.authChooserStyles.rowName, {
-          color: theme.colors.textSecondary
-        }],
-        children: t('signin.addAccountTitle') || 'Add another account'
-      })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-      style: _oxyAuthChooserStyles.authChooserStyles.footerLinks,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
-        onPress: handlers.onManage,
-        accessibilityRole: "button",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
-          style: [_oxyAuthChooserStyles.authChooserStyles.linkText, {
-            color: theme.colors.primary
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+        style: _oxyAuthChooserStyles.authChooserStyles.currentAccountMeta,
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
+          style: [_oxyAuthChooserStyles.authChooserStyles.currentAccountName, {
+            color: theme.colors.text
           }],
-          children: t('accountMenu.manage') || 'Manage accounts'
-        })
-      })
-    })]
+          numberOfLines: 1,
+          children: current.displayName
+        }), current.email ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
+          style: [_oxyAuthChooserStyles.authChooserStyles.currentAccountEmail, {
+            color: theme.colors.textSecondary
+          }],
+          numberOfLines: 1,
+          children: current.email
+        }) : null]
+      }), hasOtherAccounts ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.MaterialCommunityIcons, {
+        name: expanded ? 'chevron-up' : 'chevron-down',
+        size: 24,
+        color: theme.colors.textSecondary
+      }) : null]
+    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.Button, {
+      variant: "outline",
+      onPress: handlers.onManage,
+      style: _oxyAuthChooserStyles.authChooserStyles.manageButton,
+      children: t('accountMenu.manage') || 'Manage your Oxy account'
+    }), showList ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_settingsList.SettingsListGroup, {
+      children: [hasOtherAccounts ? orderedAccounts.map(renderAccountItem) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_settingsList.SettingsListItem, {
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+          style: [_oxyAuthChooserStyles.authChooserStyles.addBadge, {
+            borderColor: theme.colors.border
+          }],
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.MaterialCommunityIcons, {
+            name: "plus",
+            size: 20,
+            color: theme.colors.textSecondary
+          })
+        }),
+        title: t('signin.addAccountTitle') || 'Add another account',
+        onPress: handlers.onAdd,
+        disabled: switchingDisabled,
+        accessibilityLabel: t('signin.addAccountTitle') || 'Add another account',
+        showChevron: false
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_settingsList.SettingsListItem, {
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+          style: [_oxyAuthChooserStyles.authChooserStyles.addBadge, {
+            borderColor: theme.colors.border
+          }],
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.MaterialCommunityIcons, {
+            name: "cog-outline",
+            size: 20,
+            color: theme.colors.textSecondary
+          })
+        }),
+        title: t('accountSwitcher.manageOnDevice') || 'Manage accounts on this device',
+        onPress: handlers.onManage,
+        disabled: switchingDisabled,
+        accessibilityLabel: t('accountSwitcher.manageOnDevice') || 'Manage accounts on this device',
+        showChevron: false
+      })]
+    }) : null]
   });
 };
 const AccountRow = ({