@dxos/shell 0.5.2-main.2408cc7 → 0.5.2-main.41b4fdd

package/dist/lib/browser/react.mjs

@@ -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"
@@ -2905,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
@@ -2925,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?.(),
@@ -2966,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, {
@@ -3034,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,
@@ -3089,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,
@@ -3127,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)
       });
@@ -3311,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
@@ -3359,6 +3369,7 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialDisposition =
       "authenticating"
     ].some((str) => joinState?.configuration[0].id.includes(str)),
     unredeemedCodes,
+    invitationIds,
     invitationStates,
     succeededKeys,
     identity,
@@ -4037,6 +4048,7 @@ 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",