From 02d0c092b2d13b603e8a32ed5a39b3a36968abe2 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Jan 2023 15:05:43 +0000
Subject: [PATCH 01/20] Upgrade matrix-js-sdk to 23.1.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 07ec89ae85..e09c533b0a 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-js-sdk": "23.1.0-rc.1",
         "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index d790f0f2b0..6a335ad771 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8063,6 +8063,24 @@ 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@23.1.0-rc.1:
+  version "23.1.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.1.tgz#1218089935a0a61b2b0e142ac737435a0e5d9ba9"
+  integrity sha512-smy7gye40kG4vdLufWWivou+gOjCB/WO4X68PlL5MOddTBs/GiKBZ0X026SA/09eYGwH614lxZoWkir4BlKBjg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    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 "23.0.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1ebcac37cca04f108548376f02a7a2d0666904d6"

From 9f76afaac8175d6b92fae1fcd23e855655bd8c83 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Jan 2023 15:07:59 +0000
Subject: [PATCH 02/20] Upgrade matrix-react-sdk to 3.64.0-rc.1

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

diff --git a/package.json b/package.json
index e09c533b0a..95ed4d3a61 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "matrix-js-sdk": "23.1.0-rc.1",
-        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+        "matrix-react-sdk": "3.64.0-rc.1",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 6a335ad771..981b5eda8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1484,10 +1484,10 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.2.tgz#a09d0fea858e817da971a3c9f904632ef7b49eb6"
   integrity sha512-oVkBCh9YP7H9i4gAoQbZzswniczfo/aIptNa4dxRi4Ff9lSvUCFv6Hvzi7C+90c0/PWZLXjIDTIAWZYmwyd2fA==
 
-"@matrix-org/matrix-wysiwyg@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.9.0.tgz#8651eacdc0bbfa313501e4feeb713c74dbf099cc"
-  integrity sha512-utxLZPSmBR/oKFeLLteAfqprhSW8prrH9IKzeMK1VswQYganPusYYO8u86kCQt4SuDz/1Zc8C7r76xmOiVJ9JQ==
+"@matrix-org/matrix-wysiwyg@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.14.0.tgz#359fabf5af403b3f128fe6ede3bff9754a9e18c4"
+  integrity sha512-iSwIR7kS/zwAzy/8S5cUMv2aceoJl/vIGhqmY9hSU0gVyzmsyaVnx00uNMvVDBUFiiPT2gonN8R3+dxg58TPaQ==
 
 "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz":
   version "3.2.12"
@@ -8081,24 +8081,6 @@ matrix-js-sdk@23.1.0-rc.1:
     unhomoglyph "^1.0.6"
     uuid "9"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "23.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1ebcac37cca04f108548376f02a7a2d0666904d6"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    qs "^6.9.6"
-    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"
@@ -8106,13 +8088,14 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.63.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/670fca01f99b7b18259c9b276798a9324a8338e4"
+matrix-react-sdk@3.64.0-rc.1:
+  version "3.64.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0-rc.1.tgz#293f0beb7ed4516abd8d0a4a5a7257335abc5212"
+  integrity sha512-AZ7QLmD8sD8le4K4ZKBjUEWYEZJJij8PlhpdDrfJTUP3hizki6d3sxpASa3IFY6mhZJyDnEW1/WOykc71oNHyw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.3.0"
-    "@matrix-org/matrix-wysiwyg" "^0.9.0"
+    "@matrix-org/matrix-wysiwyg" "^0.14.0"
     "@matrix-org/react-sdk-module-api" "^0.0.3"
     "@sentry/browser" "^7.0.0"
     "@sentry/tracing" "^7.0.0"
@@ -8147,7 +8130,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 "23.1.0-rc.1"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"
@@ -10208,7 +10191,7 @@ qrcode@1.5.1:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
-qs@6.11.0, qs@^6.9.6:
+qs@6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
   integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==

From c525678d7edfeaf1de4723c004e640c01c700400 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Jan 2023 15:10:27 +0000
Subject: [PATCH 03/20] Prepare changelog for v1.11.18-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1103abd8e6..b27cc7aff9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,58 @@
+Changes in [1.11.18-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.1) (2023-01-11)
+===========================================================================================================
+
+## ✨ Features
+ * Make threads use new Unable to Decrypt UI ([\#9876](https://github.com/matrix-org/matrix-react-sdk/pull/9876)). Fixes #24060.
+ * Add edit and remove actions to link in RTE [Labs] ([\#9864](https://github.com/matrix-org/matrix-react-sdk/pull/9864)).
+ * Remove extensible events v1 experimental rendering ([\#9881](https://github.com/matrix-org/matrix-react-sdk/pull/9881)).
+ * Make create poll dialog scale better (PSG-929) ([\#9873](https://github.com/matrix-org/matrix-react-sdk/pull/9873)). Fixes #21855.
+ * Change RTE mode icons ([\#9861](https://github.com/matrix-org/matrix-react-sdk/pull/9861)).
+ * Device manager - prune client information events after remote sign out ([\#9874](https://github.com/matrix-org/matrix-react-sdk/pull/9874)).
+ * Check connection before starting broadcast ([\#9857](https://github.com/matrix-org/matrix-react-sdk/pull/9857)).
+ * Enable sent receipt for poll start events (PSG-962) ([\#9870](https://github.com/matrix-org/matrix-react-sdk/pull/9870)).
+ * Change clear notifications to have more readable copy ([\#9867](https://github.com/matrix-org/matrix-react-sdk/pull/9867)).
+ * combine search results when the query is present in multiple successive messages ([\#9855](https://github.com/matrix-org/matrix-react-sdk/pull/9855)). Fixes #3977. Contributed by @grimhilt.
+ * Disable bubbles for broadcasts ([\#9860](https://github.com/matrix-org/matrix-react-sdk/pull/9860)). Fixes #24140.
+ * Enable reactions and replies for broadcasts ([\#9856](https://github.com/matrix-org/matrix-react-sdk/pull/9856)). Fixes #24042.
+ * Improve switching between rich and plain editing modes ([\#9776](https://github.com/matrix-org/matrix-react-sdk/pull/9776)).
+ * Redesign the picture-in-picture window ([\#9800](https://github.com/matrix-org/matrix-react-sdk/pull/9800)). Fixes #23980.
+ * User on-boarding tasks now appear in a static order. ([\#9799](https://github.com/matrix-org/matrix-react-sdk/pull/9799)). Contributed by @GoodGuyMarco.
+ * Device manager - contextual menus ([\#9832](https://github.com/matrix-org/matrix-react-sdk/pull/9832)).
+ * If listening a non-live broadcast and changing the room, the broadcast will be paused ([\#9825](https://github.com/matrix-org/matrix-react-sdk/pull/9825)). Fixes #24078.
+ * Consider own broadcasts from other device as a playback ([\#9821](https://github.com/matrix-org/matrix-react-sdk/pull/9821)). Fixes #24068.
+ * Add link creation to rich text editor ([\#9775](https://github.com/matrix-org/matrix-react-sdk/pull/9775)).
+ * Add mark as read option in room setting ([\#9798](https://github.com/matrix-org/matrix-react-sdk/pull/9798)). Fixes #24053.
+ * Device manager - current device design and copy tweaks ([\#9801](https://github.com/matrix-org/matrix-react-sdk/pull/9801)).
+ * Unify notifications panel event design ([\#9754](https://github.com/matrix-org/matrix-react-sdk/pull/9754)).
+ * Add actions for integration manager to send and read certain events ([\#9740](https://github.com/matrix-org/matrix-react-sdk/pull/9740)).
+ * Device manager - design tweaks ([\#9768](https://github.com/matrix-org/matrix-react-sdk/pull/9768)).
+ * Change room list sorting to activity and unread first by default ([\#9773](https://github.com/matrix-org/matrix-react-sdk/pull/9773)). Fixes #24014.
+ * Add a config flag to enable the rust crypto-sdk ([\#9759](https://github.com/matrix-org/matrix-react-sdk/pull/9759)).
+ * Improve decryption error UI by consolidating error messages and providing instructions when possible ([\#9544](https://github.com/matrix-org/matrix-react-sdk/pull/9544)). Contributed by @duxovni.
+ * Honor font settings in Element Call ([\#9751](https://github.com/matrix-org/matrix-react-sdk/pull/9751)). Fixes #23661.
+ * Device manager - use deleteAccountData to prune device manager client information events ([\#9734](https://github.com/matrix-org/matrix-react-sdk/pull/9734)).
+
+## 🐛 Bug Fixes
+ * Display rooms & threads as unread (bold) if threads have unread messages. ([\#9763](https://github.com/matrix-org/matrix-react-sdk/pull/9763)). Fixes #23907.
+ * Don't prefer STIXGeneral over the default font ([\#9711](https://github.com/matrix-org/matrix-react-sdk/pull/9711)). Fixes #23899.
+ * Use the same avatar colour when creating 1:1 DM rooms ([\#9850](https://github.com/matrix-org/matrix-react-sdk/pull/9850)). Fixes #23476.
+ * Fix space lock icon size ([\#9854](https://github.com/matrix-org/matrix-react-sdk/pull/9854)). Fixes #24128.
+ * Make calls automatically disconnect if the widget disappears ([\#9862](https://github.com/matrix-org/matrix-react-sdk/pull/9862)). Fixes #23664.
+ * Fix emoji in RTE editing ([\#9827](https://github.com/matrix-org/matrix-react-sdk/pull/9827)).
+ * Fix export with attachments on formats txt and json ([\#9851](https://github.com/matrix-org/matrix-react-sdk/pull/9851)). Fixes #24130. Contributed by @grimhilt.
+ * Fixed empty `Content-Type` for encrypted uploads ([\#9848](https://github.com/matrix-org/matrix-react-sdk/pull/9848)). Contributed by @K3das.
+ * Fix sign-in instead link on password reset page ([\#9820](https://github.com/matrix-org/matrix-react-sdk/pull/9820)). Fixes #24087.
+ * The seekbar now initially shows the current position ([\#9796](https://github.com/matrix-org/matrix-react-sdk/pull/9796)). Fixes #24051.
+ * Fix: Editing a poll will silently change it to a closed poll ([\#9809](https://github.com/matrix-org/matrix-react-sdk/pull/9809)). Fixes #23176.
+ * Make call tiles look less broken in the right panel ([\#9808](https://github.com/matrix-org/matrix-react-sdk/pull/9808)). Fixes #23716.
+ * Prevent unnecessary m.direct updates ([\#9805](https://github.com/matrix-org/matrix-react-sdk/pull/9805)). Fixes #24059.
+ * Fix checkForPreJoinUISI for thread roots ([\#9803](https://github.com/matrix-org/matrix-react-sdk/pull/9803)). Fixes #24054.
+ * Snap in PiP widget when content changed ([\#9797](https://github.com/matrix-org/matrix-react-sdk/pull/9797)). Fixes #24050.
+ * Load RTE components only when RTE labs is enabled ([\#9804](https://github.com/matrix-org/matrix-react-sdk/pull/9804)).
+ * Ensure that events are correctly updated when they are edited. ([\#9789](https://github.com/matrix-org/matrix-react-sdk/pull/9789)).
+ * When stopping a broadcast also stop the playback ([\#9795](https://github.com/matrix-org/matrix-react-sdk/pull/9795)). Fixes #24052.
+ * Prevent to start two broadcasts at the same time ([\#9744](https://github.com/matrix-org/matrix-react-sdk/pull/9744)). Fixes #23973.
+
 Changes in [1.11.17](https://github.com/vector-im/element-web/releases/tag/v1.11.17) (2022-12-21)
 =================================================================================================
 

From a0bb31aaf61a06fa1299a3b67e01346288262d89 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 11 Jan 2023 15:10:28 +0000
Subject: [PATCH 04/20] v1.11.18-rc.1

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

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

From 655d16e76e3827c97845b1f88fc943c309ed5f10 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 12 Jan 2023 14:02:03 +0000
Subject: [PATCH 05/20] Upgrade matrix-js-sdk to 23.1.0-rc.2

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 381e6fb4ce..13bf8bb2f3 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "23.1.0-rc.1",
+        "matrix-js-sdk": "23.1.0-rc.2",
         "matrix-react-sdk": "3.64.0-rc.1",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 981b5eda8d..1127d55ecd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8081,6 +8081,24 @@ matrix-js-sdk@23.1.0-rc.1:
     unhomoglyph "^1.0.6"
     uuid "9"
 
+matrix-js-sdk@23.1.0-rc.2:
+  version "23.1.0-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.2.tgz#ea6743aec517ccce7c6be43e6ba70c8b648421f3"
+  integrity sha512-eihbyAwBov7DLB2zSUeJ3gSKxVhx4NGcwDq0jIBSK0GhEiBRs0+KCRXyGa6ClSzi7aDrLPvGjm9ijMBeRdgDPQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    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 a04370b24d737ece3148201ba66459b60a82ecd9 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 12 Jan 2023 14:03:32 +0000
Subject: [PATCH 06/20] Upgrade matrix-react-sdk to 3.64.0-rc.2

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

diff --git a/package.json b/package.json
index 13bf8bb2f3..510387adaf 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "matrix-js-sdk": "23.1.0-rc.2",
-        "matrix-react-sdk": "3.64.0-rc.1",
+        "matrix-react-sdk": "3.64.0-rc.2",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 1127d55ecd..045b946540 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8063,24 +8063,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@23.1.0-rc.1:
-  version "23.1.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.1.tgz#1218089935a0a61b2b0e142ac737435a0e5d9ba9"
-  integrity sha512-smy7gye40kG4vdLufWWivou+gOjCB/WO4X68PlL5MOddTBs/GiKBZ0X026SA/09eYGwH614lxZoWkir4BlKBjg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 matrix-js-sdk@23.1.0-rc.2:
   version "23.1.0-rc.2"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.2.tgz#ea6743aec517ccce7c6be43e6ba70c8b648421f3"
@@ -8106,10 +8088,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.64.0-rc.1:
-  version "3.64.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0-rc.1.tgz#293f0beb7ed4516abd8d0a4a5a7257335abc5212"
-  integrity sha512-AZ7QLmD8sD8le4K4ZKBjUEWYEZJJij8PlhpdDrfJTUP3hizki6d3sxpASa3IFY6mhZJyDnEW1/WOykc71oNHyw==
+matrix-react-sdk@3.64.0-rc.2:
+  version "3.64.0-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0-rc.2.tgz#c3077baf7b3c612c3395944ffb2c982f225f57bb"
+  integrity sha512-uW0m1EovGoLWtfAnHcz1hM2AwOR70DDxAtDlVJYhBOFRWtLsASV8q4OIjwfGfSboqpwOuxIw7MavfJ6u4abj+Q==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.3.0"
@@ -8148,7 +8130,7 @@ matrix-react-sdk@3.64.0-rc.1:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "23.1.0-rc.1"
+    matrix-js-sdk "23.1.0-rc.2"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From f026aef154d34d4559cddfeca762384439390729 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 12 Jan 2023 14:11:23 +0000
Subject: [PATCH 07/20] Prepare changelog for v1.11.18-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b27cc7aff9..22893262cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.11.18-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.2) (2023-01-12)
+===========================================================================================================
+
+## ✨ Features
+ * Switch threads on for everyone ([\#9879](https://github.com/matrix-org/matrix-react-sdk/pull/9879)).
+
 Changes in [1.11.18-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.1) (2023-01-11)
 ===========================================================================================================
 

From 372e7b95909d47ac679062bee2d29cc217bb6ba5 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 12 Jan 2023 14:11:24 +0000
Subject: [PATCH 08/20] v1.11.18-rc.2

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

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

From 7c4e1ccf6766f58226cb21761034262212cc9a3d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 13 Jan 2023 10:52:09 +0000
Subject: [PATCH 09/20] Upgrade matrix-js-sdk to 23.1.0-rc.3

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 93f6b8702d..9923b8575f 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "23.1.0-rc.2",
+        "matrix-js-sdk": "23.1.0-rc.3",
         "matrix-react-sdk": "3.64.0-rc.2",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 045b946540..9e2860b051 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8081,6 +8081,24 @@ matrix-js-sdk@23.1.0-rc.2:
     unhomoglyph "^1.0.6"
     uuid "9"
 
+matrix-js-sdk@23.1.0-rc.3:
+  version "23.1.0-rc.3"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.3.tgz#bd3f15e9d6cdc5d35a34b1fe1148a9d20196d202"
+  integrity sha512-YDPHtl7PcVTv5udDz/oeFOQysJMaQ2EVZRhcSzdvQ2rCpSwG8E6UR+tnSf+EFPEFgTwY2GBcVZgaxLYb+wLRBA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    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 79c1b68f3c46298fe5014dfbfdfcac8797a4b4e1 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 13 Jan 2023 10:53:30 +0000
Subject: [PATCH 10/20] Upgrade matrix-react-sdk to 3.64.0-rc.3

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

diff --git a/package.json b/package.json
index 9923b8575f..858970df91 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "matrix-js-sdk": "23.1.0-rc.3",
-        "matrix-react-sdk": "3.64.0-rc.2",
+        "matrix-react-sdk": "3.64.0-rc.3",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 9e2860b051..dbf53e7ce4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8063,24 +8063,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@23.1.0-rc.2:
-  version "23.1.0-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.2.tgz#ea6743aec517ccce7c6be43e6ba70c8b648421f3"
-  integrity sha512-eihbyAwBov7DLB2zSUeJ3gSKxVhx4NGcwDq0jIBSK0GhEiBRs0+KCRXyGa6ClSzi7aDrLPvGjm9ijMBeRdgDPQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 matrix-js-sdk@23.1.0-rc.3:
   version "23.1.0-rc.3"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.3.tgz#bd3f15e9d6cdc5d35a34b1fe1148a9d20196d202"
@@ -8106,10 +8088,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.64.0-rc.2:
-  version "3.64.0-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0-rc.2.tgz#c3077baf7b3c612c3395944ffb2c982f225f57bb"
-  integrity sha512-uW0m1EovGoLWtfAnHcz1hM2AwOR70DDxAtDlVJYhBOFRWtLsASV8q4OIjwfGfSboqpwOuxIw7MavfJ6u4abj+Q==
+matrix-react-sdk@3.64.0-rc.3:
+  version "3.64.0-rc.3"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0-rc.3.tgz#4b3e14f3ad38944e23619650138b25de9be9b61d"
+  integrity sha512-TCc0A8BGXTpMAJU+yCsGvUZb14JjINaEP/DQkkdzj8Nhlqe9DZD/6kh9vVI2QkFqjJouW58HIHKK6Ipz4v1rHQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.3.0"
@@ -8148,7 +8130,7 @@ matrix-react-sdk@3.64.0-rc.2:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "23.1.0-rc.2"
+    matrix-js-sdk "23.1.0-rc.3"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From e95e47b954cbffe03766de08203ba7bc1b9aa3ce Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 13 Jan 2023 10:55:05 +0000
Subject: [PATCH 11/20] Prepare changelog for v1.11.18-rc.3

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22893262cf..9485fe6cdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.11.18-rc.3](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.3) (2023-01-13)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix failure to start in firefox private browser ([\#3058](https://github.com/matrix-org/matrix-js-sdk/pull/3058)). Fixes vector-im/element-web#24216.
+
 Changes in [1.11.18-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.2) (2023-01-12)
 ===========================================================================================================
 

From 67cc8b48601d8612e7e8de55d0bad67599f0892f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 13 Jan 2023 10:55:05 +0000
Subject: [PATCH 12/20] v1.11.18-rc.3

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

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

From bc9e5ea4102dadb4700ad059579889351387e2f5 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 17 Jan 2023 09:36:26 +0000
Subject: [PATCH 13/20] Upgrade matrix-js-sdk to 23.1.0-rc.4

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1ec9ad0141..ab88abb72a 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "23.1.0-rc.3",
+        "matrix-js-sdk": "23.1.0-rc.4",
         "matrix-react-sdk": "3.64.0-rc.3",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index dbf53e7ce4..08bdaf354c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8081,6 +8081,24 @@ matrix-js-sdk@23.1.0-rc.3:
     unhomoglyph "^1.0.6"
     uuid "9"
 
+matrix-js-sdk@23.1.0-rc.4:
+  version "23.1.0-rc.4"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.4.tgz#e1a9a12ad196750a98133ccc110793a1e1857416"
+  integrity sha512-/Hf0RHTBGaEJ/W7cS1D+0/a7x7DBTINim62i6DA/u32ZuSIFmCOFJfLicAvEfviZrcHnPxke68zXGGzcOYUW+w==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    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 08280a71ea07ea94923c26aac0de2276fc316577 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 17 Jan 2023 09:37:19 +0000
Subject: [PATCH 14/20] Upgrade matrix-react-sdk to 3.64.0-rc.4

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

diff --git a/package.json b/package.json
index ab88abb72a..8b40ec1cc0 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "matrix-js-sdk": "23.1.0-rc.4",
-        "matrix-react-sdk": "3.64.0-rc.3",
+        "matrix-react-sdk": "3.64.0-rc.4",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 08bdaf354c..4d5f9a6bcc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8063,24 +8063,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@23.1.0-rc.3:
-  version "23.1.0-rc.3"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.3.tgz#bd3f15e9d6cdc5d35a34b1fe1148a9d20196d202"
-  integrity sha512-YDPHtl7PcVTv5udDz/oeFOQysJMaQ2EVZRhcSzdvQ2rCpSwG8E6UR+tnSf+EFPEFgTwY2GBcVZgaxLYb+wLRBA==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-    uuid "9"
-
 matrix-js-sdk@23.1.0-rc.4:
   version "23.1.0-rc.4"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.4.tgz#e1a9a12ad196750a98133ccc110793a1e1857416"
@@ -8106,10 +8088,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.64.0-rc.3:
-  version "3.64.0-rc.3"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0-rc.3.tgz#4b3e14f3ad38944e23619650138b25de9be9b61d"
-  integrity sha512-TCc0A8BGXTpMAJU+yCsGvUZb14JjINaEP/DQkkdzj8Nhlqe9DZD/6kh9vVI2QkFqjJouW58HIHKK6Ipz4v1rHQ==
+matrix-react-sdk@3.64.0-rc.4:
+  version "3.64.0-rc.4"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0-rc.4.tgz#9afff46186038fdb0c296f3bfde6e2d465bbade2"
+  integrity sha512-ezo3XwYD84pjM+SaefJFKjJgQdal9GvsqXvMdlI1qYfKqHFplRJ4yQc0rv6e3XqXxQWHq7bOnOJwgFDrJ4ZibA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.3.0"
@@ -8148,7 +8130,7 @@ matrix-react-sdk@3.64.0-rc.3:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "23.1.0-rc.3"
+    matrix-js-sdk "23.1.0-rc.4"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 9412f6c161858f98ff28871377797f6e05c71c8b Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 17 Jan 2023 09:39:50 +0000
Subject: [PATCH 15/20] Prepare changelog for v1.11.18-rc.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9485fe6cdc..b5abac4566 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.11.18-rc.4](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.4) (2023-01-17)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+ * Correctly handle limited sync responses by resetting the thread timeline ([\#3056](https://github.com/matrix-org/matrix-js-sdk/pull/3056)). Fixes vector-im/element-web#23952.
+
 Changes in [1.11.18-rc.3](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.3) (2023-01-13)
 ===========================================================================================================
 

From b096f2296e9d54c0f295dee19dcc2cd6bb65b440 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 17 Jan 2023 09:39:50 +0000
Subject: [PATCH 16/20] v1.11.18-rc.4

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

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

From 4cdb7c8e2bd51d3844cb16ad17b40a4d1401c319 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 18 Jan 2023 13:53:07 +0000
Subject: [PATCH 17/20] Upgrade matrix-js-sdk to 23.1.0

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cabfd5ed49..3229a0fea8 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "23.1.0-rc.4",
+        "matrix-js-sdk": "23.1.0",
         "matrix-react-sdk": "3.64.0-rc.4",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 4d5f9a6bcc..12801c32e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8063,6 +8063,24 @@ 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@23.1.0:
+  version "23.1.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0.tgz#c8dc89f82c5dce1ec25eedf05613cd9665cc1bbd"
+  integrity sha512-/9eFWJBQceQX+2dHYZ5/9p0kjJs1PVDbIEWvR6FPjdnuNK3R4qi2NwpM6MoAHt8m7mX5qUG7x0NUWlalaOwrGQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    p-retry "4"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+    uuid "9"
+
 matrix-js-sdk@23.1.0-rc.4:
   version "23.1.0-rc.4"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.4.tgz#e1a9a12ad196750a98133ccc110793a1e1857416"

From 8a632832f8cbd21c50b3b528c28a2edf0f8d20bd Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 18 Jan 2023 13:53:28 +0000
Subject: [PATCH 18/20] Upgrade matrix-react-sdk to 3.64.0

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

diff --git a/package.json b/package.json
index 3229a0fea8..820dd657de 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "matrix-js-sdk": "23.1.0",
-        "matrix-react-sdk": "3.64.0-rc.4",
+        "matrix-react-sdk": "3.64.0",
         "matrix-widget-api": "^1.1.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 12801c32e5..eba7585c3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8081,24 +8081,6 @@ matrix-js-sdk@23.1.0:
     unhomoglyph "^1.0.6"
     uuid "9"
 
-matrix-js-sdk@23.1.0-rc.4:
-  version "23.1.0-rc.4"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-23.1.0-rc.4.tgz#e1a9a12ad196750a98133ccc110793a1e1857416"
-  integrity sha512-/Hf0RHTBGaEJ/W7cS1D+0/a7x7DBTINim62i6DA/u32ZuSIFmCOFJfLicAvEfviZrcHnPxke68zXGGzcOYUW+w==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    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"
@@ -8106,10 +8088,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.64.0-rc.4:
-  version "3.64.0-rc.4"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0-rc.4.tgz#9afff46186038fdb0c296f3bfde6e2d465bbade2"
-  integrity sha512-ezo3XwYD84pjM+SaefJFKjJgQdal9GvsqXvMdlI1qYfKqHFplRJ4yQc0rv6e3XqXxQWHq7bOnOJwgFDrJ4ZibA==
+matrix-react-sdk@3.64.0:
+  version "3.64.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.64.0.tgz#55fa966be155d6545823d5d3c946b812d618bbbb"
+  integrity sha512-IdKJt6jka6bLFcOeXr3rJ4HaiinqDuBdTDkkncsj/MazekD/TTWi8y1eZQrCvG96PxELSUItHrBlcZl0/ft+XQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.3.0"
@@ -8148,7 +8130,7 @@ matrix-react-sdk@3.64.0-rc.4:
     maplibre-gl "^2.0.0"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "23.1.0-rc.4"
+    matrix-js-sdk "23.1.0"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 86c5042563ff79d5f757b3c002662ff793e52d72 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 18 Jan 2023 13:57:48 +0000
Subject: [PATCH 19/20] Prepare changelog for v1.11.18

---
 CHANGELOG.md | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5abac4566..1c2c9de2e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,8 @@
-Changes in [1.11.18-rc.4](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.4) (2023-01-17)
-===========================================================================================================
-
-## 🐛 Bug Fixes
- * Correctly handle limited sync responses by resetting the thread timeline ([\#3056](https://github.com/matrix-org/matrix-js-sdk/pull/3056)). Fixes vector-im/element-web#23952.
-
-Changes in [1.11.18-rc.3](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.3) (2023-01-13)
-===========================================================================================================
-
-## 🐛 Bug Fixes
- * Fix failure to start in firefox private browser ([\#3058](https://github.com/matrix-org/matrix-js-sdk/pull/3058)). Fixes vector-im/element-web#24216.
-
-Changes in [1.11.18-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.2) (2023-01-12)
-===========================================================================================================
+Changes in [1.11.18](https://github.com/vector-im/element-web/releases/tag/v1.11.18) (2023-01-18)
+=================================================================================================
 
 ## ✨ Features
  * Switch threads on for everyone ([\#9879](https://github.com/matrix-org/matrix-react-sdk/pull/9879)).
-
-Changes in [1.11.18-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.18-rc.1) (2023-01-11)
-===========================================================================================================
-
-## ✨ Features
  * Make threads use new Unable to Decrypt UI ([\#9876](https://github.com/matrix-org/matrix-react-sdk/pull/9876)). Fixes #24060.
  * Add edit and remove actions to link in RTE [Labs] ([\#9864](https://github.com/matrix-org/matrix-react-sdk/pull/9864)).
  * Remove extensible events v1 experimental rendering ([\#9881](https://github.com/matrix-org/matrix-react-sdk/pull/9881)).
@@ -70,6 +53,8 @@ Changes in [1.11.18-rc.1](https://github.com/vector-im/element-web/releases/tag/
  * Ensure that events are correctly updated when they are edited. ([\#9789](https://github.com/matrix-org/matrix-react-sdk/pull/9789)).
  * When stopping a broadcast also stop the playback ([\#9795](https://github.com/matrix-org/matrix-react-sdk/pull/9795)). Fixes #24052.
  * Prevent to start two broadcasts at the same time ([\#9744](https://github.com/matrix-org/matrix-react-sdk/pull/9744)). Fixes #23973.
+ * Correctly handle limited sync responses by resetting the thread timeline ([\#3056](https://github.com/matrix-org/matrix-js-sdk/pull/3056)). Fixes vector-im/element-web#23952.
+ * Fix failure to start in firefox private browser ([\#3058](https://github.com/matrix-org/matrix-js-sdk/pull/3058)). Fixes vector-im/element-web#24216.
 
 Changes in [1.11.17](https://github.com/vector-im/element-web/releases/tag/v1.11.17) (2022-12-21)
 =================================================================================================

From 7196614a967e0bcf695976efd0bf6881fbe935a6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 18 Jan 2023 13:57:49 +0000
Subject: [PATCH 20/20] v1.11.18

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

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