remove "ConfirmReset" phase from SetupEncryption

Author: uhoreg

src/components/structures/auth/CompleteSecurity.tsx

@@ -78,9 +78,6 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
         } else if (phase === Phase.Busy) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("encryption|verification|after_new_login|verify_this_device");
-        } else if (phase === Phase.ConfirmReset) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("encryption|verification|after_new_login|reset_confirmation");
         } else if (phase === Phase.Finished) {
             // SetupEncryptionBody will take care of calling onFinished, we don't need to do anything
         } else {
@@ -90,7 +87,7 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
         const forceVerification = SdkConfig.get("force_verification");
 
         let skipButton;
-        if (!forceVerification && (phase === Phase.Intro || phase === Phase.ConfirmReset)) {
+        if (!forceVerification && phase === Phase.Intro) {
             skipButton = (
                 <AccessibleButton
                     onClick={this.onSkipClick}

src/components/structures/auth/SetupEncryptionBody.tsx

@@ -113,38 +113,15 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
 
     private onResetClick = (ev: ButtonEvent): void => {
         ev.preventDefault();
-        const store = SetupEncryptionStore.sharedInstance();
-        store.reset();
-        Modal.createDialog(
-            ResetIdentityDialog,
-            /* props= */ {
-                onReset: () => {
-                    // The user completed the reset process - close this dialog
-                    this.props.onFinished();
-                    store.done();
-                },
-                onCancelled: () => {
-                    // The user cancelled the reset dialog - go back a step
-                    store.returnAfterReset();
-                },
-                variant: "confirm",
-            },
-            /* className= */ undefined,
-            /* isPriorityModal= */ false,
-            /* isStaticModal= */ false,
-            /* options= */ {
-                onBeforeClose: async (reason): Promise<boolean> => {
-                    // This is the only time that we can detect that the dialog
-                    // is being closed due to the user clicking on the
-                    // background.
-                    if (reason === "backgroundClick") {
-                        // The user clicked away - go back a step
-                        store.returnAfterReset();
-                    }
-                    return true;
-                },
+        Modal.createDialog(ResetIdentityDialog, {
+            onReset: () => {
+                // The user completed the reset process - close this dialog
+                this.props.onFinished();
+                const store = SetupEncryptionStore.sharedInstance();
+                store.done();
             },
-        );
+            variant: "confirm",
+        });
     };
 
     private onDoneClick = (): void => {
@@ -266,7 +243,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
                     </div>
                 </div>
             );
-        } else if (phase === Phase.Busy || phase === Phase.Loading || phase == Phase.ConfirmReset) {
+        } else if (phase === Phase.Busy || phase === Phase.Loading) {
             return <Spinner />;
         } else {
             logger.log(`SetupEncryptionBody: Unknown phase ${phase}`);

src/components/views/dialogs/ResetIdentityDialog.tsx

@@ -15,17 +15,21 @@ interface ResetIdentityDialogProps {
     /**
      * Called when the dialog closes.
      */
-    onFinished: () => void;
+    onFinished?: () => void;
 
     /**
      * Called when the identity is reset (before onFinished is called).
      */
-    onReset: () => void;
+    onReset?: () => void;
 
     /**
      * Called when the reset is cancelled (before onFinished is called).
+     *
+     * Note: this is only called when the "Cancel" button is clicked, and not if
+     * the user clicks outside out the dialog, as that is handled by `Modal`
+     * rather than this component.
      */
-    onCancelled: () => void;
+    onCancelled?: () => void;
 
     /**
      * Which variant of this dialog to show.
@@ -48,12 +52,12 @@ export function ResetIdentityDialog({
     // whenever the reset is done, whether by completing successfully, or by
     // being cancelled
     const onResetWrapper: MouseEventHandler<HTMLButtonElement> = (...args) => {
-        onReset();
-        onFinished();
+        onReset?.();
+        onFinished?.();
     };
     const onCancelledWrapper: () => void = () => {
-        onCancelled();
-        onFinished();
+        onCancelled?.();
+        onFinished?.();
     };
     return (
         <MatrixClientContext.Provider value={matrixClient}>

src/i18n/strings/en_EN.json

@@ -992,7 +992,6 @@
             "accepting": "Accepting…",
             "after_new_login": {
                 "device_verified": "Device verified",
-                "reset_confirmation": "Really reset verification keys?",
                 "skip_verification": "Skip verification for now",
                 "unable_to_verify": "Unable to verify this device",
                 "verify_this_device": "Verify this device"

src/stores/SetupEncryptionStore.ts

@@ -29,7 +29,6 @@ export enum Phase {
     Done = 3, // final done stage, but still showing UX
     ConfirmSkip = 4,
     Finished = 5, // UX can be closed
-    ConfirmReset = 6,
 }
 
 /**
@@ -220,11 +219,6 @@ export class SetupEncryptionStore extends EventEmitter {
         this.emit("update");
     }
 
-    public reset(): void {
-        this.phase = Phase.ConfirmReset;
-        this.emit("update");
-    }
-
     public async resetConfirm(): Promise<void> {
         try {
             // If we've gotten here, the user presumably lost their

test/components/views/dialogs/security/SetupEncryptionDialog-test.tsx

@@ -51,68 +51,6 @@ describe("SetupEncryptionDialog", () => {
         // Then the phase has been set to Finished
         expect(store.phase).toBe(Phase.Finished);
     });
-
-    it("should launch a dialog when I say Proceed, then be ready when I cancel", async () => {
-        mockClient();
-        const store = new SetupEncryptionStore();
-        jest.spyOn(SetupEncryptionStore, "sharedInstance").mockReturnValue(store);
-
-        // Given when you open the reset dialog we immediately cancel
-        jest.spyOn(Modal, "createDialog").mockImplementation((_, props) => {
-            // Simulate cancelling in the dialog
-            props?.onCancelled();
-
-            return {
-                close: jest.fn(),
-                finished: Promise.resolve([]),
-            };
-        });
-
-        // When we launch the dialog and set it ready to start
-        const onFinished = jest.fn();
-        render(<SetupEncryptionDialog onFinished={onFinished} />);
-        await act(async () => await store.fetchKeyInfo());
-        expect(store.phase).toBe(Phase.Intro);
-
-        // And we hit the Proceed with reset button.
-        // (The createDialog mock above simulates the user hitting cancel)
-        await act(async () => screen.getByRole("button", { name: "Proceed with reset" }).click());
-
-        // Then the phase has been set to Intro
-        expect(store.phase).toBe(Phase.Intro);
-    });
-
-    it("should launch a dialog when I say Proceed, then be ready when I click outside the dialog", async () => {
-        mockClient();
-        const store = new SetupEncryptionStore();
-        jest.spyOn(SetupEncryptionStore, "sharedInstance").mockReturnValue(store);
-
-        // Given when you open the reset dialog we immediately cancel
-        jest.spyOn(Modal, "createDialog").mockImplementation(
-            (_component, _props, _className, _isPriorityModal, _isStaticModal, options) => {
-                // Simulate clicking outside the dialog
-                options?.onBeforeClose?.("backgroundClick");
-
-                return {
-                    close: jest.fn(),
-                    finished: Promise.resolve([]),
-                };
-            },
-        );
-
-        // When we launch the dialog and set it ready to start
-        const onFinished = jest.fn();
-        render(<SetupEncryptionDialog onFinished={onFinished} />);
-        await act(async () => await store.fetchKeyInfo());
-        expect(store.phase).toBe(Phase.Intro);
-
-        // And we hit the Proceed with reset button.
-        // (The createDialog mock above simulates the user clicking outside the dialog)
-        await act(async () => screen.getByRole("button", { name: "Proceed with reset" }).click());
-
-        // Then the phase has been set to Intro
-        expect(store.phase).toBe(Phase.Intro);
-    });
 });
 
 function mockClient() {