Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix send two join requests when joining a room from spotlight search #10534

Merged
merged 5 commits into from
Apr 6, 2023
Merged

Fix send two join requests when joining a room from spotlight search #10534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05fb6ee
Fix send two join requests when joining a room from spotlight search
weeman1337 Apr 6, 2023
4aa73ed
Merge branch 'develop' into weeman1337/fix-duplicated-join-request
weeman1337 Apr 6, 2023
5cdbb74
Merge branch 'develop' into weeman1337/fix-duplicated-join-request
weeman1337 Apr 6, 2023
d9c3abe
Trigger CI
weeman1337 Apr 6, 2023
c45d64e
Merge branch 'develop' into weeman1337/fix-duplicated-join-request
t3chguy Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/views/dialogs/spotlight/SpotlightDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021-2022 The Matrix.org Foundation C.I.C.
Copyright 2021 - 2023 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.
Expand Down Expand Up @@ -624,6 +624,8 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
clientRoom?.getMyMembership() === "join" || result.publicRoom.world_readable || cli.isGuest();

const listener = (ev: ButtonEvent): void => {
ev.stopPropagation();

const { publicRoom } = result;
viewRoom(
{
Expand Down
5 changes: 3 additions & 2 deletions test/components/views/dialogs/SpotlightDialog-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.
Copyright 2022 - 2023 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.
Expand Down Expand Up @@ -376,7 +376,8 @@ describe("Spotlight Dialog", () => {
expect(options.length).toBe(1);
expect(options[0].innerHTML).toContain(testPublicRoom.name);

fireEvent.click(options[0]!);
fireEvent.click(options[0].querySelector("[role='button']")!);
expect(defaultDispatcher.dispatch).toHaveBeenCalledTimes(1);
expect(defaultDispatcher.dispatch).toHaveBeenCalledWith(
expect.objectContaining({
action: "view_room",
Expand Down