Merge branch 'staging' into develop

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.12.10",
+    "version": "1.12.11-rc.0",
     "description": "Element: the future of secure communication",
     "author": "New Vector Ltd.",
     "repository": {
@@ -100,7 +100,7 @@
         "lodash": "npm:lodash-es@^4.17.21",
         "maplibre-gl": "^5.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-js-sdk": "40.3.0-rc.0",
         "matrix-widget-api": "^1.16.1",
         "memoize-one": "^6.0.0",
         "mime": "^4.0.4",

pnpm-lock.yaml

@@ -7726,9 +7726,14 @@ packages:
   matrix-events-sdk@0.0.1:
     resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==}
 
+<<<<<<< HEAD
   matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7:
     resolution: {tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7}
     version: 40.2.0
+=======
+  matrix-js-sdk@40.3.0-rc.0:
+    resolution: {integrity: sha512-MxFPnlzca/g5Fq/MMN5jkzwExUv725/weW+Ids7Dwmcy34WC8NROBOhfqGJkwbAWLkJDEUKRe3+//2tHXmnnHQ==}
+>>>>>>> staging
     engines: {node: '>=22.0.0'}
 
   matrix-web-i18n@3.6.0:
@@ -18534,7 +18539,11 @@ snapshots:
 
   matrix-events-sdk@0.0.1: {}
 
+<<<<<<< HEAD
   matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7:
+=======
+  matrix-js-sdk@40.3.0-rc.0:
+>>>>>>> staging
     dependencies:
       '@babel/runtime': 7.28.6
       '@matrix-org/matrix-sdk-crypto-wasm': 17.1.0