* Convert the "Cryptography" settings panel to an HTML table to assist screen reader users. ([\#6968](https://github.com/matrix-org/matrix-react-sdk/pull/6968)). Contributed by [andybalaam](https://github.com/andybalaam).

* Swap order of private space creation and tweak copy ([\#6967](https://github.com/matrix-org/matrix-react-sdk/pull/6967)). Fixes #18768 and #18768.
 * Add spacing to Room settings - Notifications subsection ([\#6962](https://github.com/matrix-org/matrix-react-sdk/pull/6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema).
 * Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\#6955](https://github.com/matrix-org/matrix-react-sdk/pull/6955)). Contributed by [andybalaam](https://github.com/andybalaam).
 * Fix space invite edge cases ([\#6884](https://github.com/matrix-org/matrix-react-sdk/pull/6884)). Fixes #19010 #17345 and #19010.
 * Allow options to cascade kicks/bans throughout spaces ([\#6829](https://github.com/matrix-org/matrix-react-sdk/pull/6829)). Fixes #18969 and #18969.
 * Make public space alias field mandatory again ([\#6921](https://github.com/matrix-org/matrix-react-sdk/pull/6921)). Fixes #19003 and #19003.
 * Add progress bar to restricted room upgrade dialog ([\#6919](https://github.com/matrix-org/matrix-react-sdk/pull/6919)). Fixes #19146 and #19146.
 * Add customisation point for visibility of invites and room creation ([\#6922](https://github.com/matrix-org/matrix-react-sdk/pull/6922)). Fixes #19331 and #19331.
 * Inhibit `Unable to get validated threepid` error during UIA ([\#6928](https://github.com/matrix-org/matrix-react-sdk/pull/6928)). Fixes #18883 and #18883.
 * Tweak room list skeleton UI height and behaviour ([\#6926](https://github.com/matrix-org/matrix-react-sdk/pull/6926)). Fixes #18231 #16581 and #18231.
 * If public room creation fails, retry without publishing it ([\#6872](https://github.com/matrix-org/matrix-react-sdk/pull/6872)). Fixes #19194 and #19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr).
 * Iterate invite your teammates to Space view ([\#6925](https://github.com/matrix-org/matrix-react-sdk/pull/6925)). Fixes #18772 and #18772.
 * Make placeholder more grey when no input ([\#6840](https://github.com/matrix-org/matrix-react-sdk/pull/6840)). Fixes #17243 and #17243. Contributed by [wlach](https://github.com/wlach).
 * Respect tombstones in locally known rooms for Space children ([\#6906](https://github.com/matrix-org/matrix-react-sdk/pull/6906)). Fixes #19246 #19256 and #19246.
 * Improve emoji shortcodes generated from annotations ([\#6907](https://github.com/matrix-org/matrix-react-sdk/pull/6907)). Fixes #19304 and #19304.
 * Hide kick & ban options in UserInfo when looking at own profile ([\#6911](https://github.com/matrix-org/matrix-react-sdk/pull/6911)). Fixes #19066 and #19066.
 * Add progress bar to Community to Space migration tool ([\#6887](https://github.com/matrix-org/matrix-react-sdk/pull/6887)). Fixes #19216 and #19216.
 * Fix leave space cancel button exploding ([\#6966](https://github.com/matrix-org/matrix-react-sdk/pull/6966)).
 * Fix edge case behaviour of the space join spinner for guests ([\#6972](https://github.com/matrix-org/matrix-react-sdk/pull/6972)). Fixes #19359 and #19359.
 * Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\#6965](https://github.com/matrix-org/matrix-react-sdk/pull/6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
 * Fix text overflows button on Home page ([\#6898](https://github.com/matrix-org/matrix-react-sdk/pull/6898)). Fixes #19180 and #19180. Contributed by [oliver-pham](https://github.com/oliver-pham).
 * Space Room View should react to join rule changes down /sync ([\#6945](https://github.com/matrix-org/matrix-react-sdk/pull/6945)). Fixes #19390 and #19390.
 * Hide leave section button if user isn't in the room e.g peeking ([\#6920](https://github.com/matrix-org/matrix-react-sdk/pull/6920)). Fixes #17410 and #17410.
 * Fix bug where room list would get stuck showing no rooms ([\#6939](https://github.com/matrix-org/matrix-react-sdk/pull/6939)). Fixes #19373 and #19373.
 * Update room settings dialog title when room name changes ([\#6916](https://github.com/matrix-org/matrix-react-sdk/pull/6916)). Fixes #17480 and #17480. Contributed by [psrpinto](https://github.com/psrpinto).
 * Fix editing losing emote-ness and rainbow-ness of messages ([\#6931](https://github.com/matrix-org/matrix-react-sdk/pull/6931)). Fixes #19350 and #19350.
 * Remove semicolon from notifications panel ([\#6930](https://github.com/matrix-org/matrix-react-sdk/pull/6930)). Contributed by [robintown](https://github.com/robintown).
 * Prevent profile image in left panel's backdrop from being selected ([\#6924](https://github.com/matrix-org/matrix-react-sdk/pull/6924)). Contributed by [rom4nik](https://github.com/rom4nik).
 * Validate that the phone number verification field is filled before allowing user to submit ([\#6918](https://github.com/matrix-org/matrix-react-sdk/pull/6918)). Fixes #19316 and #19316. Contributed by [VFermat](https://github.com/VFermat).
 * Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\#6917](https://github.com/matrix-org/matrix-react-sdk/pull/6917)). Contributed by [LoganArnett](https://github.com/LoganArnett).
 * Use FocusLock around ContextMenus to simplify focus management ([\#6311](https://github.com/matrix-org/matrix-react-sdk/pull/6311)). Fixes #19259 and #19259.
 * Fix space hierarchy pagination ([\#6908](https://github.com/matrix-org/matrix-react-sdk/pull/6908)). Fixes #19276 and #19276.
 * Fix spaces keyboard shortcuts not working for last space ([\#6909](https://github.com/matrix-org/matrix-react-sdk/pull/6909)). Fixes #19255 and #19255.
 * Use fallback avatar only for DMs with 2 people. ([\#6895](https://github.com/matrix-org/matrix-react-sdk/pull/6895)). Fixes #18747 and #18747. Contributed by [andybalaam](https://github.com/andybalaam).
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEE6Vt2megLaKnq2aGaK6qbhVK9kEcFAmF2iooRHHJlbGVhc2Vz
 QHJpb3QuaW0ACgkQK6qbhVK9kEelQQ/9EeOIOxjvptz/S/m+FOk+Pge4VrgFbXrN
 +AN7KuyLWARGLG2itPU62IZHBvpByZIxbaMIWbngGSOAtNY6rVjH9geQ39dGOqjR
 euA1MBsw1uuYnCp3WA2/QpHNbXMzyfEOQc2W5AuGZ/SDbdsniY4OD5Sw5M6f/EIR
 iJRmHOPS6QKc3wAm6+d2C2S5M+A6dJttyxio9mCxrmXGI3fQrmkHYzTihqPBa3D2
 z3c8U2hxws5xXtYAN8L/R7B7MmRomGw04sT+Zk72AG7UAs8EIQ1nqAwdrOKe6M8H
 xFbU+lXQw/7J9LsJn1in+nXvp2IeEUi57aD1R313EU15X753zCXkNCVv1x/I1QhL
 zoccuvhZ83S0pLN7+TQ2bonKPkrlqFpCrztS4oc4jZCOIX3mfqcDTZjCuSFrT+B6
 4BHpjHyk7AhxwFSVkf546dvQzy1zyWBik/TU1aHRuEJD5z9Ii6D5awrmeP8b955I
 gmyUv2i+px2IR2VbLaPKIFpVRCmnJuLpr3lsckDOrZJvaQaFuZXRIlsKVUVKWAnA
 zUtC2TK+/QXUP3I3SCYQsGxVB5s2M/wU+mhtTFegPbWP6RRBAnXyBTnfTB+NUGNS
 CpDPLCo+wbCOUu0AdxSoXgp22JYwkbC/mFUfBYYxNpOlKq6n2dDMBVKbz7BboUyN
 YU7phhdTTKs=
 =eM3z
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQR6emmsWm8pV5k1AY7p6fZkQRCUPgUCYXb2uwAKCRDp6fZkQRCU
 Pr84APkBhUD98Iifc3kKu7nFm295OU7UpC5d1VgmqhRj2gRfIAEA7BNNOMhT/TbW
 fotpORMVyqu1L7AoMOnzN3afpP6jxAU=
 =XiOh
 -----END PGP SIGNATURE-----

Merge tag 'v1.9.3' into sc

* Convert the "Cryptography" settings panel to an HTML table to assist screen reader users. ([\#6968](https://github.com/matrix-org/matrix-react-sdk/pull/6968)). Contributed by [andybalaam](https://github.com/andybalaam).
* Swap order of private space creation and tweak copy ([\#6967](https://github.com/matrix-org/matrix-react-sdk/pull/6967)). Fixes #18768 and #18768.
* Add spacing to Room settings - Notifications subsection ([\#6962](https://github.com/matrix-org/matrix-react-sdk/pull/6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema).
* Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\#6955](https://github.com/matrix-org/matrix-react-sdk/pull/6955)). Contributed by [andybalaam](https://github.com/andybalaam).
* Fix space invite edge cases ([\#6884](https://github.com/matrix-org/matrix-react-sdk/pull/6884)). Fixes #19010 #17345 and #19010.
* Allow options to cascade kicks/bans throughout spaces ([\#6829](https://github.com/matrix-org/matrix-react-sdk/pull/6829)). Fixes #18969 and #18969.
* Make public space alias field mandatory again ([\#6921](https://github.com/matrix-org/matrix-react-sdk/pull/6921)). Fixes #19003 and #19003.
* Add progress bar to restricted room upgrade dialog ([\#6919](https://github.com/matrix-org/matrix-react-sdk/pull/6919)). Fixes #19146 and #19146.
* Add customisation point for visibility of invites and room creation ([\#6922](https://github.com/matrix-org/matrix-react-sdk/pull/6922)). Fixes #19331 and #19331.
* Inhibit `Unable to get validated threepid` error during UIA ([\#6928](https://github.com/matrix-org/matrix-react-sdk/pull/6928)). Fixes #18883 and #18883.
* Tweak room list skeleton UI height and behaviour ([\#6926](https://github.com/matrix-org/matrix-react-sdk/pull/6926)). Fixes #18231 #16581 and #18231.
* If public room creation fails, retry without publishing it ([\#6872](https://github.com/matrix-org/matrix-react-sdk/pull/6872)). Fixes #19194 and #19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr).
* Iterate invite your teammates to Space view ([\#6925](https://github.com/matrix-org/matrix-react-sdk/pull/6925)). Fixes #18772 and #18772.
* Make placeholder more grey when no input ([\#6840](https://github.com/matrix-org/matrix-react-sdk/pull/6840)). Fixes #17243 and #17243. Contributed by [wlach](https://github.com/wlach).
* Respect tombstones in locally known rooms for Space children ([\#6906](https://github.com/matrix-org/matrix-react-sdk/pull/6906)). Fixes #19246 #19256 and #19246.
* Improve emoji shortcodes generated from annotations ([\#6907](https://github.com/matrix-org/matrix-react-sdk/pull/6907)). Fixes #19304 and #19304.
* Hide kick & ban options in UserInfo when looking at own profile ([\#6911](https://github.com/matrix-org/matrix-react-sdk/pull/6911)). Fixes #19066 and #19066.
* Add progress bar to Community to Space migration tool ([\#6887](https://github.com/matrix-org/matrix-react-sdk/pull/6887)). Fixes #19216 and #19216.
* Fix leave space cancel button exploding ([\#6966](https://github.com/matrix-org/matrix-react-sdk/pull/6966)).
* Fix edge case behaviour of the space join spinner for guests ([\#6972](https://github.com/matrix-org/matrix-react-sdk/pull/6972)). Fixes #19359 and #19359.
* Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\#6965](https://github.com/matrix-org/matrix-react-sdk/pull/6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
* Fix text overflows button on Home page ([\#6898](https://github.com/matrix-org/matrix-react-sdk/pull/6898)). Fixes #19180 and #19180. Contributed by [oliver-pham](https://github.com/oliver-pham).
* Space Room View should react to join rule changes down /sync ([\#6945](https://github.com/matrix-org/matrix-react-sdk/pull/6945)). Fixes #19390 and #19390.
* Hide leave section button if user isn't in the room e.g peeking ([\#6920](https://github.com/matrix-org/matrix-react-sdk/pull/6920)). Fixes #17410 and #17410.
* Fix bug where room list would get stuck showing no rooms ([\#6939](https://github.com/matrix-org/matrix-react-sdk/pull/6939)). Fixes #19373 and #19373.
* Update room settings dialog title when room name changes ([\#6916](https://github.com/matrix-org/matrix-react-sdk/pull/6916)). Fixes #17480 and #17480. Contributed by [psrpinto](https://github.com/psrpinto).
* Fix editing losing emote-ness and rainbow-ness of messages ([\#6931](https://github.com/matrix-org/matrix-react-sdk/pull/6931)). Fixes #19350 and #19350.
* Remove semicolon from notifications panel ([\#6930](https://github.com/matrix-org/matrix-react-sdk/pull/6930)). Contributed by [robintown](https://github.com/robintown).
* Prevent profile image in left panel's backdrop from being selected ([\#6924](https://github.com/matrix-org/matrix-react-sdk/pull/6924)). Contributed by [rom4nik](https://github.com/rom4nik).
* Validate that the phone number verification field is filled before allowing user to submit ([\#6918](https://github.com/matrix-org/matrix-react-sdk/pull/6918)). Fixes #19316 and #19316. Contributed by [VFermat](https://github.com/VFermat).
* Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\#6917](https://github.com/matrix-org/matrix-react-sdk/pull/6917)). Contributed by [LoganArnett](https://github.com/LoganArnett).
* Use FocusLock around ContextMenus to simplify focus management ([\#6311](https://github.com/matrix-org/matrix-react-sdk/pull/6311)). Fixes #19259 and #19259.
* Fix space hierarchy pagination ([\#6908](https://github.com/matrix-org/matrix-react-sdk/pull/6908)). Fixes #19276 and #19276.
* Fix spaces keyboard shortcuts not working for last space ([\#6909](https://github.com/matrix-org/matrix-react-sdk/pull/6909)). Fixes #19255 and #19255.
* Use fallback avatar only for DMs with 2 people. ([\#6895](https://github.com/matrix-org/matrix-react-sdk/pull/6895)). Fixes #18747 and #18747. Contributed by [andybalaam](https://github.com/andybalaam).

.github/ISSUE_TEMPLATE/bug-desktop.yml

@@ -23,12 +23,12 @@ body:
   - type: textarea
     id: result
     attributes:
-      label: What happened?
+      label: Outcome
       placeholder: Tell us what went wrong
       value: |
-        ### What did you expect?
+        #### What did you expect?
 
-        ### What happened?
+        #### What happened instead?
     validations:
       required: true
   - type: input
@@ -65,9 +65,9 @@ body:
   - type: dropdown
     id: rageshake
     attributes:
-      label: Have you submitted a rageshake?
+      label: Will you send logs?
       description:  |
-        Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type /rageshake into the message entry area followed by a description of the problem and send the command. This will automatically submit anonymous logs to the developers.
+        Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
       options:
         - 'Yes'
         - 'No'

.github/ISSUE_TEMPLATE/bug-web.yml

@@ -23,12 +23,12 @@ body:
   - type: textarea
     id: result
     attributes:
-      label: What happened?
+      label: Outcome
       placeholder: Tell us what went wrong
       value: |
-        ### What did you expect?
+        #### What did you expect?
 
-        ### What happened?
+        #### What happened instead?
     validations:
       required: true
   - type: input
@@ -65,9 +65,9 @@ body:
   - type: dropdown
     id: rageshake
     attributes:
-      label: Have you submitted a rageshake?
+      label: Will you send logs?
       description:  |
-        Did you know that you can send a /rageshake command from the web applicaiton to submit logs for this issue? Trigger the defect, then type /rageshake into the message entry area followed by a description of the problem and send the command. This will automatically submit anonymous logs to the developers.
+        Did you know that you can send a /rageshake command from the web application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
       options:
         - 'Yes'
         - 'No'

CHANGELOG.md

@@ -1,9 +1,139 @@
+Changes in [1.9.3](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3) (2021-10-25)
+=================================================================================================
+
+## ✨ Features
+ * Convert the "Cryptography" settings panel to an HTML table to assist screen reader users. ([\#6968](https://github.com/matrix-org/matrix-react-sdk/pull/6968)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Swap order of private space creation and tweak copy ([\#6967](https://github.com/matrix-org/matrix-react-sdk/pull/6967)). Fixes #18768 and #18768.
+ * Add spacing to Room settings - Notifications subsection ([\#6962](https://github.com/matrix-org/matrix-react-sdk/pull/6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema).
+ * Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\#6955](https://github.com/matrix-org/matrix-react-sdk/pull/6955)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Fix space invite edge cases ([\#6884](https://github.com/matrix-org/matrix-react-sdk/pull/6884)). Fixes #19010 #17345 and #19010.
+ * Allow options to cascade kicks/bans throughout spaces ([\#6829](https://github.com/matrix-org/matrix-react-sdk/pull/6829)). Fixes #18969 and #18969.
+ * Make public space alias field mandatory again ([\#6921](https://github.com/matrix-org/matrix-react-sdk/pull/6921)). Fixes #19003 and #19003.
+ * Add progress bar to restricted room upgrade dialog ([\#6919](https://github.com/matrix-org/matrix-react-sdk/pull/6919)). Fixes #19146 and #19146.
+ * Add customisation point for visibility of invites and room creation ([\#6922](https://github.com/matrix-org/matrix-react-sdk/pull/6922)). Fixes #19331 and #19331.
+ * Inhibit `Unable to get validated threepid` error during UIA ([\#6928](https://github.com/matrix-org/matrix-react-sdk/pull/6928)). Fixes #18883 and #18883.
+ * Tweak room list skeleton UI height and behaviour ([\#6926](https://github.com/matrix-org/matrix-react-sdk/pull/6926)). Fixes #18231 #16581 and #18231.
+ * If public room creation fails, retry without publishing it ([\#6872](https://github.com/matrix-org/matrix-react-sdk/pull/6872)). Fixes #19194 and #19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr).
+ * Iterate invite your teammates to Space view ([\#6925](https://github.com/matrix-org/matrix-react-sdk/pull/6925)). Fixes #18772 and #18772.
+ * Make placeholder more grey when no input ([\#6840](https://github.com/matrix-org/matrix-react-sdk/pull/6840)). Fixes #17243 and #17243. Contributed by [wlach](https://github.com/wlach).
+ * Respect tombstones in locally known rooms for Space children ([\#6906](https://github.com/matrix-org/matrix-react-sdk/pull/6906)). Fixes #19246 #19256 and #19246.
+ * Improve emoji shortcodes generated from annotations ([\#6907](https://github.com/matrix-org/matrix-react-sdk/pull/6907)). Fixes #19304 and #19304.
+ * Hide kick & ban options in UserInfo when looking at own profile ([\#6911](https://github.com/matrix-org/matrix-react-sdk/pull/6911)). Fixes #19066 and #19066.
+ * Add progress bar to Community to Space migration tool ([\#6887](https://github.com/matrix-org/matrix-react-sdk/pull/6887)). Fixes #19216 and #19216.
+
+## 🐛 Bug Fixes
+ * Fix leave space cancel button exploding ([\#6966](https://github.com/matrix-org/matrix-react-sdk/pull/6966)).
+ * Fix edge case behaviour of the space join spinner for guests ([\#6972](https://github.com/matrix-org/matrix-react-sdk/pull/6972)). Fixes #19359 and #19359.
+ * Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\#6965](https://github.com/matrix-org/matrix-react-sdk/pull/6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix text overflows button on Home page ([\#6898](https://github.com/matrix-org/matrix-react-sdk/pull/6898)). Fixes #19180 and #19180. Contributed by [oliver-pham](https://github.com/oliver-pham).
+ * Space Room View should react to join rule changes down /sync ([\#6945](https://github.com/matrix-org/matrix-react-sdk/pull/6945)). Fixes #19390 and #19390.
+ * Hide leave section button if user isn't in the room e.g peeking ([\#6920](https://github.com/matrix-org/matrix-react-sdk/pull/6920)). Fixes #17410 and #17410.
+ * Fix bug where room list would get stuck showing no rooms ([\#6939](https://github.com/matrix-org/matrix-react-sdk/pull/6939)). Fixes #19373 and #19373.
+ * Update room settings dialog title when room name changes ([\#6916](https://github.com/matrix-org/matrix-react-sdk/pull/6916)). Fixes #17480 and #17480. Contributed by [psrpinto](https://github.com/psrpinto).
+ * Fix editing losing emote-ness and rainbow-ness of messages ([\#6931](https://github.com/matrix-org/matrix-react-sdk/pull/6931)). Fixes #19350 and #19350.
+ * Remove semicolon from notifications panel ([\#6930](https://github.com/matrix-org/matrix-react-sdk/pull/6930)). Contributed by [robintown](https://github.com/robintown).
+ * Prevent profile image in left panel's backdrop from being selected ([\#6924](https://github.com/matrix-org/matrix-react-sdk/pull/6924)). Contributed by [rom4nik](https://github.com/rom4nik).
+ * Validate that the phone number verification field is filled before allowing user to submit ([\#6918](https://github.com/matrix-org/matrix-react-sdk/pull/6918)). Fixes #19316 and #19316. Contributed by [VFermat](https://github.com/VFermat).
+ * Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\#6917](https://github.com/matrix-org/matrix-react-sdk/pull/6917)). Contributed by [LoganArnett](https://github.com/LoganArnett).
+ * Use FocusLock around ContextMenus to simplify focus management ([\#6311](https://github.com/matrix-org/matrix-react-sdk/pull/6311)). Fixes #19259 and #19259.
+ * Fix space hierarchy pagination ([\#6908](https://github.com/matrix-org/matrix-react-sdk/pull/6908)). Fixes #19276 and #19276.
+ * Fix spaces keyboard shortcuts not working for last space ([\#6909](https://github.com/matrix-org/matrix-react-sdk/pull/6909)). Fixes #19255 and #19255.
+ * Use fallback avatar only for DMs with 2 people. ([\#6895](https://github.com/matrix-org/matrix-react-sdk/pull/6895)). Fixes #18747 and #18747. Contributed by [andybalaam](https://github.com/andybalaam).
+
+Changes in [1.9.3-rc.3](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3-rc.3) (2021-10-25)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+ * Remove highlightjs CSS ([\#19483](https://github.com/vector-im/element-web/pull/19483)). Fixes vector-im/element-web#19476
+
+
+Changes in [1.9.3-rc.2](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3-rc.2) (2021-10-20)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix conflicting CSS on syntax highlighted blocks ([\#6991](https://github.com/matrix-org/matrix-react-sdk/pull/6991)). Fixes vector-im/element-web#19445
+
+Changes in [1.9.3-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3-rc.1) (2021-10-19)
+===========================================================================================================
+
+## ✨ Features
+ * Swap order of private space creation and tweak copy ([\#6967](https://github.com/matrix-org/matrix-react-sdk/pull/6967)). Fixes #18768 and #18768.
+ * Add spacing to Room settings - Notifications subsection ([\#6962](https://github.com/matrix-org/matrix-react-sdk/pull/6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema).
+ * Convert the "Cryptography" settings panel to an HTML to assist screen reader users. ([\#6968](https://github.com/matrix-org/matrix-react-sdk/pull/6968)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\#6955](https://github.com/matrix-org/matrix-react-sdk/pull/6955)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Fix space invite edge cases ([\#6884](https://github.com/matrix-org/matrix-react-sdk/pull/6884)). Fixes #19010 #17345 and #19010.
+ * Allow options to cascade kicks/bans throughout spaces ([\#6829](https://github.com/matrix-org/matrix-react-sdk/pull/6829)). Fixes #18969 and #18969.
+ * Make public space alias field mandatory again ([\#6921](https://github.com/matrix-org/matrix-react-sdk/pull/6921)). Fixes #19003 and #19003.
+ * Add progress bar to restricted room upgrade dialog ([\#6919](https://github.com/matrix-org/matrix-react-sdk/pull/6919)). Fixes #19146 and #19146.
+ * Add customisation point for visibility of invites and room creation ([\#6922](https://github.com/matrix-org/matrix-react-sdk/pull/6922)). Fixes #19331 and #19331.
+ * Inhibit `Unable to get validated threepid` error during UIA ([\#6928](https://github.com/matrix-org/matrix-react-sdk/pull/6928)). Fixes #18883 and #18883.
+ * Tweak room list skeleton UI height and behaviour ([\#6926](https://github.com/matrix-org/matrix-react-sdk/pull/6926)). Fixes #18231 #16581 and #18231.
+ * If public room creation fails, retry without publishing it ([\#6872](https://github.com/matrix-org/matrix-react-sdk/pull/6872)). Fixes #19194 and #19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr).
+ * Iterate invite your teammates to Space view ([\#6925](https://github.com/matrix-org/matrix-react-sdk/pull/6925)). Fixes #18772 and #18772.
+ * Make placeholder more grey when no input ([\#6840](https://github.com/matrix-org/matrix-react-sdk/pull/6840)). Fixes #17243 and #17243. Contributed by [wlach](https://github.com/wlach).
+ * Respect tombstones in locally known rooms for Space children ([\#6906](https://github.com/matrix-org/matrix-react-sdk/pull/6906)). Fixes #19246 #19256 and #19246.
+ * Improve emoji shortcodes generated from annotations ([\#6907](https://github.com/matrix-org/matrix-react-sdk/pull/6907)). Fixes #19304 and #19304.
+ * Hide kick & ban options in UserInfo when looking at own profile ([\#6911](https://github.com/matrix-org/matrix-react-sdk/pull/6911)). Fixes #19066 and #19066.
+ * Add progress bar to Community to Space migration tool ([\#6887](https://github.com/matrix-org/matrix-react-sdk/pull/6887)). Fixes #19216 and #19216.
+
+## 🐛 Bug Fixes
+ * Fix leave space cancel button exploding ([\#6966](https://github.com/matrix-org/matrix-react-sdk/pull/6966)).
+ * Fix edge case behaviour of the space join spinner for guests ([\#6972](https://github.com/matrix-org/matrix-react-sdk/pull/6972)). Fixes #19359 and #19359.
+ * Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\#6965](https://github.com/matrix-org/matrix-react-sdk/pull/6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix text overflows button on Home page ([\#6898](https://github.com/matrix-org/matrix-react-sdk/pull/6898)). Fixes #19180 and #19180. Contributed by [oliver-pham](https://github.com/oliver-pham).
+ * Space Room View should react to join rule changes down /sync ([\#6945](https://github.com/matrix-org/matrix-react-sdk/pull/6945)). Fixes #19390 and #19390.
+ * Hide leave section button if user isn't in the room e.g peeking ([\#6920](https://github.com/matrix-org/matrix-react-sdk/pull/6920)). Fixes #17410 and #17410.
+ * Fix bug where room list would get stuck showing no rooms ([\#6939](https://github.com/matrix-org/matrix-react-sdk/pull/6939)). Fixes #19373 and #19373.
+ * Update room settings dialog title when room name changes ([\#6916](https://github.com/matrix-org/matrix-react-sdk/pull/6916)). Fixes #17480 and #17480. Contributed by [psrpinto](https://github.com/psrpinto).
+ * Fix editing losing emote-ness and rainbow-ness of messages ([\#6931](https://github.com/matrix-org/matrix-react-sdk/pull/6931)). Fixes #19350 and #19350.
+ * Remove semicolon from notifications panel ([\#6930](https://github.com/matrix-org/matrix-react-sdk/pull/6930)). Contributed by [robintown](https://github.com/robintown).
+ * Prevent profile image in left panel's backdrop from being selected ([\#6924](https://github.com/matrix-org/matrix-react-sdk/pull/6924)). Contributed by [rom4nik](https://github.com/rom4nik).
+ * Validate that the phone number verification field is filled before allowing user to submit ([\#6918](https://github.com/matrix-org/matrix-react-sdk/pull/6918)). Fixes #19316 and #19316. Contributed by [VFermat](https://github.com/VFermat).
+ * Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\#6917](https://github.com/matrix-org/matrix-react-sdk/pull/6917)). Contributed by [LoganArnett](https://github.com/LoganArnett).
+ * Use FocusLock around ContextMenus to simplify focus management ([\#6311](https://github.com/matrix-org/matrix-react-sdk/pull/6311)). Fixes #19259 and #19259.
+ * Fix space hierarchy pagination ([\#6908](https://github.com/matrix-org/matrix-react-sdk/pull/6908)). Fixes #19276 and #19276.
+ * Fix spaces keyboard shortcuts not working for last space ([\#6909](https://github.com/matrix-org/matrix-react-sdk/pull/6909)). Fixes #19255 and #19255.
+ * Use fallback avatar only for DMs with 2 people. ([\#6895](https://github.com/matrix-org/matrix-react-sdk/pull/6895)). Fixes #18747 and #18747. Contributed by [andybalaam](https://github.com/andybalaam).
+
 Changes in [1.9.2](https://github.com/vector-im/element-desktop/releases/tag/v1.9.2) (2021-10-12)
 =================================================================================================
 
 ## 🐛 Bug Fixes
  * Upgrade to matrix-js-sdk#14.0.1
 
+Changes in [1.9.1](https://github.com/vector-im/element-desktop/releases/tag/v1.9.1) (2021-10-11)
+=================================================================================================
+
+## ✨ Features
+ * Decrease profile button touch target ([\#6900](https://github.com/matrix-org/matrix-react-sdk/pull/6900)). Contributed by [ColonisationCaptain](https://github.com/ColonisationCaptain).
+ * Don't let click events propagate out of context menus ([\#6892](https://github.com/matrix-org/matrix-react-sdk/pull/6892)).
+ * Allow closing Dropdown via its chevron ([\#6885](https://github.com/matrix-org/matrix-react-sdk/pull/6885)). Fixes #19030 and #19030.
+ * Improve AUX panel behaviour ([\#6699](https://github.com/matrix-org/matrix-react-sdk/pull/6699)). Fixes #18787 and #18787. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * A nicer opening animation for the Image View ([\#6454](https://github.com/matrix-org/matrix-react-sdk/pull/6454)). Fixes #18186 and #18186. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+
+## 🐛 Bug Fixes
+ * [Release] Fix space hierarchy pagination ([\#6910](https://github.com/matrix-org/matrix-react-sdk/pull/6910)).
+ * Fix leaving space via other client leaving you in undefined-land ([\#6891](https://github.com/matrix-org/matrix-react-sdk/pull/6891)). Fixes #18455 and #18455.
+ * Handle newer voice message encrypted event format for chat export ([\#6893](https://github.com/matrix-org/matrix-react-sdk/pull/6893)). Contributed by [jaiwanth-v](https://github.com/jaiwanth-v).
+ * Fix pagination when filtering space hierarchy ([\#6876](https://github.com/matrix-org/matrix-react-sdk/pull/6876)). Fixes #19235 and #19235.
+ * Fix spaces null-guard breaking the dispatcher settings watching ([\#6886](https://github.com/matrix-org/matrix-react-sdk/pull/6886)). Fixes #19223 and #19223.
+ * Fix space children without specific `order` being sorted after those with one ([\#6878](https://github.com/matrix-org/matrix-react-sdk/pull/6878)). Fixes #19192 and #19192.
+ * Ensure that sub-spaces aren't considered for notification badges ([\#6881](https://github.com/matrix-org/matrix-react-sdk/pull/6881)). Fixes #18975 and #18975.
+ * Fix timeline autoscroll with non-standard DPI settings. ([\#6880](https://github.com/matrix-org/matrix-react-sdk/pull/6880)). Fixes #18984 and #18984.
+ * Pluck out JoinRuleSettings styles so they apply in space settings too ([\#6879](https://github.com/matrix-org/matrix-react-sdk/pull/6879)). Fixes #19164 and #19164.
+ * Null guard around the matrixClient in SpaceStore ([\#6874](https://github.com/matrix-org/matrix-react-sdk/pull/6874)).
+ * Fix issue (https ([\#6871](https://github.com/matrix-org/matrix-react-sdk/pull/6871)). Fixes #19138 and #19138. Contributed by [psrpinto](https://github.com/psrpinto).
+ * Fix pills being cut off in message bubble layout ([\#6865](https://github.com/matrix-org/matrix-react-sdk/pull/6865)). Fixes #18627 and #18627. Contributed by [robintown](https://github.com/robintown).
+ * Fix space admin check false positive on multiple admins ([\#6824](https://github.com/matrix-org/matrix-react-sdk/pull/6824)).
+ * Fix the User View ([\#6860](https://github.com/matrix-org/matrix-react-sdk/pull/6860)). Fixes #19158 and #19158.
+ * Fix spacing for message composer buttons ([\#6852](https://github.com/matrix-org/matrix-react-sdk/pull/6852)). Fixes #18999 and #18999.
+ * Always show root event of a thread in room's timeline ([\#6842](https://github.com/matrix-org/matrix-react-sdk/pull/6842)). Fixes #19016 and #19016.
+
+Changes in [1.9.1-rc.2](https://github.com/vector-im/element-desktop/releases/tag/v1.9.1-rc.2) (2021-10-08)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+
 Changes in [1.9.1-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.9.1-rc.1) (2021-10-04)
 ===========================================================================================================
 

docs/labs.md

@@ -134,6 +134,15 @@ Enables sending hidden read receipts as per [MSC2285](https://github.com/matrix-
 
 Adds a "Message layout" section under `Settings -> Appearance`, where the user can select their preferred message layout (e.g. IRC or Modern). Additionally, adds a new "Message bubbles" layout.
 
-## Pseudonymous Analytics opt-in
+## Pseudonymous Analytics opt-in (`feature_pseudonymous_analytics_opt_in`)
 
 Opts in to collection of pseudonymous analytics data via Posthog. See https://github.com/matrix-org/matrix-react-sdk/pull/6495
+
+## Polls (`feature_polls`) [In Development]
+
+Polls are a way to gauge interest from your community about a certain topic with a simple voting mechanic
+within the message timeline. Note that this feature is currently under active development and therefore is
+entirely incomplete and may not work at all - it is not recommended for general use at this time.
+
+Bug reports, feature requests, etc are not currently accepted for this feature flag. A later stage of
+development will provide opportunities for feedback.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -58,11 +58,10 @@
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
     "browser-request": "^0.3.3",
     "gfm.css": "^1.1.2",
-    "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "14.0.1",
+    "matrix-js-sdk": "15.0.0",
-    "matrix-react-sdk": "3.32.1",
+    "matrix-react-sdk": "3.33.0",
     "matrix-widget-api": "^0.1.0-beta.16",
     "prop-types": "^15.7.2",
     "react": "17.0.2",

src/@types/global.d.ts

@@ -16,6 +16,7 @@ limitations under the License.
 
 import "matrix-react-sdk/src/@types/global"; // load matrix-react-sdk's type extensions first
 import type { Renderer } from "react-dom";
+import type { logger } from "matrix-js-sdk/src/logger";
 
 type ElectronChannel =
     "app_onAction" |
@@ -36,6 +37,7 @@ type ElectronChannel =
 declare global {
     interface Window {
         mxSendRageshake: (text: string, withLogs?: boolean) => void;
+        matrixLogger: typeof logger;
         matrixChat: ReturnType<Renderer>;
 
         // electron-only

src/i18n/strings/fi.json

@@ -2,7 +2,7 @@
     "Dismiss": "Hylkää",
     "Unknown device": "Tuntematon laite",
     "Welcome to Element": "Tervetuloa Element-sovellukseen",
-    "You need to be using HTTPS to place a screen-sharing call.": "Sinun täytyy käyttää HTTPS-yhteyttä, jotta voit jakaa ruudun puhelussa.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Sinun täytyy käyttää HTTPS-yhteyttä, jotta voit jakaa näytön puhelussa.",
     "powered by Matrix": "moottorina Matrix",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Hajautettua ja salattua viestintää Matrix-teknologialla",
     "Sign In": "Kirjaudu",
@@ -32,5 +32,7 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element-asetuksesi sisältävät epäkelpoa JSONia. Korjaa ongelma ja lataa sivu uudelleen.",
     "Powered by Matrix": "Moottorina Matrix",
     "Your browser can't run %(brand)s": "%(brand)s ei toimi selaimessasi",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s käyttää edistyneitä selaimen ominaisuuksia, joita nykyinen selaimesi ei tue."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s käyttää edistyneitä selaimen ominaisuuksia, joita nykyinen selaimesi ei tue.",
+    "Use %(brand)s on mobile": "Käytä %(brand)sia mobiilisti",
+    "Switch to space by number": "Vaihda avaruuteen käyttäen numeroa"
 }

src/i18n/strings/id.json

@@ -8,7 +8,7 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurasi Element Anda mengandung JSON yang tidak valid. Mohon perbaiki masalahnya dan muat ulang halaman nya.",
     "Invalid configuration: no default server specified.": "Konfigurasi tidak valid: server default belum ditentukan.",
     "Missing indexeddb worker script!": "Tidak ada script worker indexeddb!",
-    "Explore rooms": "Jelajahi ruang",
+    "Explore rooms": "Jelajahi ruangan",
     "Create Account": "Buat Akun",
     "Switch to space by number": "Beralih ke ruang dengan nomor",
     "Go to your browser to complete Sign In": "Buka browser Anda untuk menyelesaikan Masuk",
@@ -22,7 +22,7 @@
     "Your browser can't run %(brand)s": "Browser Anda tidak bisa menjalankan %(brand)s",
     "Unsupported browser": "Browser tidak didukung",
     "Use %(brand)s on mobile": "Gunakan %(brand)s di ponsel",
-    "Powered by Matrix": "Didukung oleh Matrix",
+    "Powered by Matrix": "Diberdayakan oleh Matrix",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "Previous/next recently visited room or community": "Ruangan atau komunitas yang baru saja dikunjungi sebelum/berikutnya",

src/i18n/strings/kab.json

@@ -32,5 +32,7 @@
     "Open": "Ldi",
     "Your browser can't run %(brand)s": "Iminig-inek·inem ur isselkan ara %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s isseqdac timahilin n yiminig leqqayen ur yessefrak ara yiminig-ik·im amiran.",
-    "Powered by Matrix": "Iteddu s lmendad n Matrix"
+    "Powered by Matrix": "Iteddu s lmendad n Matrix",
+    "Use %(brand)s on mobile": "Seqdec %(brand)s deg tiliɣri",
+    "Switch to space by number": "Ddu ɣer space s uṭṭun"
 }

src/i18n/strings/ru.json

@@ -9,7 +9,7 @@
     "Create Account": "Создать учётную запись",
     "Explore rooms": "Список комнат",
     "Unexpected error preparing the app. See console for details.": "Неожиданная ошибка при подготовке приложения. Подробности см. в консоли.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Неверная конфигурация: может указывать только один из следующих параметров: default_server_config, default_server_name или default_hs_url.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Неверная конфигурация: можно указывать только один из следующих параметров: default_server_config, default_server_name или default_hs_url.",
     "Invalid configuration: no default server specified.": "Неверная конфигурация: сервер по умолчанию не указан.",
     "The message from the parser is: %(message)s": "Сообщение из парсера: %(message)s",
     "Invalid JSON": "Нерабочий JSON",

src/vector/app.tsx

@@ -31,6 +31,7 @@ import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
 import * as Lifecycle from "matrix-react-sdk/src/Lifecycle";
 import type MatrixChatType from "matrix-react-sdk/src/components/structures/MatrixChat";
 import SdkConfig from "matrix-react-sdk/src/SdkConfig";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { parseQs, parseQsFromFragment } from './url_utils';
 import VectorBasePlatform from "./platform/VectorBasePlatform";
@@ -38,7 +39,9 @@ import { createClient } from "matrix-js-sdk/src/matrix";
 
 let lastLocationHashSet: string = null;
 
-console.log(`Application is running in ${process.env.NODE_ENV} mode`);
+logger.log(`Application is running in ${process.env.NODE_ENV} mode`);
+
+window.matrixLogger = logger;
 
 // Parse the given window.location and return parameters that can be used when calling
 // MatrixChat.showScreen(screen, params)
@@ -55,7 +58,7 @@ function getScreenFromLocation(location: Location) {
 function routeUrl(location: Location) {
     if (!window.matrixChat) return;
 
-    console.log("Routing URL ", location.href);
+    logger.log("Routing URL ", location.href);
     const s = getScreenFromLocation(location);
     (window.matrixChat as MatrixChatType).showScreen(s.screen, s.params);
 }
@@ -71,7 +74,7 @@ function onHashChange(ev: HashChangeEvent) {
 // This will be called whenever the SDK changes screens,
 // so a web page can update the URL bar appropriately.
 function onNewScreen(screen: string, replaceLast = false) {
-    console.log("newscreen " + screen);
+    logger.log("newscreen " + screen);
     const hash = '#/' + screen;
     lastLocationHashSet = hash;
 
@@ -133,7 +136,7 @@ function onTokenLoginCompleted() {
 
     url.searchParams.delete("loginToken");
 
-    console.log(`Redirecting to ${url.href} to drop loginToken from queryparams`);
+    logger.log(`Redirecting to ${url.href} to drop loginToken from queryparams`);
     window.history.replaceState(null, "", url.href);
 }
 
@@ -145,7 +148,7 @@ export async function loadApp(fragParams: {}) {
     const params = parseQs(window.location);
 
     const urlWithoutQuery = window.location.protocol + '//' + window.location.host + window.location.pathname;
-    console.log("Vector starting at " + urlWithoutQuery);
+    logger.log("Vector starting at " + urlWithoutQuery);
 
     (platform as VectorBasePlatform).startUpdater();
 
@@ -158,7 +161,7 @@ export async function loadApp(fragParams: {}) {
     const isReturningFromSso = !!params.loginToken;
     const autoRedirect = config['sso_immediate_redirect'] === true;
     if (!hasPossibleToken && !isReturningFromSso && autoRedirect) {
-        console.log("Bypassing app load to redirect to SSO");
+        logger.log("Bypassing app load to redirect to SSO");
         const tempCli = createClient({
             baseUrl: config['validated_server_config'].hsUrl,
             idBaseUrl: config['validated_server_config'].isUrl,
@@ -188,7 +191,7 @@ export async function loadApp(fragParams: {}) {
 async function verifyServerConfig() {
     let validatedConfig;
     try {
-        console.log("Verifying homeserver configuration");
+        logger.log("Verifying homeserver configuration");
 
         // Note: the query string may include is_url and hs_url - we only respect these in the
         // context of email validation. Because we don't respect them otherwise, we do not need
@@ -219,8 +222,8 @@ async function verifyServerConfig() {
         }
 
         if (hsUrl) {
-            console.log("Config uses a default_hs_url - constructing a default_server_config using this information");
+            logger.log("Config uses a default_hs_url - constructing a default_server_config using this information");
-            console.warn(
+            logger.warn(
                 "DEPRECATED CONFIG OPTION: In the future, default_hs_url will not be accepted. Please use " +
                 "default_server_config instead.",
             );
@@ -239,13 +242,13 @@ async function verifyServerConfig() {
 
         let discoveryResult = null;
         if (wkConfig) {
-            console.log("Config uses a default_server_config - validating object");
+            logger.log("Config uses a default_server_config - validating object");
             discoveryResult = await AutoDiscovery.fromDiscoveryConfig(wkConfig);
         }
 
         if (serverName) {
-            console.log("Config uses a default_server_name - doing .well-known lookup");
+            logger.log("Config uses a default_server_name - doing .well-known lookup");
-            console.warn(
+            logger.warn(
                 "DEPRECATED CONFIG OPTION: In the future, default_server_name will not be accepted. Please " +
                 "use default_server_config instead.",
             );
@@ -256,10 +259,10 @@ async function verifyServerConfig() {
     } catch (e) {
         const { hsUrl, isUrl, userId } = await Lifecycle.getStoredSessionVars();
         if (hsUrl && userId) {
-            console.error(e);
+            logger.error(e);
-            console.warn("A session was found - suppressing config error and using the session's homeserver");
+            logger.warn("A session was found - suppressing config error and using the session's homeserver");
 
-            console.log("Using pre-existing hsUrl and isUrl: ", { hsUrl, isUrl });
+            logger.log("Using pre-existing hsUrl and isUrl: ", { hsUrl, isUrl });
             validatedConfig = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
         } else {
             // the user is not logged in, so scream
@@ -270,10 +273,10 @@ async function verifyServerConfig() {
     validatedConfig.isDefault = true;
 
     // Just in case we ever have to debug this
-    console.log("Using homeserver config:", validatedConfig);
+    logger.log("Using homeserver config:", validatedConfig);
 
     // Add the newly built config to the actual config for use by the app
-    console.log("Updating SdkConfig with validated discovery information");
+    logger.log("Updating SdkConfig with validated discovery information");
     SdkConfig.add({ "validated_server_config": validatedConfig });
 
     return SdkConfig.get();

src/vector/index.ts

@@ -22,7 +22,6 @@ limitations under the License.
 // Our own CSS (which is themed) is imported via separate webpack entry points
 // in webpack.config.js
 require('gfm.css/gfm.css');
-require('highlight.js/styles/github.css');
 require('katex/dist/katex.css');
 
 /**
@@ -38,19 +37,21 @@ require('./localstorage-fix');
 import { parseQsFromFragment } from "./url_utils";
 import './modernizr';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 async function settled(...promises: Array<Promise<any>>) {
     for (const prom of promises) {
         try {
             await prom;
         } catch (e) {
-            console.error(e);
+            logger.error(e);
         }
     }
 }
 
 function checkBrowserFeatures() {
     if (!window.Modernizr) {
-        console.error("Cannot check features - Modernizr global is missing.");
+        logger.error("Cannot check features - Modernizr global is missing.");
         return false;
     }
 
@@ -77,14 +78,14 @@ function checkBrowserFeatures() {
     let featureComplete = true;
     for (let i = 0; i < featureList.length; i++) {
         if (window.Modernizr[featureList[i]] === undefined) {
-            console.error(
+            logger.error(
                 "Looked for feature '%s' but Modernizr has no results for this. " +
                 "Has it been configured correctly?", featureList[i],
             );
             return false;
         }
         if (window.Modernizr[featureList[i]] === false) {
-            console.error("Browser missing feature: '%s'", featureList[i]);
+            logger.error("Browser missing feature: '%s'", featureList[i]);
             // toggle flag rather than return early so we log all missing features rather than just the first.
             featureComplete = false;
         }
@@ -173,13 +174,13 @@ async function start() {
         // ##########################
         if (!acceptBrowser) {
             await new Promise<void>(resolve => {
-                console.error("Browser is missing required features.");
+                logger.error("Browser is missing required features.");
                 // take to a different landing page to AWOOOOOGA at the user
                 showIncompatibleBrowser(() => {
                     if (window.localStorage) {
                         window.localStorage.setItem('mx_accepts_unsupported_browser', String(true));
                     }
-                    console.log("User accepts the compatibility risks.");
+                    logger.log("User accepts the compatibility risks.");
                     resolve();
                 });
             });
@@ -222,7 +223,7 @@ async function start() {
         // run on the components.
         await loadApp(fragparts.params);
     } catch (err) {
-        console.error(err);
+        logger.error(err);
         // Like the compatibility page, AWOOOOOGA at the user
         // This uses the default brand since the app config is unavailable.
         await showError(_t("Your Element is misconfigured"), [
@@ -232,7 +233,7 @@ async function start() {
 }
 
 start().catch(err => {
-    console.error(err);
+    logger.error(err);
     // show the static error in an iframe to not lose any context / console data
     // with some basic styling to make the iframe full page
     delete document.body.style.height;

src/vector/init.tsx

@@ -35,17 +35,19 @@ import { setTheme } from "matrix-react-sdk/src/theme";
 
 import { initRageshake, initRageshakeStore } from "./rageshakesetup";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 export const rageshakePromise = initRageshake();
 
 export function preparePlatform() {
     if (window.electron) {
-        console.log("Using Electron platform");
+        logger.log("Using Electron platform");
         PlatformPeg.set(new ElectronPlatform());
     } else if (window.matchMedia('(display-mode: standalone)').matches) {
-        console.log("Using PWA platform");
+        logger.log("Using PWA platform");
         PlatformPeg.set(new PWAPlatform());
     } else {
-        console.log("Using Web platform");
+        logger.log("Using Web platform");
         PlatformPeg.set(new WebPlatform());
     }
 }
@@ -54,7 +56,7 @@ export function setupLogStorage() {
     if (SdkConfig.get().bug_report_endpoint_url) {
         return initRageshakeStore();
     }
-    console.warn("No bug report endpoint set - logs will not be persisted");
+    logger.warn("No bug report endpoint set - logs will not be persisted");
     return Promise.resolve();
 }
 
@@ -82,9 +84,9 @@ export function loadOlm(): Promise<void> {
     return Olm.init({
         locateFile: () => olmWasmPath,
     }).then(() => {
-        console.log("Using WebAssembly Olm");
+        logger.log("Using WebAssembly Olm");
     }).catch((e) => {
-        console.log("Failed to load Olm: trying legacy version", e);
+        logger.log("Failed to load Olm: trying legacy version", e);
         return new Promise((resolve, reject) => {
             const s = document.createElement('script');
             s.src = 'olm_legacy.js'; // XXX: This should be cache-busted too
@@ -96,9 +98,9 @@ export function loadOlm(): Promise<void> {
             // not 'Olm' which is still the failed wasm version.
             return window.Olm.init();
         }).then(() => {
-            console.log("Using legacy Olm");
+            logger.log("Using legacy Olm");
         }).catch((e) => {
-            console.log("Both WebAssembly and asm.js Olm failed!", e);
+            logger.log("Both WebAssembly and asm.js Olm failed!", e);
         });
     });
 }
@@ -118,14 +120,14 @@ export async function loadLanguage() {
         await languageHandler.setLanguage(langs);
         document.documentElement.setAttribute("lang", languageHandler.getCurrentLanguage());
     } catch (e) {
-        console.error("Unable to set language", e);
+        logger.error("Unable to set language", e);
     }
 }
 
 export async function loadSkin() {
     // Ensure the skin is the very first thing to load for the react-sdk. We don't even want to reference
     // the SDK until we have to in imports.
-    console.log("Loading skin...");
+    logger.log("Loading skin...");
     // load these async so that its code is not executed immediately and we can catch any exceptions
     const [sdk, skin] = await Promise.all([
         import(
@@ -140,7 +142,7 @@ export async function loadSkin() {
             "../component-index"),
     ]);
     sdk.loadSkin(skin);
-    console.log("Skin loaded!");
+    logger.log("Skin loaded!");
 }
 
 export async function loadTheme() {

src/vector/jitsi/index.ts

@@ -26,6 +26,8 @@ import {
 } from "matrix-widget-api";
 import { ElementWidgetActions } from "matrix-react-sdk/src/stores/widgets/ElementWidgetActions";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 const JITSI_OPENIDTOKEN_JWT_AUTH = 'openidtoken-jwt';
 
 // Dev note: we use raw JS without many dependencies to reduce bundle size.
@@ -94,7 +96,7 @@ let meetApi: any; // JitsiMeetExternalAPI
             ]);
             widgetApi.start();
         } else {
-            console.warn("No parent URL or no widget ID - assuming no widget API is available");
+            logger.warn("No parent URL or no widget ID - assuming no widget API is available");
         }
 
         // Populate the Jitsi params now
@@ -115,7 +117,7 @@ let meetApi: any; // JitsiMeetExternalAPI
             if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
                 // Request credentials, give callback to continue when received
                 openIdToken = await widgetApi.requestOpenIDConnectToken();
-                console.log("Got OpenID Connect token");
+                logger.log("Got OpenID Connect token");
             }
 
             // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/element-web/issues/12795)
@@ -146,7 +148,7 @@ let meetApi: any; // JitsiMeetExternalAPI
 
         enableJoinButton(); // always enable the button
     } catch (e) {
-        console.error("Error setting up Jitsi widget", e);
+        logger.error("Error setting up Jitsi widget", e);
         document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget";
     }
 })();
@@ -206,7 +208,7 @@ function joinConference() { // event handler bound in HTML
     if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
         if (!openIdToken?.access_token) { // eslint-disable-line camelcase
             // We've failing to get a token, don't try to init conference
-            console.warn('Expected to have an OpenID credential, cannot initialize widget.');
+            logger.warn('Expected to have an OpenID credential, cannot initialize widget.');
             document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget";
             return;
         }
@@ -221,7 +223,7 @@ function joinConference() { // event handler bound in HTML
         widgetApi.setAlwaysOnScreen(true);
     }
 
-    console.warn(
+    logger.warn(
         "[Jitsi Widget] The next few errors about failing to parse URL parameters are fine if " +
         "they mention 'external_api' or 'jitsi' in the stack. They're just Jitsi Meet trying to parse " +
         "our fragment values and not recognizing the options.",

src/vector/mobile_guide/index.ts

@@ -1,5 +1,7 @@
 import { getVectorConfig } from '../getconfig';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 function onBackToElementClick(): void {
     // Cookie should expire in 4 hours
     document.cookie = 'element_mobile_redirect_to_guide=false;path=/;max-age=14400';
@@ -76,7 +78,7 @@ async function initPage(): Promise<void> {
                 }
             }
         } catch (e) {
-            console.error(e);
+            logger.error(e);
             return renderConfigError("Unable to fetch homeserver configuration");
         }
     }

src/vector/platform/ElectronPlatform.tsx

@@ -55,6 +55,8 @@ import { IMatrixProfile, IEventWithRoomId as IMatrixEvent, IResultRoomEvents } f
 
 import VectorBasePlatform from './VectorBasePlatform';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 const electron = window.electron;
 const isMac = navigator.platform.toUpperCase().includes('MAC');
 
@@ -124,12 +126,12 @@ class SeshatIndexManager extends BaseEventIndexManager {
 
     private onIpcReply = (ev: {}, payload: IPCPayload) => {
         if (payload.id === undefined) {
-            console.warn("Ignoring IPC reply with no ID");
+            logger.warn("Ignoring IPC reply with no ID");
             return;
         }
 
         if (this.pendingIpcCalls[payload.id] === undefined) {
-            console.warn("Unknown IPC payload ID: " + payload.id);
+            logger.warn("Unknown IPC payload ID: " + payload.id);
             return;
         }
 
@@ -245,7 +247,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
 
         // try to flush the rageshake logs to indexeddb before quit.
         electron.on('before-quit', function() {
-            console.log('element-desktop closing');
+            logger.log('element-desktop closing');
             rageshake.flush();
         });
 
@@ -489,10 +491,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
     }
 
     reload() {
-        // we used to remote to the main process to get it to
+        window.location.reload();
-        // reload the webcontents, but in practice this is unnecessary:
-        // the normal way works fine.
-        window.location.reload(false);
     }
 
     private async ipcCall(name: string, ...args: any[]): Promise<any> {
@@ -506,12 +505,12 @@ export default class ElectronPlatform extends VectorBasePlatform {
 
     private onIpcReply = (ev, payload) => {
         if (payload.id === undefined) {
-            console.warn("Ignoring IPC reply with no ID");
+            logger.warn("Ignoring IPC reply with no ID");
             return;
         }
 
         if (this.pendingIpcCalls[payload.id] === undefined) {
-            console.warn("Unknown IPC payload ID: " + payload.id);
+            logger.warn("Unknown IPC payload ID: " + payload.id);
             return;
         }
 
@@ -534,8 +533,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
 
     setSpellCheckLanguages(preferredLangs: string[]) {
         this.ipcCall('setSpellCheckLanguages', preferredLangs).catch(error => {
-            console.log("Failed to send setSpellCheckLanguages IPC to Electron");
+            logger.log("Failed to send setSpellCheckLanguages IPC to Electron");
-            console.error(error);
+            logger.error(error);
         });
     }
 

src/vector/platform/PWAPlatform.ts

@@ -16,6 +16,8 @@ limitations under the License.
 
 import WebPlatform from "./WebPlatform";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 export default class PWAPlatform extends WebPlatform {
     setNotificationCount(count: number) {
         if (!navigator.setAppBadge) return super.setNotificationCount(count);
@@ -23,7 +25,7 @@ export default class PWAPlatform extends WebPlatform {
         this.notificationCount = count;
 
         navigator.setAppBadge(count).catch(e => {
-            console.error("Failed to update PWA app badge", e);
+            logger.error("Failed to update PWA app badge", e);
         });
     }
 }

src/vector/platform/WebPlatform.ts

@@ -28,6 +28,8 @@ import { CheckUpdatesPayload } from 'matrix-react-sdk/src/dispatcher/payloads/Ch
 
 import UAParser from 'ua-parser-js';
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 const POKE_RATE_MS = 10 * 60 * 1000; // 10 min
 
 export default class WebPlatform extends VectorBasePlatform {
@@ -159,7 +161,7 @@ export default class WebPlatform extends VectorBasePlatform {
 
             return { status: UpdateCheckStatus.NotAvailable };
         }, (err) => {
-            console.error("Failed to poll for update", err);
+            logger.error("Failed to poll for update", err);
             return {
                 status: UpdateCheckStatus.Error,
                 detail: err.message || err.status ? err.status.toString() : 'Unknown Error',
@@ -178,7 +180,7 @@ export default class WebPlatform extends VectorBasePlatform {
     }
 
     installUpdate() {
-        window.location.reload(true);
+        window.location.reload();
     }
 
     getDefaultDeviceDisplayName(): string {
@@ -212,8 +214,6 @@ export default class WebPlatform extends VectorBasePlatform {
     }
 
     reload() {
-        // forceReload=false since we don't really need new HTML/JS files
+        window.location.reload();
-        // we just need to restart the JS runtime.
-        window.location.reload(false);
     }
 }

src/vector/rageshakesetup.ts

@@ -30,23 +30,25 @@ import * as rageshake from "matrix-react-sdk/src/rageshake/rageshake";
 import SdkConfig from "matrix-react-sdk/src/SdkConfig";
 import sendBugReport from "matrix-react-sdk/src/rageshake/submit-rageshake";
 
+import { logger } from "matrix-js-sdk/src/logger";
+
 export function initRageshake() {
     // we manually check persistence for rageshakes ourselves
     const prom = rageshake.init(/*setUpPersistence=*/false);
     prom.then(() => {
-        console.log("Initialised rageshake.");
+        logger.log("Initialised rageshake.");
-        console.log("To fix line numbers in Chrome: " +
+        logger.log("To fix line numbers in Chrome: " +
             "Meatball menu → Settings → Ignore list → Add /rageshake\\.js$");
 
         window.addEventListener('beforeunload', (e) => {
-            console.log('element-web closing');
+            logger.log('element-web closing');
             // try to flush the logs to indexeddb
             rageshake.flush();
         });
 
         rageshake.cleanup();
     }, (err) => {
-        console.error("Failed to initialise rageshake: " + err);
+        logger.error("Failed to initialise rageshake: " + err);
     });
     return prom;
 }
@@ -58,22 +60,22 @@ export function initRageshakeStore() {
 window.mxSendRageshake = function(text: string, withLogs?: boolean) {
     const url = SdkConfig.get().bug_report_endpoint_url;
     if (!url) {
-        console.error("Cannot send a rageshake - no bug_report_endpoint_url configured");
+        logger.error("Cannot send a rageshake - no bug_report_endpoint_url configured");
         return;
     }
 
     if (withLogs === undefined) withLogs = true;
     if (!text || !text.trim()) {
-        console.error("Cannot send a rageshake without a message - please tell us what went wrong");
+        logger.error("Cannot send a rageshake without a message - please tell us what went wrong");
         return;
     }
     sendBugReport(url, {
         userText: text,
         sendLogs: withLogs,
-        progressCallback: console.log.bind(console),
+        progressCallback: logger.log.bind(console),
     }).then(() => {
-        console.log("Bug report sent!");
+        logger.log("Bug report sent!");
     }, (err) => {
-        console.error(err);
+        logger.error(err);
     });
 };