Skip to content

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Aug 13, 2025

Fixes the EW part of element-hq/element-meta#2874

There are two modes. First, when you are sending invites from the InviteDialog, the content of the dialog is replaced with a spinner. (Currently a small spinner appears at the top of the dialog but the contents are otherwise unchanged.) Screenshot:

image

Second, for modes of sending invites that don't involve the InviteDialog, we open a separate modal.

image

… open

... otherwise the `RoomUpgradeWarning` dialog disappears during the invites,
and the tests that assert that it is showing the correct thing fail.
 enter the commit message for your changes. Lines starting
@richvdh
Copy link
Member Author

richvdh commented Aug 15, 2025

@florianduros would you mind taking another look?

import InviteProgressBody from "./InviteProgressBody.tsx";

interface Props {
onFinished: () => void;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to have a comment here explaining that this is only added because Modal.createDialog expects this component to have this prop.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it's not needed at all. I'll get rid of it.

}

/** A Modal dialog that pops up while room invites are being sent. */
const InviteProgressDialog: React.FC<Props> = (props) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const InviteProgressDialog: React.FC<Props> = (props) => {
const InviteProgressDialog: React.FC<Props> = (_) => {

To make it clear that this is intentionally left unused.

@@ -0,0 +1,27 @@
/*
Copyright 2025 The Matrix.org Foundation C.I.C.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong license I think, newer test files have:

/*
 * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
 */

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What actually changed here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh, great question. Here's the diff:

image

Looks like a sub-pixel difference in some of the text.

@richvdh richvdh added this pull request to the merge queue Aug 22, 2025
Merged via the queue into develop with commit e8c8891 Aug 22, 2025
35 checks passed
@richvdh richvdh deleted the rav/invite_progress branch August 22, 2025 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants