Merge tag 'v1.9.0' into deploy-auto

* Fix space keyboard shortcuts conflicting with native zoom shortcuts ([\element-hq#19037](element-hq#19037)). Fixes element-hq#18481 and undefined/element-web#18481.
* Say Joining space instead of Joining room where we know its a space ([\element-hq#6818](matrix-org/matrix-react-sdk#6818)). Fixes element-hq#19064 and element-hq#19064.
* Add warning that some spaces may not be relinked to the newly upgraded room ([\element-hq#6805](matrix-org/matrix-react-sdk#6805)). Fixes element-hq#18858 and element-hq#18858.
* Delabs Spaces, iterate some copy and move communities/space toggle to preferences ([\element-hq#6594](matrix-org/matrix-react-sdk#6594)). Fixes element-hq#18088, element-hq#18524 element-hq#18088 and element-hq#18088.
* Show "Message" in the user info panel instead of "Start chat" ([\element-hq#6319](matrix-org/matrix-react-sdk#6319)). Fixes element-hq#17877 and element-hq#17877. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
* Fix space keyboard shortcuts conflicting with native zoom shortcuts ([\element-hq#6804](matrix-org/matrix-react-sdk#6804)).
* Replace plain text emoji at the end of a line ([\element-hq#6784](matrix-org/matrix-react-sdk#6784)). Fixes element-hq#18833 and element-hq#18833. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
* Simplify Space Panel layout and fix some edge cases ([\element-hq#6800](matrix-org/matrix-react-sdk#6800)). Fixes element-hq#18694 and element-hq#18694.
* Show unsent message warning on Space Panel buttons ([\#6778](matrix-org/matrix-react-sdk#6778)). Fixes element-hq#18891 and element-hq#18891.
* Hide mute/unmute button in UserInfo for Spaces as it makes no sense ([\element-hq#6790](matrix-org/matrix-react-sdk#6790)). Fixes element-hq#19007 and element-hq#19007.
* Fix automatic field population in space create menu not validating ([\element-hq#6792](matrix-org/matrix-react-sdk#6792)). Fixes element-hq#19005 and element-hq#19005.
* Optimize input label transition on focus ([\#6783](matrix-org/matrix-react-sdk#6783)). Fixes element-hq#12876 and element-hq#12876. Contributed by [MadLittleMods](https://github.com/MadLittleMods).
* Adapt and re-use the RolesRoomSettingsTab for Spaces ([\element-hq#6779](matrix-org/matrix-react-sdk#6779)). Fixes element-hq#18908 element-hq#18909 and element-hq#18908.
* Deduplicate join rule management between rooms and spaces ([\element-hq#6724](matrix-org/matrix-react-sdk#6724)). Fixes element-hq#18798 and element-hq#18798.
* Add config option to turn on in-room event sending timing metrics ([\element-hq#6766](matrix-org/matrix-react-sdk#6766)).
* Improve the upgrade for restricted user experience ([\element-hq#6764](matrix-org/matrix-react-sdk#6764)). Fixes element-hq#18677 and element-hq#18677.
* Improve tooltips on space quick actions and explore button ([\element-hq#6760](matrix-org/matrix-react-sdk#6760)). Fixes element-hq#18528 and element-hq#18528.
* Make space members and user info behave more expectedly ([\element-hq#6765](matrix-org/matrix-react-sdk#6765)). Fixes element-hq#17018 and element-hq#17018.
* hide no-op m.room.encryption events and better word param changes ([\element-hq#6747](matrix-org/matrix-react-sdk#6747)). Fixes element-hq#18597 and element-hq#18597.
* Respect m.space.parent relations if they hold valid permissions ([\element-hq#6746](matrix-org/matrix-react-sdk#6746)). Fixes element-hq#10935 and element-hq#10935.
* Space panel accessibility improvements ([\element-hq#6744](matrix-org/matrix-react-sdk#6744)). Fixes element-hq#18892 and element-hq#18892.
* Fix spacing for message composer buttons ([\element-hq#6854](matrix-org/matrix-react-sdk#6854)).
* Fix accessing field on oobData which may be undefined ([\element-hq#6830](matrix-org/matrix-react-sdk#6830)). Fixes element-hq#19085 and element-hq#19085.
* Fix reactions aria-label not being a string and thus being read as [Object object] ([\element-hq#6828](matrix-org/matrix-react-sdk#6828)).
* Fix missing null guard in space hierarchy pagination ([\element-hq#6821](matrix-org/matrix-react-sdk#6821)). Fixes matrix-org/element-web-rageshakes#6299 and matrix-org/element-web-rageshakes#6299.
* Fix checks to show prompt to start new chats ([\element-hq#6812](matrix-org/matrix-react-sdk#6812)).
* Fix room list scroll jumps ([\element-hq#6777](matrix-org/matrix-react-sdk#6777)). Fixes element-hq#17460 element-hq#18440 and element-hq#17460. Contributed by [robintown](https://github.com/robintown).
* Fix various message bubble alignment issues ([\element-hq#6785](matrix-org/matrix-react-sdk#6785)). Fixes element-hq#18293, element-hq#18294 element-hq#18305 and element-hq#18293. Contributed by [robintown](https://github.com/robintown).
* Make message bubble font size consistent ([\element-hq#6795](matrix-org/matrix-react-sdk#6795)). Contributed by [robintown](https://github.com/robintown).
* Fix edge cases around joining new room which does not belong to active space ([\#6797](matrix-org/matrix-react-sdk#6797)). Fixes element-hq#19025 and element-hq#19025.
* Fix edge case space issues around creation and initial view ([\#6798](matrix-org/matrix-react-sdk#6798)). Fixes element-hq#19023 and element-hq#19023.
* Stop spinner on space preview if the join fails ([\element-hq#6803](matrix-org/matrix-react-sdk#6803)). Fixes element-hq#19034 and element-hq#19034.
* Fix emoji picker and stickerpicker not appearing correctly when opened ([\#6793](matrix-org/matrix-react-sdk#6793)). Fixes element-hq#19012 and element-hq#19012. Contributed by [Palid](https://github.com/Palid).
* Fix autocomplete not having y-scroll ([\element-hq#6794](matrix-org/matrix-react-sdk#6794)). Fixes element-hq#18997 and element-hq#18997. Contributed by [Palid](https://github.com/Palid).
* Fix broken edge case with public space creation with no alias ([\element-hq#6791](matrix-org/matrix-react-sdk#6791)). Fixes element-hq#19003 and element-hq#19003.
* Redirect from /#/welcome to /#/home if already logged in ([\element-hq#6786](matrix-org/matrix-react-sdk#6786)). Fixes element-hq#18990 and element-hq#18990. Contributed by [aaronraimist](https://github.com/aaronraimist).
* Fix build issues from two conflicting PRs landing without merge conflict ([\element-hq#6780](matrix-org/matrix-react-sdk#6780)).
* Render guest settings only in public rooms/spaces ([\element-hq#6693](matrix-org/matrix-react-sdk#6693)). Fixes element-hq#18776 and element-hq#18776. Contributed by [SimonBrandner](https://github.com/SimonBrandner).
* Fix message bubble corners being wrong in the presence of hidden events ([\element-hq#6776](matrix-org/matrix-react-sdk#6776)). Fixes element-hq#18124 and element-hq#18124. Contributed by [robintown](https://github.com/robintown).
* Debounce read marker update on scroll ([\element-hq#6771](matrix-org/matrix-react-sdk#6771)). Fixes element-hq#18961 and element-hq#18961.
* Use cursor:pointer on space panel buttons ([\element-hq#6770](matrix-org/matrix-react-sdk#6770)). Fixes element-hq#18951 and element-hq#18951.
* Fix regressed tab view buttons in space update toast ([\element-hq#6761](matrix-org/matrix-react-sdk#6761)). Fixes element-hq#18781 and element-hq#18781.

.env.example

@@ -1,6 +1,7 @@
 # To enable CSS hot-reload, set the following variable to 1.
 CSS_HOT_RELOAD=1
-# To use the annoying and inconsistent full page error dialog, set this to 1.
+# To use the full page error dialog, set this to 1. Please report false positives to
+# the issue tracker for handling.
 FULL_PAGE_ERRORS=0
 # To use a single theme, uncomment the line with the theme you want to hot-reload.
 MATRIX_THEMES='light'

.github/workflows/issues_to_projects.yaml

@@ -8,7 +8,7 @@ jobs:
         if: >
             contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
              (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-              contains(github.event.issue.labels.*.name, 'O-Intermediate')) &&
+              contains(github.event.issue.labels.*.name, 'O-Occasional')) &&
              (contains(github.event.issue.labels.*.name, 'S-Critical') ||
               contains(github.event.issue.labels.*.name, 'S-Major') ||
               contains(github.event.issue.labels.*.name, 'S-Minor'))

.github/workflows/triage-priority-bugs.yml

@@ -11,7 +11,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'T-Defect') &&
         contains(github.event.issue.labels.*.name, 'S-Critical') &&
         (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'O-Intermediate')) ||
+         contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
         contains(github.event.issue.labels.*.name, 'S-Major') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent') ||
         contains(github.event.issue.labels.*.name, 'A11y') &&

README.md

@@ -401,6 +401,6 @@ For a developer guide, see the [translating dev doc](docs/translating-dev.md).
 Triaging issues
 ===============
 
-Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/vector-im/element-web/wiki/Triage-process).
+Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/vector-im/element-meta/wiki/Triage-process).
 
-We use [issue labels](https://github.com/vector-im/element-web/wiki/Issue-labelling) to sort all incoming issues.
+We use [issue labels](https://github.com/vector-im/element-meta/wiki/Issue-labelling) to sort all incoming issues.

docs/labs.md

@@ -12,14 +12,6 @@ dropped. Ask in the room if you are unclear about any details here.**
 A new version of the "Report" dialog that lets users send abuse reports directly to room moderators,
 if the room supports it.
 
-## Matrix Spaces [MSC1772](https://github.com/matrix-org/matrix-doc/pull/1772) support (`feature_spaces`)
-
-Enables showing, using, creating, and managing spaces. Create Spaces from the all new Space Panel (to left of Room List).
-
-Incompatible with (will disable) `feature_custom_tags`, `feature_communities_v2_prototypes` and stable Communities/Groups support.
-
-Still in heavy development.
-
 ## Render LaTeX maths in messages (`feature_latex_maths`)
 
 Enables rendering of LaTeX maths in messages using [KaTeX](https://katex.org/). LaTeX between single dollar-signs is interpreted as inline maths and double dollar-signs as display maths (i.e. centred on its own line).

docs/translating-dev.md

@@ -2,7 +2,7 @@
 
 ## Requirements
 
-- A working [Development Setup](../../#setting-up-a-dev-environment)
+- A working [Development Setup](../README.md#setting-up-a-dev-environment)
   - Including up-to-date versions of matrix-react-sdk and matrix-js-sdk
 - Latest LTS version of Node.js installed
 - Be able to understand English

element.io/develop/config.json

@@ -48,5 +48,13 @@
       "privacyPolicyUrl": "https://element.io/privacy",
       "termsOfServiceUrl": "https://element.io/terms-of-service",
       "url": "https://ems.element.io/element-home/in-app-loader"
+    },
+    "sentry": {
+        "dsn": "https://[email protected]/6",
+        "environment": "develop"
+    },
+    "posthog": {
+        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
+        "apiHost": "https://posthog.hss.element.io"
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.8.5",
+  "version": "1.9.0",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -61,12 +61,12 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "12.5.0",
-    "matrix-react-sdk": "3.30.0",
+    "matrix-js-sdk": "13.0.0",
+    "matrix-react-sdk": "3.31.0",
     "matrix-widget-api": "^0.1.0-beta.16",
     "prop-types": "^15.7.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
     "sanitize-html": "^2.3.2",
     "ua-parser-js": "^0.7.24"
   },
@@ -93,8 +93,8 @@
     "@types/flux": "^3.1.9",
     "@types/modernizr": "^3.5.3",
     "@types/node": "^14.14.22",
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.2",
+    "@types/react": "17.0.14",
+    "@types/react-dom": "17.0.9",
     "@types/sanitize-html": "^2.3.1",
     "@typescript-eslint/eslint-plugin": "^4.17.0",
     "@typescript-eslint/parser": "^4.17.0",
@@ -151,13 +151,16 @@
     "stylelint-config-standard": "^20.0.0",
     "stylelint-scss": "^3.18.0",
     "terser-webpack-plugin": "^2.3.8",
-    "typescript": "^4.1.3",
+    "typescript": "4.3.5",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.2",
     "worker-loader": "^2.0.0",
     "worklet-loader": "^2.0.0"
   },
+  "resolutions": {
+    "@types/react": "17.0.14"
+  },
   "jest": {
     "testEnvironment": "jest-environment-jsdom-sixteen",
     "testMatch": [

src/i18n/strings/ar.json

@@ -33,5 +33,6 @@
     "Go to element.io": "انتقل إلى element.io",
     "Failed to start": "فشل البدء",
     "Powered by Matrix": "تدعمه «ماترِكس»",
-    "Use %(brand)s on mobile": "استعمل %(brand)s على المحمول"
+    "Use %(brand)s on mobile": "استعمل %(brand)s على المحمول",
+    "Switch to space by number": "التبديل إلى المساحة بالرقم"
 }

src/i18n/strings/et.json

@@ -33,6 +33,6 @@
     "Your browser can't run %(brand)s": "%(brand)s ei toimi sinu brauseris",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid, mis ei ole veel sinu veebibrauseris toetatud.",
     "Powered by Matrix": "Põhineb Matrix'il",
-    "Use %(brand)s on mobile": "Kasuta %(brand)s rakendust nutiseadmes",
+    "Use %(brand)s on mobile": "Kasuta rakendust %(brand)s nutiseadmes",
     "Switch to space by number": "Vaata kogukonnakeskust tema numbri alusel"
 }

src/i18n/strings/nl.json

@@ -7,7 +7,7 @@
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chatten & samenwerken dankzij [matrix]",
     "Sign In": "Inloggen",
     "Create Account": "Registreren",
-    "Explore rooms": "Kamersgids",
+    "Explore rooms": "Ontdek kamers",
     "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
     "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.",
@@ -34,5 +34,5 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.",
     "Powered by Matrix": "Mogelijk gemaakt door Matrix",
     "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel",
-    "Switch to space by number": "Wissel naar space per nummer"
+    "Switch to space by number": "Wissel naar ruimte met nummer"
 }

src/vector/platform/ElectronPlatform.tsx

@@ -566,6 +566,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
     private navigateForwardBack(back: boolean) {
         this.ipcCall(back ? "navigateBack" : "navigateForward");
     }
+
     private navigateToSpace(num: number) {
         dis.dispatch<SwitchSpacePayload>({
             action: Action.SwitchSpace,
@@ -597,8 +598,9 @@ export default class ElectronPlatform extends VectorBasePlatform {
         if (!handled &&
             // ideally we would use SpaceStore.spacesEnabled here but importing SpaceStore in this platform
             // breaks skinning as the platform is instantiated prior to the skin being loaded
-            SettingsStore.getValue("feature_spaces") &&
+            !SettingsStore.getValue("showCommunitiesInsteadOfSpaces") &&
             ev.code.startsWith("Digit") &&
+            ev.code !== "Digit0" && // this is the shortcut for reset zoom, don't override it
             isOnlyCtrlOrCmdKeyEvent(ev)
         ) {
             const spaceNumber = ev.code.slice(5); // Cut off the first 5 characters - "Digit"