@dxos/shell 0.7.5-labs.e27f9b9 → 0.7.5-main.2567c87

package/src/components/index.ts

@@ -4,6 +4,8 @@
 
 export * from './AgentConfig';
 export * from './CompoundButton';
+export * from './EmojiPicker';
+export * from './HuePicker';
 export * from './IdentityList';
 export * from './DeviceList';
 export * from './InvitationList';

package/src/panels/IdentityPanel/IdentityPanel.stories.tsx

@@ -6,7 +6,6 @@ import '@dxos-theme';
 
 import React from 'react';
 
-import { IdentityDid } from '@dxos/keys';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { faker } from '@dxos/random';
 import { PublicKey } from '@dxos/react-client';
@@ -28,7 +27,6 @@ const noOpProps: IdentityPanelImplProps = {
   activeView: 'identity action chooser',
   createInvitationUrl: (code) => code,
   identity: {
-    did: IdentityDid.random(),
     identityKey: PublicKey.random(),
     profile: {
       displayName: faker.person.firstName(),

package/src/panels/IdentityPanel/IdentityPanel.tsx

@@ -13,7 +13,6 @@ import { useInvitationStatus } from '@dxos/react-client/invitations';
 import { type CancellableInvitationObservable } from '@dxos/react-client/invitations';
 import { useNetworkStatus, ConnectionState } from '@dxos/react-client/mesh';
 import { Avatar, Input, Toolbar, Tooltip, useClipboard, useId, useTranslation } from '@dxos/react-ui';
-import { EmojiPickerToolbarButton, HuePickerToolbarButton } from '@dxos/react-ui-pickers';
 import { getSize } from '@dxos/react-ui-theme';
 import { hexToEmoji, hexToHue, keyToFallback } from '@dxos/util';
 
@@ -25,7 +24,7 @@ import {
 import { useIdentityMachine } from './identityMachine';
 import { IdentityActionChooser } from './steps';
 import { useAgentHandlers } from './useAgentHandlers';
-import { Viewport, CloseButton, Heading } from '../../components';
+import { Viewport, CloseButton, EmojiPickerToolbarButton, Heading, HuePickerToolbarButton } from '../../components';
 import { ConfirmReset, InvitationManager } from '../../steps';
 
 const viewStyles = 'pbs-1 pbe-3 pli-3';

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

@@ -8,10 +8,9 @@ import { type Event, type SingleOrArray } from 'xstate';
 import { log } from '@dxos/log';
 import { type Identity } from '@dxos/react-client/halo';
 import { useClipboard, useTranslation } from '@dxos/react-ui';
-import { EmojiPickerBlock, HuePickerBlock } from '@dxos/react-ui-pickers';
 import { hexToEmoji, hexToHue } from '@dxos/util';
 
-import { Action, Actions, StepHeading, Input } from '../../../components';
+import { Action, Actions, StepHeading, Input, EmojiPickerBlock, HuePickerBlock } from '../../../components';
 import { type IdentityPanelStepProps } from '../IdentityPanelProps';
 import { type IdentityEvent } from '../identityMachine';
 

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

@@ -31,7 +31,7 @@ export const IdentityInput = (props: IdentityInputProps) => {
   const [validationMessage, setValidationMessage] = useState('');
   const handleConfirm = async (value: string) => {
     if (isRecover) {
-      await client.halo.recoverIdentity({ recoveryCode: value }).then(
+      await client.halo.recoverIdentity({ seedphrase: value }).then(
         (identity) => {
           send?.({ type: 'selectIdentity' as const, identity });
         },

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

@@ -6,7 +6,7 @@ import '@dxos-theme';
 
 import React from 'react';
 
-import { IdentityDid, PublicKey } from '@dxos/keys';
+import { PublicKey } from '@dxos/keys';
 import { HaloSpaceMember, SpaceMember } from '@dxos/react-client/echo';
 import { Invitation } from '@dxos/react-client/invitations';
 import { withTheme } from '@dxos/storybook-utils';
@@ -179,7 +179,6 @@ export const SpaceManagerWithMember = () => {
                       presence: SpaceMember.PresenceState.ONLINE,
                       role: HaloSpaceMember.Role.ADMIN,
                       identity: {
-                        did: IdentityDid.random(),
                         identityKey: PublicKey.random(),
                       },
                     },
@@ -213,7 +212,6 @@ export const SpaceManagerWithMembers = () => {
                       presence: SpaceMember.PresenceState.ONLINE,
                       role: HaloSpaceMember.Role.ADMIN,
                       identity: {
-                        did: IdentityDid.random(),
                         identityKey: PublicKey.random(),
                         profile: {
                           displayName: 'John Doe',
@@ -254,7 +252,6 @@ export const SpaceManagerWithMoreMembers = () => {
                       presence: SpaceMember.PresenceState.ONLINE,
                       role: HaloSpaceMember.Role.ADMIN,
                       identity: {
-                        did: IdentityDid.random(),
                         identityKey: PublicKey.random(),
                         profile: {
                           displayName: 'John Doe',
@@ -265,7 +262,6 @@ export const SpaceManagerWithMoreMembers = () => {
                       presence: SpaceMember.PresenceState.OFFLINE,
                       role: HaloSpaceMember.Role.ADMIN,
                       identity: {
-                        did: IdentityDid.random(),
                         identityKey: PublicKey.random(),
                         profile: {
                           displayName: 'Alice Wong',
@@ -276,7 +272,6 @@ export const SpaceManagerWithMoreMembers = () => {
                       presence: SpaceMember.PresenceState.OFFLINE,
                       role: HaloSpaceMember.Role.ADMIN,
                       identity: {
-                        did: IdentityDid.random(),
                         identityKey: PublicKey.random(),
                         profile: {
                           displayName: 'Steel Nickels',

package/src/testing/fixtures/identities.ts

@@ -2,14 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import { IdentityDid } from '@dxos/keys';
 import { PublicKey } from '@dxos/react-client';
 import { HaloSpaceMember, SpaceMember } from '@dxos/react-client/echo';
 
 export const alice: SpaceMember = {
   role: HaloSpaceMember.Role.ADMIN,
   identity: {
-    did: IdentityDid.random(),
     identityKey: PublicKey.random(),
     profile: {
       displayName: 'Alice',