Merge tag 'v3.49.0' into sc

* Hide screenshare button in video rooms on Desktop ([\matrix-org#9045](matrix-org#9045)). * Add a developer command to reset Megolm and Olm sessions ([\matrix-org#9044](matrix-org#9044)). * add spaces to TileErrorBoundary ([\matrix-org#9012](matrix-org#9012)). Contributed by @HarHarLinks. * Location sharing - add localised strings to map ([\matrix-org#9025](matrix-org#9025)). Fixes element-hq/element-web#21443. Contributed by @kerryarchibald. * Added trim to ignore whitespaces in email check ([\matrix-org#9027](matrix-org#9027)). Contributed by @ankur12-1610. * Improve _GenericEventListSummary.scss ([\matrix-org#9005](matrix-org#9005)). Contributed by @luixxiul. * Live location share - tiles without tile server (PSG-591) ([\matrix-org#8962](matrix-org#8962)). Contributed by @kerryarchibald. * Add option to display tooltip on link hover ([\matrix-org#8394](matrix-org#8394)). Fixes element-hq/element-web#21907. * Support a module API surface for custom functionality ([\matrix-org#8246](matrix-org#8246)). * Adjust encryption copy when creating a video room ([\matrix-org#8989](matrix-org#8989)). Fixes element-hq/element-web#22737. * Add bidirectonal isolation for pills ([\matrix-org#8985](matrix-org#8985)). Contributed by @sha-265. * Delabs `Show current avatar and name for users in message history` ([\matrix-org#8764](matrix-org#8764)). Fixes element-hq/element-web#22336. * Live location share - open latest location in map site ([\matrix-org#8981](matrix-org#8981)). Contributed by @kerryarchibald. * Improve LinkPreviewWidget ([\matrix-org#8881](matrix-org#8881)). Fixes element-hq/element-web#22634. Contributed by @luixxiul. * Render HTML topics in rooms on space home ([\matrix-org#8939](matrix-org#8939)). * Hide timestamp on event tiles being edited on every layout ([\matrix-org#8956](matrix-org#8956)). Contributed by @luixxiul. * Introduce new copy icon ([\matrix-org#8942](matrix-org#8942)). * Allow finding group DMs by members in spotlight ([\matrix-org#8922](matrix-org#8922)). Fixes element-hq/element-web#22564. Contributed by @justjanne. * Live location share - explicitly stop beacons replaced beacons ([\matrix-org#8933](matrix-org#8933)). Contributed by @kerryarchibald. * Remove unpin from widget kebab menu ([\matrix-org#8924](matrix-org#8924)). * Live location share - redact related locations on beacon redaction ([\matrix-org#8926](matrix-org#8926)). Contributed by @kerryarchibald. * Live location share - disallow message pinning ([\matrix-org#8928](matrix-org#8928)). Contributed by @kerryarchibald. * Unbreak in-app permalink tooltips ([\matrix-org#9100](matrix-org#9100)). * Add space for the stroke on message editor on IRC layout ([\matrix-org#9030](matrix-org#9030)). Fixes element-hq/element-web#22785. Contributed by @luixxiul. * Fix pinned messages not re-linkifying on edit ([\matrix-org#9042](matrix-org#9042)). Fixes element-hq/element-web#22726. * Don't unnecessarily persist the host signup dialog ([\matrix-org#9043](matrix-org#9043)). Fixes element-hq/element-web#22778. * Fix URL previews causing messages to become unrenderable ([\matrix-org#9028](matrix-org#9028)). Fixes element-hq/element-web#22766. * Fix event list summaries including invalid events ([\matrix-org#9041](matrix-org#9041)). Fixes element-hq/element-web#22790. * Correct accessibility labels for unread rooms in spotlight ([\matrix-org#9003](matrix-org#9003)). Contributed by @justjanne. * Enable search strings highlight on bubble layout ([\matrix-org#9032](matrix-org#9032)). Fixes element-hq/element-web#22786. Contributed by @luixxiul. * Unbreak URL preview for formatted links with tooltips ([\matrix-org#9022](matrix-org#9022)). Fixes element-hq/element-web#22764. * Re-add margin to tiles based on EventTileBubble ([\matrix-org#9015](matrix-org#9015)). Fixes element-hq/element-web#22772. Contributed by @luixxiul. * Fix Shortcut prompt for Search showing in minimized Roomlist ([\matrix-org#9014](matrix-org#9014)). Fixes element-hq/element-web#22739. Contributed by @justjanne. * Fix avatar position on event info line for hidden events on a thread ([\matrix-org#9019](matrix-org#9019)). Fixes element-hq/element-web#22777. Contributed by @luixxiul. * Fix lost padding of event tile info line ([\matrix-org#9009](matrix-org#9009)). Fixes element-hq/element-web#22754 and element-hq/element-web#22759. Contributed by @luixxiul. * Align verification bubble with normal event tiles on IRC layout ([\matrix-org#9001](matrix-org#9001)). Fixes element-hq/element-web#22758. Contributed by @luixxiul. * Ensure timestamp on generic event list summary is not hidden from TimelineCard ([\matrix-org#9000](matrix-org#9000)). Fixes element-hq/element-web#22755. Contributed by @luixxiul. * Fix headings margin on security user settings tab ([\matrix-org#8826](matrix-org#8826)). Contributed by @luixxiul. * Fix timestamp position on file panel ([\matrix-org#8976](matrix-org#8976)). Fixes element-hq/element-web#22718. Contributed by @luixxiul. * Stop using :not() pseudo class for mx_GenericEventListSummary ([\matrix-org#8944](matrix-org#8944)). Fixes element-hq/element-web#22602. Contributed by @luixxiul. * Don't show the same user twice in Spotlight ([\matrix-org#8978](matrix-org#8978)). Fixes element-hq/element-web#22697. * Align the right edge of expand / collapse link buttons of generic event list summary in bubble layout with a variable ([\matrix-org#8992](matrix-org#8992)). Fixes element-hq/element-web#22743. Contributed by @luixxiul. * Display own avatars on search results panel in bubble layout ([\matrix-org#8990](matrix-org#8990)). Contributed by @luixxiul. * Fix text flow of thread summary content on threads list ([\matrix-org#8991](matrix-org#8991)). Fixes element-hq/element-web#22738. Contributed by @luixxiul. * Fix the size of the clickable area of images ([\matrix-org#8987](matrix-org#8987)). Fixes element-hq/element-web#22282. * Fix font size of MessageTimestamp on TimelineCard ([\matrix-org#8950](matrix-org#8950)). Contributed by @luixxiul. * Improve security room settings tab style rules ([\matrix-org#8844](matrix-org#8844)). Fixes element-hq/element-web#22575. Contributed by @luixxiul. * Align E2E icon and avatar of info tile in compact modern layout ([\matrix-org#8965](matrix-org#8965)). Fixes element-hq/element-web#22652. Contributed by @luixxiul. * Fix clickable area of general event list summary toggle ([\matrix-org#8979](matrix-org#8979)). Fixes element-hq/element-web#22722. Contributed by @luixxiul. * Fix resizing room topic ([\matrix-org#8966](matrix-org#8966)). Fixes element-hq/element-web#22689. * Dismiss the search dialogue when starting a DM ([\matrix-org#8967](matrix-org#8967)). Fixes element-hq/element-web#22700. * Fix "greyed out" text style inconsistency on search result panel ([\matrix-org#8974](matrix-org#8974)). Contributed by @luixxiul. * Add top padding to EventTilePreview loader ([\matrix-org#8977](matrix-org#8977)). Fixes element-hq/element-web#22719. Contributed by @luixxiul. * Fix read receipts group position on TimelineCard in compact modern/group layout ([\matrix-org#8971](matrix-org#8971)). Fixes element-hq/element-web#22715. Contributed by @luixxiul. * Fix calls on homeservers without the unstable thirdparty endpoints. ([\matrix-org#8931](matrix-org#8931)). Fixes element-hq/element-web#21680. Contributed by @deepbluev7. * Enable ReplyChain text to be expanded on IRC layout ([\matrix-org#8959](matrix-org#8959)). Fixes element-hq/element-web#22709. Contributed by @luixxiul. * Fix hidden timestamp on message edit history dialog ([\matrix-org#8955](matrix-org#8955)). Fixes element-hq/element-web#22701. Contributed by @luixxiul. * Enable ReplyChain text to be expanded on bubble layout ([\matrix-org#8958](matrix-org#8958)). Fixes element-hq/element-web#22709. Contributed by @luixxiul. * Fix expand/collapse state wrong in metaspaces ([\matrix-org#8952](matrix-org#8952)). Fixes element-hq/element-web#22632. * Location (live) share replies now provide a fallback content ([\matrix-org#8949](matrix-org#8949)). * Fix space settings not opening for script-created spaces ([\matrix-org#8957](matrix-org#8957)). Fixes element-hq/element-web#22703. * Respect `filename` field on `m.file` events ([\matrix-org#8951](matrix-org#8951)). * Fix PlatformSettingsHandler always returning true due to returning a Promise ([\matrix-org#8954](matrix-org#8954)). Fixes element-hq/element-web#22616. * Improve high-contrast support for spotlight ([\matrix-org#8948](matrix-org#8948)). Fixes element-hq/element-web#22481. Contributed by @justjanne. * Fix wrong assertions that all media events have a mimetype ([\matrix-org#8946](matrix-org#8946)). Fixes matrix-org/element-web-rageshakes#13727. * Make invite dialogue fixed height ([\matrix-org#8934](matrix-org#8934)). Fixes element-hq/element-web#22659. * Fix all megolm error reported as unknown ([\matrix-org#8916](matrix-org#8916)). * Remove line-height declarations from _ReplyTile.scss ([\matrix-org#8932](matrix-org#8932)). Fixes element-hq/element-web#22687. Contributed by @luixxiul. * Reduce video rooms log spam ([\matrix-org#8913](matrix-org#8913)). * Correct new search input’s rounded corners ([\matrix-org#8921](matrix-org#8921)). Fixes element-hq/element-web#22576. Contributed by @justjanne. * Align unread notification dot on threads list in compact modern=group layout ([\matrix-org#8911](matrix-org#8911)). Fixes element-hq/element-web#22677. Contributed by @luixxiul.
SchildiChat · Aug 1, 2022 · 602c09e · 602c09e
2 parents 8cd42a0 + dc3d659
commit 602c09e
Show file tree

Hide file tree

Showing 282 changed files with 6,190 additions and 3,480 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,81 @@
+Changes in [3.49.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.49.0) (2022-07-26)
+=====================================================================================================
+
+## ✨ Features
+ * Hide screenshare button in video rooms on Desktop ([\#9045](https://github.com/matrix-org/matrix-react-sdk/pull/9045)).
+ * Add a developer command to reset Megolm and Olm sessions ([\#9044](https://github.com/matrix-org/matrix-react-sdk/pull/9044)).
+ * add spaces to TileErrorBoundary ([\#9012](https://github.com/matrix-org/matrix-react-sdk/pull/9012)). Contributed by @HarHarLinks.
+ * Location sharing - add localised strings to map ([\#9025](https://github.com/matrix-org/matrix-react-sdk/pull/9025)). Fixes vector-im/element-web#21443. Contributed by @kerryarchibald.
+ * Added trim to ignore whitespaces in email check ([\#9027](https://github.com/matrix-org/matrix-react-sdk/pull/9027)). Contributed by @ankur12-1610.
+ * Improve _GenericEventListSummary.scss ([\#9005](https://github.com/matrix-org/matrix-react-sdk/pull/9005)). Contributed by @luixxiul.
+ * Live location share - tiles without tile server (PSG-591) ([\#8962](https://github.com/matrix-org/matrix-react-sdk/pull/8962)). Contributed by @kerryarchibald.
+ * Add option to display tooltip on link hover ([\#8394](https://github.com/matrix-org/matrix-react-sdk/pull/8394)). Fixes vector-im/element-web#21907.
+ * Support a module API surface for custom functionality ([\#8246](https://github.com/matrix-org/matrix-react-sdk/pull/8246)).
+ * Adjust encryption copy when creating a video room ([\#8989](https://github.com/matrix-org/matrix-react-sdk/pull/8989)). Fixes vector-im/element-web#22737.
+ * Add bidirectonal isolation for pills ([\#8985](https://github.com/matrix-org/matrix-react-sdk/pull/8985)). Contributed by @sha-265.
+ * Delabs `Show current avatar and name for users in message history` ([\#8764](https://github.com/matrix-org/matrix-react-sdk/pull/8764)). Fixes vector-im/element-web#22336.
+ * Live location share - open latest location in map site ([\#8981](https://github.com/matrix-org/matrix-react-sdk/pull/8981)). Contributed by @kerryarchibald.
+ * Improve LinkPreviewWidget ([\#8881](https://github.com/matrix-org/matrix-react-sdk/pull/8881)). Fixes vector-im/element-web#22634. Contributed by @luixxiul.
+ * Render HTML topics in rooms on space home ([\#8939](https://github.com/matrix-org/matrix-react-sdk/pull/8939)).
+ * Hide timestamp on event tiles being edited on every layout ([\#8956](https://github.com/matrix-org/matrix-react-sdk/pull/8956)). Contributed by @luixxiul.
+ * Introduce new copy icon ([\#8942](https://github.com/matrix-org/matrix-react-sdk/pull/8942)).
+ * Allow finding group DMs by members in spotlight ([\#8922](https://github.com/matrix-org/matrix-react-sdk/pull/8922)). Fixes vector-im/element-web#22564. Contributed by @justjanne.
+ * Live location share - explicitly stop beacons replaced beacons ([\#8933](https://github.com/matrix-org/matrix-react-sdk/pull/8933)). Contributed by @kerryarchibald.
+ * Remove unpin from widget kebab menu ([\#8924](https://github.com/matrix-org/matrix-react-sdk/pull/8924)).
+ * Live location share - redact related locations on beacon redaction ([\#8926](https://github.com/matrix-org/matrix-react-sdk/pull/8926)). Contributed by @kerryarchibald.
+ * Live location share - disallow message pinning ([\#8928](https://github.com/matrix-org/matrix-react-sdk/pull/8928)). Contributed by @kerryarchibald.
+
+## 🐛 Bug Fixes
+ * Unbreak in-app permalink tooltips  ([\#9100](https://github.com/matrix-org/matrix-react-sdk/pull/9100)).
+ * Add space for the stroke on message editor on IRC layout ([\#9030](https://github.com/matrix-org/matrix-react-sdk/pull/9030)). Fixes vector-im/element-web#22785. Contributed by @luixxiul.
+ * Fix pinned messages not re-linkifying on edit ([\#9042](https://github.com/matrix-org/matrix-react-sdk/pull/9042)). Fixes vector-im/element-web#22726.
+ * Don't unnecessarily persist the host signup dialog ([\#9043](https://github.com/matrix-org/matrix-react-sdk/pull/9043)). Fixes vector-im/element-web#22778.
+ * Fix URL previews causing messages to become unrenderable ([\#9028](https://github.com/matrix-org/matrix-react-sdk/pull/9028)). Fixes vector-im/element-web#22766.
+ * Fix event list summaries including invalid events ([\#9041](https://github.com/matrix-org/matrix-react-sdk/pull/9041)). Fixes vector-im/element-web#22790.
+ * Correct accessibility labels for unread rooms in spotlight ([\#9003](https://github.com/matrix-org/matrix-react-sdk/pull/9003)). Contributed by @justjanne.
+ * Enable search strings highlight on bubble layout ([\#9032](https://github.com/matrix-org/matrix-react-sdk/pull/9032)). Fixes vector-im/element-web#22786. Contributed by @luixxiul.
+ * Unbreak URL preview for formatted links with tooltips ([\#9022](https://github.com/matrix-org/matrix-react-sdk/pull/9022)). Fixes vector-im/element-web#22764.
+ * Re-add margin to tiles based on EventTileBubble ([\#9015](https://github.com/matrix-org/matrix-react-sdk/pull/9015)). Fixes vector-im/element-web#22772. Contributed by @luixxiul.
+ * Fix Shortcut prompt for Search showing in minimized Roomlist ([\#9014](https://github.com/matrix-org/matrix-react-sdk/pull/9014)). Fixes vector-im/element-web#22739. Contributed by @justjanne.
+ * Fix avatar position on event info line for hidden events on a thread ([\#9019](https://github.com/matrix-org/matrix-react-sdk/pull/9019)). Fixes vector-im/element-web#22777. Contributed by @luixxiul.
+ * Fix lost padding of event tile info line ([\#9009](https://github.com/matrix-org/matrix-react-sdk/pull/9009)). Fixes vector-im/element-web#22754 and vector-im/element-web#22759. Contributed by @luixxiul.
+ * Align verification bubble with normal event tiles on IRC layout ([\#9001](https://github.com/matrix-org/matrix-react-sdk/pull/9001)). Fixes vector-im/element-web#22758. Contributed by @luixxiul.
+ * Ensure timestamp on generic event list summary is not hidden from TimelineCard ([\#9000](https://github.com/matrix-org/matrix-react-sdk/pull/9000)). Fixes vector-im/element-web#22755. Contributed by @luixxiul.
+ * Fix headings margin on security user settings tab ([\#8826](https://github.com/matrix-org/matrix-react-sdk/pull/8826)). Contributed by @luixxiul.
+ * Fix timestamp position on file panel ([\#8976](https://github.com/matrix-org/matrix-react-sdk/pull/8976)). Fixes vector-im/element-web#22718. Contributed by @luixxiul.
+ * Stop using :not() pseudo class for mx_GenericEventListSummary ([\#8944](https://github.com/matrix-org/matrix-react-sdk/pull/8944)). Fixes vector-im/element-web#22602. Contributed by @luixxiul.
+ * Don't show the same user twice in Spotlight ([\#8978](https://github.com/matrix-org/matrix-react-sdk/pull/8978)). Fixes vector-im/element-web#22697.
+ * Align the right edge of expand / collapse link buttons of generic event list summary in bubble layout with a variable ([\#8992](https://github.com/matrix-org/matrix-react-sdk/pull/8992)). Fixes vector-im/element-web#22743. Contributed by @luixxiul.
+ * Display own avatars on search results panel in bubble layout ([\#8990](https://github.com/matrix-org/matrix-react-sdk/pull/8990)). Contributed by @luixxiul.
+ * Fix text flow of thread summary content on threads list ([\#8991](https://github.com/matrix-org/matrix-react-sdk/pull/8991)). Fixes vector-im/element-web#22738. Contributed by @luixxiul.
+ * Fix the size of the clickable area of images ([\#8987](https://github.com/matrix-org/matrix-react-sdk/pull/8987)). Fixes vector-im/element-web#22282.
+ * Fix font size of MessageTimestamp on TimelineCard ([\#8950](https://github.com/matrix-org/matrix-react-sdk/pull/8950)). Contributed by @luixxiul.
+ * Improve security room settings tab style rules ([\#8844](https://github.com/matrix-org/matrix-react-sdk/pull/8844)). Fixes vector-im/element-web#22575. Contributed by @luixxiul.
+ * Align E2E icon and avatar of info tile in compact modern layout ([\#8965](https://github.com/matrix-org/matrix-react-sdk/pull/8965)). Fixes vector-im/element-web#22652. Contributed by @luixxiul.
+ * Fix clickable area of general event list summary toggle ([\#8979](https://github.com/matrix-org/matrix-react-sdk/pull/8979)). Fixes vector-im/element-web#22722. Contributed by @luixxiul.
+ * Fix resizing room topic ([\#8966](https://github.com/matrix-org/matrix-react-sdk/pull/8966)). Fixes vector-im/element-web#22689.
+ * Dismiss the search dialogue when starting a DM ([\#8967](https://github.com/matrix-org/matrix-react-sdk/pull/8967)). Fixes vector-im/element-web#22700.
+ * Fix "greyed out" text style inconsistency on search result panel ([\#8974](https://github.com/matrix-org/matrix-react-sdk/pull/8974)). Contributed by @luixxiul.
+ * Add top padding to EventTilePreview loader ([\#8977](https://github.com/matrix-org/matrix-react-sdk/pull/8977)). Fixes vector-im/element-web#22719. Contributed by @luixxiul.
+ * Fix read receipts group position on TimelineCard in compact modern/group layout ([\#8971](https://github.com/matrix-org/matrix-react-sdk/pull/8971)). Fixes vector-im/element-web#22715. Contributed by @luixxiul.
+ * Fix calls on homeservers without the unstable thirdparty endpoints. ([\#8931](https://github.com/matrix-org/matrix-react-sdk/pull/8931)). Fixes vector-im/element-web#21680. Contributed by @deepbluev7.
+ * Enable ReplyChain text to be expanded on IRC layout ([\#8959](https://github.com/matrix-org/matrix-react-sdk/pull/8959)). Fixes vector-im/element-web#22709. Contributed by @luixxiul.
+ * Fix hidden timestamp on message edit history dialog ([\#8955](https://github.com/matrix-org/matrix-react-sdk/pull/8955)). Fixes vector-im/element-web#22701. Contributed by @luixxiul.
+ * Enable ReplyChain text to be expanded on bubble layout ([\#8958](https://github.com/matrix-org/matrix-react-sdk/pull/8958)). Fixes vector-im/element-web#22709. Contributed by @luixxiul.
+ * Fix expand/collapse state wrong in metaspaces ([\#8952](https://github.com/matrix-org/matrix-react-sdk/pull/8952)). Fixes vector-im/element-web#22632.
+ * Location (live) share replies now provide a fallback content ([\#8949](https://github.com/matrix-org/matrix-react-sdk/pull/8949)).
+ * Fix space settings not opening for script-created spaces ([\#8957](https://github.com/matrix-org/matrix-react-sdk/pull/8957)). Fixes vector-im/element-web#22703.
+ * Respect `filename` field on `m.file` events ([\#8951](https://github.com/matrix-org/matrix-react-sdk/pull/8951)).
+ * Fix PlatformSettingsHandler always returning true due to returning a Promise ([\#8954](https://github.com/matrix-org/matrix-react-sdk/pull/8954)). Fixes vector-im/element-web#22616.
+ * Improve high-contrast support for spotlight ([\#8948](https://github.com/matrix-org/matrix-react-sdk/pull/8948)). Fixes vector-im/element-web#22481. Contributed by @justjanne.
+ * Fix wrong assertions that all media events have a mimetype ([\#8946](https://github.com/matrix-org/matrix-react-sdk/pull/8946)). Fixes matrix-org/element-web-rageshakes#13727.
+ * Make invite dialogue fixed height ([\#8934](https://github.com/matrix-org/matrix-react-sdk/pull/8934)). Fixes vector-im/element-web#22659.
+ * Fix all megolm error reported as unknown ([\#8916](https://github.com/matrix-org/matrix-react-sdk/pull/8916)).
+ * Remove line-height declarations from _ReplyTile.scss ([\#8932](https://github.com/matrix-org/matrix-react-sdk/pull/8932)). Fixes vector-im/element-web#22687. Contributed by @luixxiul.
+ * Reduce video rooms log spam ([\#8913](https://github.com/matrix-org/matrix-react-sdk/pull/8913)).
+ * Correct new search input’s rounded corners ([\#8921](https://github.com/matrix-org/matrix-react-sdk/pull/8921)). Fixes vector-im/element-web#22576. Contributed by @justjanne.
+ * Align unread notification dot on threads list in compact modern=group layout ([\#8911](https://github.com/matrix-org/matrix-react-sdk/pull/8911)). Fixes vector-im/element-web#22677. Contributed by @luixxiul.
+
 Changes in [3.48.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.48.0) (2022-07-05)
 =====================================================================================================
 

diff --git a/README.md b/README.md
@@ -209,6 +209,6 @@ Now the yarn commands should work as normal.
 ### End-to-End tests
 
 Make sure you've got your Element development server running (by doing `yarn
-start` in element-web), and then in this project, run `yarn run e2etests`. See
-[`test/end-to-end-tests/README.md`](https://github.com/matrix-org/matrix-react-sdk/blob/develop/test/end-to-end-tests/README.md)
+start` in element-web), and then in this project, run `yarn run test:cypress`. See
+[`docs/cypress.md`](https://github.com/matrix-org/matrix-react-sdk/blob/develop/docs/cypress.md)
 for more information.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -0,0 +1,33 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+    videoUploadOnPasses: false,
+    projectId: 'ppvnzg',
+    experimentalInteractiveRunEvents: true,
+    defaultCommandTimeout: 10000,
+    chromeWebSecurity: false,
+    e2e: {
+        setupNodeEvents(on, config) {
+            return require('./cypress/plugins/index.ts').default(on, config);
+        },
+        baseUrl: 'http://localhost:8080',
+        experimentalSessionAndOrigin: true,
+        specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
+    },
+});
diff --git a/cypress.json b/cypress.json
diff --git a/...s/integration/1-register/register.spec.ts → cypress/e2e/1-register/register.spec.ts b/...s/integration/1-register/register.spec.ts → cypress/e2e/1-register/register.spec.ts
diff --git a/...ntegration/10-user-view/user-view.spec.ts → cypress/e2e/10-user-view/user-view.spec.ts b/...ntegration/10-user-view/user-view.spec.ts → cypress/e2e/10-user-view/user-view.spec.ts
@@ -27,7 +27,7 @@ describe("UserView", () => {
             synapse = data;
 
             cy.initTestUser(synapse, "Violet");
-            cy.getBot(synapse, "Usman").as("bot");
+            cy.getBot(synapse, { displayName: "Usman" }).as("bot");
         });
     });
 

diff --git a/.../11-room-directory/room-directory.spec.ts → .../11-room-directory/room-directory.spec.ts b/.../11-room-directory/room-directory.spec.ts → .../11-room-directory/room-directory.spec.ts
@@ -27,7 +27,7 @@ describe("Room Directory", () => {
             synapse = data;
 
             cy.initTestUser(synapse, "Ray");
-            cy.getBot(synapse, "Paul").as("bot");
+            cy.getBot(synapse, { displayName: "Paul" }).as("bot");
         });
     });
 

diff --git a/...ntegration/12-spotlight/spotlight.spec.ts → cypress/e2e/12-spotlight/spotlight.spec.ts b/...ntegration/12-spotlight/spotlight.spec.ts → cypress/e2e/12-spotlight/spotlight.spec.ts
@@ -55,6 +55,7 @@ declare global {
             roomHeaderName(
                 options?: Partial<Loggable & Timeoutable & Withinable & Shadow>
             ): Chainable<JQuery<HTMLElement>>;
+            startDM(name: string): Chainable<void>;
         }
     }
 }
@@ -109,6 +110,20 @@ Cypress.Commands.add("roomHeaderName", (
     return cy.get(".mx_RoomHeader_nametext", options);
 });
 
+Cypress.Commands.add("startDM", (name: string) => {
+    cy.openSpotlightDialog().within(() => {
+        cy.spotlightFilter(Filter.People);
+        cy.spotlightSearch().clear().type(name);
+        cy.get(".mx_Spinner").should("not.exist");
+        cy.spotlightResults().should("have.length", 1);
+        cy.spotlightResults().eq(0).should("contain", name);
+        cy.spotlightResults().eq(0).click();
+    }).then(() => {
+        cy.roomHeaderName().should("contain", name);
+        cy.get(".mx_RoomSublist[aria-label=People]").should("contain", name);
+    });
+});
+
 describe("Spotlight", () => {
     let synapse: SynapseInstance;
 
@@ -128,11 +143,11 @@ describe("Spotlight", () => {
         cy.startSynapse("default").then(data => {
             synapse = data;
             cy.initTestUser(synapse, "Jim").then(() =>
-                cy.getBot(synapse, bot1Name).then(_bot1 => {
+                cy.getBot(synapse, { displayName: bot1Name }).then(_bot1 => {
                     bot1 = _bot1;
                 }),
             ).then(() =>
-                cy.getBot(synapse, bot2Name).then(_bot2 => {
+                cy.getBot(synapse, { displayName: bot2Name }).then(_bot2 => {
                     // eslint-disable-next-line @typescript-eslint/no-unused-vars
                     bot2 = _bot2;
                 }),
@@ -156,6 +171,7 @@ describe("Spotlight", () => {
     });
 
     afterEach(() => {
+        cy.visit("/#/home");
         cy.stopSynapse(synapse);
     });
 
@@ -264,6 +280,47 @@ describe("Spotlight", () => {
         });
     });
 
+    it("should find group DMs by usernames or user ids", () => {
+        // First we want to share a room with both bots to ensure we’ve got their usernames cached
+        cy.inviteUser(room1Id, bot2.getUserId());
+
+        // Starting a DM with ByteBot (will be turned into a group dm later)
+        cy.openSpotlightDialog().within(() => {
+            cy.spotlightFilter(Filter.People);
+            cy.spotlightSearch().clear().type(bot2Name);
+            cy.spotlightResults().should("have.length", 1);
+            cy.spotlightResults().eq(0).should("contain", bot2Name);
+            cy.spotlightResults().eq(0).click();
+        }).then(() => {
+            cy.roomHeaderName().should("contain", bot2Name);
+            cy.get(".mx_RoomSublist[aria-label=People]").should("contain", bot2Name);
+        });
+
+        // Invite BotBob into existing DM with ByteBot
+        cy.getDmRooms(bot2.getUserId()).then(dmRooms => dmRooms[0])
+            .then(groupDmId => cy.inviteUser(groupDmId, bot1.getUserId()))
+            .then(() => {
+                cy.roomHeaderName().should("contain", `${bot1Name} and ${bot2Name}`);
+                cy.get(".mx_RoomSublist[aria-label=People]").should("contain", `${bot1Name} and ${bot2Name}`);
+            });
+
+        // Search for BotBob by id, should return group DM and user
+        cy.openSpotlightDialog().within(() => {
+            cy.spotlightFilter(Filter.People);
+            cy.spotlightSearch().clear().type(bot1.getUserId());
+            cy.spotlightResults().should("have.length", 2);
+            cy.spotlightResults().eq(0).should("contain", `${bot1Name} and ${bot2Name}`);
+        });
+
+        // Search for ByteBot by id, should return group DM and user
+        cy.openSpotlightDialog().within(() => {
+            cy.spotlightFilter(Filter.People);
+            cy.spotlightSearch().clear().type(bot2.getUserId());
+            cy.spotlightResults().should("have.length", 2);
+            cy.spotlightResults().eq(0).should("contain", `${bot1Name} and ${bot2Name}`);
+        });
+    });
+
     it("should allow opening group chat dialog", () => {
         cy.openSpotlightDialog().within(() => {
             cy.spotlightFilter(Filter.People);
@@ -277,6 +334,23 @@ describe("Spotlight", () => {
         });
     });
 
+    it("should close spotlight after starting a DM", () => {
+        cy.startDM(bot1Name);
+        cy.get(".mx_SpotlightDialog").should("have.length", 0);
+    });
+
+    it("should show the same user only once", () => {
+        cy.startDM(bot1Name);
+        cy.visit("/#/home");
+
+        cy.openSpotlightDialog().within(() => {
+            cy.spotlightFilter(Filter.People);
+            cy.spotlightSearch().clear().type(bot1Name);
+            cy.get(".mx_Spinner").should("not.exist");
+            cy.spotlightResults().should("have.length", 1);
+        });
+    });
+
     it("should be able to navigate results via keyboard", () => {
         cy.openSpotlightDialog().within(() => {
             cy.spotlightFilter(Filter.People);

diff --git a/...gression-tests/pills-click-in-app.spec.ts → ...gression-tests/pills-click-in-app.spec.ts b/...gression-tests/pills-click-in-app.spec.ts → ...gression-tests/pills-click-in-app.spec.ts