From 03c369e164c6f741072929dad9465f74bded881b Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Wed, 1 Dec 2021 13:12:07 +0000 Subject: [PATCH] Hotfix: Make modify stat showcase button go straight to stat showcase --- .../users/games/_game/_playtype/UGPTSettingsPage.tsx | 7 ++++++- client/src/components/user/UGPTStatShowcase.tsx | 2 +- client/src/components/util/useQueryString.tsx | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx index cab960070..13bcbdc82 100644 --- a/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx +++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx @@ -6,6 +6,7 @@ import Divider from "components/util/Divider"; import Icon from "components/util/Icon"; import Muted from "components/util/Muted"; import SelectButton from "components/util/SelectButton"; +import useQueryString from "components/util/useQueryString"; import { UGPTSettingsContext } from "context/UGPTSettingsContext"; import deepmerge from "deepmerge"; import { useFormik } from "formik"; @@ -25,7 +26,11 @@ import { APIFetchV1 } from "util/api"; type Props = { reqUser: PublicUserDocument } & GamePT; export default function UGPTSettingsPage({ reqUser, game, playtype }: Props) { - const [page, setPage] = useState<"preferences" | "showcase">("preferences"); + const query = useQueryString(); + + const [page, setPage] = useState<"preferences" | "showcase">( + query.get("showcase") ? "showcase" : "preferences" + ); const gameConfig = GetGameConfig(game); useSetSubheader( diff --git a/client/src/components/user/UGPTStatShowcase.tsx b/client/src/components/user/UGPTStatShowcase.tsx index aa141fc6b..454972672 100644 --- a/client/src/components/user/UGPTStatShowcase.tsx +++ b/client/src/components/user/UGPTStatShowcase.tsx @@ -61,7 +61,7 @@ export default function UGPTStatShowcase({ type="edit" to={`/dashboard/users/${ user!.username - }/games/${game}/${playtype}/settings`} + }/games/${game}/${playtype}/settings?showcase=yea`} hoverText="Modify your statistics showcase." /> ) : null diff --git a/client/src/components/util/useQueryString.tsx b/client/src/components/util/useQueryString.tsx index fb0d46cb0..a5e02a606 100644 --- a/client/src/components/util/useQueryString.tsx +++ b/client/src/components/util/useQueryString.tsx @@ -2,7 +2,7 @@ import { useMemo } from "react"; import { useLocation } from "react-router-dom"; export default function useQueryString() { - const { search } = useLocation<{ code?: string }>(); + const { search } = useLocation(); return useMemo(() => new URLSearchParams(search), [search]); }