@dxos/shell 0.8.1-main.ae460ac → 0.8.1-staging.31c3ee1

package/src/panels/IdentityPanel/IdentityPanel.tsx

@@ -81,11 +81,16 @@ const IdentityHeading = ({
 
   return (
     <Heading titleId={titleId} title={title} corner={<CloseButton onDone={onDone} />}>
-      <Avatar.Root size={16} variant='circle' status={isConnected ? 'active' : 'error'} hue={hue || fallbackValue.hue}>
+      <Avatar.Root>
         <Toolbar.Root classNames='flex justify-center'>
-          <Avatar.Frame classNames='relative z-[2] -mli-4 chromatic-ignore'>
-            <Avatar.Fallback text={emoji || fallbackValue.emoji} />
-          </Avatar.Frame>
+          <Avatar.Content
+            size={16}
+            variant='circle'
+            status={isConnected ? 'active' : 'error'}
+            hue={hue || fallbackValue.hue}
+            fallback={emoji || fallbackValue.emoji}
+            classNames='relative z-[2] -mli-4 chromatic-ignore'
+          />
         </Toolbar.Root>
 
         <Avatar.Label classNames='sr-only' data-testid='identityHeading.displayName'>
@@ -106,7 +111,13 @@ const IdentityHeading = ({
 
         <Toolbar.Root classNames='flex justify-center items-center gap-1 pt-3'>
           <EmojiPickerToolbarButton emoji={emoji} onChangeEmoji={setEmoji} classNames='bs-[--rail-action]' />
-          <HuePicker value={hue} onChange={setHue} onReset={() => setHue(undefined)} classNames='bs-[--rail-action]' />
+          <HuePicker
+            value={hue}
+            onChange={setHue}
+            onReset={() => setHue(undefined)}
+            classNames='bs-[--rail-action]'
+            rootVariant='toolbar-button'
+          />
           <Clipboard.IconButton
             classNames='bs-[--rail-action]'
             data-testid='update-profile-form-copy-key'

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

@@ -43,10 +43,12 @@ export const IdentityAdded = (props: IdentityAddedProps) => {
     <>
       <StepHeading>{t('identity added label')}</StepHeading>
       <div role='none' className='grow flex flex-col items-center justify-center text-center gap-2'>
-        <Avatar.Root status='active' labelId={labelId} hue={addedIdentity?.profile?.data?.hue || fallbackValue.hue}>
-          <Avatar.Frame>
-            <Avatar.Fallback text={addedIdentity?.profile?.data?.emoji || fallbackValue.emoji} />
-          </Avatar.Frame>
+        <Avatar.Root labelId={labelId}>
+          <Avatar.Content
+            status='active'
+            hue={addedIdentity?.profile?.data?.hue || fallbackValue.hue}
+            fallback={addedIdentity?.profile?.data?.emoji || fallbackValue.emoji}
+          />
           <Avatar.Label classNames={mx('text-lg truncate', !addedIdentity?.profile?.displayName && 'font-mono')}>
             {displayName}
           </Avatar.Label>

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

@@ -87,15 +87,15 @@ export const os = {
   'device list heading': 'Devices',
   'space member list heading': 'Members',
   'space panel heading': 'Space membership',
-  'auth code message': 'Enter the following auth code on the joining device.',
-  'auth other device emoji message': 'Be sure the other device shows the following symbol:',
+  'auth code message': 'Enter the following auth code on the joining device. Click the code to copy it.',
+  'auth other device emoji message': 'Be sure the other device shows the following emoji.',
   'display name input label': 'Display name',
   'display name input placeholder': 'Enter a display name',
-  'invite one label': 'Single-use invitation',
+  'invite one label': 'Create single-use invitation',
   'invite one description': 'Only one user may join.',
   'invite one qr label': 'Single-use invitation',
   'invite one list item label': 'Active single-use invitation',
-  'invite many label': 'Multi-use invitation',
+  'invite many label': 'Create multi-use invitation',
   'invite many description': 'Anyone with the link can join.',
   'invite many qr label': 'Multi-use invitation',
   'invite many list item label': 'Active multi-use invitation',
@@ -111,7 +111,7 @@ export const os = {
   'confirmation placeholder': 'Enter {{confirmationValue}} to continue.',
   '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',
+  'join new identity label': 'Join an existing identity',
   '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',