Skip to content

Commit

Permalink
Merge pull request #59 from superhero-com/features/sync-code
Browse files Browse the repository at this point in the history
fix: invite dialog
  • Loading branch information
ifaouibadi authored Feb 15, 2024
2 parents cb9f3e2 + 5914c7f commit 1b560bb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/pull_request.yaml

This file was deleted.

8 changes: 1 addition & 7 deletions src/components/views/dialogs/InviteDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { _t, _td } from "matrix-react-sdk/src/languageHandler";
import { MatrixClientPeg } from "matrix-react-sdk/src/MatrixClientPeg";
import { makeRoomPermalink, makeUserPermalink } from "matrix-react-sdk/src/utils/permalinks/Permalinks";
import DMRoomMap from "matrix-react-sdk/src/utils/DMRoomMap";
import SdkConfig from "matrix-react-sdk/src/SdkConfig";
import * as Email from "matrix-react-sdk/src/email";
import {
getDefaultIdentityServerUrl,
Expand Down Expand Up @@ -379,9 +378,6 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
this.profilesStore = SdkContextClass.instance.userProfilesStore;

const excludedIds = new Set([MatrixClientPeg.safeGet().getUserId()!]);
const welcomeUserId = SdkConfig.get("welcome_user_id");
if (welcomeUserId) excludedIds.add(welcomeUserId);

if (isRoomInvite(props)) {
const room = MatrixClientPeg.safeGet().getRoom(props.roomId);
const isFederated = room?.currentState.getStateEvents(EventType.RoomCreate, "")?.getContent()["m.federate"];
Expand Down Expand Up @@ -1346,9 +1342,7 @@ export default class InviteDialog extends React.PureComponent<Props, IInviteDial
footer = (
<div className="mx_InviteDialog_footer">
<h3>{_t("invite|send_link_prompt")}</h3>
<CopyableText
getTextToCopy={(): string => makeUserPermalink(MatrixClientPeg.safeGet().getSafeUserId())}
>
<CopyableText getTextToCopy={() => makeUserPermalink(MatrixClientPeg.safeGet().getSafeUserId())}>
<a className="mx_InviteDialog_footer_link" href={link} onClick={this.onLinkClick}>
{link}
</a>
Expand Down

0 comments on commit 1b560bb

Please sign in to comment.