@oxyhq/services 22.10.0 → 22.11.1

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

@@ -47,36 +47,88 @@ const authChooserStyles = exports.authChooserStyles = _reactNative.StyleSheet.cr
     fontSize: 12.5,
     marginTop: 1
   },
-  /** Prominent current-account header (Google-style collapsed row). */
-  currentAccountRow: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: 12,
-    paddingVertical: 8,
-    paddingHorizontal: 4
-  },
-  currentAccountMeta: {
-    flex: 1,
-    minWidth: 0
+  /**
+   * Animated-collapse container for the account switch list — the outer clip and
+   * the inner measuring wrapper. Style-based (NOT NativeWind): the container
+   * carries the animated `height`/`opacity` off a reanimated style, and the
+   * measuring wrapper must stay className-free so its `onLayout` fires on RN-Web.
+   */
+  collapse: {
+    overflow: 'hidden'
+  },
+  collapseMeasure: {
+    width: '100%'
   },
-  currentAccountName: {
-    fontSize: 16,
-    fontWeight: '700'
+  /**
+   * The HERO block that opens the account menu: the current account's large
+   * avatar, a greeting, and the "Manage your Oxy account" pill — centred and
+   * deliberately chrome-free (no card, no grouped-section surface) so the
+   * grouped cards below read as the menu proper. The account's email sits above
+   * it in the Dialog's own nav bar, not here.
+   */
+  hero: {
+    alignItems: 'center',
+    paddingTop: 4,
+    paddingBottom: 20,
+    gap: 12
+  },
+  /**
+   * The current account's accent ring in the switch list, drawn OUTSIDE its
+   * avatar as an overlay so it adds no width to the row — every avatar in the
+   * list keeps the same footprint and the same content line. The 3px offset is
+   * the ring's 2px stroke plus a 1px gap.
+   */
+  currentAvatarRing: {
+    position: 'absolute',
+    top: -3,
+    left: -3,
+    right: -3,
+    bottom: -3,
+    borderWidth: 2,
+    borderRadius: 9999
+  },
+  /**
+   * The hero avatar's pressable wrapper — the "change your photo" entry point.
+   * `relative` so the accent ring + camera badge (both absolutely positioned)
+   * anchor to the avatar box.
+   */
+  heroAvatarPressable: {
+    position: 'relative'
+  },
+  /** The hero avatar's accent ring — an overlay, like the row-level one. */
+  heroAvatarRing: {
+    position: 'absolute',
+    top: -4,
+    left: -4,
+    right: -4,
+    bottom: -4,
+    borderWidth: 3,
+    borderRadius: 9999
+  },
+  /** Greeting + address stacked tight, centred (the hero's own 12px gap sits
+   *  between this block and the avatar / manage pill, not between these lines). */
+  heroNameBlock: {
+    alignItems: 'center',
+    gap: 2
   },
-  currentAccountEmail: {
-    fontSize: 13,
-    marginTop: 2
+  heroGreeting: {
+    fontSize: 22,
+    fontWeight: '600',
+    textAlign: 'center'
   },
-  manageButton: {
-    width: '100%',
-    borderRadius: 14,
-    marginTop: 4
+  /** The account address (`username@oxy.so` / `@handle`) under the greeting. */
+  heroAddress: {
+    fontSize: 14,
+    textAlign: 'center'
   },
-  addBadge: {
-    width: 40,
-    height: 40,
-    borderRadius: 9999,
-    borderWidth: _reactNative.StyleSheet.hairlineWidth,
+  /**
+   * The switch row's disclosure affordance — a filled circle around the chevron,
+   * right-aligned to the same 12px row inset every other trailing element uses.
+   */
+  chevronCircle: {
+    width: 32,
+    height: 32,
+    borderRadius: 16,
     alignItems: 'center',
     justifyContent: 'center'
   },

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","QR_PLATE_BG","authChooserStyles","exports","StyleSheet","create","rows","width","gap","accountRow","flexDirection","alignItems","borderWidth","hairlineWidth","borderRadius","paddingVertical","paddingHorizontal","rowDisabled","opacity","avatarRing","padding","rowMeta","flex","minWidth","rowName","fontSize","fontWeight","rowHandle","marginTop","currentAccountRow","currentAccountMeta","currentAccountName","currentAccountEmail","manageButton","addBadge","height","justifyContent","footerLink","alignSelf","linkText","signInBlock","primaryButton","secondaryButton","usernameInput","dividerRow","marginVertical","dividerLine","dividerText","marginHorizontal","centeredBlock","mutedText","textAlign","qrHeadline","qrPlate","backgroundColor"],"sourceRoot":"../../../../src","sources":["ui/components/oxyAuthChooserStyles.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","QR_PLATE_BG","authChooserStyles","exports","StyleSheet","create","rows","width","gap","accountRow","flexDirection","alignItems","borderWidth","hairlineWidth","borderRadius","paddingVertical","paddingHorizontal","rowDisabled","opacity","avatarRing","padding","rowMeta","flex","minWidth","rowName","fontSize","fontWeight","rowHandle","marginTop","collapse","overflow","collapseMeasure","hero","paddingTop","paddingBottom","currentAvatarRing","position","top","left","right","bottom","heroAvatarPressable","heroAvatarRing","heroNameBlock","heroGreeting","textAlign","heroAddress","chevronCircle","height","justifyContent","footerLink","alignSelf","linkText","signInBlock","primaryButton","secondaryButton","usernameInput","dividerRow","marginVertical","dividerLine","dividerText","marginHorizontal","centeredBlock","mutedText","qrHeadline","qrPlate","backgroundColor"],"sourceRoot":"../../../../src","sources":["ui/components/oxyAuthChooserStyles.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/components/photogrid/JustifiedPhotoGrid.js

@@ -3,20 +3,71 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.PHOTOS_PER_ROW = void 0;
+exports.chunkPhotos = chunkPhotos;
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
+var _reactQuery = require("@tanstack/react-query");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+/** Stable empty map so an unresolved query yields a referentially-stable value. */
+const EMPTY_DIMENSIONS = {};
+
+/**
+ * Measure the intrinsic size of every photo whose thumbnail URL has resolved,
+ * via `Image.getSize`. Pure/async (no React state) so it can be a React Query
+ * `queryFn`. Photos without a resolved URL are skipped and re-measured on the
+ * next signature change; a load error falls back to 1×1 (→ the 4/3 default).
+ */
+async function measurePhotoDimensions(photos, getThumbUrl) {
+  const measured = {};
+  await Promise.all(photos.map(photo => new Promise(resolve => {
+    const url = getThumbUrl(photo);
+    if (!url) {
+      resolve();
+      return;
+    }
+    _reactNative.Image.getSize(url, (width, height) => {
+      measured[photo.id] = {
+        width,
+        height
+      };
+      resolve();
+    }, () => {
+      measured[photo.id] = {
+        width: 1,
+        height: 1
+      };
+      resolve();
+    });
+  })));
+  return measured;
+}
+
+/** Fixed photos-per-row for the justified grid (Apple Photos-style trio). */
+const PHOTOS_PER_ROW = exports.PHOTOS_PER_ROW = 3;
+
+/** Chunk a photo list into fixed-length rows (last row may be short). */
+function chunkPhotos(photos, perRow) {
+  const rows = [];
+  for (let i = 0; i < photos.length; i += perRow) {
+    rows.push(photos.slice(i, i + perRow));
+  }
+  return rows;
+}
 /**
  * Responsive justified photo grid that stretches to the provided containerWidth.
  * Uses flex rows with proportional children widths instead of absolute pixel widths so it always fills.
+ *
+ * Owns its own intrinsic-dimension measurement: it calls `Image.getSize` on each
+ * photo's resolved thumbnail URL and reflows once real aspect ratios are known
+ * (falling back to 4/3 until then). Measurement re-runs whenever a photo is added
+ * OR its (asynchronously-resolved) private-safe URL first appears.
  */
 const JustifiedPhotoGrid = ({
   photos,
-  photoDimensions,
-  loadPhotoDimensions,
-  createJustifiedRows,
+  getThumbUrl,
   renderJustifiedPhotoItem,
   textColor,
   containerWidth: explicitWidth,
@@ -40,11 +91,24 @@ const JustifiedPhotoGrid = ({
     const w = e.nativeEvent.layout.width;
     setMeasuredWidth(prev => prev === w ? prev : w);
   }, [resolvedExplicitWidth]);
-  // Ensure dimensions are loaded for displayed photos
-  (0, _react.useEffect)(() => {
-    loadPhotoDimensions(photos);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [photos.map(p => p.id).join(',')]);
+
+  // Signature of every photo id + its currently-resolved URL — the measurement
+  // query key. A private tile's URL resolves asynchronously after it enters the
+  // list, so keying on THIS (not just the photo set) re-measures the moment a
+  // URL lands, not just when photos are added.
+  const urlSignature = (0, _react.useMemo)(() => photos.map(p => `${p.id}:${getThumbUrl(p) ?? ''}`).join('|'), [photos, getThumbUrl]);
+
+  // Intrinsic dimensions via React Query (no effect): re-runs when the signature
+  // changes and reflows the justified rows. `keepPreviousData` holds the last
+  // measured map during a re-measure so tiles never flash back to the 4/3 default.
+  const dimensionsQuery = (0, _reactQuery.useQuery)({
+    queryKey: ['justifiedPhotoDimensions', urlSignature],
+    queryFn: () => measurePhotoDimensions(photos, getThumbUrl),
+    placeholderData: _reactQuery.keepPreviousData,
+    staleTime: Number.POSITIVE_INFINITY,
+    gcTime: 5 * 60 * 1000
+  });
+  const photoDimensions = dimensionsQuery.data ?? EMPTY_DIMENSIONS;
 
   // Group photos by date first
   const photosByDate = (0, _react.useMemo)(() => {
@@ -72,10 +136,9 @@ const JustifiedPhotoGrid = ({
     onLayout: onLayoutContainer,
     children: sortedDates.map(date => {
       const dayPhotos = photosByDate[date];
-      // createJustifiedRows should build rows such that the "ideal" height (availableWidth / totalAspect) stays within min/max.
-      // We pass the effective container width.
-      const dateWidth = dateWidths[date] ?? effectiveWidth; // fallback to overall width until measured
-      const rows = dateWidth > 0 ? createJustifiedRows(dayPhotos, dateWidth) : [];
+      // Fall back to the overall width until this section is measured.
+      const dateWidth = dateWidths[date] ?? effectiveWidth;
+      const rows = dateWidth > 0 ? chunkPhotos(dayPhotos, PHOTOS_PER_ROW) : [];
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
         style: {
           marginBottom: 24,
@@ -100,7 +163,7 @@ const JustifiedPhotoGrid = ({
             width: '100%'
           },
           children: rows.map((row, rowIndex) => {
-            // Compute total aspect ratios using loaded dimensions (fallback 4/3)
+            // Total aspect ratio of the row, using measured dims (fallback 4/3).
             const aspects = row.map(p => {
               const dims = photoDimensions[p.id];
               return dims ? dims.width / dims.height : 4 / 3;
@@ -108,32 +171,29 @@ const JustifiedPhotoGrid = ({
             const totalAspect = aspects.reduce((a, b) => a + b, 0);
             const gapsTotal = gap * (row.length - 1);
             const availableWidth = dateWidth - gapsTotal;
-            // Ideal height that perfectly fills width when preserving aspect ratios
+            // Ideal height that perfectly fills width when preserving aspect ratios.
             const idealHeight = availableWidth / totalAspect;
-            // We rely on row construction keeping idealHeight within min/max bounds; if not, clamp but then distribute leftover/overflow.
+            // Clamp to min/max, then distribute the leftover/overflow proportionally.
             let rowHeight = idealHeight;
-            let widthAdjustment = 0; // difference to distribute if clamped
+            let widthAdjustment = 0;
             if (idealHeight < minRowHeight) {
               rowHeight = minRowHeight;
-              widthAdjustment = availableWidth - rowHeight * totalAspect; // negative means overflow
+              widthAdjustment = availableWidth - rowHeight * totalAspect;
             } else if (idealHeight > maxRowHeight) {
               rowHeight = maxRowHeight;
               widthAdjustment = availableWidth - rowHeight * totalAspect;
             }
-
-            // Pre-compute widths maintaining aspect ratios
             let widths = aspects.map(ar => ar * rowHeight);
-            // If we have widthAdjustment (due to clamping) distribute proportionally so row still fills exactly
             if (widthAdjustment !== 0) {
               const widthSum = widths.reduce((a, b) => a + b, 0);
               widths = widths.map(w => w + w / widthSum * widthAdjustment);
             }
 
-            // To combat rounding issues, adjust last item width to fill precisely
+            // Correct any rounding drift on the last tile so the row fills exactly.
             const widthSumRounded = widths.reduce((a, b) => a + b, 0);
             const roundingDiff = availableWidth - widthSumRounded;
             if (Math.abs(roundingDiff) > 0.5) {
-              widths[widths.length - 1] += roundingDiff; // minimal correction
+              widths[widths.length - 1] += roundingDiff;
             }
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
               style: {
@@ -152,7 +212,7 @@ const JustifiedPhotoGrid = ({
                   children: renderJustifiedPhotoItem(p, photoWidth, rowHeight, i === row.length - 1)
                 }, p.id);
               })
-            }, rowIndex);
+            }, row[0]?.id ?? rowIndex);
           })
         })]
       }, date);

package/lib/commonjs/ui/components/photogrid/JustifiedPhotoGrid.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","JustifiedPhotoGrid","photos","photoDimensions","loadPhotoDimensions","createJustifiedRows","renderJustifiedPhotoItem","textColor","containerWidth","explicitWidth","gap","minRowHeight","maxRowHeight","dateFormatLocale","width","windowWidth","useWindowDimensions","measuredWidth","setMeasuredWidth","useState","resolvedExplicitWidth","resolvedMeasuredWidth","effectiveWidth","onLayoutContainer","useCallback","w","nativeEvent","layout","prev","useEffect","map","p","id","join","photosByDate","useMemo","reduce","groups","photo","date","Date","uploadDate","toDateString","push","sortedDates","keys","sort","a","b","getTime","dateWidths","setDateWidths","onLayoutDate","jsx","View","style","onLayout","children","dayPhotos","dateWidth","rows","jsxs","marginBottom","Text","fontSize","fontWeight","color","toLocaleDateString","weekday","year","month","day","row","rowIndex","aspects","dims","height","totalAspect","gapsTotal","length","availableWidth","idealHeight","rowHeight","widthAdjustment","widths","ar","widthSum","widthSumRounded","roundingDiff","Math","abs","flexDirection","photoWidth","marginRight","_default","exports","React","memo"],"sourceRoot":"../../../../../src","sources":["ui/components/photogrid/JustifiedPhotoGrid.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactQuery","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","EMPTY_DIMENSIONS","measurePhotoDimensions","photos","getThumbUrl","measured","Promise","all","map","photo","resolve","url","Image","getSize","width","height","id","PHOTOS_PER_ROW","exports","chunkPhotos","perRow","rows","length","push","slice","JustifiedPhotoGrid","renderJustifiedPhotoItem","textColor","containerWidth","explicitWidth","gap","minRowHeight","maxRowHeight","dateFormatLocale","windowWidth","useWindowDimensions","measuredWidth","setMeasuredWidth","useState","resolvedExplicitWidth","resolvedMeasuredWidth","effectiveWidth","onLayoutContainer","useCallback","w","nativeEvent","layout","prev","urlSignature","useMemo","p","join","dimensionsQuery","useQuery","queryKey","queryFn","placeholderData","keepPreviousData","staleTime","Number","POSITIVE_INFINITY","gcTime","photoDimensions","data","photosByDate","reduce","groups","date","Date","uploadDate","toDateString","sortedDates","keys","sort","a","b","getTime","dateWidths","setDateWidths","onLayoutDate","jsx","View","style","onLayout","children","dayPhotos","dateWidth","jsxs","marginBottom","Text","fontSize","fontWeight","color","toLocaleDateString","weekday","year","month","day","row","rowIndex","aspects","dims","totalAspect","gapsTotal","availableWidth","idealHeight","rowHeight","widthAdjustment","widths","ar","widthSum","widthSumRounded","roundingDiff","Math","abs","flexDirection","photoWidth","marginRight","_default","React","memo"],"sourceRoot":"../../../../../src","sources":["ui/components/photogrid/JustifiedPhotoGrid.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/context/OxyContext.js

@@ -594,6 +594,28 @@ const OxyProvider = ({
   // reactive `accountDialogOpen` mirror below: presenting flips it true, the
   // surface settling (`result.finally`) flips it false — no other write site.
   const accountDialogSurfaceRef = (0, _react.useRef)(null);
+
+  // When the account dialog is shown by MORPHING an already-open route surface
+  // (e.g. ManageAccount → the account switcher) it is pushed as a frame ONTO that
+  // surface rather than presented as its own. This holds that host surface so the
+  // close path can pop the AccountDialog frame back to it. `null` when the dialog
+  // is its OWN detached surface (opened cold, with no surface underneath).
+  const accountDialogHostRef = (0, _react.useRef)(null);
+
+  // The single teardown for the account dialog wherever it lives: pop the morphed
+  // frame back to its host surface (reshaping Manage ← switcher), or dismiss the
+  // detached surface (whose settle then flips `accountDialogOpen`). Reads only
+  // stable refs + `setAccountDialogOpen`, so its identity never changes.
+  const dismissAccountDialogSurface = (0, _react.useCallback)(() => {
+    const host = accountDialogHostRef.current;
+    if (host) {
+      accountDialogHostRef.current = null;
+      setAccountDialogOpen(false);
+      host.goBack();
+      return;
+    }
+    accountDialogSurfaceRef.current?.dismiss();
+  }, []);
   const accountDialogControllerRef = (0, _react.useRef)(null);
   if (!accountDialogControllerRef.current) {
     accountDialogControllerRef.current = (0, _core.createAccountDialogController)({
@@ -607,11 +629,9 @@ const OxyProvider = ({
       commitSession: session => handleWebSessionRef.current(session),
       commitSwitchedSession: session => commitSwitchedSessionRef.current(session),
       onSignedIn: () => {
-        // Dismiss the surface; its settle (`result.finally` below) is what flips
-        // `accountDialogOpen` false. The surface's present→settle lifecycle is the
-        // SINGLE source of truth for "is the account dialog open" — never a manual
-        // flip here.
-        accountDialogSurfaceRef.current?.dismiss();
+        // Close the dialog: pop the morphed frame back to its host surface, or
+        // dismiss the detached surface (whose settle flips `accountDialogOpen`).
+        dismissAccountDialogSurface();
       },
       openUrl: url => {
         if ((0, _isWebBrowser.isWebBrowser)()) {
@@ -635,44 +655,60 @@ const OxyProvider = ({
   }
   const accountDialogController = accountDialogControllerRef.current;
   const openAccountDialog = (0, _react.useCallback)(view => {
-    accountDialogControllerRef.current?.setView(view ?? 'accounts');
-    // Present the AccountDialog surface on the shared Bloom stack the FIRST time
-    // (subsequent opens just re-point the controller's view above). `presentDetached`
-    // keeps it OUT of the `showBottomSheet` route-surface lineage, so closing the
-    // bottom-sheet session never touches the account dialog and vice-versa. When a
-    // route surface (e.g. ManageAccount) is already open, this stacks the dialog
-    // ABOVE it; dismissing the dialog unwinds back to that surface.
-    if (!accountDialogSurfaceRef.current) {
-      const instance = (0, _surfaces.presentDetached)('AccountDialog', {
-        initialView: view ?? 'accounts'
-      }, {
-        placement: {
-          base: 'bottom',
-          md: 'center'
-        },
-        dismissOnBackdrop: false,
-        maxWidth: 420
-      });
-      accountDialogSurfaceRef.current = instance;
-      // The surface settling is the ONE place `accountDialogOpen` flips false —
-      // covering every dismiss path (close button, `onSignedIn`, programmatic
-      // `closeAccountDialog`, host unmount). So the stack owns the open state.
-      instance.result.finally(() => {
-        if (accountDialogSurfaceRef.current === instance) {
-          accountDialogSurfaceRef.current = null;
-          setAccountDialogOpen(false);
-        }
+    const nextView = view ?? 'accounts';
+    accountDialogControllerRef.current?.setView(nextView);
+
+    // Its own detached surface is already open → just re-point the view above.
+    if (accountDialogSurfaceRef.current) {
+      setAccountDialogOpen(true);
+      return;
+    }
+
+    // When a route surface (e.g. ManageAccount) is already open, MORPH it in
+    // place: push the AccountDialog as a frame ONTO that surface, so the panel
+    // reshapes from that surface to the switcher and a back returns to it. With no
+    // surface open (opened cold from a sign-in button), present the dialog as its
+    // OWN detached surface — kept OUT of the `showBottomSheet` route-surface
+    // lineage so closing the bottom-sheet session never touches it and vice-versa.
+    // `navigate` is idempotent for the top frame (it replaces rather than
+    // duplicates), so calling this while already morphed in just re-points the
+    // view, and calling it after a back re-pushes the frame — no stale guard.
+    const host = (0, _surfaces.topRouteSurface)();
+    if (host) {
+      accountDialogHostRef.current = host;
+      host.navigate('AccountDialog', {
+        initialView: nextView
       });
+      setAccountDialogOpen(true);
+      return;
     }
+    const instance = (0, _surfaces.presentDetached)('AccountDialog', {
+      initialView: nextView
+    }, {
+      placement: {
+        base: 'bottom',
+        md: 'center'
+      },
+      dismissOnBackdrop: false,
+      maxWidth: 420
+    });
+    accountDialogSurfaceRef.current = instance;
+    // The surface settling is the ONE place `accountDialogOpen` flips false for
+    // the detached path — covering every dismiss (close button, `onSignedIn`,
+    // programmatic `closeAccountDialog`, host unmount). The morphed path clears
+    // its own state in `dismissAccountDialogSurface`.
+    instance.result.finally(() => {
+      if (accountDialogSurfaceRef.current === instance) {
+        accountDialogSurfaceRef.current = null;
+        setAccountDialogOpen(false);
+      }
+    });
     setAccountDialogOpen(true);
   }, []);
   const closeAccountDialog = (0, _react.useCallback)(() => {
     accountDialogControllerRef.current?.cancelSignIn();
-    // Dismiss the surface; its settle (`result.finally` above) flips
-    // `accountDialogOpen` false. Do NOT flip it here — the surface lifecycle is
-    // the single source of truth, so a manual write would be a second authority.
-    accountDialogSurfaceRef.current?.dismiss();
-  }, []);
+    dismissAccountDialogSurface();
+  }, [dismissAccountDialogSurface]);
 
   // Start driving the dialog on mount; tear it down on unmount.
   (0, _react.useEffect)(() => {