rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Goodbye, aliases

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2023-08-11 13:25:09 +02:00
parent b2f5f90f37
commit c86ef40162
7 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/room/InCallView.tsx
View File

@@ -461,11 +461,7 @@ export function InCallView({
/>
)}
{inviteModalState.isOpen && (
<InviteModal
roomAlias={groupCall.room.getCanonicalAlias() ?? undefined}
roomId={groupCall.room.roomId}
{...inviteModalProps}
/>
<InviteModal roomId={groupCall.room.roomId} {...inviteModalProps} />
)}
</div>
);

5
src/room/InviteModal.tsx
View File

@@ -24,11 +24,10 @@ import styles from "./InviteModal.module.css";
import { useRoomSharedKey } from "../e2ee/sharedKeyManagement";
interface Props extends Omit<ModalProps, "title" | "children"> {
roomAlias?: string;
roomId: string;
}
export const InviteModal: FC<Props> = ({ roomAlias, roomId, ...rest }) => {
export const InviteModal: FC<Props> = ({ roomId, ...rest }) => {
const { t } = useTranslation();
const [roomSharedKey] = useRoomSharedKey(roomId);
@@ -43,7 +42,7 @@ export const InviteModal: FC<Props> = ({ roomAlias, roomId, ...rest }) => {
<p>{t("Copy and share this call link")}</p>
<CopyButton
className={styles.copyButton}
value={getRoomUrl(roomAlias ?? roomId, roomSharedKey ?? undefined)}
value={getRoomUrl(roomId, roomSharedKey ?? undefined)}
data-testid="modal_inviteLink"
/>
</ModalContent>

5
src/room/LobbyView.tsx
View File

@@ -82,10 +82,7 @@ export const LobbyView: FC<Props> = ({
<Body>Or</Body>
<CopyButton
variant="secondaryCopy"
value={getRoomUrl(
matrixInfo.roomAlias ?? matrixInfo.roomId,
roomSharedKey ?? undefined
)}
value={getRoomUrl(matrixInfo.roomId, roomSharedKey ?? undefined)}
className={styles.copyButton}
copiedMessage={t("Call link copied")}
data-testid="lobby_inviteLink"