diff --git a/src/home/RegisteredView.jsx b/src/home/RegisteredView.jsx index 9ef5b2a..0480050 100644 --- a/src/home/RegisteredView.jsx +++ b/src/home/RegisteredView.jsx @@ -13,12 +13,13 @@ import { JoinExistingCallModal } from "./JoinExistingCallModal"; import { useHistory } from "react-router-dom"; import { Headline, Title } from "../typography/Typography"; import { Form } from "../form/Form"; -import { shouldShowPtt } from "../shouldShowPtt"; +import { useShouldShowPtt } from "../useShouldShowPtt"; export function RegisteredView({ client }) { const [loading, setLoading] = useState(false); const [error, setError] = useState(); const history = useHistory(); + const shouldShowPtt = useShouldShowPtt(); const onSubmit = useCallback( (e) => { e.preventDefault(); @@ -99,14 +100,16 @@ export function RegisteredView({ client }) { {loading ? "Loading..." : "Go"} - {shouldShowPtt() && - - } + {shouldShowPtt && ( + + + + )} {error && ( {error.message} diff --git a/src/home/UnauthenticatedView.jsx b/src/home/UnauthenticatedView.jsx index 005dc73..8243510 100644 --- a/src/home/UnauthenticatedView.jsx +++ b/src/home/UnauthenticatedView.jsx @@ -15,9 +15,10 @@ import { Form } from "../form/Form"; import styles from "./UnauthenticatedView.module.css"; import commonStyles from "./common.module.css"; import { generateRandomName } from "../auth/generateRandomName"; -import { shouldShowPtt } from "../shouldShowPtt"; +import { useShouldShowPtt } from "../useShouldShowPtt"; export function UnauthenticatedView() { + const shouldShowPtt = useShouldShowPtt(); const [loading, setLoading] = useState(false); const [error, setError] = useState(); const [{ privacyPolicyUrl, recaptchaKey }, register] = @@ -113,14 +114,16 @@ export function UnauthenticatedView() { autoComplete="off" /> - {shouldShowPtt() && - - } + {shouldShowPtt && ( + + + + )} By clicking "Go", you agree to our{" "} Terms and conditions diff --git a/src/shouldShowPtt.js b/src/shouldShowPtt.js deleted file mode 100644 index a1b68e5..0000000 --- a/src/shouldShowPtt.js +++ /dev/null @@ -1,3 +0,0 @@ -export function shouldShowPtt() { - return window.location.hash.startsWith('#ptt'); -} \ No newline at end of file diff --git a/src/useShouldShowPtt.js b/src/useShouldShowPtt.js new file mode 100644 index 0000000..606a689 --- /dev/null +++ b/src/useShouldShowPtt.js @@ -0,0 +1,6 @@ +import { useLocation } from "react-router-dom"; + +export function useShouldShowPtt() { + const { hash } = useLocation(); + return hash.startsWith("#ptt"); +}