@oxyhq/services 22.12.5 → 22.13.1

package/lib/module/notifications/deviceNotifications.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createLogger","Platform","log","isRecord","value","loadNotifications","OS","error","warn","method","easProjectId","constants","default","debug","fromEasConfig","easConfig","projectId","length","extra","expoConfig","eas","undefined","pushTokenPlatform","hasNotificationPermission","notifications","permissions","getPermissionsAsync","granted","requestNotificationPermission","existing","canAskAgain","requested","requestPermissionsAsync","getExpoPushToken","token","getExpoPushTokenAsync","data","takeLaunchNotificationData","response","getLastNotificationResponse","notification","request","content","clearLastNotificationResponse","clearError","foregroundHandlerAttempted","ensureNotificationChannel","spec","setNotificationChannelAsync","id","name","importance","AndroidImportance","HIGH","DEFAULT","description","channelId","installForegroundNotificationHandler","decide","setNotificationHandler","handleNotification","show","shouldShowBanner","shouldShowList","shouldPlaySound","shouldSetBadge","subscribeToNotificationResponses","listener","subscription","addNotificationResponseReceivedListener","remove"],"sourceRoot":"../../../src","sources":["notifications/deviceNotifications.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/boot/runProviderColdBoot.js

@@ -5,6 +5,7 @@ import { loadPersistedDeviceCredential } from "../utils/deviceCredential.js";
 import { consumeSilentOAuthError, isSilentRestoreEligibleOrigin, maybeStartSilentOAuthRestore } from "../utils/crossOriginRestore.js";
 import { tryCompleteOAuthReturn, consumeHubSyncFailure } from "../utils/oauthReturn.js";
 import { isWebBrowser } from "../utils/isWebBrowser.js";
+import { allowsAutomaticIdpRedirect } from "../oauth/legacyRedirectLanes.js";
 /** How long the cold boot waits for the post-boot SessionClient handoff (ms). */
 export const SESSION_HANDOFF_DEADLINE_MS = 6000;
 
@@ -62,8 +63,18 @@ async function detectOfflineHint() {
  *
  * Ordered pipeline:
  * 1. Complete OAuth authorization-code return (web)
- * 2. `runSessionColdBoot` — device-secret mint (+ native shared-key)
+ * 2. `runSessionColdBoot` — device-secret mint (+ native shared-key, or the
+ *    primary-identity-key lane in `sessionMode: 'identity'`)
  * 3. Silent OAuth for all web apps when mint finds no session
+ *
+ * Steps 1 and 3 are ACCOUNT-MODE ONLY: both commit whichever account the IdP
+ * resolves, which for an identity-bound client is somebody else's account by
+ * construction. In `'identity'` mode the boot is exactly step 2.
+ *
+ * Step 3 is additionally REDIRECT-MODE ONLY: it navigates the top-level window
+ * with no user gesture behind it, which `webAuthMode: 'popup'` exists to
+ * eliminate. In popup mode the boot is steps 1 and 2, and a domain with no local
+ * credential simply resolves signed out. See `allowsAutomaticIdpRedirect`.
  */
 export async function runProviderColdBoot(opts) {
   const {
@@ -72,17 +83,34 @@ export async function runProviderColdBoot(opts) {
     clientId,
     authRedirectUri,
     authorizeBaseUrl,
+    sessionMode = 'account',
+    identity,
+    webAuthMode = 'redirect',
     sessionClient,
     syncDeviceCredentialToHost,
     commitSession,
     markAuthResolved,
     setTokenReady
   } = opts;
+  const identityBound = sessionMode === 'identity';
   setTokenReady(false);
   try {
+    // MODE-INDEPENDENT URL cleanup, deliberately so: both consume query params a
+    // PREVIOUS redirect-mode session left in the address bar (`?error=login_required`
+    // from a silent authorize, `?hub_sync=failed` from the hub) and restore the
+    // page the visit started on. Flipping an app to popup mode must not strand
+    // those params, so neither is gated on `webAuthMode`. Neither starts a
+    // navigation — they only rewrite the URL via `history.replaceState`.
     consumeSilentOAuthError();
     consumeHubSyncFailure();
-    const oauthCompleted = await tryCompleteOAuthReturn({
+
+    // The redirect transport's RETURN leg — also NOT gated on `webAuthMode`. A
+    // popup-mode app legitimately lands here with `?code=` whenever the browser
+    // blocked the popup and `startWebOAuthSignIn` fell back to a full-page
+    // redirect (`popup-blocked` / `popup-navigation-failed`), and an app that
+    // switched modes mid-flight must not be stranded with a dead `?code=`
+    // either. It consumes a code already on the URL; it never starts one.
+    const oauthCompleted = identityBound ? false : await tryCompleteOAuthReturn({
       oxyServices,
       clientId,
       authRedirectUri,
@@ -109,6 +137,8 @@ export async function runProviderColdBoot(opts) {
         isWeb: isWebBrowser(),
         isNative: !isWebBrowser()
       },
+      sessionMode,
+      identity,
       overallDeadlineMs: COLD_BOOT_OVERALL_DEADLINE_MS,
       isOffline: () => offline,
       onStepDeadline: stepId => {
@@ -163,14 +193,26 @@ export async function runProviderColdBoot(opts) {
       }
     });
 
-    // Silent cross-origin OAuth restore (web cross-app SSO). Gate it the SAME
-    // way the hub-sync WRITE side (`syncHubAfterSignIn`) gates: official web
-    // origins only, never the IdP hub itself, and — unlike the write side —
-    // never a loopback / local-dev origin (which must not be bounced to a hosted
-    // IdP on cold boot). The authorize endpoint is env-configurable so a
-    // local/staging app targets its own IdP instead of production.
+    // Silent cross-origin OAuth restore (web cross-app SSO): a full-page
+    // `prompt=none` bounce to the IdP when the mint found no local session.
+    //
+    // TRANSPORT gate (`allowsAutomaticIdpRedirect`): `webAuthMode: 'popup'`
+    // FORBIDS this lane. It navigates the top-level window with no user gesture
+    // behind it, which is precisely what popup mode exists to eliminate — a
+    // popup-mode domain without a local credential resolves signed out right
+    // here and waits for the user's next explicit "Continue with Oxy" (issue
+    // #691, "Cold boot and cross-domain behavior"). `'redirect'` — still the
+    // default and the compatibility path — reaches this lane unchanged, and this
+    // whole block disappears with the transport in phase 7b.
+    //
+    // ORIGIN gate: same as the hub-sync WRITE side (`syncHubAfterSignIn`) —
+    // official web origins only, never the IdP hub itself, and — unlike the
+    // write side — never a loopback / local-dev origin (which must not be
+    // bounced to a hosted IdP on cold boot). The authorize endpoint is
+    // env-configurable so a local/staging app targets its own IdP instead of
+    // production.
     const webOrigin = isWebBrowser() ? globalThis.location?.origin : undefined;
-    if (clientId && outcome.kind !== 'session' && webOrigin && isSilentRestoreEligibleOrigin(webOrigin)) {
+    if (!identityBound && allowsAutomaticIdpRedirect(webAuthMode) && clientId && outcome.kind !== 'session' && webOrigin && isSilentRestoreEligibleOrigin(webOrigin)) {
       const redirected = await maybeStartSilentOAuthRestore({
         oxyServices,
         clientId,

package/lib/module/ui/boot/runProviderColdBoot.js.map

@@ -1 +1 @@
-{"version":3,"names":["logger","loggerUtil","runSessionColdBoot","loadPersistedDeviceCredential","consumeSilentOAuthError","isSilentRestoreEligibleOrigin","maybeStartSilentOAuthRestore","tryCompleteOAuthReturn","consumeHubSyncFailure","isWebBrowser","SESSION_HANDOFF_DEADLINE_MS","COLD_BOOT_OVERALL_DEADLINE_MS","OFFLINE_PROBE_TIMEOUT_MS","detectOfflineHint","online","globalThis","navigator","onLine","NetInfo","state","Promise","race","default","fetch","resolve","setTimeout","isConnected","runProviderColdBoot","opts","oxyServices","authStore","clientId","authRedirectUri","authorizeBaseUrl","sessionClient","syncDeviceCredentialToHost","commitSession","markAuthResolved","setTokenReady","oauthCompleted","input","activate","hubSync","offline","outcome","oxy","store","platform","isWeb","isNative","overallDeadlineMs","isOffline","onStepDeadline","stepId","warn","component","method","onSession","session","handoff","sessionId","accessToken","userId","handoffDeadlineId","finally","undefined","clearTimeout","onSignedOut","cred","start","socketError","__DEV__","debug","onStepError","id","error","webOrigin","location","origin","kind","redirected","redirectUri","Error","String"],"sourceRoot":"../../../../src","sources":["ui/boot/runProviderColdBoot.ts"],"mappings":";;AAAA,SACEA,MAAM,IAAIC,UAAU,EACpBC,kBAAkB,QAGb,aAAa;AAEpB,SAASC,6BAA6B,QAAQ,8BAA2B;AACzE,SACEC,uBAAuB,EACvBC,6BAA6B,EAC7BC,4BAA4B,QACvB,gCAA6B;AACpC,SAASC,sBAAsB,EAAEC,qBAAqB,QAAQ,yBAAsB;AACpF,SAASC,YAAY,QAAQ,0BAAuB;AAGpD;AACA,OAAO,MAAMC,2BAA2B,GAAG,IAAI;;AAE/C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,6BAA6B,GAAG,MAAM;;AAEnD;AACA;AACA;AACA;AACA;AACA,MAAMC,wBAAwB,GAAG,GAAG;;AAEpC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAeC,iBAAiBA,CAAA,EAAqB;EACnD,IAAI;IACF,IAAIJ,YAAY,CAAC,CAAC,EAAE;MAClB,MAAMK,MAAM,GAAIC,UAAU,CAA0CC,SAAS,EAAEC,MAAM;MACrF;MACA,OAAOH,MAAM,KAAK,KAAK;IACzB;IACA,MAAMI,OAAO,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC;IAC/D,MAAMC,KAAK,GAAG,MAAMC,OAAO,CAACC,IAAI,CAAC,CAC/BH,OAAO,CAACI,OAAO,CAACC,KAAK,CAAC,CAAC,EACvB,IAAIH,OAAO,CAAQI,OAAO,IAAK;MAC7BC,UAAU,CAAC,MAAMD,OAAO,CAAC,IAAI,CAAC,EAAEZ,wBAAwB,CAAC;IAC3D,CAAC,CAAC,CACH,CAAC;IACF;IACA;IACA,OAAOO,KAAK,EAAEO,WAAW,KAAK,KAAK;EACrC,CAAC,CAAC,MAAM;IACN;IACA,OAAO,KAAK;EACd;AACF;AAuBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,mBAAmBA,CAACC,IAAgC,EAAiB;EACzF,MAAM;IACJC,WAAW;IACXC,SAAS;IACTC,QAAQ;IACRC,eAAe;IACfC,gBAAgB;IAChBC,aAAa;IACbC,0BAA0B;IAC1BC,aAAa;IACbC,gBAAgB;IAChBC;EACF,CAAC,GAAGV,IAAI;EAERU,aAAa,CAAC,KAAK,CAAC;EAEpB,IAAI;IACFlC,uBAAuB,CAAC,CAAC;IACzBI,qBAAqB,CAAC,CAAC;IAEvB,MAAM+B,cAAc,GAAG,MAAMhC,sBAAsB,CAAC;MAClDsB,WAAW;MACXE,QAAQ;MACRC,eAAe;MACfI,aAAa,EAAGI,KAAK,IAAKJ,aAAa,CAACI,KAAK,EAAE;QAAEC,QAAQ,EAAE,IAAI;QAAEC,OAAO,EAAE;MAAM,CAAC;IACnF,CAAC,CAAC;IACF,IAAIH,cAAc,EAAE;MAClBD,aAAa,CAAC,IAAI,CAAC;MACnBD,gBAAgB,CAAC,CAAC;MAClB;IACF;;IAEA;IACA;IACA;IACA;IACA,MAAMM,OAAO,GAAG,MAAM9B,iBAAiB,CAAC,CAAC;IAEzC,MAAM+B,OAAO,GAAG,MAAM1C,kBAAkB,CAAC;MACvC2C,GAAG,EAAEhB,WAAW;MAChBiB,KAAK,EAAEhB,SAAS;MAChBiB,QAAQ,EAAE;QAAEC,KAAK,EAAEvC,YAAY,CAAC,CAAC;QAAEwC,QAAQ,EAAE,CAACxC,YAAY,CAAC;MAAE,CAAC;MAC9DyC,iBAAiB,EAAEvC,6BAA6B;MAChDwC,SAAS,EAAEA,CAAA,KAAMR,OAAO;MACxBS,cAAc,EAAGC,MAAM,IAAK;QAC1BpD,UAAU,CAACqD,IAAI,CACb,mBAAmBD,MAAM,kBAAkB1C,6BAA6B,8DAA8D,EACtI;UAAE4C,SAAS,EAAE,qBAAqB;UAAEC,MAAM,EAAE;QAAiB,CAC/D,CAAC;MACH,CAAC;MACDC,SAAS,EAAE,MAAOC,OAAO,IAAK;QAC5B;QACA;QACA,MAAMvB,0BAA0B,CAAC,CAAC;QAClC,MAAMwB,OAAO,GAAGvB,aAAa,CAC3B;UACEwB,SAAS,EAAEF,OAAO,CAACE,SAAS;UAC5BC,WAAW,EAAEH,OAAO,CAACG,WAAW;UAChCC,MAAM,EAAEJ,OAAO,CAACI;QAClB,CAAC,EACD;UAAErB,QAAQ,EAAE;QAAM,CACpB,CAAC;QACD,IAAIsB,iBAA4D;QAChE,MAAM3C,OAAO,CAACC,IAAI,CAAC,CACjBsC,OAAO,EACP,IAAIvC,OAAO,CAAQI,OAAO,IAAK;UAC7BuC,iBAAiB,GAAGtC,UAAU,CAACD,OAAO,EAAEd,2BAA2B,CAAC;QACtE,CAAC,CAAC,CACH,CAAC,CAACsD,OAAO,CAAC,MAAM;UACf,IAAID,iBAAiB,KAAKE,SAAS,EAAE;YACnCC,YAAY,CAACH,iBAAiB,CAAC;UACjC;QACF,CAAC,CAAC;QACF1B,gBAAgB,CAAC,CAAC;MACpB,CAAC;MACD8B,WAAW,EAAE,MAAAA,CAAA,KAAY;QACvB,MAAMhC,0BAA0B,CAAC,CAAC;QAClC,MAAMiC,IAAI,GAAG,MAAMjE,6BAA6B,CAAC2B,SAAS,CAAC;QAC3D,IAAIsC,IAAI,EAAE;UACR,IAAI;YACF,MAAMlC,aAAa,CAACmC,KAAK,CAAC,CAAC;UAC7B,CAAC,CAAC,OAAOC,WAAW,EAAE;YACpB,IAAIC,OAAO,EAAE;cACXtE,UAAU,CAACuE,KAAK,CACd,wCAAwC,EACxC;gBAAEjB,SAAS,EAAE;cAAsB,CAAC,EACpCe,WACF,CAAC;YACH;UACF;QACF;QACAjC,gBAAgB,CAAC,CAAC;MACpB,CAAC;MACDoC,WAAW,EAAEA,CAACC,EAAE,EAAEC,KAAK,KAAK;QAC1B,IAAIJ,OAAO,EAAE;UACXtE,UAAU,CAACuE,KAAK,CACd,mBAAmBE,EAAE,wCAAwC,EAC7D;YAAEnB,SAAS,EAAE;UAAsB,CAAC,EACpCoB,KACF,CAAC;QACH;MACF;IACF,CAAC,CAAC;;IAEF;IACA;IACA;IACA;IACA;IACA;IACA,MAAMC,SAAS,GAAGnE,YAAY,CAAC,CAAC,GAC3BM,UAAU,CAA6B8D,QAAQ,EAAEC,MAAM,GACxDb,SAAS;IACb,IACElC,QAAQ,IACRa,OAAO,CAACmC,IAAI,KAAK,SAAS,IAC1BH,SAAS,IACTvE,6BAA6B,CAACuE,SAAS,CAAC,EACxC;MACA,MAAMI,UAAU,GAAG,MAAM1E,4BAA4B,CAAC;QACpDuB,WAAW;QACXE,QAAQ;QACRkD,WAAW,EAAEjD,eAAe;QAC5BC;MACF,CAAC,CAAC;MACF,IAAI+C,UAAU,EAAE;QACd;MACF;IACF;EACF,CAAC,CAAC,OAAOL,KAAK,EAAE;IACd,IAAIJ,OAAO,EAAE;MACXtE,UAAU,CAAC0E,KAAK,CACd,iBAAiB,EACjBA,KAAK,YAAYO,KAAK,GAAGP,KAAK,GAAG,IAAIO,KAAK,CAACC,MAAM,CAACR,KAAK,CAAC,CAAC,EACzD;QAAEpB,SAAS,EAAE;MAAsB,CACrC,CAAC;IACH;EACF,CAAC,SAAS;IACRlB,gBAAgB,CAAC,CAAC;EACpB;AACF","ignoreList":[]}
+{"version":3,"names":["logger","loggerUtil","runSessionColdBoot","loadPersistedDeviceCredential","consumeSilentOAuthError","isSilentRestoreEligibleOrigin","maybeStartSilentOAuthRestore","tryCompleteOAuthReturn","consumeHubSyncFailure","isWebBrowser","allowsAutomaticIdpRedirect","SESSION_HANDOFF_DEADLINE_MS","COLD_BOOT_OVERALL_DEADLINE_MS","OFFLINE_PROBE_TIMEOUT_MS","detectOfflineHint","online","globalThis","navigator","onLine","NetInfo","state","Promise","race","default","fetch","resolve","setTimeout","isConnected","runProviderColdBoot","opts","oxyServices","authStore","clientId","authRedirectUri","authorizeBaseUrl","sessionMode","identity","webAuthMode","sessionClient","syncDeviceCredentialToHost","commitSession","markAuthResolved","setTokenReady","identityBound","oauthCompleted","input","activate","hubSync","offline","outcome","oxy","store","platform","isWeb","isNative","overallDeadlineMs","isOffline","onStepDeadline","stepId","warn","component","method","onSession","session","handoff","sessionId","accessToken","userId","handoffDeadlineId","finally","undefined","clearTimeout","onSignedOut","cred","start","socketError","__DEV__","debug","onStepError","id","error","webOrigin","location","origin","kind","redirected","redirectUri","Error","String"],"sourceRoot":"../../../../src","sources":["ui/boot/runProviderColdBoot.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/client.js

@@ -18,7 +18,6 @@ export { LogoIcon } from "./components/logo/LogoIcon.js";
 export { LogoText } from "./components/logo/LogoText.js";
 export { default as FollowButton } from "./components/FollowButton.js";
 export { default as OxyPayButton } from "./components/OxyPayButton.js";
-export { FontLoader, setupFonts } from './components/FontLoader';
 
 // Context
 export { useOxy } from "./context/OxyContext.js";

package/lib/module/ui/client.js.map

@@ -1 +1 @@
-{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyAuthPrompt","LogoIcon","LogoText","FollowButton","OxyPayButton","FontLoader","setupFonts","useOxy","useAuth","useFollow","useStorage","ProfileScreen","ManageAccountScreen","useAuthStore","useAccountStore","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,6BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,iCAA8B;AACzE,SAASF,OAAO,IAAIG,aAAa,QAAQ,+BAA4B;AAErE,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASL,OAAO,IAAIM,YAAY,QAAQ,8BAA2B;AACnE,SAASN,OAAO,IAAIO,YAAY,QAAQ,8BAA2B;AACnE,SAASC,UAAU,EAAEC,UAAU,QAAQ,yBAAyB;;AAEhE;AACA,SAASC,MAAM,QAAQ,yBAAsB;;AAE7C;AACA,SAASC,OAAO,QAAQ,oBAAiB;AAEzC,SAASC,SAAS,QAAQ,sBAAmB;AAC7C,SAASC,UAAU,QAAQ,uBAAoB;AAG/C;AACA,SAASb,OAAO,IAAIc,aAAa,QAAQ,4BAAyB;AAClE,SAASd,OAAO,IAAIe,mBAAmB,QAAQ,kCAA+B;;AAE9E;AACA,SAASC,YAAY,QAAQ,uBAAoB;AACjD,SAASC,eAAe,QAAQ,0BAAuB;;AAEvD;AACA,SACIC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QAChB,0BAAuB","ignoreList":[]}
+{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyAuthPrompt","LogoIcon","LogoText","FollowButton","OxyPayButton","useOxy","useAuth","useFollow","useStorage","ProfileScreen","ManageAccountScreen","useAuthStore","useAccountStore","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,6BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,iCAA8B;AACzE,SAASF,OAAO,IAAIG,aAAa,QAAQ,+BAA4B;AAErE,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASL,OAAO,IAAIM,YAAY,QAAQ,8BAA2B;AACnE,SAASN,OAAO,IAAIO,YAAY,QAAQ,8BAA2B;;AAEnE;AACA,SAASC,MAAM,QAAQ,yBAAsB;;AAE7C;AACA,SAASC,OAAO,QAAQ,oBAAiB;AAEzC,SAASC,SAAS,QAAQ,sBAAmB;AAC7C,SAASC,UAAU,QAAQ,uBAAoB;AAG/C;AACA,SAASX,OAAO,IAAIY,aAAa,QAAQ,4BAAyB;AAClE,SAASZ,OAAO,IAAIa,mBAAmB,QAAQ,kCAA+B;;AAE9E;AACA,SAASC,YAAY,QAAQ,uBAAoB;AACjD,SAASC,eAAe,QAAQ,0BAAuB;;AAEvD;AACA,SACIC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QAChB,0BAAuB","ignoreList":[]}

package/lib/module/ui/components/OxyAccountDialogScreen.js

@@ -75,7 +75,19 @@ const OxyAccountDialogScreen = ({
     view
   } = snapshot;
   const showBack = view === 'qr' || view === 'signup' || view === 'add' && snapshot.accounts.length > 0;
-  const goToAccounts = useCallback(() => controller?.setView('accounts'), [controller]);
+  const goToAccounts = useCallback(() => {
+    if (!controller) return;
+    const {
+      view: currentView,
+      signIn
+    } = controller.getSnapshot();
+    // Backing out of an active request must withdraw it — otherwise the
+    // authorizeCode stays approvable until expiry (issue #691 phase 5).
+    if ((currentView === 'qr' || currentView === 'add') && (signIn.phase === 'starting' || signIn.phase === 'waiting')) {
+      controller.cancelSignIn();
+    }
+    controller.setView('accounts');
+  }, [controller]);
   // An ENTRY view (accounts / signin — no in-dialog back of its own) that is
   // MORPHED into a host surface (ManageAccount → switcher) has a frame beneath it,
   // so its back CLOSES the dialog and reshapes back to the host — routed through
@@ -112,10 +124,16 @@ const OxyAccountDialogScreen = ({
 
 function headerCopy(view, accountCount, t) {
   switch (view) {
+    // The ACTIVE REQUEST. Its header is deliberately route-AGNOSTIC: Oxy picks
+    // the delivery route (QR here, a push to the user's phone, or opening
+    // Commons on this device — issue #691), so naming one of them in the bar
+    // would contradict the other two. The route-specific status line lives in
+    // the body, derived from `signIn.progress`, and is the only thing that
+    // describes HOW the request is travelling.
     case 'qr':
       return {
-        title: t('accountSwitcher.scanTitle') || 'Sign in with Oxy',
-        subtitle: t('accountSwitcher.scanSubtitle') || 'Scan with Commons on your phone.'
+        title: t('accountSwitcher.signInWithOxy') || 'Sign in with Oxy',
+        subtitle: null
       };
     case 'signup':
       return {
@@ -144,7 +162,12 @@ const EMPTY_SNAPSHOT = {
     authorizeCode: null,
     qrPayload: null,
     expiresAt: null,
-    error: null
+    error: null,
+    route: null,
+    routeFailed: false,
+    pushSentAt: null,
+    openedAt: null,
+    progress: 'idle'
   },
   commonsAvailability: 'unknown'
 };

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useSyncExternalStore","StyleSheet","View","useOxy","useI18n","useSurfaceHeader","LogoText","OxyAuthChooser","jsx","_jsx","NAV_LOGO","height","OxyAccountDialogScreen","canGoBack","accountDialogController","controller","closeAccountDialog","t","subscribe","listener","undefined","getSnapshot","EMPTY_SNAPSHOT","snapshot","view","showBack","accounts","length","goToAccounts","setView","backsToHost","copy","headerCopy","titleContent","title","subtitle","onBack","style","styles","bodyContent","children","onComplete","accountCount","activeAccountId","loading","error","switchingAccountId","signIn","phase","authorizeCode","qrPayload","expiresAt","commonsAvailability","SCREEN_MARGIN","create","paddingTop","paddingBottom","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAccountDialogScreen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useSyncExternalStore","StyleSheet","View","useOxy","useI18n","useSurfaceHeader","LogoText","OxyAuthChooser","jsx","_jsx","NAV_LOGO","height","OxyAccountDialogScreen","canGoBack","accountDialogController","controller","closeAccountDialog","t","subscribe","listener","undefined","getSnapshot","EMPTY_SNAPSHOT","snapshot","view","showBack","accounts","length","goToAccounts","currentView","signIn","phase","cancelSignIn","setView","backsToHost","copy","headerCopy","titleContent","title","subtitle","onBack","style","styles","bodyContent","children","onComplete","accountCount","activeAccountId","loading","error","switchingAccountId","authorizeCode","qrPayload","expiresAt","route","routeFailed","pushSentAt","openedAt","progress","commonsAvailability","SCREEN_MARGIN","create","paddingTop","paddingBottom","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAccountDialogScreen.tsx"],"mappings":"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","ignoreList":[]}