@dxos/shell 0.4.10-main.b112538 → 0.4.10-main.c32f430

package/dist/lib/browser/react.mjs

@@ -1375,15 +1375,13 @@ var SignOutChooserImpl = ({ disabled, onResetDevice, onJoinNewIdentity, onBack }
     disabled,
     onClick: onBack
   }, t("back label")), /* @__PURE__ */ React27.createElement(Action, {
-    variant: "primary",
+    variant: "destructive",
     "data-testid": "sign-out.join-new-identity",
-    classNames: "!bg-error-500 hover:!bg-error-550",
     disabled,
     onClick: onJoinNewIdentity
   }, t("join new identity label")), /* @__PURE__ */ React27.createElement(Action, {
-    variant: "primary",
+    variant: "destructive",
     "data-testid": "sign-out.reset-device",
-    classNames: "!bg-error-500 hover:!bg-error-550",
     disabled,
     onClick: onResetDevice
   }, t("reset device label"))));
@@ -2828,7 +2826,7 @@ import { log as log9 } from "@dxos/log";
 import { useClient as useClient5 } from "@dxos/react-client";
 import { useTranslation as useTranslation24 } from "@dxos/react-ui";
 var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/panels/JoinPanel/steps/ResetIdentity.tsx";
-var ResetIdentity = ({ send, active }) => {
+var ResetIdentity = ({ send, active, onCancelResetIdentity }) => {
   const client = useClient5();
   const { t } = useTranslation24("os");
   const [validationMessage, setValidationMessage] = useState9("");
@@ -2840,7 +2838,7 @@ var ResetIdentity = ({ send, active }) => {
     }), (error) => {
       log9.catch(error, void 0, {
         F: __dxlog_file9,
-        L: 35,
+        L: 37,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2852,10 +2850,11 @@ var ResetIdentity = ({ send, active }) => {
     disabled: !active,
     pending,
     validationMessage,
-    onConfirm: () => resetIdentity()
+    onConfirm: () => resetIdentity(),
+    onCancelResetIdentity
   });
 };
-var ResetIdentityImpl = ({ disabled, pending, validationMessage, onConfirm }) => {
+var ResetIdentityImpl = ({ disabled, pending, validationMessage, onConfirm, onCancelResetIdentity }) => {
   const { t } = useTranslation24("os");
   const confirmationValue = t("confirmation value");
   const [inputValue, setInputValue] = useState9("");
@@ -2872,8 +2871,12 @@ var ResetIdentityImpl = ({ disabled, pending, validationMessage, onConfirm }) =>
     placeholder: confirmationValue,
     onChange: ({ target: { value } }) => setInputValue(value)
   })), /* @__PURE__ */ React38.createElement(Actions, null, /* @__PURE__ */ React38.createElement(Action, {
+    disabled,
+    onClick: () => onCancelResetIdentity?.(),
+    "data-testid": "reset-identity-input-cancel"
+  }, t("cancel label")), /* @__PURE__ */ React38.createElement(Action, {
     // TODO(wittjosiah): Probably make this red?
-    variant: "primary",
+    variant: "destructive",
     disabled: disabled || pending || inputValue !== confirmationValue,
     onClick: () => onConfirm?.(),
     "data-testid": "reset-identity-input-confirm"
@@ -2907,7 +2910,7 @@ var resolvedTextColor = (status) => status === Invitation7.State.ERROR ? errorTe
 // packages/sdk/shell/src/panels/JoinPanel/JoinPanel.tsx
 var __dxlog_file10 = "/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, IdentityInput: IdentityInputComponent = IdentityInput, ResetIdentity: ResetIdentityComponent = ResetIdentity } = props;
+  const { titleId, send, activeView, failed, mode, unredeemedCodes, invitationStates, succeededKeys, failReasons, onExit, onHaloDone, onSpaceDone, exitActionParent, doneActionParent, onHaloInvitationCancel, onSpaceInvitationCancel, onHaloInvitationAuthenticate, onSpaceInvitationAuthenticate, onCancelResetIdentity, IdentityInput: IdentityInputComponent = IdentityInput, ResetIdentity: ResetIdentityComponent = ResetIdentity } = props;
   return /* @__PURE__ */ React39.createElement(DensityProvider3, {
     density: "fine"
   }, mode !== "halo-only" && /* @__PURE__ */ React39.createElement(JoinHeading, {
@@ -2930,7 +2933,8 @@ var JoinPanelImpl = (props) => {
   }, /* @__PURE__ */ React39.createElement(ResetIdentityComponent, {
     send,
     method: "reset identity",
-    active: activeView === "reset identity confirmation"
+    active: activeView === "reset identity confirmation",
+    onCancelResetIdentity
   })), /* @__PURE__ */ React39.createElement(Viewport.View, {
     classNames: stepStyles,
     id: "create identity input"
@@ -3046,7 +3050,7 @@ var JoinPanelImpl = (props) => {
     onDone: onSpaceDone
   })))));
 };
-var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCode, exitActionParent, onExit, doneActionParent, onDone: propsOnDone }) => {
+var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCode, exitActionParent, onExit, doneActionParent, onDone: propsOnDone, onCancelResetIdentity }) => {
   const client = useClient6();
   const identity = useIdentity2();
   const { hasIosKeyboard } = useThemeContext4();
@@ -3066,7 +3070,7 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCod
     const subscription = joinService.subscribe((state) => {
       log10("[state]", state, {
         F: __dxlog_file10,
-        L: 198,
+        L: 201,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -3311,7 +3315,8 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCod
         type: "authenticateSpaceVerificationCode"
       });
       return joinState.context.space.invitationObservable?.authenticate(authCode);
-    }
+    },
+    onCancelResetIdentity
   });
 };
 
@@ -3737,6 +3742,9 @@ var Shell = ({ runtime, origin }) => {
       return /* @__PURE__ */ React45.createElement(JoinDialog, {
         mode: "halo-only",
         initialInvitationCode: invitationCode,
+        onCancelResetIdentity: () => runtime.setLayout({
+          layout: ShellLayout.IDENTITY
+        }),
         onDone: () => {
           void runtime.setAppContext({
             display: ShellDisplay.NONE