@dxos/shell 0.4.10-main.ec8b427 → 0.4.10-main.eedd150

package/src/panels/IdentityPanel/IdentityPanelProps.ts

@@ -11,6 +11,8 @@ import type { InvitationStatus } from '@dxos/react-client/invitations';
 import type { IdentityEvent } from './identityMachine';
 import type { InvitationManagerProps } from '../../steps';
 
+export type IdentityPanelInitialDisposition = 'default' | 'manage-device-invitation' | 'manage-profile';
+
 export type AgentFormProps = {
   onAgentCreate?: () => Promise<void>;
   onAgentDestroy?: () => Promise<void>;
@@ -28,12 +30,14 @@ export type IdentityPanelImplProps = {
     | 'update profile form'
     | 'device invitation manager'
     | 'identity action chooser'
-    | 'signing out';
+    | 'confirm join new identity'
+    | 'confirm reset storage';
+  initialDisposition?: IdentityPanelInitialDisposition;
   identity: Identity;
   devices: Device[];
   onUpdateProfile?: (profile: NonNullable<Identity['profile']>) => Promise<void>;
-  onResetDevice?: () => Promise<void>;
-  onJoinNewIdentity?: () => void;
+  onResetStorage?: () => Promise<void>;
+  onJoinNewIdentity?: () => Promise<void>;
   createInvitationUrl: (invitationCode: string) => string;
   send?: (event: SingleOrArray<Event<IdentityEvent>>) => void;
   onDone?: () => void;

package/src/panels/IdentityPanel/identityMachine.ts

@@ -10,16 +10,24 @@ import { type Client } from '@dxos/react-client';
 import { type Identity } from '@dxos/react-client/halo';
 import { type CancellableInvitationObservable } from '@dxos/react-client/invitations';
 
+import { type IdentityPanelInitialDisposition } from './IdentityPanelProps';
 import { type StepEvent } from '../../steps';
 
 type IdentityMachineContext = {
+  initialDisposition?: IdentityPanelInitialDisposition;
   invitation?: CancellableInvitationObservable;
   identity: Identity | null;
   identitySubscribable: Subscribable<SetIdentityEvent> | null;
 };
 
 type IdentityChooseActionEvent = {
-  type: 'chooseDevices' | 'chooseAgent' | 'chooseProfile' | 'chooseSignOut' | 'sigingOut' | 'unchooseAction';
+  type:
+    | 'chooseDevices'
+    | 'chooseAgent'
+    | 'chooseProfile'
+    | 'chooseResetStorage'
+    | 'chooseJoinNewIdentity'
+    | 'unchooseAction';
 };
 
 type IdentitySelectDeviceInvitationEvent = {
@@ -56,6 +64,13 @@ const identityMachine = createMachine<IdentityMachineContext, IdentityEvent>(
       src: (context) => context.identitySubscribable!,
     },
     states: {
+      unknown: {
+        always: [
+          { cond: 'initiallyManagingDeviceInvitation', target: 'managingDeviceInvitation', actions: 'log' },
+          { cond: 'initiallyManagingProfile', target: 'managingProfile', actions: 'log' },
+          { target: 'choosingAction', actions: 'log' },
+        ],
+      },
       choosingAction: {},
       managingDeviceInvitation: {},
       managingAgent: {
@@ -77,7 +92,8 @@ const identityMachine = createMachine<IdentityMachineContext, IdentityEvent>(
           updateProfile: { target: '.pending', actions: 'log' },
         },
       },
-      signingOut: {},
+      confirmingResetStorage: {},
+      confirmingJoinNewIdentity: {},
     },
     on: {
       unchooseAction: { target: '.choosingAction', actions: ['unsetInvitation', 'log'] },
@@ -85,11 +101,17 @@ const identityMachine = createMachine<IdentityMachineContext, IdentityEvent>(
       selectInvitation: { target: '.managingDeviceInvitation', actions: ['setInvitation', 'log'] },
       chooseDevices: { target: '.managingDevices', actions: 'log' },
       chooseProfile: { target: '.managingProfile', actions: 'log' },
-      chooseSignOut: { target: '.signingOut', actions: 'log' },
+      chooseJoinNewIdentity: { target: '.confirmingJoinNewIdentity', actions: 'log' },
+      chooseResetStorage: { target: '.confirmingResetStorage', actions: 'log' },
       chooseAgent: { target: '.managingAgent', actions: 'log' },
     },
   },
   {
+    guards: {
+      initiallyManagingDeviceInvitation: ({ initialDisposition }, _event) =>
+        initialDisposition === 'manage-device-invitation',
+      initiallyManagingProfile: ({ initialDisposition }, _event) => initialDisposition === 'manage-profile',
+    },
     actions: {
       setIdentity: assign<IdentityMachineContext, IdentityEvent>({
         identity: (context, event) => (event as SetIdentityEvent)?.identity ?? null,

package/src/panels/IdentityPanel/steps/IdentityActionChooser.tsx

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { CaretRight, Devices, Plus, Power, UserGear, HardDrive } from '@phosphor-icons/react';
+import { CaretRight, Devices, Plus, Power, UserGear, HardDrive, Intersect } from '@phosphor-icons/react';
 import React, { useCallback } from 'react';
 
 import { log } from '@dxos/log';
@@ -73,6 +73,11 @@ export const IdentityActionChooserImpl = ({
     <div role='none' className='grow flex flex-col gap-1'>
       <DensityProvider density='coarse'>
         <div className='grow justify-center flex flex-col gap-1'>
+          <Action data-testid='manage-profile' onClick={() => send?.({ type: 'chooseProfile' })} classNames='plb-4'>
+            <UserGear className={getSize(6)} />
+            <span className='grow mli-3'>{t('choose profile label')}</span>
+            <CaretRight weight='bold' className={getSize(4)} />
+          </Action>
           {agentHostingEnabled && (
             <Action data-testid='manage-agent' onClick={() => send?.({ type: 'chooseAgent' })} classNames='plb-4'>
               <HardDrive className={getSize(6)} />
@@ -90,19 +95,23 @@ export const IdentityActionChooserImpl = ({
             <span className='grow mli-3'>{t('choose add device label')}</span>
             <CaretRight weight='bold' className={getSize(4)} />
           </Action>
+          <Action
+            data-testid='devices-panel.join-new-identity'
+            onClick={() => send?.({ type: 'chooseJoinNewIdentity' })}
+            classNames='plb-4'
+          >
+            <Intersect className={getSize(6)} />
+            <span className='grow mli-3'>{t('choose join new identity label')}</span>
+            <CaretRight weight='bold' className={getSize(4)} />
+          </Action>
           <Action data-testid='manage-devices' onClick={() => send?.({ type: 'chooseDevices' })} classNames='plb-4'>
             <Devices className={getSize(6)} />
             <span className='grow mli-3'>{t('choose devices label')}</span>
             <CaretRight weight='bold' className={getSize(4)} />
           </Action>
-          <Action data-testid='manage-profile' onClick={() => send?.({ type: 'chooseProfile' })} classNames='plb-4'>
-            <UserGear className={getSize(6)} />
-            <span className='grow mli-3'>{t('choose profile label')}</span>
-            <CaretRight weight='bold' className={getSize(4)} />
-          </Action>
           <Action
             data-testid='devices-panel.sign-out'
-            onClick={() => send?.({ type: 'chooseSignOut' })}
+            onClick={() => send?.({ type: 'chooseResetStorage' })}
             classNames='plb-4'
           >
             <Power className={getSize(6)} />

package/src/panels/IdentityPanel/steps/ProfileForm.tsx

@@ -106,7 +106,12 @@ const ProfileFormImpl = (props: ProfileFormImplProps) => {
         <Action
           variant='primary'
           disabled={disabled}
-          onClick={() => onUpdateProfile?.({ displayName, data: { emoji, hue } })}
+          onClick={() =>
+            onUpdateProfile?.({
+              ...(displayName && { displayName }),
+              ...((emoji || hue) && { data: { ...(emoji && { emoji }), ...(hue && { hue }) } }),
+            })
+          }
           data-testid='update-profile-form-continue'
         >
           {t('done label')}

package/src/panels/IdentityPanel/steps/index.ts

@@ -6,4 +6,3 @@ export * from './AgentForm';
 export * from './DeviceManager';
 export * from './IdentityActionChooser';
 export * from './ProfileForm';
-export * from './SignOutChooser';

package/src/panels/JoinPanel/JoinPanel.stories.tsx

@@ -10,8 +10,9 @@ import { withTheme } from '@dxos/storybook-utils';
 
 import { JoinPanelImpl } from './JoinPanel';
 import { type JoinPanelImplProps } from './JoinPanelProps';
-import { IdentityInputImpl, ResetIdentityImpl } from './steps';
+import { IdentityInputImpl } from './steps';
 import { StorybookDialog } from '../../components/StorybookDialog';
+import { ConfirmResetImpl } from '../../steps';
 
 const noOpProps: JoinPanelImplProps = {
   titleId: 'storybookJoinPanel__title',
@@ -34,7 +35,7 @@ export default {
   parameters: { chromatic: { disableSnapshot: false } },
   args: {
     IdentityInput: IdentityInputImpl,
-    ResetIdentity: ResetIdentityImpl,
+    ResetIdentity: ConfirmResetImpl,
   },
 };
 

package/src/panels/JoinPanel/JoinPanel.tsx

@@ -19,9 +19,9 @@ import {
   InvitationRescuer,
   InvitationInput,
   InvitationAccepted,
-  ResetIdentity,
 } from './steps';
 import { Viewport } from '../../components';
+import { ConfirmReset } from '../../steps';
 import { stepStyles } from '../../styles';
 
 export const JoinPanelImpl = (props: JoinPanelImplProps) => {
@@ -44,8 +44,10 @@ export const JoinPanelImpl = (props: JoinPanelImplProps) => {
     onSpaceInvitationCancel,
     onHaloInvitationAuthenticate,
     onSpaceInvitationAuthenticate,
+    onCancelResetStorage,
+    onConfirmResetStorage,
     IdentityInput: IdentityInputComponent = IdentityInput,
-    ResetIdentity: ResetIdentityComponent = ResetIdentity,
+    ConfirmReset: ConfirmResetComponent = ConfirmReset,
   } = props;
   return (
     <DensityProvider density='fine'>
@@ -55,11 +57,12 @@ export const JoinPanelImpl = (props: JoinPanelImplProps) => {
           <Viewport.View classNames={stepStyles} id='addition method chooser'>
             <AdditionMethodChooser send={send} active={activeView === 'addition method chooser'} />
           </Viewport.View>
-          <Viewport.View classNames={stepStyles} id='reset identity confirmation'>
-            <ResetIdentityComponent
+          <Viewport.View classNames={stepStyles} id='reset storage confirmation'>
+            <ConfirmResetComponent
               send={send}
-              method='reset identity'
               active={activeView === 'reset identity confirmation'}
+              onCancel={onCancelResetStorage}
+              onConfirm={onConfirmResetStorage}
             />
           </Viewport.View>
           <Viewport.View classNames={stepStyles} id='create identity input'>
@@ -172,11 +175,13 @@ export const JoinPanelImpl = (props: JoinPanelImplProps) => {
 export const JoinPanel = ({
   titleId: propsTitleId,
   mode = 'default',
+  initialDisposition = 'default',
   initialInvitationCode,
   exitActionParent,
   onExit,
   doneActionParent,
   onDone: propsOnDone,
+  onCancelResetStorage,
 }: JoinPanelProps) => {
   const client = useClient();
   const identity = useIdentity();
@@ -186,6 +191,7 @@ export const JoinPanel = ({
   const [joinState, joinSend, joinService] = useJoinMachine(client, {
     context: {
       mode,
+      initialDisposition,
       identity,
       ...(initialInvitationCode && {
         [mode === 'halo-only' ? 'halo' : 'space']: { unredeemedCode: initialInvitationCode },
@@ -379,6 +385,14 @@ export const JoinPanel = ({
     });
   }, [joinState, propsOnDone]);
 
+  const onConfirmResetStorage = useCallback(
+    () =>
+      client.reset().then(() => {
+        joinSend({ type: 'resetIdentity' });
+      }),
+    [client, joinSend],
+  );
+
   return (
     <JoinPanelImpl
       {...{
@@ -409,6 +423,8 @@ export const JoinPanel = ({
           joinSend({ type: 'authenticateSpaceVerificationCode' });
           return joinState.context.space.invitationObservable?.authenticate(authCode);
         },
+        onConfirmResetStorage,
+        onCancelResetStorage,
       }}
     />
   );

package/src/panels/JoinPanel/JoinPanelProps.ts

@@ -8,12 +8,14 @@ import type { Identity } from '@dxos/react-client/halo';
 import type { Invitation, AuthenticatingInvitationObservable, InvitationResult } from '@dxos/react-client/invitations';
 
 import { type JoinSend } from './joinMachine';
-import { type ResetIdentityProps, type IdentityInputProps } from './steps';
-import { type StepProps } from '../../steps';
+import { type IdentityInputProps } from './steps';
+import { type ConfirmResetProps, type StepProps } from '../../steps';
 import { type FailReason } from '../../types';
 
 export type JoinPanelMode = 'default' | 'halo-only';
 
+export type JoinPanelInitialDisposition = 'default' | 'accept-halo-invitation';
+
 export type JoinStepProps = Omit<StepProps, 'send' | 'onDone'> & {
   send: JoinSend;
   onDone?: (result: InvitationResult | null) => void;
@@ -21,6 +23,7 @@ export type JoinStepProps = Omit<StepProps, 'send' | 'onDone'> & {
 
 export interface JoinPanelProps {
   mode?: JoinPanelMode;
+  initialDisposition?: JoinPanelInitialDisposition;
   initialInvitationCode?: string;
   titleId?: string;
   exitActionParent?: Parameters<typeof cloneElement>[0];
@@ -28,6 +31,7 @@ export interface JoinPanelProps {
   onExit?: () => void;
   onDone?: (result: InvitationResult | null) => void;
   parseInvitationCodeInput?: (invitationCodeInput: string) => string;
+  onCancelResetStorage?: () => void;
 }
 
 export type JoinPanelImplProps = Pick<
@@ -61,8 +65,10 @@ export type JoinPanelImplProps = Pick<
   onSpaceInvitationCancel?: () => Promise<void> | undefined;
   onHaloInvitationAuthenticate?: (authCode: string) => Promise<void> | undefined;
   onSpaceInvitationAuthenticate?: (authCode: string) => Promise<void> | undefined;
+  onConfirmResetStorage?: () => Promise<void>;
+  onCancelResetStorage?: () => void;
   IdentityInput?: React.FC<IdentityInputProps>;
-  ResetIdentity?: React.FC<ResetIdentityProps>;
+  ConfirmReset?: React.FC<ConfirmResetProps>;
 };
 
 export interface IdentityAction {

package/src/panels/JoinPanel/joinMachine.ts

@@ -19,7 +19,7 @@ import { type Client, AlreadyJoinedError } from '@dxos/react-client';
 import { type Identity } from '@dxos/react-client/halo';
 import { type AuthenticatingInvitationObservable, Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 
-import { type JoinPanelMode } from './JoinPanelProps';
+import { type JoinPanelInitialDisposition, type JoinPanelMode } from './JoinPanelProps';
 import { type FailReason } from '../../types';
 
 type InvitationKindContext = Partial<{
@@ -33,6 +33,7 @@ type InvitationKindContext = Partial<{
 
 type JoinMachineContext = {
   mode: JoinPanelMode;
+  initialDisposition: JoinPanelInitialDisposition;
   identity: Identity | null;
   halo: InvitationKindContext;
   space: InvitationKindContext;
@@ -74,7 +75,8 @@ type EmptyInvitationEvent = {
     | 'authenticateHaloVerificationCode'
     | 'authenticateSpaceVerificationCode'
     | 'resetHaloInvitation'
-    | 'resetSpaceInvitation';
+    | 'resetSpaceInvitation'
+    | 'deselectInvitation';
 };
 
 type InvitationEvent = FailInvitationEvent | SetInvitationCodeEvent | SetInvitationEvent | EmptyInvitationEvent;
@@ -294,6 +296,7 @@ const joinMachine = createMachine<JoinMachineContext, JoinEvent>(
     id: 'join',
     predictableActionArguments: true,
     context: {
+      initialDisposition: 'default',
       mode: 'default',
       identity: null,
       halo: {},
@@ -304,6 +307,11 @@ const joinMachine = createMachine<JoinMachineContext, JoinEvent>(
       unknown: {
         always: [
           { cond: 'existingIdentity', target: 'resettingIdentity', actions: 'log' },
+          {
+            cond: 'initiallyAcceptingHaloInvitation',
+            target: '#join.choosingIdentity.acceptingHaloInvitation',
+            actions: 'log',
+          },
           { cond: 'noSelectedIdentity', target: 'choosingIdentity', actions: 'log' },
           { target: 'acceptingSpaceInvitation', actions: 'log' },
         ],
@@ -352,6 +360,8 @@ const joinMachine = createMachine<JoinMachineContext, JoinEvent>(
     guards: {
       existingIdentity: ({ identity, mode }, _event) => mode === 'halo-only' && !!identity,
       noSelectedIdentity: ({ identity }, _event) => !identity,
+      initiallyAcceptingHaloInvitation: ({ identity, initialDisposition }, _event) =>
+        !identity && initialDisposition === 'accept-halo-invitation',
       hasHaloUnredeemedCode: ({ halo }, _event) => !!halo.unredeemedCode,
       noSpaceInvitation: ({ space }, _event) => !space.invitation && !space.unredeemedCode,
     },

package/src/panels/JoinPanel/steps/index.ts

@@ -9,4 +9,3 @@ export * from './InvitationAccepted';
 export * from './InvitationInput';
 export * from './InvitationRescuer';
 export * from './InvitationAuthenticator';
-export * from './ResetIdentity';

package/src/panels/StatusPanel/StatusPanel.tsx

@@ -0,0 +1,19 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React from 'react';
+
+import { Status, useTranslation } from '@dxos/react-ui';
+
+export const StatusPanel = ({ titleId }: { titleId?: string }) => {
+  const { t } = useTranslation('os');
+  return (
+    <div className='grid place-items-center p-2 gap-2'>
+      <p id={titleId} className='font-medium text-center'>
+        {t('resetting message')}
+      </p>
+      <Status indeterminate>{t('resetting message')}</Status>
+    </div>
+  );
+};

package/src/panels/StatusPanel/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './StatusPanel';

package/src/panels/index.ts

@@ -5,3 +5,4 @@
 export * from './IdentityPanel';
 export * from './JoinPanel';
 export * from './SpacePanel';
+export * from './StatusPanel';

package/src/steps/ConfirmReset.tsx

@@ -0,0 +1,112 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Warning } from '@phosphor-icons/react';
+import React, { useState } from 'react';
+
+import { log } from '@dxos/log';
+import { Message, useTranslation } from '@dxos/react-ui';
+import { getSize, mx } from '@dxos/react-ui-theme';
+
+import { type StepProps } from './StepProps';
+import { Action, Actions, StepHeading, Input } from '../components';
+
+type ConfirmResetOptions = Partial<{
+  onCancel: () => void;
+  onConfirm: () => Promise<void>;
+  mode: 'join new identity' | 'reset storage';
+}>;
+
+export type ConfirmResetProps = StepProps & ConfirmResetOptions;
+
+export type ConfirmResetImplProps = ConfirmResetOptions & {
+  disabled?: boolean;
+  pending?: boolean;
+  validationMessage?: string;
+};
+
+export const ConfirmReset = ({ active, onCancel, onConfirm, mode }: ConfirmResetProps) => {
+  const { t } = useTranslation('os');
+  const [validationMessage, setValidationMessage] = useState('');
+  const [pending, setPending] = useState(false);
+  const processReset = async () => {
+    setPending(true);
+    return onConfirm?.().then(
+      () => setPending(false),
+      (error) => {
+        log.catch(error);
+        setValidationMessage(t('failed to reset identity message'));
+        setPending(false);
+      },
+    );
+  };
+  return (
+    <ConfirmResetImpl
+      disabled={!active}
+      pending={pending}
+      validationMessage={validationMessage}
+      onConfirm={processReset}
+      onCancel={onCancel}
+      mode={mode}
+    />
+  );
+};
+
+export const ConfirmResetImpl = ({
+  disabled,
+  pending,
+  validationMessage,
+  onConfirm,
+  onCancel,
+  mode,
+}: ConfirmResetImplProps) => {
+  const { t } = useTranslation('os');
+  const confirmationValue = t('confirmation value');
+  const [inputValue, setInputValue] = useState('');
+  const testIdAffix = mode === 'join new identity' ? 'join-new-identity' : 'reset-storage';
+  return (
+    <>
+      <div role='none' className='grow flex flex-col gap-2 justify-center'>
+        <Message.Root valence='error'>
+          <Message.Title>
+            <Warning className={mx(getSize(6), 'inline mie-2')} />
+            {t('sign out chooser title')}
+          </Message.Title>
+          <Message.Body>{t('sign out chooser message')}</Message.Body>
+        </Message.Root>
+        <Input
+          {...{ validationMessage }}
+          label={
+            <StepHeading className='text-start mlb-2'>
+              {t(mode === 'join new identity' ? 'join new identity input label' : 'reset storage input label', {
+                confirmationValue,
+              })}
+            </StepHeading>
+          }
+          disabled={disabled}
+          data-testid={`${testIdAffix}.reset-identity-input`}
+          placeholder={confirmationValue}
+          onChange={({ target: { value } }) => setInputValue(value)}
+        />
+      </div>
+      <Actions>
+        {onCancel && (
+          <Action disabled={disabled} onClick={onCancel} data-testid={`${testIdAffix}.reset-identity-cancel`}>
+            {t('cancel label')}
+          </Action>
+        )}
+        {onConfirm && (
+          <Action
+            variant='destructive'
+            disabled={disabled || pending || inputValue !== confirmationValue}
+            onClick={onConfirm}
+            data-testid={`${testIdAffix}.reset-identity-confirm`}
+          >
+            {pending ? t('reset in progress label') : t('reset device label')}
+          </Action>
+        )}
+      </Actions>
+    </>
+  );
+};

package/src/steps/StepProps.ts

@@ -6,8 +6,9 @@ import { type cloneElement } from 'react';
 import { type Event, type SingleOrArray } from 'xstate';
 
 type StepDeselectInvitationEvent = { type: 'deselectInvitation' };
+type StepResetIdentityEvent = { type: 'resetIdentity' };
 
-export type StepEvent = StepDeselectInvitationEvent;
+export type StepEvent = StepDeselectInvitationEvent | StepResetIdentityEvent;
 
 export type StepProps = {
   active?: boolean;

package/src/steps/index.ts

@@ -4,3 +4,4 @@
 
 export * from './InvitationManager';
 export * from './StepProps';
+export * from './ConfirmReset';

package/src/testing/shell-manager.ts

@@ -66,16 +66,14 @@ export class ShellManager extends ScopedShellManager {
 
     this.page.on('dialog', handleDialog);
     await this.shell.getByTestId('devices-panel.sign-out').click();
-    await this.shell.getByTestId('sign-out.reset-device').click();
-    this.page.off('dialog', handleDialog);
+    await this.shell.getByTestId('reset-storage.reset-identity-input').fill('CONFIRM');
+    await this.shell.getByTestId('reset-storage.reset-identity-confirm').click();
   }
 
   async joinNewIdentity(invitationCode: string) {
-    await this.shell.getByTestId('devices-panel.sign-out').click();
-    await this.shell.getByTestId('sign-out.join-new-identity').click();
-    await this.shell.getByTestId('reset-identity-input').fill('CONFIRM');
-    await this.shell.getByTestId('reset-identity-input-confirm').click();
-    await this.shell.getByTestId('identity-chooser.join-identity').click();
+    await this.shell.getByTestId('devices-panel.join-new-identity').click();
+    await this.shell.getByTestId('join-new-identity.reset-identity-input').fill('CONFIRM');
+    await this.shell.getByTestId('join-new-identity.reset-identity-input-confirm').click();
     await this.inputInvitation('device', invitationCode, this.shell);
   }
 

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

@@ -73,7 +73,8 @@ export const os = {
   'choose add device label': 'Add device',
   'choose devices label': 'Manage devices',
   'choose profile label': 'Edit profile',
-  'choose sign out label': 'Sign out',
+  'choose sign out label': 'Reset storage',
+  'choose join new identity label': 'Join existing device',
   'empty space members message': 'There is nobody in this space yet.',
   'back to all invitations label': 'Back to all invitations',
   'invitation heading': 'Invitation',
@@ -97,19 +98,22 @@ export const os = {
   'invite options label': 'Change the active invite option.',
   'reset in progress label': 'Resetting...',
   'confirm label': 'Confirm',
-  'reset identity input label':
+  'reset storage input label':
     'This will clear this device and all associated data. Type {{confirmationValue}} and confirm to continue.',
+  'join new identity input label':
+    'In order to join an existing device, storage on this device must be cleared first. Type {{confirmationValue}} to continue.',
   'failed to reset identity message': 'Failed to reset identity.',
   'confirmation value': 'CONFIRM',
-  'sign out chooser title': 'DANGER ZONE',
-  'sign out chooser message': 'Proceeding with either action below will erase all data on this device.',
+  'sign out chooser title': 'Danger zone',
+  'sign out chooser message': 'Proceeding with the action below will erase all data on this device.',
   'join new identity label': 'Join a new identity',
-  'reset device label': 'Reset device',
+  'reset device label': 'Reset storage',
   'reset device confirm message': 'Are you sure you want to reset your device? All data will be lost.',
   'emoji and color label': 'Emoji and color',
   'clear label': 'Use default',
   'select emoji label': 'Choose an emoji to use in your avatar',
   'select hue label': 'Choose a hue to use in your avatar',
+  'resetting message': 'One moment while things are reset…',
   'red label': 'Red',
   'orange label': 'Orange',
   'amber label': 'Amber',

package/src/types/index.ts

@@ -4,3 +4,5 @@
 
 export * from './FailReason';
 export * from './IInvitation';
+
+// This comment is here to bust NX cache. Remove it after the code changes.

package/dist/types/src/panels/IdentityPanel/steps/SignOutChooser.d.ts

@@ -1,16 +0,0 @@
-import { type Event, type SingleOrArray } from 'xstate';
-import { type IdentityPanelStepProps } from '../IdentityPanelProps';
-import { type IdentityEvent } from '../identityMachine';
-export interface SignOutChooserProps extends Omit<IdentityPanelStepProps, 'send'> {
-    send?: (event: SingleOrArray<Event<IdentityEvent>>) => void;
-    onResetDevice?: () => Promise<void>;
-    onJoinNewIdentity?: () => void;
-}
-export declare const SignOutChooser: (props: SignOutChooserProps) => JSX.Element;
-export type SignOutChooserImplProps = {
-    disabled?: boolean;
-    onResetDevice?: () => void;
-    onJoinNewIdentity?: () => void;
-    onBack?: () => void;
-};
-//# sourceMappingURL=SignOutChooser.d.ts.map

package/dist/types/src/panels/IdentityPanel/steps/SignOutChooser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SignOutChooser.d.ts","sourceRoot":"","sources":["../../../../../../src/panels/IdentityPanel/steps/SignOutChooser.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAMxD,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAC/E,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,IAAI,CAAC;IAC5D,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC;AAED,eAAO,MAAM,cAAc,UAAW,mBAAmB,gBAexD,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC"}