@dxos/shell 0.6.13 → 0.6.14-main.2b6a0f3

package/src/panels/JoinPanel/JoinPanelProps.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type cloneElement } from 'react';
+import { type FC, type cloneElement } from 'react';
 
 import type { Identity } from '@dxos/react-client/halo';
 import type { Invitation, AuthenticatingInvitationObservable, InvitationResult } from '@dxos/react-client/invitations';
@@ -55,6 +55,10 @@ export type JoinPanelImplProps = Pick<
     Halo: Invitation.State;
     Space: Invitation.State;
   }>;
+  invitationAuthMethods?: Partial<{
+    Halo: Invitation.AuthMethod;
+    Space: Invitation.AuthMethod;
+  }>;
   succeededKeys?: Partial<{
     Halo: Set<string>;
     Space: Set<string>;
@@ -71,8 +75,8 @@ export type JoinPanelImplProps = Pick<
   onSpaceInvitationAuthenticate?: (authCode: string) => Promise<void> | undefined;
   onConfirmResetStorage?: () => Promise<void>;
   onCancelResetStorage?: () => void;
-  IdentityInput?: React.FC<IdentityInputProps>;
-  ConfirmReset?: React.FC<ConfirmResetProps>;
+  IdentityInput?: FC<IdentityInputProps>;
+  ConfirmReset?: FC<ConfirmResetProps>;
 };
 
 export interface IdentityAction {

package/src/panels/JoinPanel/joinMachine.ts

@@ -316,6 +316,7 @@ const joinMachine = createMachine<JoinMachineContext, JoinEvent>(
           { target: 'acceptingSpaceInvitation', actions: 'log' },
         ],
       },
+      // TODO(wittjosiah): Remove.
       choosingIdentity: {
         initial: 'unknownAuthMethod',
         states: {
@@ -343,6 +344,7 @@ const joinMachine = createMachine<JoinMachineContext, JoinEvent>(
           deselectAuthMethod: { target: '.choosingAuthMethod', actions: 'log' },
         },
       },
+      // TODO(wittjosiah): Factor out to a machine handling recovery and device invitations.
       resettingIdentity: {},
       acceptingSpaceInvitation: acceptingInvitationTemplate('Space', '#join.finishingJoiningSpace'),
       finishingJoiningSpace: {

package/src/panels/JoinPanel/steps/InvitationAuthenticator.tsx

@@ -4,7 +4,9 @@
 
 import React, { type ChangeEvent, useState } from 'react';
 
+import { Invitation } from '@dxos/react-client/invitations';
 import { Input, useTranslation } from '@dxos/react-ui';
+import { descriptionText } from '@dxos/react-ui-theme';
 import { hexToEmoji } from '@dxos/util';
 
 import { Actions, Action, Emoji, StepHeading, Label } from '../../../components';
@@ -14,6 +16,7 @@ const pinLength = 6;
 
 export interface InvitationAuthenticatorProps extends JoinStepProps {
   Kind: 'Space' | 'Halo';
+  authMethod?: Invitation.AuthMethod;
   failed?: boolean;
   pending?: boolean;
   invitationId?: string;
@@ -24,6 +27,7 @@ export interface InvitationAuthenticatorProps extends JoinStepProps {
 export const InvitationAuthenticator = ({
   failed,
   Kind,
+  authMethod,
   active,
   pending,
   invitationId,
@@ -51,22 +55,31 @@ export const InvitationAuthenticator = ({
           })}
         >
           <Input.Label asChild>
-            <StepHeading>{t('auth code input label')}</StepHeading>
+            {authMethod === Invitation.AuthMethod.SHARED_SECRET ? (
+              <StepHeading>{t('auth code input label')}</StepHeading>
+            ) : (
+              <>
+                <StepHeading className={descriptionText}>{t('authenticating label')}</StepHeading>
+                <div role='none' className='grow' />
+              </>
+            )}
           </Input.Label>
-          <Input.PinInput
-            {...{
-              disabled,
-              length: pinLength,
-              onChange,
-              inputMode: 'numeric',
-              autoComplete: 'off',
-              pattern: '\\d*',
-              'data-autofocus': `connecting${Kind}Invitation inputting${Kind}VerificationCode authenticationFailing${Kind}VerificationCode authenticating${Kind}VerificationCode`,
-              'data-prevent-ios-autofocus': true,
-              'data-testid': `${invitationType}-auth-code-input`,
-              'data-1p-ignore': true,
-            }}
-          />
+          {authMethod === Invitation.AuthMethod.SHARED_SECRET && (
+            <Input.PinInput
+              {...{
+                disabled,
+                length: pinLength,
+                onChange,
+                inputMode: 'numeric',
+                autoComplete: 'off',
+                pattern: '\\d*',
+                'data-autofocus': `connecting${Kind}Invitation inputting${Kind}VerificationCode authenticationFailing${Kind}VerificationCode authenticating${Kind}VerificationCode`,
+                'data-prevent-ios-autofocus': true,
+                'data-testid': `${invitationType}-auth-code-input`,
+                'data-1p-ignore': true,
+              }}
+            />
+          )}
           {failed && (
             <Input.DescriptionAndValidation classNames='text-center'>
               <Input.Validation>{t('failed to authenticate message')}</Input.Validation>
@@ -74,7 +87,7 @@ export const InvitationAuthenticator = ({
           )}
         </Input.Root>
 
-        {invitationId && (
+        {invitationId && authMethod === Invitation.AuthMethod.SHARED_SECRET && (
           <>
             <Label>{t('auth other device emoji message')}</Label>
             <div className='flex justify-center'>

package/src/panels/JoinPanel/steps/InvitationInput.tsx

@@ -78,25 +78,17 @@ export const InvitationInput = (props: InvitationInputProps) => {
         />
       </div>
       <Actions>
-        {Kind === 'Halo' ? (
-          <Action
-            variant='ghost'
-            disabled={disabled}
-            onClick={() => send({ type: 'deselectAuthMethod' })}
-            data-testid={`${Kind.toLowerCase()}-invitation-input-back`}
-          >
-            {t('back label')}
-          </Action>
-        ) : exitActionParent ? (
-          cloneElement(exitActionParent, {}, exitAction)
-        ) : doneActionParent ? (
-          cloneElement(doneActionParent, {}, exitAction)
-        ) : (
-          exitAction
-        )}
+        {/* TODO(wittjosiah): This disables returning to deprecated identity creation flow. */}
+        {Kind === 'Halo'
+          ? null
+          : exitActionParent
+            ? cloneElement(exitActionParent, {}, exitAction)
+            : doneActionParent
+              ? cloneElement(doneActionParent, {}, exitAction)
+              : exitAction}
         <Action
           variant='primary'
-          disabled={disabled}
+          disabled={disabled || inputValue.trim().length === 0}
           onClick={handleNext}
           data-testid={`${Kind.toLowerCase()}-invitation-input-continue`}
         >

package/src/panels/Panels.stories.tsx

@@ -53,7 +53,7 @@ export const Default = (props: any) => {
 Default.parameters = { layout: 'fullscreen' };
 
 export default {
-  title: 'react-shell/All',
+  title: 'sdk/react-shell/All',
   decorators: [withTheme],
   component: StoryRow,
   parameters: { chromatic: { disableSnapshot: false }, translations: [osTranslations] },

package/src/panels/SpacePanel/SpacePanel.stories.tsx

@@ -28,7 +28,7 @@ const noOpProps: SpacePanelImplProps = {
 };
 
 export default {
-  title: 'react-shell/SpacePanel',
+  title: 'sdk/react-shell/SpacePanel',
   component: SpacePanelImpl,
   decorators: [withTheme],
   parameters: { chromatic: { disableSnapshot: false } },

package/src/panels/SpacePanel/SpacePanel.tsx

@@ -8,7 +8,7 @@ import React, { useEffect, useMemo } from 'react';
 import { log } from '@dxos/log';
 import { useInvitationStatus } from '@dxos/react-client/invitations';
 import type { CancellableInvitationObservable } from '@dxos/react-client/invitations';
-import { DensityProvider, useId, useTranslation } from '@dxos/react-ui';
+import { useId, useTranslation } from '@dxos/react-ui';
 
 import { type SpacePanelHeadingProps, type SpacePanelImplProps, type SpacePanelProps } from './SpacePanelProps';
 import { useSpaceMachine } from './spaceMachine';
@@ -46,7 +46,7 @@ export const SpacePanelImpl = (props: SpacePanelImplProps) => {
   } = props;
 
   return (
-    <DensityProvider density='fine'>
+    <>
       <SpacePanelHeading {...rest} {...{ titleId, space }} />
       <Viewport.Root activeView={activeView}>
         <Viewport.Views>
@@ -62,7 +62,7 @@ export const SpacePanelImpl = (props: SpacePanelImplProps) => {
           </Viewport.View>
         </Viewport.Views>
       </Viewport.Root>
-    </DensityProvider>
+    </>
   );
 };
 

package/src/panels/SpacePanel/SpacePanelProps.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type cloneElement } from 'react';
+import { type FC, type cloneElement } from 'react';
 import { type SingleOrArray, type Event } from 'xstate';
 
 import { type Space } from '@dxos/react-client/echo';
@@ -23,9 +23,9 @@ export type SpacePanelImplProps = {
   authCode?: string;
   onDone?: () => void;
   doneActionParent?: Parameters<typeof cloneElement>[0];
-  DoneAction?: React.FC;
-  SpaceManager?: React.FC<SpaceManagerProps>;
-  InvitationManager?: React.FC<InvitationManagerProps>;
+  DoneAction?: FC;
+  SpaceManager?: FC<SpaceManagerProps>;
+  InvitationManager?: FC<InvitationManagerProps>;
 };
 
 export type SpacePanelProps = Pick<SpacePanelImplProps, 'space'> &

package/src/playwright/invitations-manager.ts

@@ -2,14 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import type { Browser, ConsoleMessage } from '@playwright/test';
-import { expect } from 'chai';
-import waitForExpect from 'wait-for-expect';
+import { expect, type Browser, type ConsoleMessage } from '@playwright/test';
 
 import { Trigger } from '@dxos/async';
 import { type Invitation } from '@dxos/react-client/invitations';
 import { ConnectionState } from '@dxos/react-client/mesh';
-import { setupPage } from '@dxos/test/playwright';
+import { setupPage } from '@dxos/test-utils/playwright';
 
 import { ScopedShellManager } from '../testing';
 
@@ -35,11 +33,11 @@ export class InvitationsManager extends ScopedShellManager {
 
     const { page } = await setupPage(this._browser, {
       url: storybookUrl('invitations--default'),
-      waitFor: (page) => page.getByTestId('invitations.identity-header').first().isVisible(),
     });
 
     this.page = page;
     this.page.on('console', (message) => this._onConsoleMessage(message));
+    await this.page.getByTestId('invitations.identity-header').first().waitFor({ state: 'visible' });
     this._initialized = true;
   }
 
@@ -119,9 +117,7 @@ export class InvitationsManager extends ScopedShellManager {
     const createIdentity = this.peer(id).getByTestId('invitations.create-identity');
     // TODO(wittjosiah): Clicking on buttons wrapped in tooltips is flaky in webkit playwright.
     await createIdentity.click();
-    await waitForExpect(async () => {
-      expect(await createIdentity.isDisabled()).to.be.true;
-    });
+    await expect(createIdentity).toBeDisabled();
   }
 
   async createSpace(id: number) {

package/src/playwright/invitations.spec.ts

@@ -2,8 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
-import { test } from '@playwright/test';
-import { expect } from 'chai';
+import { expect, test } from '@playwright/test';
 
 import { sleep } from '@dxos/async';
 import { Invitation } from '@dxos/react-client/invitations';
@@ -47,7 +46,7 @@ test.describe('Invitations', () => {
       await manager.authenticateInvitation('device', authCode, manager.peer(1));
       await manager.doneInvitation('device', manager.peer(1));
 
-      expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
+      expect(await manager.getDisplayName(0)).toEqual(await manager.getDisplayName(1));
     });
 
     test('no auth method', async () => {
@@ -59,7 +58,7 @@ test.describe('Invitations', () => {
       await manager.acceptInvitation(1, 'device', invitation);
       await manager.doneInvitation('device', manager.peer(1));
 
-      expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
+      expect(await manager.getDisplayName(0)).toEqual(await manager.getDisplayName(1));
     });
 
     test('invalid & retry auth code', async () => {
@@ -75,7 +74,7 @@ test.describe('Invitations', () => {
       await manager.authenticateInvitation('device', authCode, manager.peer(1));
       await manager.doneInvitation('device', manager.peer(1));
 
-      expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
+      expect(await manager.getDisplayName(0)).toEqual(await manager.getDisplayName(1));
     });
 
     // TODO(wittjosiah): Remove? This seems to invalidate the invitation now.
@@ -94,7 +93,7 @@ test.describe('Invitations', () => {
       await manager.clearAuthCode('device', manager.peer(1));
       await manager.authenticateInvitation('device', '000003', manager.peer(1));
 
-      expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      expect(await manager.invitationFailed(manager.peer(1))).toBe(true);
 
       await manager.resetInvitation(manager.peer(1));
       await manager.invitationInputContinue('device', manager.peer(1));
@@ -102,7 +101,7 @@ test.describe('Invitations', () => {
       await manager.authenticateInvitation('device', authCode, manager.peer(1));
       await manager.doneInvitation('device', manager.peer(1));
 
-      expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
+      expect(await manager.getDisplayName(0)).toEqual(await manager.getDisplayName(1));
     });
 
     test('invitation timeout', async () => {
@@ -113,7 +112,7 @@ test.describe('Invitations', () => {
       await manager.openPanel(1, 'identity');
       await manager.acceptInvitation(1, 'device', invitation);
 
-      expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      expect(await manager.invitationFailed(manager.peer(1))).toBe(true);
     });
 
     // TODO(thure): This is skipped because the UI no longer affords cancelling device invitations, consider removing.
@@ -125,10 +124,10 @@ test.describe('Invitations', () => {
 
       await manager.openPanel(1, 'identity');
       await manager.acceptInvitation(1, 'device', invitation);
-      expect(await manager.readyToAuthenticate('device', manager.peer(1))).to.be.true;
+      expect(await manager.readyToAuthenticate('device', manager.peer(1))).toBe(true);
       await manager.cancelInvitation('device', 'host', manager.peer(0));
 
-      expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      expect(await manager.invitationFailed(manager.peer(1))).toBe(true);
     });
 
     // TODO(wittjosiah): Remove? This seems to invalidate the invitation now.
@@ -147,7 +146,7 @@ test.describe('Invitations', () => {
       await manager.authenticateInvitation('device', authCode, manager.peer(1));
       await manager.doneInvitation('device', manager.peer(1));
 
-      expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
+      expect(await manager.getDisplayName(0)).toEqual(await manager.getDisplayName(1));
     });
 
     // TODO(thure): The design no longer affords signalling an identity’s network status. Remove or adjust test, or adjust design.
@@ -159,18 +158,18 @@ test.describe('Invitations', () => {
 
       await manager.openPanel(1, 'identity');
       await manager.acceptInvitation(1, 'device', invitation);
-      expect(await manager.readyToAuthenticate('device', manager.peer(1))).to.be.true;
+      expect(await manager.readyToAuthenticate('device', manager.peer(1))).toBe(true);
       await manager.toggleNetworkStatus(0);
-      expect(await manager.getNetworkStatus(0)).to.equal(ConnectionState.OFFLINE);
+      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionState.OFFLINE);
       await manager.toggleNetworkStatus(0);
-      expect(await manager.getNetworkStatus(0)).to.equal(ConnectionState.ONLINE);
+      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionState.ONLINE);
       await manager.resetInvitation(manager.peer(1));
       await manager.invitationInputContinue('device', manager.peer(1));
       await manager.clearAuthCode('device', manager.peer(1));
       await manager.authenticateInvitation('device', authCode, manager.peer(1));
       await manager.doneInvitation('device', manager.peer(1));
 
-      expect(await manager.getDisplayName(0)).to.equal(await manager.getDisplayName(1));
+      expect(await manager.getDisplayName(0)).toEqual(await manager.getDisplayName(1));
     });
   });
 
@@ -190,7 +189,7 @@ test.describe('Invitations', () => {
       await manager.doneInvitation('space', manager.peer(1));
 
       await manager.openPanel(0, 'spaces');
-      expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(1, 1));
+      expect(await manager.getSpaceName(0, 1)).toEqual(await manager.getSpaceName(1, 1));
     });
 
     test('already joined', async () => {
@@ -209,7 +208,7 @@ test.describe('Invitations', () => {
       await manager.acceptInvitation(1, 'space', invitation2);
       await manager.doneInvitation('space', manager.peer(1));
 
-      expect(await manager.getSpaceMembersCount(0)).to.equal(2);
+      expect(await manager.getSpaceMembersCount(0)).toEqual(2);
     });
 
     test('no auth method', async () => {
@@ -224,7 +223,7 @@ test.describe('Invitations', () => {
       await manager.doneInvitation('space', manager.peer(1));
 
       await manager.openPanel(0, 'spaces');
-      expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(1, 1));
+      expect(await manager.getSpaceName(0, 1)).toEqual(await manager.getSpaceName(1, 1));
     });
 
     test('invalid & retry auth code', async () => {
@@ -239,14 +238,14 @@ test.describe('Invitations', () => {
       await manager.acceptInvitation(1, 'space', invitation);
       await manager.authenticateInvitation('space', '000000', manager.peer(1));
 
-      expect(await manager.authenticatorIsVisible('space', manager.peer(1))).to.be.true;
+      expect(await manager.authenticatorIsVisible('space', manager.peer(1))).toBe(true);
 
       await manager.clearAuthCode('space', manager.peer(1));
       await manager.authenticateInvitation('space', authCode, manager.peer(1));
       await manager.doneInvitation('space', manager.peer(1));
 
       await manager.openPanel(0, 'spaces');
-      expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(1, 1));
+      expect(await manager.getSpaceName(0, 1)).toEqual(await manager.getSpaceName(1, 1));
     });
 
     // TODO(wittjosiah): Remove? This seems to invalidate the invitation now.
@@ -267,7 +266,7 @@ test.describe('Invitations', () => {
       await manager.clearAuthCode('space', manager.peer(1));
       await manager.authenticateInvitation('space', '000003', manager.peer(1));
 
-      expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      expect(await manager.invitationFailed(manager.peer(1))).toBe(true);
 
       await manager.resetInvitation(manager.peer(1));
       await manager.invitationInputContinue('space', manager.peer(1));
@@ -276,7 +275,7 @@ test.describe('Invitations', () => {
       await manager.doneInvitation('space', manager.peer(1));
 
       await manager.openPanel(0, 'spaces');
-      expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(1, 1));
+      expect(await manager.getSpaceName(0, 1)).toEqual(await manager.getSpaceName(1, 1));
     });
 
     test('invitation timeout', async () => {
@@ -289,7 +288,7 @@ test.describe('Invitations', () => {
       await manager.openPanel(1, 'join');
       await manager.acceptInvitation(1, 'space', invitation);
 
-      expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      expect(await manager.invitationFailed(manager.peer(1))).toBe(true);
     });
 
     // TODO(wittjosiah): Cancel not propagating.
@@ -302,10 +301,10 @@ test.describe('Invitations', () => {
       await manager.createIdentity(1);
       await manager.openPanel(1, 'join');
       await manager.acceptInvitation(1, 'space', invitation);
-      expect(await manager.readyToAuthenticate('space', manager.peer(1))).to.be.true;
+      expect(await manager.readyToAuthenticate('space', manager.peer(1))).toBe(true);
       await manager.cancelInvitation('space', 'host', manager.peer(0));
 
-      expect(await manager.invitationFailed(manager.peer(1))).to.be.true;
+      expect(await manager.invitationFailed(manager.peer(1))).toBe(true);
     });
 
     // TODO(wittjosiah): Remove? This seems to invalidate the invitation now.
@@ -327,7 +326,7 @@ test.describe('Invitations', () => {
       await manager.doneInvitation('space', manager.peer(1));
 
       await manager.openPanel(0, 'spaces');
-      expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(1, 1));
+      expect(await manager.getSpaceName(0, 1)).toEqual(await manager.getSpaceName(1, 1));
     });
 
     // TODO(thure): The design no longer affords signalling an identity’s network status. Remove or adjust test, or adjust design.
@@ -341,11 +340,11 @@ test.describe('Invitations', () => {
       await manager.createIdentity(1);
       await manager.openPanel(1, 'join');
       await manager.acceptInvitation(1, 'space', invitation);
-      expect(await manager.readyToAuthenticate('space', manager.peer(1))).to.be.true;
+      expect(await manager.readyToAuthenticate('space', manager.peer(1))).toBe(true);
       await manager.toggleNetworkStatus(0);
-      expect(await manager.getNetworkStatus(0)).to.equal(ConnectionState.OFFLINE);
+      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionState.OFFLINE);
       await manager.toggleNetworkStatus(0);
-      expect(await manager.getNetworkStatus(0)).to.equal(ConnectionState.ONLINE);
+      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionState.ONLINE);
       await manager.resetInvitation(manager.peer(1));
       await manager.invitationInputContinue('space', manager.peer(1));
       await manager.clearAuthCode('space', manager.peer(1));
@@ -353,7 +352,7 @@ test.describe('Invitations', () => {
       await manager.doneInvitation('space', manager.peer(1));
 
       await manager.openPanel(0, 'spaces');
-      expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(1, 1));
+      expect(await manager.getSpaceName(0, 1)).toEqual(await manager.getSpaceName(1, 1));
     });
 
     test('multiple concurrent invitations', async () => {
@@ -385,9 +384,9 @@ test.describe('Invitations', () => {
       await manager.doneInvitation('space', manager.peer(2));
 
       await manager.openPanel(0, 'spaces');
-      expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(1, 1));
-      expect(await manager.getSpaceName(0, 1)).to.equal(await manager.getSpaceName(2, 1));
-      expect(await manager.getSpaceName(1, 1)).to.equal(await manager.getSpaceName(2, 1));
+      expect(await manager.getSpaceName(0, 1)).toEqual(await manager.getSpaceName(1, 1));
+      expect(await manager.getSpaceName(0, 1)).toEqual(await manager.getSpaceName(2, 1));
+      expect(await manager.getSpaceName(1, 1)).toEqual(await manager.getSpaceName(2, 1));
     });
   });
 });

package/src/playwright/playwright.config.ts

@@ -2,6 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import { defaultPlaywrightConfig } from '@dxos/test/playwright';
+import { nxE2EPreset } from '@nx/playwright/preset';
+import { defineConfig } from '@playwright/test';
 
-export default defaultPlaywrightConfig;
+import { e2ePreset } from '@dxos/test-utils/playwright';
+
+export default defineConfig({
+  ...nxE2EPreset(__filename, { testDir: __dirname }),
+  ...e2ePreset(__dirname),
+  webServer: {
+    command: 'pnpm -w nx storybook-e2e stories',
+    port: 9009,
+    reuseExistingServer: !process.env.CI,
+  },
+});

package/src/testing/shell-manager.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import type { ConsoleMessage, Dialog, Page } from '@playwright/test';
+import type { ConsoleMessage, Page } from '@playwright/test';
 
 import { sleep, Trigger } from '@dxos/async';
 
@@ -60,13 +60,6 @@ export class ShellManager extends ScopedShellManager {
   }
 
   async resetDevice() {
-    const handleDialog = async (dialog: Dialog) => {
-      if (dialog.type() === 'confirm') {
-        await dialog.accept();
-      }
-    };
-    this.page.on('dialog', handleDialog);
-
     await this.shell.getByTestId('device-list-item-current.options').click();
     await this.shell.getByTestId('device-list-item-current.reset').click();
     await this.shell.getByTestId('reset-storage.reset-identity-input').fill(CONFIRM_INPUT);
@@ -78,6 +71,9 @@ export class ShellManager extends ScopedShellManager {
     await this.shell.getByTestId('device-list-item-current.join-existing').click();
     await this.shell.getByTestId('join-new-identity.reset-identity-input').fill(CONFIRM_INPUT);
     await this.shell.getByTestId('join-new-identity.reset-identity-confirm').click();
+  }
+
+  async acceptDeviceInvitation(invitationCode: string) {
     await this.inputInvitation('device', invitationCode, this.shell);
   }
 
@@ -114,7 +110,6 @@ export class ShellManager extends ScopedShellManager {
     // Wait for focus to shift before typing.
     await sleep(1500);
     await this.authenticateInvitation('space', authCode, this.shell);
-    await this.doneInvitation('space', this.shell);
   }
 
   private async _onConsoleMessage(message: ConsoleMessage) {

package/src/translations/locales/en-US.ts

@@ -34,7 +34,7 @@ export const os = {
   'recover identity input label': 'Type or paste your seed phrase',
   'failed to create identity message': 'Failed to create an identity.',
   'failed to recover identity message': 'Failed to recover an identity from the provided seed phrase.',
-  'failed to authenticate message': 'Incorrect PIN.',
+  'failed to authenticate message': 'Incorrect code.',
   'identity added label': 'Created identity & added to this device:',
   'join space as identity heading': '<part>as </part><part><icon/><label>{{labelValue}}</label></part>',
   'error status label': 'Failed',
@@ -42,8 +42,8 @@ export const os = {
   'cancelled status label': 'Cancelled',
   'init status label': 'Ready to connect',
   'connecting status label': 'Connecting…',
-  'connected status label': 'Enter confirmation PIN',
-  'authenticating status label': 'Enter confirmation PIN',
+  'connected status label': 'Enter authentication code',
+  'authenticating status label': 'Enter authentication code',
   'success status label': 'Success',
   'cancel label': 'Cancel',
   'done label': 'Done',
@@ -152,4 +152,5 @@ export const os = {
   'agent requested label': 'Agent requested',
   'agent requested description':
     'The agent service is creating an agent for you. Once the agent connects, it will display in the devices list.',
+  'authenticating label': 'Authenticating…',
 };