@oxyhq/services 22.12.5 → 22.13.1

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

@@ -80,7 +80,19 @@ const OxyAccountDialogScreen = ({
     view
   } = snapshot;
   const showBack = view === 'qr' || view === 'signup' || view === 'add' && snapshot.accounts.length > 0;
-  const goToAccounts = (0, _react.useCallback)(() => controller?.setView('accounts'), [controller]);
+  const goToAccounts = (0, _react.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
@@ -117,10 +129,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 {
@@ -149,7 +167,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/commonjs/ui/components/OxyAccountDialogScreen.js.map

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