From bd033212a2612954ee5980486265e3898896efc6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 2 Jun 2026 16:36:05 +0100 Subject: [PATCH 1/9] Update to matrix-js-sdk@41.7.0-rc.2 --- apps/web/package.json | 2 +- pnpm-lock.yaml | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index cf6ab7af4b..0e6e1e70e3 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -83,7 +83,7 @@ "lodash": "npm:lodash-es@4.18.1", "maplibre-gl": "^5.0.0", "matrix-encrypt-attachment": "^1.0.3", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "41.7.0-rc.2", "matrix-widget-api": "^1.16.1", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c099c4f326..044b297d77 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -632,8 +632,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 matrix-js-sdk: - specifier: github:matrix-org/matrix-js-sdk#develop - version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/68e5cdea91fddbb72023e12dd5f57206a3a1ef0d + specifier: 41.7.0-rc.2 + version: 41.7.0-rc.2 matrix-widget-api: specifier: ^1.17.0 version: 1.17.0 @@ -10276,9 +10276,8 @@ packages: matrix-events-sdk@0.0.1: resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==} - matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/68e5cdea91fddbb72023e12dd5f57206a3a1ef0d: - resolution: {gitHosted: true, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/68e5cdea91fddbb72023e12dd5f57206a3a1ef0d} - version: 41.6.0 + matrix-js-sdk@41.7.0-rc.2: + resolution: {integrity: sha512-+8jmbkm8UyQeTwQJaY/gm6UTEw56GLfb1EzEiR+OSNYNJ2D1IaEmnPnlgjRH3NKoP8e7S0aOe3Zl5DcPkuoHnA==} engines: {node: '>=22.0.0'} matrix-web-i18n@3.6.0: @@ -23958,7 +23957,7 @@ snapshots: matrix-events-sdk@0.0.1: {} - matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/68e5cdea91fddbb72023e12dd5f57206a3a1ef0d: + matrix-js-sdk@41.7.0-rc.2: dependencies: '@babel/runtime': 7.29.2 '@matrix-org/matrix-sdk-crypto-wasm': 18.2.0 From d478b80d993ad63490c871b5cfbc589db9509922 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 2 Jun 2026 15:41:08 +0000 Subject: [PATCH 2/9] v1.12.21-rc.0 --- apps/desktop/package.json | 2 +- apps/web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index df8723051e..02db6eaaaa 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "productName": "Element", "main": "lib/electron-main.js", "exports": "./lib/electron-main.js", - "version": "1.12.20", + "version": "1.12.21-rc.0", "description": "Element: the future of secure communication", "author": { "name": "Element", diff --git a/apps/web/package.json b/apps/web/package.json index 0e6e1e70e3..9ce0b281f9 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.12.20", + "version": "1.12.21-rc.0", "description": "Element: the future of secure communication", "author": "New Vector Ltd.", "repository": { From 07ce599b4f72d4ef02efe82ce3a588aede4f413d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 2 Jun 2026 17:17:09 +0100 Subject: [PATCH 3/9] Set up deploy workflow correctly --- .github/workflows/deploy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 162c67e2ab..290b045d14 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,6 +38,12 @@ jobs: with: persist-credentials: false + - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8 + - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + with: + cache: "pnpm" + node-version-file: package.json + - name: Load GPG key run: | curl https://packages.element.io/element-release-key.gpg | gpg --import From 1ae3038bf09805920419df61585e364f42e6a365 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 2 Jun 2026 16:32:20 +0000 Subject: [PATCH 4/9] v1.12.21-rc.1 --- apps/desktop/package.json | 2 +- apps/web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 02db6eaaaa..8ee010d3f0 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "productName": "Element", "main": "lib/electron-main.js", "exports": "./lib/electron-main.js", - "version": "1.12.21-rc.0", + "version": "1.12.21-rc.1", "description": "Element: the future of secure communication", "author": { "name": "Element", diff --git a/apps/web/package.json b/apps/web/package.json index 9ce0b281f9..6bc254b473 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.12.21-rc.0", + "version": "1.12.21-rc.1", "description": "Element: the future of secure communication", "author": "New Vector Ltd.", "repository": { From 8e205f7b7ada5692ab5b633f38d60cf5044896ad Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Jun 2026 13:56:34 +0000 Subject: [PATCH 5/9] Upgrade dependency to matrix-js-sdk@41.7.0-rc.3 --- apps/web/package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 6bc254b473..f8ffc9f4d0 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -83,7 +83,7 @@ "lodash": "npm:lodash-es@4.18.1", "maplibre-gl": "^5.0.0", "matrix-encrypt-attachment": "^1.0.3", - "matrix-js-sdk": "41.7.0-rc.2", + "matrix-js-sdk": "41.7.0-rc.3", "matrix-widget-api": "^1.16.1", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 044b297d77..c233e7c63a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -632,8 +632,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 matrix-js-sdk: - specifier: 41.7.0-rc.2 - version: 41.7.0-rc.2 + specifier: 41.7.0-rc.3 + version: 41.7.0-rc.3 matrix-widget-api: specifier: ^1.17.0 version: 1.17.0 @@ -3370,8 +3370,8 @@ packages: '@matrix-org/emojibase-bindings@1.5.0': resolution: {integrity: sha512-+W9/ow2Z3iQa7ZOF698PBhwNcgGkn36B5Sr8VDPx8N8CH7+Uw+7TrtbtKPZVdgf4m/THmgmfX40jS5YDBsLaYg==} - '@matrix-org/matrix-sdk-crypto-wasm@18.2.0': - resolution: {integrity: sha512-puyZefvq6sHfqlmkri8umhA44724H2JL0YtX8wlvhGuNl8awX/Q1tZyW2Iekm9ZJP7BtuOqlNdg9oQd6iaGbNw==} + '@matrix-org/matrix-sdk-crypto-wasm@18.3.1': + resolution: {integrity: sha512-VRjWhE1UgHnPpJ3b9B5+8z71ZC/HICFngPPFIN6ktzmUBKI5RusPujzbAQUoB3CgZ0yU58L99AfSQS4YTztSWw==} engines: {node: '>= 18'} '@matrix-org/react-sdk-module-api@2.5.0': @@ -10276,8 +10276,8 @@ packages: matrix-events-sdk@0.0.1: resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==} - matrix-js-sdk@41.7.0-rc.2: - resolution: {integrity: sha512-+8jmbkm8UyQeTwQJaY/gm6UTEw56GLfb1EzEiR+OSNYNJ2D1IaEmnPnlgjRH3NKoP8e7S0aOe3Zl5DcPkuoHnA==} + matrix-js-sdk@41.7.0-rc.3: + resolution: {integrity: sha512-DKPusJPhOt4RNM3fA9LMr3AWcsgljup75RkzgjKsJSYIv4c4O4olQpmrNRyDyDgCJD5EvRhsD5unjuA2VMPgEw==} engines: {node: '>=22.0.0'} matrix-web-i18n@3.6.0: @@ -16166,7 +16166,7 @@ snapshots: emojibase: 17.0.0 emojibase-data: 17.0.0(emojibase@17.0.0) - '@matrix-org/matrix-sdk-crypto-wasm@18.2.0': {} + '@matrix-org/matrix-sdk-crypto-wasm@18.3.1': {} '@matrix-org/react-sdk-module-api@2.5.0(patch_hash=016146c9cc96e6363609d2b2ac0896ccef567882eb1d73b75a77b8a30929de96)(react@19.2.6)': dependencies: @@ -23957,10 +23957,10 @@ snapshots: matrix-events-sdk@0.0.1: {} - matrix-js-sdk@41.7.0-rc.2: + matrix-js-sdk@41.7.0-rc.3: dependencies: '@babel/runtime': 7.29.2 - '@matrix-org/matrix-sdk-crypto-wasm': 18.2.0 + '@matrix-org/matrix-sdk-crypto-wasm': 18.3.1 another-json: 0.2.0 bs58: 6.0.0 content-type: 2.0.0 From c27bf50d0b145fb5878a842ba16b1fdee6949a40 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Jun 2026 14:03:37 +0000 Subject: [PATCH 6/9] v1.12.21-rc.2 --- apps/desktop/package.json | 2 +- apps/web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 8ee010d3f0..159ea2fdf9 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "productName": "Element", "main": "lib/electron-main.js", "exports": "./lib/electron-main.js", - "version": "1.12.21-rc.1", + "version": "1.12.21-rc.2", "description": "Element: the future of secure communication", "author": { "name": "Element", diff --git a/apps/web/package.json b/apps/web/package.json index f8ffc9f4d0..92d6904da2 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.12.21-rc.1", + "version": "1.12.21-rc.2", "description": "Element: the future of secure communication", "author": "New Vector Ltd.", "repository": { From 10bacc944cdbf06a15373572f92cdf37cae8d049 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 9 Jun 2026 12:43:02 +0000 Subject: [PATCH 7/9] Upgrade dependency to matrix-js-sdk@41.7.0 --- apps/web/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 92d6904da2..cd118dfc19 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -83,7 +83,7 @@ "lodash": "npm:lodash-es@4.18.1", "maplibre-gl": "^5.0.0", "matrix-encrypt-attachment": "^1.0.3", - "matrix-js-sdk": "41.7.0-rc.3", + "matrix-js-sdk": "41.7.0", "matrix-widget-api": "^1.16.1", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c233e7c63a..2c9948a5ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -632,8 +632,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 matrix-js-sdk: - specifier: 41.7.0-rc.3 - version: 41.7.0-rc.3 + specifier: 41.7.0 + version: 41.7.0 matrix-widget-api: specifier: ^1.17.0 version: 1.17.0 @@ -10276,8 +10276,8 @@ packages: matrix-events-sdk@0.0.1: resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==} - matrix-js-sdk@41.7.0-rc.3: - resolution: {integrity: sha512-DKPusJPhOt4RNM3fA9LMr3AWcsgljup75RkzgjKsJSYIv4c4O4olQpmrNRyDyDgCJD5EvRhsD5unjuA2VMPgEw==} + matrix-js-sdk@41.7.0: + resolution: {integrity: sha512-MP0xNv/VVRbshq00TE6EVo77IIXsQk0KjiVtgKV0t9j/V77a6Klt00QrrO0XykkTUsNC0+mQeBMxnx75rZO86Q==} engines: {node: '>=22.0.0'} matrix-web-i18n@3.6.0: @@ -23957,7 +23957,7 @@ snapshots: matrix-events-sdk@0.0.1: {} - matrix-js-sdk@41.7.0-rc.3: + matrix-js-sdk@41.7.0: dependencies: '@babel/runtime': 7.29.2 '@matrix-org/matrix-sdk-crypto-wasm': 18.3.1 From 86c7a9b51204a26a2af1eeee301201833fab3b5e Mon Sep 17 00:00:00 2001 From: R Midhun Suresh Date: Tue, 9 Jun 2026 15:51:29 +0530 Subject: [PATCH 8/9] Recreate resizer view-model when switching to/from multiroom view (#33792) (cherry picked from commit a2a9800393b65e38596f2e8dd72f87a415cf6fb7) --- .../components/structures/LoggedInView.tsx | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/apps/web/src/components/structures/LoggedInView.tsx b/apps/web/src/components/structures/LoggedInView.tsx index 1a736ae696..24631ea617 100644 --- a/apps/web/src/components/structures/LoggedInView.tsx +++ b/apps/web/src/components/structures/LoggedInView.tsx @@ -202,8 +202,18 @@ class LoggedInView extends React.Component { OwnProfileStore.instance.on(UPDATE_EVENT, this.refreshBackgroundImage); this.refreshBackgroundImage(); + } - this.resizerViewModel = new ResizerViewModel(); + private getResizerViewModel(): ResizerViewModel { + if (!this.resizerViewModel) { + this.resizerViewModel = new ResizerViewModel(); + } + return this.resizerViewModel; + } + + private disposeResizerViewModel(): void { + this.resizerViewModel?.dispose(); + this.resizerViewModel = undefined; } /** @@ -739,6 +749,8 @@ class LoggedInView extends React.Component { break; default: { if (moduleRenderer) { + // Since the view will be removed, remove the vm as well + this.disposeResizerViewModel(); pageElement = moduleRenderer(); } else { console.warn(`Couldn't render page type "${this.props.page_type}"`); @@ -797,14 +809,15 @@ class LoggedInView extends React.Component { const roomView =
{pageElement}
; let content: React.ReactNode; - if (useNewRoomList && this.resizerViewModel && !moduleRenderer) { + const resizerViewModel = !moduleRenderer ? this.getResizerViewModel() : undefined; + if (useNewRoomList && resizerViewModel && !moduleRenderer) { // New room list owned by element-web: resizable layout with a draggable separator. // The SpacePanel lives inside GroupView (leftPanel omits it when the new room list is enabled). content = ( - + { > {leftPanel} - + {roomView} ); From 1829f5244826c439a0140f6a36108e00db65ac4a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 9 Jun 2026 12:58:28 +0000 Subject: [PATCH 9/9] v1.12.21 --- CHANGELOG.md | 19 +++++++++++++++++++ apps/desktop/package.json | 2 +- apps/web/package.json | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bdbf69f68..56273ce561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +Changes in [1.12.21](https://github.com/element-hq/element-web/releases/tag/v1.12.21) (2026-06-09) +================================================================================================== +## ✨ Features + +* Bump module API to 1.14.0 ([#33685](https://github.com/element-hq/element-web/pull/33685)). Contributed by @Half-Shot. +* Apply new design and display logic to logout confirmation dialog ([#33426](https://github.com/element-hq/element-web/pull/33426)). Contributed by @uhoreg. +* Room list: improve custom sections in Spaces ([#33523](https://github.com/element-hq/element-web/pull/33523)). Contributed by @florianduros. +* Periodically nag the user if their device remains unverified ([#33346](https://github.com/element-hq/element-web/pull/33346)). Contributed by @uhoreg. +* Use the separator as border between roomlist and main panel ([#33598](https://github.com/element-hq/element-web/pull/33598)). Contributed by @MidhunSureshR. +* Add support for `m.recent_emoji` account data event ([#33172](https://github.com/element-hq/element-web/pull/33172)). Contributed by @t3chguy. +* Room list: reduce font size of sections ([#33580](https://github.com/element-hq/element-web/pull/33580)). Contributed by @florianduros. + +## 🐛 Bug Fixes + +* Remove resizer from fullscreen modules(like multiroom) ([#33684](https://github.com/element-hq/element-web/pull/33684)). Contributed by @langleyd. +* fix: use configured brand name in JSON and PlainText chat export filenames ([#33680](https://github.com/element-hq/element-web/pull/33680)). Contributed by @RoySerbi. +* Fix pinned message banner disappearing when a pinned message event is unkown ([#33534](https://github.com/element-hq/element-web/pull/33534)). Contributed by @florianduros. + + Changes in [1.12.20](https://github.com/element-hq/element-web/releases/tag/v1.12.20) (2026-05-27) ================================================================================================== ## 🐛 Bug Fixes diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 159ea2fdf9..8eb91fc54d 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "productName": "Element", "main": "lib/electron-main.js", "exports": "./lib/electron-main.js", - "version": "1.12.21-rc.2", + "version": "1.12.21", "description": "Element: the future of secure communication", "author": { "name": "Element", diff --git a/apps/web/package.json b/apps/web/package.json index cd118dfc19..2735153070 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.12.21-rc.2", + "version": "1.12.21", "description": "Element: the future of secure communication", "author": "New Vector Ltd.", "repository": {