Update identity reset UI (Make consistent with EX) #29701

andybalaam · 2025-04-09T12:31:24Z

This adds IdentityResetDialog, which wraps IdentityResetBody in a dialog, and launches it from SetupEncryptionBody, instead of doing the reset directly there.

This is mostly work by @uhoreg , rebased and refactored a bit here.

~~I recommend reviewing commit-by-commit.~~

dbkr · 2025-04-15T16:50:54Z

src/components/views/dialogs/ResetIdentityDialog.tsx

+    /**
+     * Called when the identity is reset (before onFinished is called).
+     */
+    onReset: MouseEventHandler<HTMLButtonElement>;


It seems a bit weird for 'onReset' to take a mouse event: it's hard to see how the original click would be relevant.

It's just copied from the original settings panel (where I don't think the mouse event is used either). We can get rid of it here.

I've changed this to be a function with no arguments. Should I also change ResetIdentityBody and ResetIdentityPanel (since we already touch those lines in this PR)?

Oh I see - thanks. Up to you whether you fancy changing it elsewhere.

dbkr · 2025-04-15T16:53:37Z

src/components/structures/auth/SetupEncryptionBody.tsx

+            },
+            onFinished: () => {
+                // The user cancelled the reset dialog or click away - go back a step
+                this.onResetBackClick();


onFinished is called in either case isn't it? Is there a risk this will confuse things by clicking back after the dialog is done (also I don't love that we are calling click handlers for reasons other than when a click happened).

I've added an onCancelled callback, and used that. I'm not sure if it's necessary, but it's clearer

Also changed the code so that it doesn't call the click handlers.

dbkr · 2025-04-15T16:54:09Z

src/components/structures/auth/SetupEncryptionBody.tsx

+            onReset: () => {
+                // The user completed the reset process - close this dialog
+                this.props.onFinished();
+                this.onDoneClick();


As per below on calling click handlers rather than them just handling clicks.

richvdh · 2025-04-15T17:06:02Z

src/components/views/dialogs/ResetIdentityDialog.tsx

+    // Wrappers for ResetIdentityBody's callbacks so that onFinish gets called
+    // whenever the reset is done, whether by completing successfully, or by
+    // being cancelled
+    const onResetWrapper: MouseEventHandler<HTMLButtonElement> = (...args) => {
+        onFinished();
+        onResetFinished(...args);
+    };
+    const onCancelWrapper: () => void = () => {
+        onFinished();
+        onCancelClick();
+    };


General feedback: this seems to immediately change in the next commit, so reviewing it is trickier than it needs to be

richvdh

Struggling to follow this :/

src/components/structures/auth/CompleteSecurity.tsx

richvdh · 2025-04-15T17:21:01Z

src/components/views/settings/encryption/ResetIdentityBody.tsx

- * "forgot" is shown when the user has just forgotten their passphrase.
+ * "forgot" is shown when the user chose 'Forgot recovery key?' during `SetupEncryptionToast`.
+ *
+ * "confirm" is shown when the user chose 'Reset all' during `SetupEncryptionBody`.


it would be good to detail how the behaviour is different, rather than when it is called.

No behaviour change. It just changes the messages displayed. I've added a comment about that.

richvdh · 2025-04-15T17:22:12Z

src/components/structures/auth/SetupEncryptionBody.tsx

-        } else if (phase === Phase.ConfirmReset) {
-            return (
-                <div>
-                    <p>{_t("encryption|verification|verify_reset_warning_1")}</p>
-                    <p>{_t("encryption|verification|verify_reset_warning_2")}</p>
-
-                    <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton kind="danger_outline" onClick={this.onResetConfirmClick}>
-                            {_t("encryption|verification|reset_proceed_prompt")}
-                        </AccessibleButton>
-                        <AccessibleButton kind="primary" onClick={this.onResetBackClick}>
-                            {_t("action|go_back")}
-                        </AccessibleButton>
-                    </div>
-                </div>
-            );
-        } else if (phase === Phase.Busy || phase === Phase.Loading) {
+        } else if (phase === Phase.Busy || phase === Phase.Loading || phase == Phase.ConfirmReset) {


again, bit confused about why it is safe to get rid of the confirm step, and why we now show a spinner for "ConfirmReset".

This dialog used to do confirm resetting the identity, but now it uses ResetIdentityDialog to do so. So during the "ConfirmReset" stage, this dialog just shows a spinner, while ResetIdentityDialog does the actual confirmation.

richvdh

Slightly struggling to understand the scope of the changes here.

Make identity reset consistent with EX

Before I try and page in the code changes again, could we rephrase this in a way that summarises what's actually changing in EW as part of this change? A few screenshots might not go amiss, either.

Fixes #29227

The linked issue isn't terribly helpful at getting an overview of what actually needs to change: it links to a load of designs but I'm unclear what is already done and what this PR is aiming to change. But in particular: #29227 talks about changing something in the OIDC flow, which doesn't seem to be done here? Is that because it's already done?

I recommend reviewing commit-by-commit.

I assume this is no longer the recommended approach?

uhoreg · 2025-04-24T20:12:20Z

Slightly struggling to understand the scope of the changes here.

Make identity reset consistent with EX

Before I try and page in the code changes again, could we rephrase this in a way that summarises what's actually changing in EW as part of this change? A few screenshots might not go amiss, either.

Added a screenshot, and updated the title. It is "just" a UI update, with the annoying part being that in order to get the desired UI, I had to make it pop up a new modal, rather than to do it all in SetupEncryptionBody.

Fixes #29227

The linked issue isn't terribly helpful at getting an overview of what actually needs to change: it links to a load of designs but I'm unclear what is already done and what this PR is aiming to change. But in particular: #29227 talks about changing something in the OIDC flow, which doesn't seem to be done here? Is that because it's already done?

Looks like Andy and I both missed the OIDC part. But I've split it off into #29809 since it's a separate component and is non-trivial.

I recommend reviewing commit-by-commit.

I assume this is no longer the recommended approach?

Yes, by now it has accumulated enough commits that that approach may not be the best.

github-actions bot deployed to Netlify April 9, 2025 12:34 View deployment

andybalaam mentioned this pull request Apr 9, 2025

Make identity reset consistent with EX #29686

Closed

andybalaam added T-Defect T-Feature Request to add a new feature which does not exist right now and removed T-Defect labels Apr 9, 2025

github-actions bot deployed to EndToEndTests April 9, 2025 12:43 View deployment

andybalaam added T-Enhancement and removed T-Feature Request to add a new feature which does not exist right now labels Apr 9, 2025

andybalaam force-pushed the andybalaam/reset-encryption-redesign2 branch from 5ca414f to fec5e88 Compare April 11, 2025 10:56

github-actions bot deployed to Netlify April 11, 2025 10:59 View deployment

github-actions bot deployed to EndToEndTests April 11, 2025 11:10 View deployment

andybalaam force-pushed the andybalaam/reset-encryption-redesign2 branch 2 times, most recently from 0edccfe to dab78ad Compare April 11, 2025 15:02

github-actions bot deployed to Netlify April 11, 2025 15:05 View deployment

andybalaam force-pushed the andybalaam/reset-encryption-redesign2 branch from dab78ad to 8f0073e Compare April 11, 2025 15:12

github-actions bot deployed to Netlify April 11, 2025 15:15 View deployment

github-actions bot deployed to EndToEndTests April 11, 2025 15:26 View deployment

andybalaam force-pushed the andybalaam/reset-encryption-redesign2 branch from 8f0073e to f3035e1 Compare April 14, 2025 09:28

github-actions bot deployed to Netlify April 14, 2025 09:31 View deployment

github-actions bot deployed to EndToEndTests April 14, 2025 09:41 View deployment

github-actions bot deployed to EndToEndTests April 14, 2025 12:46 View deployment

andybalaam force-pushed the andybalaam/reset-encryption-redesign2 branch from f3035e1 to 94c7056 Compare April 14, 2025 14:16

github-actions bot deployed to Netlify April 14, 2025 14:19 View deployment

andybalaam force-pushed the andybalaam/reset-encryption-redesign2 branch from 94c7056 to 4fdc53e Compare April 14, 2025 14:21

github-actions bot deployed to Netlify April 14, 2025 14:24 View deployment

github-actions bot deployed to EndToEndTests April 14, 2025 14:34 View deployment

andybalaam force-pushed the andybalaam/reset-encryption-redesign2 branch from 4fdc53e to fff5732 Compare April 14, 2025 16:02

github-actions bot deployed to Netlify April 14, 2025 16:04 View deployment

github-actions bot deployed to EndToEndTests April 14, 2025 16:14 View deployment

andybalaam force-pushed the andybalaam/reset-encryption-redesign2 branch from fff5732 to eccb05c Compare April 15, 2025 07:31

andybalaam requested a review from richvdh April 15, 2025 11:27

dbkr reviewed Apr 15, 2025

View reviewed changes

richvdh reviewed Apr 15, 2025

View reviewed changes

richvdh requested changes Apr 15, 2025

View reviewed changes

apply changes from review

99fe598

github-actions bot deployed to Netlify April 22, 2025 21:34 View deployment

github-actions bot deployed to EndToEndTests April 22, 2025 21:45 View deployment

don't call click handlers

3bca537

github-actions bot deployed to Netlify April 22, 2025 22:10 View deployment

github-actions bot deployed to EndToEndTests April 22, 2025 22:23 View deployment

This comment was marked as spam.

Sign in to view

fix tests

d3835cd

github-actions bot deployed to Netlify April 23, 2025 01:32 View deployment

github-actions bot deployed to EndToEndTests April 23, 2025 01:42 View deployment

dbkr approved these changes Apr 23, 2025

View reviewed changes

fix playwright test

05e6ab8

github-actions bot deployed to Netlify April 23, 2025 21:31 View deployment

github-actions bot deployed to EndToEndTests April 23, 2025 21:41 View deployment

github-actions bot deployed to Netlify April 23, 2025 21:51 View deployment

github-actions bot deployed to EndToEndTests April 23, 2025 22:02 View deployment

add test for clicking outside of dialog box

0935979

uhoreg force-pushed the andybalaam/reset-encryption-redesign2 branch from c7b15fb to 0935979 Compare April 23, 2025 22:03

github-actions bot deployed to Netlify April 23, 2025 22:05 View deployment

github-actions bot deployed to EndToEndTests April 23, 2025 22:16 View deployment

uhoreg requested a review from richvdh April 23, 2025 23:17

richvdh requested changes Apr 24, 2025

View reviewed changes

uhoreg changed the title ~~Make identity reset consistent with EX~~ Update identity reset UI (Make consistent with EX) Apr 24, 2025

uhoreg requested a review from richvdh April 24, 2025 20:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update identity reset UI (Make consistent with EX) #29701

Update identity reset UI (Make consistent with EX) #29701

andybalaam commented Apr 9, 2025 •

edited by uhoreg

Loading

dbkr Apr 15, 2025

uhoreg Apr 21, 2025

uhoreg Apr 22, 2025

dbkr Apr 23, 2025

dbkr Apr 15, 2025

uhoreg Apr 22, 2025

uhoreg Apr 22, 2025

dbkr Apr 23, 2025

dbkr Apr 15, 2025

richvdh Apr 15, 2025

richvdh left a comment

richvdh Apr 15, 2025

uhoreg Apr 22, 2025

richvdh Apr 15, 2025

uhoreg Apr 21, 2025

This comment was marked as spam.

This comment was marked as spam.

richvdh left a comment

uhoreg commented Apr 24, 2025

Update identity reset UI (Make consistent with EX) #29701

Are you sure you want to change the base?

Update identity reset UI (Make consistent with EX) #29701

Conversation

andybalaam commented Apr 9, 2025 • edited by uhoreg Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

richvdh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

richvdh left a comment

Choose a reason for hiding this comment

uhoreg commented Apr 24, 2025

andybalaam commented Apr 9, 2025 •

edited by uhoreg

Loading