@dxos/shell 0.5.1-next.ed1615e → 0.5.2-main.16cd857

package/dist/lib/browser/react.mjs

@@ -582,11 +582,11 @@ var DeviceListItem = /* @__PURE__ */ forwardRef2(({ device, onClickAdd, onClickE
     DeviceType.AGENT_MANAGED
   ].includes(device.profile.type) ? /* @__PURE__ */ React9.createElement(Robot, iconProps) : device.profile.type === DeviceType.MOBILE ? /* @__PURE__ */ React9.createElement(DeviceMobile, iconProps) : /* @__PURE__ */ React9.createElement(Devices, iconProps) : /* @__PURE__ */ React9.createElement(Avatar3.Fallback, {
     text: fallbackValue.emoji
-  })), isCurrent && /* @__PURE__ */ React9.createElement(Tag, {
-    color: "primary"
-  }, t("current device tag label")), /* @__PURE__ */ React9.createElement(Avatar3.Label, {
+  })), /* @__PURE__ */ React9.createElement(Avatar3.Label, {
     classNames: "flex-1 text-sm truncate"
-  }, displayName), device.kind === DeviceKind.CURRENT && /* @__PURE__ */ React9.createElement(DropdownMenu2.Root, null, /* @__PURE__ */ React9.createElement(DropdownMenu2.Trigger, {
+  }, displayName), isCurrent && /* @__PURE__ */ React9.createElement(Tag, {
+    color: "primary"
+  }, t("current device tag label")), device.kind === DeviceKind.CURRENT && /* @__PURE__ */ React9.createElement(DropdownMenu2.Root, null, /* @__PURE__ */ React9.createElement(DropdownMenu2.Trigger, {
     asChild: true
   }, /* @__PURE__ */ React9.createElement(Button5, {
     variant: "ghost",
@@ -1572,7 +1572,7 @@ var InvitationManager = ({ invitationUrl, active, send, status, multiUse, authCo
     code: authCode,
     large: true,
     classNames: "text-black dark:text-white"
-  }), /* @__PURE__ */ React27.createElement(Label, null, "Be sure the other device is showing this symbol:"), emoji && /* @__PURE__ */ React27.createElement(Emoji, {
+  }), /* @__PURE__ */ React27.createElement(Label, null, t("auth other device emoji message")), emoji && /* @__PURE__ */ React27.createElement(Emoji, {
     text: emoji
   })), /* @__PURE__ */ React27.createElement(InvitationManagerView, {
     id: "showing final"
@@ -1644,7 +1644,9 @@ var ConfirmResetImpl = ({ disabled, pending, validationMessage, onConfirm, onCan
     })),
     disabled,
     "data-testid": `${testIdAffix}.reset-identity-input`,
-    placeholder: confirmationValue,
+    placeholder: t("confirmation placeholder", {
+      confirmationValue
+    }),
     onChange: ({ target: { value } }) => setInputValue(value)
   })), /* @__PURE__ */ React28.createElement(Actions, null, onCancel && /* @__PURE__ */ React28.createElement(Action, {
     disabled,
@@ -2903,10 +2905,8 @@ var InvitationAuthenticator = ({ failed, Kind, active, pending, invitationId, on
   };
   return /* @__PURE__ */ React37.createElement(React37.Fragment, null, /* @__PURE__ */ React37.createElement("div", {
     role: "none",
-    className: "grow flex flex-col justify-center"
-  }, invitationId && /* @__PURE__ */ React37.createElement(Emoji, {
-    text: hexToEmoji5(invitationId)
-  }), /* @__PURE__ */ React37.createElement(Input3.Root, failed && {
+    className: "grow flex flex-col justify-center gap-4"
+  }, /* @__PURE__ */ React37.createElement(Input3.Root, failed && {
     validationValence: "error"
   }, /* @__PURE__ */ React37.createElement(Input3.Label, {
     asChild: true
@@ -2923,7 +2923,11 @@ var InvitationAuthenticator = ({ failed, Kind, active, pending, invitationId, on
     "data-1p-ignore": true
   }), failed && /* @__PURE__ */ React37.createElement(Input3.DescriptionAndValidation, {
     classNames: "text-center"
-  }, /* @__PURE__ */ React37.createElement(Input3.Validation, null, t("failed to authenticate message"))))), /* @__PURE__ */ React37.createElement(Actions, null, /* @__PURE__ */ React37.createElement(Action, {
+  }, /* @__PURE__ */ React37.createElement(Input3.Validation, null, t("failed to authenticate message")))), invitationId && /* @__PURE__ */ React37.createElement(React37.Fragment, null, /* @__PURE__ */ React37.createElement(Label, null, t("auth other device emoji message")), /* @__PURE__ */ React37.createElement("div", {
+    className: "flex justify-center"
+  }, /* @__PURE__ */ React37.createElement(Emoji, {
+    text: hexToEmoji5(invitationId)
+  })))), /* @__PURE__ */ React37.createElement(Actions, null, /* @__PURE__ */ React37.createElement(Action, {
     variant: "ghost",
     disabled,
     onClick: () => onInvitationCancel?.(),
@@ -2964,7 +2968,7 @@ var resolvedTextColor = (status) => status === Invitation6.State.ERROR ? errorTe
 // packages/sdk/shell/src/panels/JoinPanel/JoinPanel.tsx
 var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/JoinPanel.tsx";
 var JoinPanelImpl = (props) => {
-  const { titleId, send, activeView, failed, mode, unredeemedCodes, invitationStates, succeededKeys, failReasons, onExit, onHaloDone, onSpaceDone, exitActionParent, doneActionParent, onHaloInvitationCancel, onSpaceInvitationCancel, onHaloInvitationAuthenticate, onSpaceInvitationAuthenticate, onCancelResetStorage, onConfirmResetStorage, IdentityInput: IdentityInputComponent = IdentityInput, ConfirmReset: ConfirmResetComponent = ConfirmReset } = props;
+  const { titleId, send, activeView, failed, mode, unredeemedCodes, invitationIds, invitationStates, succeededKeys, failReasons, onExit, onHaloDone, onSpaceDone, exitActionParent, doneActionParent, onHaloInvitationCancel, onSpaceInvitationCancel, onHaloInvitationAuthenticate, onSpaceInvitationAuthenticate, onCancelResetStorage, onConfirmResetStorage, IdentityInput: IdentityInputComponent = IdentityInput, ConfirmReset: ConfirmResetComponent = ConfirmReset } = props;
   return /* @__PURE__ */ React38.createElement(DensityProvider2, {
     density: "fine"
   }, mode !== "halo-only" && /* @__PURE__ */ React38.createElement(JoinHeading, {
@@ -3032,6 +3036,7 @@ var JoinPanelImpl = (props) => {
   }, /* @__PURE__ */ React38.createElement(InvitationAuthenticator, {
     send,
     Kind: "Halo",
+    invitationId: invitationIds?.Halo,
     active: activeView === "halo invitation authenticator",
     onInvitationCancel: onHaloInvitationCancel,
     onInvitationAuthenticate: onHaloInvitationAuthenticate,
@@ -3087,6 +3092,7 @@ var JoinPanelImpl = (props) => {
   }, /* @__PURE__ */ React38.createElement(InvitationAuthenticator, {
     send,
     Kind: "Space",
+    invitationId: invitationIds?.Space,
     active: activeView === "space invitation authenticator",
     onInvitationCancel: onSpaceInvitationCancel,
     onInvitationAuthenticate: onSpaceInvitationAuthenticate,
@@ -3125,7 +3131,7 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialDisposition =
     const subscription = joinService.subscribe((state) => {
       log10("[state]", state, {
         F: __dxlog_file9,
-        L: 204,
+        L: 207,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -3309,6 +3315,12 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialDisposition =
   }), [
     joinState
   ]);
+  const invitationIds = useMemo4(() => ({
+    Halo: joinState.context.halo.invitationObservable?.get().invitationId,
+    Space: joinState.context.space.invitationObservable?.get().invitationId
+  }), [
+    joinState
+  ]);
   const failReasons = useMemo4(() => ({
     Halo: joinState.context.halo.failReason,
     Space: joinState.context.space.failReason
@@ -3357,6 +3369,7 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialDisposition =
       "authenticating"
     ].some((str) => joinState?.configuration[0].id.includes(str)),
     unredeemedCodes,
+    invitationIds,
     invitationStates,
     succeededKeys,
     identity,
@@ -4035,23 +4048,25 @@ var os = {
   "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:",
   "display name input label": "Display name",
   "display name input placeholder": "Enter a display name",
   "invite one label": "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": "Standing invitation",
+  "invite many label": "Multi-use invitation",
   "invite many description": "Anyone with the link can join.",
-  "invite many qr label": "Standing invitation",
-  "invite many list item label": "Active standing invitation",
+  "invite many qr label": "Multi-use invitation",
+  "invite many list item label": "Active multi-use invitation",
   "invite options label": "Change the active invite option.",
   "reset in progress label": "Resetting...",
   "confirm label": "Confirm",
-  "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.",
+  "reset storage input label": "WARNING: This will delete all data on this device. Type {{confirmationValue}} to continue.",
+  "join new identity input label": "WARNING: To join an existing device all data on this device will be deleted. Type {{confirmationValue}} to continue.",
   "failed to reset identity message": "Failed to reset identity.",
-  "confirmation value": "CONFIRM",
+  "confirmation value": "RESET",
+  "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",
@@ -4061,7 +4076,7 @@ var os = {
   "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\u2026",
+  "resetting message": "One moment while the device is reset\u2026",
   "red label": "Red",
   "orange label": "Orange",
   "amber label": "Amber",