Allow dismissing 'Key storage out of sync' temporarily by andybalaam · Pull Request #31455 · element-hq/element-web

andybalaam · 2025-12-08T17:00:02Z

Adds a close button to the "Key storage out of sync" toast, which closes the dialog for this session only.

richvdh

My suspicion is that, without changes to DeviceListener, this will pop up again next time there is any change to devices, etc

andybalaam · 2025-12-11T16:36:14Z

My suspicion is that, without changes to DeviceListener, this will pop up again next time there is any change to devices, etc

I'm sure you're right, thanks. I'll check this.

andybalaam · 2025-12-12T11:02:47Z

My suspicion is that, without changes to DeviceListener, this will pop up again next time there is any change to devices, etc

I'm sure you're right, thanks. I'll check this.

It turns out this change does actually update state, because it calls DeviceListener.dismissEncryptionSetup which sets dismissedThisDeviceToast to true, suppressing the dialog.

So I think this change actually does what it should :-)

andybalaam · 2026-01-21T15:13:09Z

This is ready for review after a design change. It now uses an "X" in the top right.

richvdh

A few nits

richvdh · 2026-01-22T13:02:19Z

src/stores/ToastStore.ts

    className?: string;
    bodyClassName?: string;
+
+    /** If defined, the toast has a close button in the top right */


If defined, the toast has a close button in the top right

If that's all it means, why not use a boolean?

Presumably onClose gets called when the close button is pressed, but please join the dots a bit. Is the toast automatically closed, or is onClose expected to do that? (I think the latter, but then it should probably be called onCloseButtonClicked or sth)

Done in 32b5694

richvdh · 2026-01-22T16:32:38Z

src/components/structures/ToastContainer.tsx

+                                {title}
+                            </Text>
+                        </div>
+                        {onClose && (


it looks like onClose will only work if a title is specified. We should note that in the documentation on IToast.

Done in 92e453b

richvdh · 2026-01-22T16:40:22Z

src/toasts/SetupEncryptionToast.tsx

        key: TOAST_KEY,
        title: getTitle(state),
        icon: getIcon(state),
+        onClose: getOnClose(state),


I feel like this would be easier to grok if the get... method just returned a boolean rather than the callback:

const getShouldShowCloseButton = (state: DeviceStateForToast): boolean => { /* ... */ }; // inside `showToast` const onClose = shouldShowCloseButton(state) ? () => DeviceListener.sharedInstance().dismissEncryptionSetup() : undefined;

Done in 84e8efa

richvdh · 2026-01-22T16:41:00Z

src/toasts/SetupEncryptionToast.tsx

+        case "key_storage_out_of_sync":
+        case "identity_needs_reset":
+            return () => DeviceListener.sharedInstance().dismissEncryptionSetup();
+        default:


I'd prefer to spell out each of the cases here, to try to encourage people to think about whether we need a close button if we add more cases in future.

Done in 84e8efa

richvdh

LGTM otherwise

src/stores/ToastStore.ts

…880) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [element-hq/element-web](https://github.com/element-hq/element-web) | patch | `v1.12.9` → `v1.12.10` | --- ### Release Notes <details> <summary>element-hq/element-web (element-hq/element-web)</summary> ### [`v1.12.10`](https://github.com/element-hq/element-web/releases/tag/v1.12.10) [Compare Source](element-hq/element-web@v1.12.9...v1.12.10) #### ✨ Features - Support additional\_creators in /upgraderoom (MSC4289) ([#31934](element-hq/element-web#31934)). Contributed by [@andybalaam](https://github.com/andybalaam). - Update room header icon for world\_readable rooms ([#31915](element-hq/element-web#31915)). Contributed by [@richvdh](https://github.com/richvdh). - Show an icon in the room header for shared history ([#31879](element-hq/element-web#31879)). Contributed by [@richvdh](https://github.com/richvdh). - Remove "history may be shared" banner. ([#31881](element-hq/element-web#31881)). Contributed by [@kaylendog](https://github.com/kaylendog). - Allow dismissing 'Key storage out of sync' temporarily ([#31455](element-hq/element-web#31455)). Contributed by [@andybalaam](https://github.com/andybalaam). - Add `resolutions` entry for `matrix-widget-api` to package.json ([#31851](element-hq/element-web#31851)). Contributed by [@toger5](https://github.com/toger5). - Improve visibility under contrast control mode ([#31847](element-hq/element-web#31847)). Contributed by [@t3chguy](https://github.com/t3chguy). - Unread Sorting - Add option for sorting in `OptionsMenuView` ([#31754](element-hq/element-web#31754)). Contributed by [@MidhunSureshR](https://github.com/MidhunSureshR). - Unread sorting - Implement sorter and use it in the room list store ([#31723](element-hq/element-web#31723)). Contributed by [@MidhunSureshR](https://github.com/MidhunSureshR). - Allow Element Call widgets to receive sticky events ([#31843](element-hq/element-web#31843)). Contributed by [@robintown](https://github.com/robintown). - Improve icon rendering accessibility ([#31791](element-hq/element-web#31791)). Contributed by [@t3chguy](https://github.com/t3chguy). - Add message preview toggle to room list header option ([#31821](element-hq/element-web#31821)). Contributed by [@florianduros](https://github.com/florianduros). #### 🐛 Bug Fixes - \[Backport staging] Fix room list not being cleared ([#32438](element-hq/element-web#32438)). Contributed by [@RiotRobot](https://github.com/RiotRobot). - Fix failure to update room info panel on joinrule change ([#31938](element-hq/element-web#31938)). Contributed by [@richvdh](https://github.com/richvdh). - Throttle space notification state calculation ([#31922](element-hq/element-web#31922)). Contributed by [@dbkr](https://github.com/dbkr). - Fix emoji verification responsive layout ([#31899](element-hq/element-web#31899)). Contributed by [@t3chguy](https://github.com/t3chguy). - Add patch for linkify to fix doctype handling ([#31900](element-hq/element-web#31900)). Contributed by [@dbkr](https://github.com/dbkr). - Fix rooms with no messages appearing at the top of the room list ([#31798](element-hq/element-web#31798)). Contributed by [@MidhunSureshR](https://github.com/MidhunSureshR). - Fix room list menu flashes when menu is closed ([#31868](element-hq/element-web#31868)). Contributed by [@florianduros](https://github.com/florianduros). - Message preview toggle is inverted in room list header ([#31865](element-hq/element-web#31865)). Contributed by [@florianduros](https://github.com/florianduros). - Fix duplicate toasts appearing for the same call if two events appear. ([#31693](element-hq/element-web#31693)). Contributed by [@Half-Shot](https://github.com/Half-Shot). - Fix ability to send rageshake during session restore failure ([#31848](element-hq/element-web#31848)). Contributed by [@t3chguy](https://github.com/t3chguy). - Fix mis-alignment of `Threads` right panel title ([#31849](element-hq/element-web#31849)). Contributed by [@t3chguy](https://github.com/t3chguy). - Unset buttons does not include color inherit ([#31801](element-hq/element-web#31801)). Contributed by [@Philldomd](https://github.com/Philldomd). </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://gitea.alexlebens.dev/alexlebens/infrastructure/pulls/3880 Co-authored-by: Renovate Bot <renovate-bot@alexlebens.net> Co-committed-by: Renovate Bot <renovate-bot@alexlebens.net>

andybalaam added the T-Feature Request to add a new feature which does not exist right now label Dec 8, 2025

github-actions bot deployed to Netlify December 8, 2025 17:04 View deployment

github-actions bot deployed to EndToEndTests December 8, 2025 17:21 View deployment

richvdh reviewed Dec 11, 2025

View reviewed changes

andybalaam force-pushed the andybalaam/allow-dismiss-key-storage-out-of-sync branch from c5d1d58 to 6e51ba5 Compare December 12, 2025 11:15

github-actions bot deployed to Netlify December 12, 2025 11:19 View deployment

github-actions bot deployed to EndToEndTests December 12, 2025 11:36 View deployment

andybalaam force-pushed the andybalaam/allow-dismiss-key-storage-out-of-sync branch from 6e51ba5 to da03f08 Compare December 19, 2025 11:35

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

andybalaam mentioned this pull request Dec 19, 2025

Allow "key storage out of sync" toast to be dismissed #30959

Closed

andybalaam force-pushed the andybalaam/allow-dismiss-key-storage-out-of-sync branch from da03f08 to 3c69526 Compare January 21, 2026 15:11

andybalaam marked this pull request as ready for review January 21, 2026 15:12

andybalaam requested a review from a team as a code owner January 21, 2026 15:12

andybalaam requested review from MidhunSureshR, florianduros and richvdh January 21, 2026 15:12

github-actions bot deployed to Netlify January 21, 2026 15:16 View deployment

github-actions bot deployed to Netlify January 21, 2026 15:23 View deployment

github-actions bot deployed to EndToEndTests January 21, 2026 15:38 View deployment

github-actions bot deployed to Netlify January 21, 2026 15:44 View deployment

github-actions bot deployed to EndToEndTests January 21, 2026 15:58 View deployment

richvdh requested changes Jan 22, 2026

View reviewed changes

github-actions bot deployed to Netlify January 23, 2026 10:55 View deployment

github-actions bot deployed to EndToEndTests January 23, 2026 11:09 View deployment

andybalaam requested a review from richvdh January 23, 2026 12:50

github-actions bot deployed to Netlify January 23, 2026 12:54 View deployment

github-actions bot deployed to EndToEndTests January 23, 2026 13:06 View deployment

richvdh approved these changes Jan 23, 2026

View reviewed changes

src/stores/ToastStore.ts Outdated Show resolved Hide resolved

Allow dismissing 'Key storage out of sync' temporarily

5e21c8d

andybalaam force-pushed the andybalaam/allow-dismiss-key-storage-out-of-sync branch from a7ae16a to 5e21c8d Compare January 26, 2026 10:20

andybalaam enabled auto-merge January 26, 2026 10:21

github-actions bot deployed to Netlify January 26, 2026 10:24 View deployment

github-actions bot deployed to EndToEndTests January 26, 2026 10:38 View deployment

andybalaam added this pull request to the merge queue Jan 26, 2026

Merged via the queue into develop with commit 0947517 Jan 26, 2026
39 of 41 checks passed

andybalaam deleted the andybalaam/allow-dismiss-key-storage-out-of-sync branch January 26, 2026 11:06

Uh oh!

Conversation

andybalaam commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

richvdh left a comment

Choose a reason for hiding this comment

Uh oh!

andybalaam commented Dec 11, 2025

Uh oh!

andybalaam commented Dec 12, 2025

Uh oh!

andybalaam commented Jan 21, 2026

Uh oh!

richvdh left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

richvdh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

andybalaam commented Dec 8, 2025 •

edited

Loading