From a5e46f3cf1db4afe41d756dcc53b6df059c47851 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 24 Aug 2021 18:02:21 +0100
Subject: [PATCH 01/14] Upgrade matrix-js-sdk to 12.4.0-rc.1

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

diff --git a/package.json b/package.json
index 0f35d816d5..b1208172c6 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "12.4.0-rc.1",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index c3d775b6d7..1a75bf1063 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7614,6 +7614,22 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
+matrix-js-sdk@12.4.0-rc.1:
+  version "12.4.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.0-rc.1.tgz#6eee9f159bcc5dd968346a9ce5c7b7427636f57c"
+  integrity sha512-6AGIEJvgWlNYyzxPj/V13s9JUg8zsiJ9Hyj6yTpDahufkAUT5yhpFzdPNNRaLlVxHox5HlwJJBdyNQtML727Og==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    p-retry "^4.5.0"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "12.3.1"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3216d7e5a7a333212b00d4d7578e29a9f0e247d8"

From c9659631049381e8a9919a2a3fd78cf539503d45 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 24 Aug 2021 18:02:47 +0100
Subject: [PATCH 02/14] Upgrade matrix-react-sdk to 3.29.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 89 +++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index b1208172c6..cc8c40a0f6 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
     "matrix-js-sdk": "12.4.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.29.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 1a75bf1063..55efb09a9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1476,6 +1476,69 @@
   resolved "https://registry.yarnpkg.com/@principalstudio/html-webpack-inject-preload/-/html-webpack-inject-preload-1.2.7.tgz#0c1f0b32a34d814b36ce84111f89990441cc64e8"
   integrity sha512-KJKkiKG63ugBjf8U0e9jUcI9CLPTFIsxXplEDE0oi3mPpxd90X9SJovo3W2l7yh/ARKIYXhQq8fSXUN7M29TzQ==
 
+"@sentry/browser@^6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.11.0.tgz#9e90bbc0488ebcdd1e67937d8d5b4f13c3f6dee0"
+  integrity sha512-Qr2QRA0t5/S9QQqxzYKvM9W8prvmiWuldfwRX4hubovXzcXLgUi4WK0/H612wSbYZ4dNAEcQbtlxFWJNN4wxdg==
+  dependencies:
+    "@sentry/core" "6.11.0"
+    "@sentry/types" "6.11.0"
+    "@sentry/utils" "6.11.0"
+    tslib "^1.9.3"
+
+"@sentry/core@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.11.0.tgz#40e94043afcf6407a109be26655c77832c64e740"
+  integrity sha512-09TB+f3pqEq8LFahFWHO6I/4DxHo+NcS52OkbWMDqEi6oNZRD7PhPn3i14LfjsYVv3u3AESU8oxSEGbFrr2UjQ==
+  dependencies:
+    "@sentry/hub" "6.11.0"
+    "@sentry/minimal" "6.11.0"
+    "@sentry/types" "6.11.0"
+    "@sentry/utils" "6.11.0"
+    tslib "^1.9.3"
+
+"@sentry/hub@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.11.0.tgz#ddf9ddb0577d1c8290dc02c0242d274fe84d6c16"
+  integrity sha512-pT9hf+ZJfVFpoZopoC+yJmFNclr4NPqPcl2cgguqCHb69DklD1NxgBNWK8D6X05qjnNFDF991U6t1mxP9HrGuw==
+  dependencies:
+    "@sentry/types" "6.11.0"
+    "@sentry/utils" "6.11.0"
+    tslib "^1.9.3"
+
+"@sentry/minimal@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.11.0.tgz#806d5512658370e40827b3e3663061db708fff33"
+  integrity sha512-XkZ7qrdlGp4IM/gjGxf1Q575yIbl5RvPbg+WFeekpo16Ufvzx37Mr8c2xsZaWosISVyE6eyFpooORjUlzy8EDw==
+  dependencies:
+    "@sentry/hub" "6.11.0"
+    "@sentry/types" "6.11.0"
+    tslib "^1.9.3"
+
+"@sentry/tracing@^6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.11.0.tgz#9bd9287addea1ebc12c75b226f71c7713c0fac4f"
+  integrity sha512-9VA1/SY++WeoMQI4K6n/sYgIdRtCu9NLWqmGqu/5kbOtESYFgAt1DqSyqGCr00ZjQiC2s7tkDkTNZb38K6KytQ==
+  dependencies:
+    "@sentry/hub" "6.11.0"
+    "@sentry/minimal" "6.11.0"
+    "@sentry/types" "6.11.0"
+    "@sentry/utils" "6.11.0"
+    tslib "^1.9.3"
+
+"@sentry/types@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.11.0.tgz#5122685478d32ddacd3a891cbcf550012df85f7c"
+  integrity sha512-gm5H9eZhL6bsIy/h3T+/Fzzz2vINhHhqd92CjHle3w7uXdTdFV98i2pDpErBGNTSNzbntqOMifYEB5ENtZAvcg==
+
+"@sentry/utils@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.11.0.tgz#d1dee4faf4d9c42c54bba88d5a66fb96b902a14c"
+  integrity sha512-IOvyFHcnbRQxa++jO+ZUzRvFHEJ1cZjrBIQaNVc0IYF0twUOB5PTP6joTcix38ldaLeapaPZ9LGfudbvYvxkdg==
+  dependencies:
+    "@sentry/types" "6.11.0"
+    tslib "^1.9.3"
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -7630,21 +7693,6 @@ matrix-js-sdk@12.4.0-rc.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "12.3.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3216d7e5a7a333212b00d4d7578e29a9f0e247d8"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    p-retry "^4.5.0"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@@ -7653,11 +7701,14 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.28.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/d5ffdf119673456746ca0f22aa828ecd749265d2"
+matrix-react-sdk@3.29.0-rc.1:
+  version "3.29.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0-rc.1.tgz#0987bbc15e76d3f1b09908f07ea2fed91344376b"
+  integrity sha512-xAKC8rnp4NFdz7jyPuBOfC0OzFhxe0Ot6V1ucVYLTdXavSBVNvtHOLUy0i26+JoqGik3nj6RacnpcwmWVSNFew==
   dependencies:
     "@babel/runtime" "^7.12.5"
+    "@sentry/browser" "^6.11.0"
+    "@sentry/tracing" "^6.11.0"
     await-lock "^2.1.0"
     blurhash "^1.1.3"
     browser-encrypt-attachment "^0.3.0"
@@ -7683,7 +7734,7 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "12.4.0-rc.1"
     matrix-widget-api "^0.1.0-beta.15"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 64ad740d39beee8b138519cb5122e1150449cb82 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 24 Aug 2021 18:05:35 +0100
Subject: [PATCH 03/14] Prepare changelog for v1.8.2-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ad31adb84..534425bacc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,46 @@
+Changes in [1.8.2-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2-rc.1) (2021-08-24)
+===========================================================================================================
+
+## ✨ Features
+ * Documentation for sentry config ([\#18608](https://github.com/vector-im/element-web/pull/18608)). Contributed by [novocaine](https://github.com/novocaine).
+ * Add a warning on E2EE rooms if you try to make them public ([\#5698](https://github.com/matrix-org/matrix-react-sdk/pull/5698)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Allow pagination of the space hierarchy and use new APIs ([\#6507](https://github.com/matrix-org/matrix-react-sdk/pull/6507)). Fixes #18089 and #18427.
+ * Improve emoji in composer ([\#6650](https://github.com/matrix-org/matrix-react-sdk/pull/6650)). Fixes #18593 and #18593. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Allow playback of replied-to voice message ([\#6629](https://github.com/matrix-org/matrix-react-sdk/pull/6629)). Fixes #18599 and #18599. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Format autocomplete suggestions vertically ([\#6620](https://github.com/matrix-org/matrix-react-sdk/pull/6620)). Fixes #17574 and #17574. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Remember last `MemberList` search query per-room ([\#6640](https://github.com/matrix-org/matrix-react-sdk/pull/6640)). Fixes #18613 and #18613. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Sentry rageshakes ([\#6597](https://github.com/matrix-org/matrix-react-sdk/pull/6597)). Fixes #11111 and #11111. Contributed by [novocaine](https://github.com/novocaine).
+ * Autocomplete has been updated to match modern accessibility standards. Navigate via up/down arrows rather than Tab. Enter or Tab to confirm a suggestion. This should be familiar to Slack & Discord users. You can now use Tab to navigate around the application and do more without touching your mouse. No more accidentally sending half of people's names because the completion didn't fire on Enter! ([\#5659](https://github.com/matrix-org/matrix-react-sdk/pull/5659)). Fixes #4872, #11071, #17171, #15646 #4872 and #4872.
+ * Add new call tile states ([\#6610](https://github.com/matrix-org/matrix-react-sdk/pull/6610)). Fixes #18521 and #18521. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Left align call tiles ([\#6609](https://github.com/matrix-org/matrix-react-sdk/pull/6609)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Make loading encrypted images look snappier ([\#6590](https://github.com/matrix-org/matrix-react-sdk/pull/6590)). Fixes #17878 and #17862. Contributed by [Palid](https://github.com/Palid).
+ * Offer a way to create a space based on existing community ([\#6543](https://github.com/matrix-org/matrix-react-sdk/pull/6543)). Fixes #18092.
+ * Accessibility improvements in and around Spaces ([\#6569](https://github.com/matrix-org/matrix-react-sdk/pull/6569)). Fixes #18094 and #18094.
+
+## 🐛 Bug Fixes
+ * Fix images not rendering when sent from other clients. ([\#6661](https://github.com/matrix-org/matrix-react-sdk/pull/6661)). Fixes #18702 and #18702.
+ * Fix autocomplete scrollbar and make the autocomplete a little smaller ([\#6655](https://github.com/matrix-org/matrix-react-sdk/pull/6655)). Fixes #18682 and #18682. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix replies on the bubble layout ([\#6451](https://github.com/matrix-org/matrix-react-sdk/pull/6451)). Fixes #18184. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Show "Enable encryption in settings" only when the user can do that ([\#6646](https://github.com/matrix-org/matrix-react-sdk/pull/6646)). Fixes #18646 and #18646. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix cross signing setup from settings screen ([\#6633](https://github.com/matrix-org/matrix-react-sdk/pull/6633)). Fixes #17761 and #17761.
+ * Fix call tiles on the bubble layout ([\#6647](https://github.com/matrix-org/matrix-react-sdk/pull/6647)). Fixes #18648 and #18648. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix error on accessing encrypted media without encryption keys ([\#6625](https://github.com/matrix-org/matrix-react-sdk/pull/6625)). Contributed by [Palid](https://github.com/Palid).
+ * Fix jitsi widget sometimes being permanently stuck in the bottom-right corner ([\#6632](https://github.com/matrix-org/matrix-react-sdk/pull/6632)). Fixes #17226 and #17226. Contributed by [Palid](https://github.com/Palid).
+ * Fix FilePanel pagination in E2EE rooms ([\#6630](https://github.com/matrix-org/matrix-react-sdk/pull/6630)). Fixes #18415 and #18415. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix call tile buttons ([\#6624](https://github.com/matrix-org/matrix-react-sdk/pull/6624)). Fixes #18565 and #18565. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix vertical call tile spacing issues ([\#6621](https://github.com/matrix-org/matrix-react-sdk/pull/6621)). Fixes #18558 and #18558. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix long display names in call tiles ([\#6618](https://github.com/matrix-org/matrix-react-sdk/pull/6618)). Fixes #18562 and #18562. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Avoid access token overflow ([\#6616](https://github.com/matrix-org/matrix-react-sdk/pull/6616)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Properly handle media errors  ([\#6615](https://github.com/matrix-org/matrix-react-sdk/pull/6615)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix glare related regressions ([\#6614](https://github.com/matrix-org/matrix-react-sdk/pull/6614)). Fixes #18538 and #18538. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix long display names in call toasts ([\#6617](https://github.com/matrix-org/matrix-react-sdk/pull/6617)). Fixes #18557 and #18557. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix PiP of held calls ([\#6611](https://github.com/matrix-org/matrix-react-sdk/pull/6611)). Fixes #18539 and #18539. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix call tile behaviour on narrow layouts ([\#6556](https://github.com/matrix-org/matrix-react-sdk/pull/6556)). Fixes #18398. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix video call persisting when widget removed ([\#6608](https://github.com/matrix-org/matrix-react-sdk/pull/6608)). Fixes #15703 and #15703.
+ * Fix toast colors ([\#6606](https://github.com/matrix-org/matrix-react-sdk/pull/6606)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Remove tiny scrollbar dot from code blocks ([\#6596](https://github.com/matrix-org/matrix-react-sdk/pull/6596)). Fixes #18474. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Improve handling of pills in the composer ([\#6353](https://github.com/matrix-org/matrix-react-sdk/pull/6353)). Fixes #10134 #10896 and #15037. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+
 Changes in [1.8.1](https://github.com/vector-im/element-desktop/releases/tag/v1.8.1) (2021-08-17)
 =================================================================================================
 

From e41885bf4e3a00845833569077306f5811ba74fc Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 24 Aug 2021 18:05:35 +0100
Subject: [PATCH 04/14] v1.8.2-rc.1

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

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

From 4719a6e310ad79e14149fd980c1e4de10fe56b4d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 25 Aug 2021 11:51:59 +0100
Subject: [PATCH 05/14] Update react-sdk

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4e595aba84..e672224ded 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
     "matrix-js-sdk": "12.4.0-rc.1",
-    "matrix-react-sdk": "3.29.0-rc.1",
+    "matrix-react-sdk": "3.29.0-rc.2",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 55efb09a9f..a5ce36c90e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7701,10 +7701,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.29.0-rc.1:
-  version "3.29.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0-rc.1.tgz#0987bbc15e76d3f1b09908f07ea2fed91344376b"
-  integrity sha512-xAKC8rnp4NFdz7jyPuBOfC0OzFhxe0Ot6V1ucVYLTdXavSBVNvtHOLUy0i26+JoqGik3nj6RacnpcwmWVSNFew==
+matrix-react-sdk@3.29.0-rc.2:
+  version "3.29.0-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0-rc.2.tgz#727f61fc28837fd3dc914a598de7b3321571b92b"
+  integrity sha512-J8nrNvu26/IfUUBPrbuR2IzO0LXvZtOVsvtuT46tKAr9wh5AtJS39qtdSG9xN1Fkwps5Oh6mzfEjpYFzDX1obA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@sentry/browser" "^6.11.0"

From 66012c3e841068619526a6e03faae91f6ec7f570 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 25 Aug 2021 11:53:09 +0100
Subject: [PATCH 06/14] Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 534425bacc..dcdd4a725e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.8.2-rc.2](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2-rc.2) (2021-08-25)
+===========================================================================================================
+
+## ✨ Features
+ * [Release]Increase general app performance by optimizing layers ([\#6672](https://github.com/matrix-org/matrix-react-sdk/pull/6672)). Fixes #18730 and #18730. Contributed by [Palid](https://github.com/Palid).
+
 Changes in [1.8.2-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2-rc.1) (2021-08-24)
 ===========================================================================================================
 

From ee9d6afba896aa3d3c1b4dc64f8bb829e85b7cf8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 25 Aug 2021 11:55:17 +0100
Subject: [PATCH 07/14] v1.8.2-rc.2

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

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

From a42400d6d6dbcff4537c24994a42cec286332769 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 26 Aug 2021 14:25:07 +0100
Subject: [PATCH 08/14] Upgrade react-sdk

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 83edde7873..06feb822a8 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
     "matrix-js-sdk": "12.4.0-rc.1",
-    "matrix-react-sdk": "3.29.0-rc.2",
+    "matrix-react-sdk": "3.29.0-rc.3",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index a5ce36c90e..05e04518d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7701,10 +7701,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.29.0-rc.2:
-  version "3.29.0-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0-rc.2.tgz#727f61fc28837fd3dc914a598de7b3321571b92b"
-  integrity sha512-J8nrNvu26/IfUUBPrbuR2IzO0LXvZtOVsvtuT46tKAr9wh5AtJS39qtdSG9xN1Fkwps5Oh6mzfEjpYFzDX1obA==
+matrix-react-sdk@3.29.0-rc.3:
+  version "3.29.0-rc.3"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0-rc.3.tgz#c4fbdce7d3df3f9f0f99da6e7b7e7dbc65ae638d"
+  integrity sha512-xn5mCPSBTjuPerHnlYZIeRAjxiQvz1sPjvZmIwNe4WiefuRPVcKrkQzXLxfooMrUrz3+1hA9ytBoOj9KAGkkzw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@sentry/browser" "^6.11.0"

From 56599776b585e85edb6a09c25eb4d04c99b0c957 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 26 Aug 2021 14:30:38 +0100
Subject: [PATCH 09/14] Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcdd4a725e..a6f831699b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.8.2-rc.3](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2-rc.3) (2021-08-26)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+ * [Release] Fix commit edit history ([\#6690](https://github.com/matrix-org/matrix-react-sdk/pull/6690)). Fixes #18742 and #18742. Contributed by [Palid](https://github.com/Palid).
+
 Changes in [1.8.2-rc.2](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2-rc.2) (2021-08-25)
 ===========================================================================================================
 

From 6dfd745b047d7180676be1f16e9113e3c995116c Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Thu, 26 Aug 2021 14:32:37 +0100
Subject: [PATCH 10/14] v1.8.2-rc.3

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

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

From 6535b36a87ec50487d42661eaaa3ff5ee68d3286 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 31 Aug 2021 14:44:08 +0100
Subject: [PATCH 11/14] Upgrade matrix-js-sdk to 12.4.0

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

diff --git a/package.json b/package.json
index 3229c847a1..573e204203 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "12.4.0-rc.1",
+    "matrix-js-sdk": "12.4.0",
     "matrix-react-sdk": "3.29.0-rc.3",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 05e04518d7..666559457a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7677,6 +7677,22 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
+matrix-js-sdk@12.4.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.0.tgz#ff60306f9a9e39fd1ae6c7e501001f80eb779dd7"
+  integrity sha512-KamHmvNle4mkdErmNgVsGIL3n8/zgPe60DLVaEA2t4aSNwQLEmRS+oVpIgsO3ZrUivBvn4oc9sBqxP0OIl6kUg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    p-retry "^4.5.0"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-js-sdk@12.4.0-rc.1:
   version "12.4.0-rc.1"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.0-rc.1.tgz#6eee9f159bcc5dd968346a9ce5c7b7427636f57c"

From 719822eb1e2c36596c79822c93da0fb02d97e9f7 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 31 Aug 2021 14:45:13 +0100
Subject: [PATCH 12/14] Upgrade matrix-react-sdk to 3.29.0

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

diff --git a/package.json b/package.json
index 573e204203..2e4040086d 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
     "matrix-js-sdk": "12.4.0",
-    "matrix-react-sdk": "3.29.0-rc.3",
+    "matrix-react-sdk": "3.29.0",
     "matrix-widget-api": "^0.1.0-beta.15",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 666559457a..8e2d6b7628 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7693,22 +7693,6 @@ matrix-js-sdk@12.4.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-matrix-js-sdk@12.4.0-rc.1:
-  version "12.4.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.0-rc.1.tgz#6eee9f159bcc5dd968346a9ce5c7b7427636f57c"
-  integrity sha512-6AGIEJvgWlNYyzxPj/V13s9JUg8zsiJ9Hyj6yTpDahufkAUT5yhpFzdPNNRaLlVxHox5HlwJJBdyNQtML727Og==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    p-retry "^4.5.0"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@@ -7717,10 +7701,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.29.0-rc.3:
-  version "3.29.0-rc.3"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0-rc.3.tgz#c4fbdce7d3df3f9f0f99da6e7b7e7dbc65ae638d"
-  integrity sha512-xn5mCPSBTjuPerHnlYZIeRAjxiQvz1sPjvZmIwNe4WiefuRPVcKrkQzXLxfooMrUrz3+1hA9ytBoOj9KAGkkzw==
+matrix-react-sdk@3.29.0:
+  version "3.29.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0.tgz#ab8536fe712b156d911f1f19a89f6c8acca7eafd"
+  integrity sha512-20Acs/5rs8lhPvFcAza7bFPRZSfm8x3/KILTaQrztIMl1iCSmxLbqJNxhyRjVegLQPEXltdkI3unyKQngn5EYA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@sentry/browser" "^6.11.0"
@@ -7750,7 +7734,7 @@ matrix-react-sdk@3.29.0-rc.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "12.4.0-rc.1"
+    matrix-js-sdk "12.4.0"
     matrix-widget-api "^0.1.0-beta.15"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From d44f0bd45d4d8b750951144648b54c63b9b20965 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 31 Aug 2021 14:47:02 +0100
Subject: [PATCH 13/14] Prepare changelog for v1.8.2

---
 CHANGELOG.md | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6f831699b..5be3d4fcd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,9 @@
-Changes in [1.8.2-rc.3](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2-rc.3) (2021-08-26)
-===========================================================================================================
-
-## 🐛 Bug Fixes
- * [Release] Fix commit edit history ([\#6690](https://github.com/matrix-org/matrix-react-sdk/pull/6690)). Fixes #18742 and #18742. Contributed by [Palid](https://github.com/Palid).
-
-Changes in [1.8.2-rc.2](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2-rc.2) (2021-08-25)
-===========================================================================================================
-
-## ✨ Features
- * [Release]Increase general app performance by optimizing layers ([\#6672](https://github.com/matrix-org/matrix-react-sdk/pull/6672)). Fixes #18730 and #18730. Contributed by [Palid](https://github.com/Palid).
-
-Changes in [1.8.2-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2-rc.1) (2021-08-24)
-===========================================================================================================
+Changes in [1.8.2](https://github.com/vector-im/element-desktop/releases/tag/v1.8.2) (2021-08-31)
+=================================================================================================
 
 ## ✨ Features
  * Documentation for sentry config ([\#18608](https://github.com/vector-im/element-web/pull/18608)). Contributed by [novocaine](https://github.com/novocaine).
+ * [Release]Increase general app performance by optimizing layers ([\#6672](https://github.com/matrix-org/matrix-react-sdk/pull/6672)). Fixes #18730 and #18730. Contributed by [Palid](https://github.com/Palid).
  * Add a warning on E2EE rooms if you try to make them public ([\#5698](https://github.com/matrix-org/matrix-react-sdk/pull/5698)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
  * Allow pagination of the space hierarchy and use new APIs ([\#6507](https://github.com/matrix-org/matrix-react-sdk/pull/6507)). Fixes #18089 and #18427.
  * Improve emoji in composer ([\#6650](https://github.com/matrix-org/matrix-react-sdk/pull/6650)). Fixes #18593 and #18593. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
@@ -30,6 +19,7 @@ Changes in [1.8.2-rc.1](https://github.com/vector-im/element-desktop/releases/ta
  * Accessibility improvements in and around Spaces ([\#6569](https://github.com/matrix-org/matrix-react-sdk/pull/6569)). Fixes #18094 and #18094.
 
 ## 🐛 Bug Fixes
+ * [Release] Fix commit edit history ([\#6690](https://github.com/matrix-org/matrix-react-sdk/pull/6690)). Fixes #18742 and #18742. Contributed by [Palid](https://github.com/Palid).
  * Fix images not rendering when sent from other clients. ([\#6661](https://github.com/matrix-org/matrix-react-sdk/pull/6661)). Fixes #18702 and #18702.
  * Fix autocomplete scrollbar and make the autocomplete a little smaller ([\#6655](https://github.com/matrix-org/matrix-react-sdk/pull/6655)). Fixes #18682 and #18682. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
  * Fix replies on the bubble layout ([\#6451](https://github.com/matrix-org/matrix-react-sdk/pull/6451)). Fixes #18184. Contributed by [SimonBrandner](https://github.com/SimonBrandner).

From 3b37c52479fd46886fa701926a68c3d9c287775a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 31 Aug 2021 14:47:03 +0100
Subject: [PATCH 14/14] v1.8.2

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

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