From 12da7c2773e6170e4c2093b8d5f6ab6e48359ada Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 31 Oct 2023 14:59:24 +0000
Subject: [PATCH 01/13] Upgrade matrix-react-sdk to 3.84.0-rc.1

---
 package.json |  6 +++---
 yarn.lock    | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index f13c6e25bc..7eb8d0ec02 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
         "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+        "matrix-react-sdk": "3.84.0-rc.1",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
@@ -124,6 +124,7 @@
         "chokidar": "^3.5.1",
         "concurrently": "^8.0.0",
         "cpx": "1.5.0",
+        "cronstrue": "^2.41.0",
         "css-loader": "^4",
         "dotenv": "^16.0.2",
         "eslint": "8.51.0",
@@ -186,8 +187,7 @@
         "webpack-dev-server": "^4.15.1",
         "worker-loader": "^3.0.0",
         "worklet-loader": "^2.0.0",
-        "yaml": "^2.3.3",
-        "cronstrue": "^2.41.0"
+        "yaml": "^2.3.3"
     },
     "@casualbot/jest-sonar-reporter": {
         "outputDirectory": "coverage",
diff --git a/yarn.lock b/yarn.lock
index 4d3b9efb33..63a8f589e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1666,6 +1666,11 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.1.1.tgz#5b20125d73eb404b1c49b61380f443c5fcfbacd2"
   integrity sha512-PNFdLr68uLNT81iFmJL0PH98t7/U4g+a51d5+BmbKo0LEqchLkEKNraD1vq/kzPK6X7p/3IapQI5P+5Lr8jHsg==
 
+"@matrix-org/matrix-sdk-crypto-wasm@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.2.0.tgz#7c60afe01915281a6b71502821bc8e01afbfa70d"
+  integrity sha512-txmvaTiZpVV0/kWCRcE7tZvRESCEc1ynLJDVh9OUsFlaXfl13c7qdD3E6IJEJ8YiPMIn+PHogdfBZsO84reaMg==
+
 "@matrix-org/matrix-wysiwyg@2.4.1":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.4.1.tgz#e1325a42366a1c891b2ba90c88e597b39187b2cb"
@@ -8818,6 +8823,26 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
+matrix-js-sdk@30.0.0-rc.1:
+  version "30.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.0.0-rc.1.tgz#e3ff14c6992562ca12c205020b7c1bfc57b451fa"
+  integrity sha512-W7/MCbNKuhXPfCmdhbWPclJy8xiY39jcW7nch8mKI5ovxTtgE1yioKcFVjIGIgjPrOJ5bmVrnsAQsgra2RV5Yw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-wasm" "^2.2.0"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    jwt-decode "^3.1.2"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.6.0"
+    oidc-client-ts "^2.2.4"
+    p-retry "4"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+    uuid "9"
+
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "29.1.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d750e33ec955a9305a29426e5a64f05e66b14310"
@@ -8844,9 +8869,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.83.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/6e24b4d221e6deb9b84173f1afb753ce7211de00"
+matrix-react-sdk@3.84.0-rc.1:
+  version "3.84.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.84.0-rc.1.tgz#0683b44c05095d57fe40adfa50c2cee1cc0f0ce5"
+  integrity sha512-8SHgC1/nSrHp87UIZxF/0rqSdJru/5E0bEiINaaUaTGV+MVDgF/kCa/2T67FO2MCMFWYF6+NYZxhbpDdwZX4ew==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.8.0"
@@ -8889,7 +8915,7 @@ matrix-mock-request@^2.5.0:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "30.0.0-rc.1"
     matrix-widget-api "^1.5.0"
     memoize-one "^6.0.0"
     minimist "^1.2.5"

From 7ec7fb5d98423355754ac3be6fe5fa9e107b8d96 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 31 Oct 2023 15:05:28 +0000
Subject: [PATCH 02/13] Upgrade matrix-js-sdk to 30.0.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 7eb8d0ec02..c6754a3a1a 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-js-sdk": "30.0.0-rc.1",
         "matrix-react-sdk": "3.84.0-rc.1",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 63a8f589e7..8790c61bfb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1661,11 +1661,6 @@
     emojibase "^15.0.0"
     emojibase-data "^15.0.0"
 
-"@matrix-org/matrix-sdk-crypto-wasm@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.1.1.tgz#5b20125d73eb404b1c49b61380f443c5fcfbacd2"
-  integrity sha512-PNFdLr68uLNT81iFmJL0PH98t7/U4g+a51d5+BmbKo0LEqchLkEKNraD1vq/kzPK6X7p/3IapQI5P+5Lr8jHsg==
-
 "@matrix-org/matrix-sdk-crypto-wasm@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.2.0.tgz#7c60afe01915281a6b71502821bc8e01afbfa70d"
@@ -8843,25 +8838,6 @@ matrix-js-sdk@30.0.0-rc.1:
     unhomoglyph "^1.0.6"
     uuid "9"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "29.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d750e33ec955a9305a29426e5a64f05e66b14310"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-wasm" "^2.1.1"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    jwt-decode "^3.1.2"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.6.0"
-    oidc-client-ts "^2.2.4"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 matrix-mock-request@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92"

From be82347b2a25d5fadf3e7e155897695515a67987 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 31 Oct 2023 15:09:09 +0000
Subject: [PATCH 03/13] Prepare changelog for v1.11.48-rc.1

---
 CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc3e4d1a44..88765a1271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+Changes in [1.11.48-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.48-rc.1) (2023-10-31)
+===========================================================================================================
+
+## ✨ Features
+ * Correctly fill window.matrixChat even when a Wrapper module is active ([\#26395](https://github.com/vector-im/element-web/pull/26395)). Contributed by @dhenneke.
+ * Knock on a ask-to-join room if a module wants to join the room when navigating to a room ([\#11787](https://github.com/matrix-org/matrix-react-sdk/pull/11787)). Contributed by @dhenneke.
+ * Element-R:  Include crypto info in sentry ([\#11798](https://github.com/matrix-org/matrix-react-sdk/pull/11798)). Contributed by @florianduros.
+ * Element-R:  Include crypto info in rageshake ([\#11797](https://github.com/matrix-org/matrix-react-sdk/pull/11797)). Contributed by @florianduros.
+ * Element-R: Add current version of the rust-sdk and vodozemac ([\#11785](https://github.com/matrix-org/matrix-react-sdk/pull/11785)). Contributed by @florianduros.
+ * Fix unfederated invite dialog ([\#9618](https://github.com/matrix-org/matrix-react-sdk/pull/9618)). Fixes vector-im/element-meta#1466 and #22102. Contributed by @owi92.
+ * New right panel visual language ([\#11664](https://github.com/matrix-org/matrix-react-sdk/pull/11664)).
+ * OIDC: add friendly errors ([\#11184](https://github.com/matrix-org/matrix-react-sdk/pull/11184)). Fixes #25665. Contributed by @kerryarchibald.
+
+## 🐛 Bug Fixes
+ * Fix multi-tab session lock on Firefox not being cleared ([\#11800](https://github.com/matrix-org/matrix-react-sdk/pull/11800)). Fixes #26165. Contributed by @ManuelHu.
+ * Deserialise spoilers back into slash command form ([\#11805](https://github.com/matrix-org/matrix-react-sdk/pull/11805)). Fixes #26344.
+ * Fix Incorrect message scaling for verification request ([\#11793](https://github.com/matrix-org/matrix-react-sdk/pull/11793)). Fixes #24304. Contributed by @capGoblin.
+ * Fix: Unable to restore a soft-logged-out session established via SSO ([\#11794](https://github.com/matrix-org/matrix-react-sdk/pull/11794)). Fixes #25957. Contributed by @kerryarchibald.
+ * Use configurable github issue links more consistently ([\#11796](https://github.com/matrix-org/matrix-react-sdk/pull/11796)).
+ * Fix io.element.late_event received_ts vs received_at ([\#11789](https://github.com/matrix-org/matrix-react-sdk/pull/11789)).
+ * Make invitation dialog scrollable when infos are too long ([\#11753](https://github.com/matrix-org/matrix-react-sdk/pull/11753)). Contributed by @nurjinjafar.
+ * Fix spoiler text-align ([\#11790](https://github.com/matrix-org/matrix-react-sdk/pull/11790)). Contributed by @ajbura.
+ * Fix: Right panel keeps showing chat when unmaximizing widget.  ([\#11697](https://github.com/matrix-org/matrix-react-sdk/pull/11697)). Fixes #26265. Contributed by @manancodes.
+ * Fix margin of invite to room button ([\#11780](https://github.com/matrix-org/matrix-react-sdk/pull/11780)). Fixes #26410.
+ * Update base64 import ([\#11784](https://github.com/matrix-org/matrix-react-sdk/pull/11784)).
+ * Set max size for Element logo in search warning ([\#11779](https://github.com/matrix-org/matrix-react-sdk/pull/11779)). Fixes #26408.
+ * Fix: emoji size in room header topic, remove obsolete emoji style ([\#11757](https://github.com/matrix-org/matrix-react-sdk/pull/11757)). Fixes #26326. Contributed by @kerryarchibald.
+ * Fix: Bubble layout design is broken ([\#11763](https://github.com/matrix-org/matrix-react-sdk/pull/11763)). Fixes #25818. Contributed by @manancodes.
+
 Changes in [1.11.47](https://github.com/vector-im/element-web/releases/tag/v1.11.47) (2023-10-24)
 =================================================================================================
 

From e8b09f3d8a0fe9ff285f4b8ca9895bed36436cb0 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 31 Oct 2023 15:09:10 +0000
Subject: [PATCH 04/13] v1.11.48-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c6754a3a1a..e8a91067aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.47",
+    "version": "1.11.48-rc.1",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {

From 7e370909da1059555db0acd8e0286307bfc7ba60 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 1 Nov 2023 08:49:56 +0000
Subject: [PATCH 05/13] Update build_debian.yaml

---
 .github/workflows/build_debian.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_debian.yaml b/.github/workflows/build_debian.yaml
index 7448a4611a..86553a05bf 100644
--- a/.github/workflows/build_debian.yaml
+++ b/.github/workflows/build_debian.yaml
@@ -35,7 +35,7 @@ jobs:
                   cp -R debian/ /tmp/element-web-debian/DEBIAN/
                   mkdir -p /tmp/element-web-debian/usr/share/element-web/
 
-                  tar -xf "element-$VERSION.tar.gz" -C /tmp/element-web/debian/usr/share/element-web --strip-components=1
+                  tar -xf "element-$VERSION.tar.gz" -C /tmp/element-web-debian/usr/share/element-web --strip-components=1
                   cp config.sample.json /tmp/element-web-debian/usr/share/element-web/config.json
 
             - name: Build deb package

From 222cf5cb67cb0bdf483ce20f9f4310f1e99261be Mon Sep 17 00:00:00 2001
From: Johannes Marbach <johannesm@element.io>
Date: Mon, 6 Nov 2023 14:09:13 +0100
Subject: [PATCH 06/13] Make triage-labelled workflow reusable

---
 .github/workflows/triage-labelled.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 7b5b0829e1..492d1bc846 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -3,6 +3,7 @@ name: Move labelled issues to correct projects
 on:
     issues:
         types: [labeled]
+    workflow_call:
 
 jobs:
     apply_Z-Labs_label:

From 11f46a0d115e21ad9a3b24d075fa7cf953d8d85a Mon Sep 17 00:00:00 2001
From: Johannes Marbach <johannesm@element.io>
Date: Mon, 6 Nov 2023 15:55:50 +0100
Subject: [PATCH 07/13] Add input parameter for ELEMENT_BOT_TOKEN

---
 .github/workflows/triage-labelled.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 492d1bc846..7ee8480984 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -4,6 +4,9 @@ on:
     issues:
         types: [labeled]
     workflow_call:
+        secrets:
+            ELEMENT_BOT_TOKEN:
+                required: true
 
 jobs:
     apply_Z-Labs_label:

From b2387c302767e468588ed5a32ace4a7d38c6c814 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 7 Nov 2023 15:19:34 +0000
Subject: [PATCH 08/13] Upgrade matrix-react-sdk to 3.84.0

---
 package.json |  2 +-
 yarn.lock    | 30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index e8a91067aa..70549949a8 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
         "matrix-js-sdk": "30.0.0-rc.1",
-        "matrix-react-sdk": "3.84.0-rc.1",
+        "matrix-react-sdk": "3.84.0",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 8790c61bfb..19f80527be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8818,6 +8818,26 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
+matrix-js-sdk@30.0.0:
+  version "30.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.0.0.tgz#8a0ed49ea7eb1d4a036107c5789edd1eb2e7d65a"
+  integrity sha512-v0fDomTGCEkeq97BI4viphTrd7Bn26Op1i+ssubFjlQs302Q5xTfuEVXUaMjuXkn9iUYm8daee1WNezo7kxoaQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-wasm" "^2.2.0"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    jwt-decode "^3.1.2"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.6.0"
+    oidc-client-ts "^2.2.4"
+    p-retry "4"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+    uuid "9"
+
 matrix-js-sdk@30.0.0-rc.1:
   version "30.0.0-rc.1"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.0.0-rc.1.tgz#e3ff14c6992562ca12c205020b7c1bfc57b451fa"
@@ -8845,10 +8865,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.84.0-rc.1:
-  version "3.84.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.84.0-rc.1.tgz#0683b44c05095d57fe40adfa50c2cee1cc0f0ce5"
-  integrity sha512-8SHgC1/nSrHp87UIZxF/0rqSdJru/5E0bEiINaaUaTGV+MVDgF/kCa/2T67FO2MCMFWYF6+NYZxhbpDdwZX4ew==
+matrix-react-sdk@3.84.0:
+  version "3.84.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.84.0.tgz#843e70460aff0680236180b8d5d92ab60cc906bf"
+  integrity sha512-k/3G+vNuAYQQy3Hx/leAOCsnPh8wJDMxNP4QB9JBm1wBTqFVtMojepyKaK0AryINbZzMa7xDPLel09u/cgJswQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.8.0"
@@ -8891,7 +8911,7 @@ matrix-react-sdk@3.84.0-rc.1:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "30.0.0-rc.1"
+    matrix-js-sdk "30.0.0"
     matrix-widget-api "^1.5.0"
     memoize-one "^6.0.0"
     minimist "^1.2.5"

From a582cec41219378eff7a29699b8f86a9cb58b34f Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 7 Nov 2023 15:20:22 +0000
Subject: [PATCH 09/13] Upgrade matrix-js-sdk to 30.0.0

---
 package.json |  2 +-
 yarn.lock    | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 70549949a8..f60d0e6ca8 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
-        "matrix-js-sdk": "30.0.0-rc.1",
+        "matrix-js-sdk": "30.0.0",
         "matrix-react-sdk": "3.84.0",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 19f80527be..a77410c4a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8838,26 +8838,6 @@ matrix-js-sdk@30.0.0:
     unhomoglyph "^1.0.6"
     uuid "9"
 
-matrix-js-sdk@30.0.0-rc.1:
-  version "30.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.0.0-rc.1.tgz#e3ff14c6992562ca12c205020b7c1bfc57b451fa"
-  integrity sha512-W7/MCbNKuhXPfCmdhbWPclJy8xiY39jcW7nch8mKI5ovxTtgE1yioKcFVjIGIgjPrOJ5bmVrnsAQsgra2RV5Yw==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-wasm" "^2.2.0"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    jwt-decode "^3.1.2"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.6.0"
-    oidc-client-ts "^2.2.4"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 matrix-mock-request@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92"

From ba11a5d68f87e82e0be996933b4d3b8ad2898b36 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 7 Nov 2023 15:23:23 +0000
Subject: [PATCH 10/13] Prepare changelog for v1.11.48

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88765a1271..0f4c059afd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
-Changes in [1.11.48-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.48-rc.1) (2023-10-31)
-===========================================================================================================
+Changes in [1.11.48](https://github.com/vector-im/element-web/releases/tag/v1.11.48) (2023-11-07)
+=================================================================================================
 
 ## ✨ Features
  * Correctly fill window.matrixChat even when a Wrapper module is active ([\#26395](https://github.com/vector-im/element-web/pull/26395)). Contributed by @dhenneke.
@@ -12,6 +12,7 @@ Changes in [1.11.48-rc.1](https://github.com/vector-im/element-web/releases/tag/
  * OIDC: add friendly errors ([\#11184](https://github.com/matrix-org/matrix-react-sdk/pull/11184)). Fixes #25665. Contributed by @kerryarchibald.
 
 ## 🐛 Bug Fixes
+ * Fix rightpanel hiding scrollbar ([\#11831](https://github.com/matrix-org/matrix-react-sdk/pull/11831)). Contributed by @kerryarchibald.
  * Fix multi-tab session lock on Firefox not being cleared ([\#11800](https://github.com/matrix-org/matrix-react-sdk/pull/11800)). Fixes #26165. Contributed by @ManuelHu.
  * Deserialise spoilers back into slash command form ([\#11805](https://github.com/matrix-org/matrix-react-sdk/pull/11805)). Fixes #26344.
  * Fix Incorrect message scaling for verification request ([\#11793](https://github.com/matrix-org/matrix-react-sdk/pull/11793)). Fixes #24304. Contributed by @capGoblin.

From 2c1304c3bfceff206af7b4385ff026f7f42620c5 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 7 Nov 2023 15:23:24 +0000
Subject: [PATCH 11/13] v1.11.48

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f60d0e6ca8..6a438a8eae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.48-rc.1",
+    "version": "1.11.48",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {

From 740bf8ae70d932811615907f395de7a1bb69d748 Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 7 Nov 2023 15:26:41 +0000
Subject: [PATCH 12/13] Reset matrix-react-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 47 ++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index e82f5df9ac..0376747553 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
         "matrix-js-sdk": "30.0.0",
-        "matrix-react-sdk": "3.84.0",
+        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index a6180a9b64..739bbdb8b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1676,13 +1676,20 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec"
   integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q==
 
-"@matrix-org/react-sdk-module-api@^2.1.0", "@matrix-org/react-sdk-module-api@^2.1.1":
+"@matrix-org/react-sdk-module-api@^2.1.0":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.1.1.tgz#54e8617c15185010d608c0325ecaec8d1574d12b"
   integrity sha512-dYPY3aXtNwPrg2aEmFeWddMdohus/Ha17XES2QH+WMCawt+hH+uq28jH1EmW1RUOOzxVcdY36lRGOwqRtAJbhA==
   dependencies:
     "@babel/runtime" "^7.17.9"
 
+"@matrix-org/react-sdk-module-api@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.2.0.tgz#cb284601a82448dc23fac31949c466eb34ec64b4"
+  integrity sha512-HSicxLdagZRbQp35d3t2SeDFTiT4GmEQDQGih8dWSKRHXK4krVQjb6Kf1NkwweiFDAeU0qgbz2pP4RZqbv0XIg==
+  dependencies:
+    "@babel/runtime" "^7.17.9"
+
 "@matrix-org/spec@^1.7.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@matrix-org/spec/-/spec-1.8.0.tgz#5d46f0ddcdff01934a63aa1f070f0ce960326acc"
@@ -8943,6 +8950,25 @@ matrix-js-sdk@30.0.0:
     unhomoglyph "^1.0.6"
     uuid "9"
 
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "30.0.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/107e28e1145c8b2667701e1f75b9f09b5d2ac3d6"
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-wasm" "^2.2.0"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    jwt-decode "^3.1.2"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.6.0"
+    oidc-client-ts "^2.2.4"
+    p-retry "4"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+    uuid "9"
+
 matrix-mock-request@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92"
@@ -8950,16 +8976,15 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.84.0:
+"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.84.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.84.0.tgz#843e70460aff0680236180b8d5d92ab60cc906bf"
-  integrity sha512-k/3G+vNuAYQQy3Hx/leAOCsnPh8wJDMxNP4QB9JBm1wBTqFVtMojepyKaK0AryINbZzMa7xDPLel09u/cgJswQ==
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/5ae461989d3a32b04421891918ae2b66ae0d7bea"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.8.0"
     "@matrix-org/emojibase-bindings" "^1.1.2"
     "@matrix-org/matrix-wysiwyg" "2.4.1"
-    "@matrix-org/react-sdk-module-api" "^2.1.1"
+    "@matrix-org/react-sdk-module-api" "^2.2.0"
     "@matrix-org/spec" "^1.7.0"
     "@sentry/browser" "^7.0.0"
     "@sentry/tracing" "^7.0.0"
@@ -8996,7 +9021,7 @@ matrix-react-sdk@3.84.0:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "30.0.0"
+    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
     matrix-widget-api "^1.5.0"
     memoize-one "^6.0.0"
     minimist "^1.2.5"
@@ -9004,7 +9029,7 @@ matrix-react-sdk@3.84.0:
     opus-recorder "^8.0.3"
     pako "^2.0.3"
     png-chunks-extract "^1.0.0"
-    posthog-js "1.83.0"
+    posthog-js "1.87.2"
     proposal-temporal "^0.9.0"
     qrcode "1.5.3"
     re-resizable "^6.9.0"
@@ -10850,10 +10875,10 @@ postcss@^8.2.1, postcss@^8.3.11, postcss@^8.4.28, postcss@^8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-posthog-js@1.83.0:
-  version "1.83.0"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.83.0.tgz#e13d114922f863f4bfbf7c7cc4e11dc194139a91"
-  integrity sha512-3dp/yNbRCYsOgvJovFUMCLv9/KxnwmGBy5Ft27Q7/rbW++iJXVR64liX7i0NrXkudjoL9j1GW1LGh84rV7kv8Q==
+posthog-js@1.87.2:
+  version "1.87.2"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.87.2.tgz#0e9395ea93d50bb624f0be19f254e62e54ae504d"
+  integrity sha512-pdxEylfxwEDwwz7g5dunPucvAN51RAOWWQmkcqHsLNHlV5o5bTaTwcAXaWB1IUn3xKPuKYE2lqbdB3vC4H4rFQ==
   dependencies:
     fflate "^0.4.1"
 

From 8b01798bd6a4661de35b981d4a113e8c472d94cf Mon Sep 17 00:00:00 2001
From: ElementRobot <releases@riot.im>
Date: Tue, 7 Nov 2023 15:26:48 +0000
Subject: [PATCH 13/13] Reset matrix-js-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 0376747553..decbaa577a 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
-        "matrix-js-sdk": "30.0.0",
+        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
         "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 739bbdb8b5..24dac20305 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8930,26 +8930,6 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-matrix-js-sdk@30.0.0:
-  version "30.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-30.0.0.tgz#8a0ed49ea7eb1d4a036107c5789edd1eb2e7d65a"
-  integrity sha512-v0fDomTGCEkeq97BI4viphTrd7Bn26Op1i+ssubFjlQs302Q5xTfuEVXUaMjuXkn9iUYm8daee1WNezo7kxoaQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-wasm" "^2.2.0"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    jwt-decode "^3.1.2"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.6.0"
-    oidc-client-ts "^2.2.4"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "30.0.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/107e28e1145c8b2667701e1f75b9f09b5d2ac3d6"