From a959436ac7ae27da049e58b8fe0b170a88e2f9b6 Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 27 Sep 2023 15:17:04 -0400 Subject: [PATCH] Change wording from 'share' to 'invite' This was updated in the designs. --- .../{ShareButton.tsx => InviteButton.tsx} | 4 ++-- src/room/GroupCallView.tsx | 18 +++++++++--------- src/room/InCallView.tsx | 4 ++-- ...Modal.module.css => InviteModal.module.css} | 0 src/room/{ShareModal.tsx => InviteModal.tsx} | 6 +++--- src/room/LobbyView.tsx | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) rename src/button/{ShareButton.tsx => InviteButton.tsx} (95%) rename src/room/{ShareModal.module.css => InviteModal.module.css} (100%) rename src/room/{ShareModal.tsx => InviteModal.tsx} (87%) diff --git a/src/button/ShareButton.tsx b/src/button/InviteButton.tsx similarity index 95% rename from src/button/ShareButton.tsx rename to src/button/InviteButton.tsx index 2f7f1334..158b3297 100644 --- a/src/button/ShareButton.tsx +++ b/src/button/InviteButton.tsx @@ -19,13 +19,13 @@ import { Button } from "@vector-im/compound-web"; import { useTranslation } from "react-i18next"; import { ReactComponent as UserAddSolidIcon } from "@vector-im/compound-design-tokens/icons/user-add-solid.svg"; -export const ShareButton: FC< +export const InviteButton: FC< Omit, "children"> > = (props) => { const { t } = useTranslation(); return ( ); }; diff --git a/src/room/GroupCallView.tsx b/src/room/GroupCallView.tsx index ab96926a..de4b1ed4 100644 --- a/src/room/GroupCallView.tsx +++ b/src/room/GroupCallView.tsx @@ -47,7 +47,7 @@ import { useEnableE2EE } from "../settings/useSetting"; import { useRoomAvatar } from "./useRoomAvatar"; import { useRoomName } from "./useRoomName"; import { useJoinRule } from "./useJoinRule"; -import { ShareModal } from "./ShareModal"; +import { InviteModal } from "./InviteModal"; declare global { interface Window { @@ -274,15 +274,15 @@ export function GroupCallView({ const joinRule = useJoinRule(rtcSession.room); - const [shareModalOpen, setShareModalOpen] = useState(false); - const onDismissShareModal = useCallback( - () => setShareModalOpen(false), - [setShareModalOpen] + const [shareModalOpen, setInviteModalOpen] = useState(false); + const onDismissInviteModal = useCallback( + () => setInviteModalOpen(false), + [setInviteModalOpen] ); const onShareClickFn = useCallback( - () => setShareModalOpen(true), - [setShareModalOpen] + () => setInviteModalOpen(true), + [setInviteModalOpen] ); const onShareClick = joinRule === JoinRule.Public ? onShareClickFn : null; @@ -325,10 +325,10 @@ export function GroupCallView({ } const shareModal = ( - ); diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx index 313cc42f..06191f6c 100644 --- a/src/room/InCallView.tsx +++ b/src/room/InCallView.tsx @@ -69,7 +69,7 @@ import { useWakeLock } from "../useWakeLock"; import { useMergedRefs } from "../useMergedRefs"; import { MuteStates } from "./MuteStates"; import { MatrixInfo } from "./VideoPreview"; -import { ShareButton } from "../button/ShareButton"; +import { InviteButton } from "../button/InviteButton"; import { LayoutToggle } from "./LayoutToggle"; import { ECAddonConnectionState, @@ -417,7 +417,7 @@ export function InCallView({ {!reducedControls && onShareClick !== null && ( - + )} diff --git a/src/room/ShareModal.module.css b/src/room/InviteModal.module.css similarity index 100% rename from src/room/ShareModal.module.css rename to src/room/InviteModal.module.css diff --git a/src/room/ShareModal.tsx b/src/room/InviteModal.tsx similarity index 87% rename from src/room/ShareModal.tsx rename to src/room/InviteModal.tsx index 0439f10a..6a04e2ef 100644 --- a/src/room/ShareModal.tsx +++ b/src/room/InviteModal.tsx @@ -21,7 +21,7 @@ import { Room } from "matrix-js-sdk"; import { Modal } from "../Modal"; import { CopyButton } from "../button"; import { getAbsoluteRoomUrl } from "../matrix-utils"; -import styles from "./ShareModal.module.css"; +import styles from "./InviteModal.module.css"; import { useRoomSharedKey } from "../e2ee/sharedKeyManagement"; interface Props { @@ -30,12 +30,12 @@ interface Props { onDismiss: () => void; } -export const ShareModal: FC = ({ room, open, onDismiss }) => { +export const InviteModal: FC = ({ room, open, onDismiss }) => { const { t } = useTranslation(); const roomSharedKey = useRoomSharedKey(room.roomId); return ( - +

{t("Copy and share this call link")}

= ({ /> - {onShareClick !== null && } + {onShareClick !== null && } )}