From 09b5d25f86b5c3375c30cc0ffff059eb7f35b880 Mon Sep 17 00:00:00 2001 From: Pavel Drankov Date: Wed, 18 Sep 2024 00:05:21 +0300 Subject: [PATCH] releasef fixing profile icons + default bracket --- frontend/src/containers/Activity/index.tsx | 4 ++-- frontend/src/containers/Profile/PvpBrackets.tsx | 6 +++--- frontend/src/utils/urlparts.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/containers/Activity/index.tsx b/frontend/src/containers/Activity/index.tsx index a8cb6328..ca21faac 100644 --- a/frontend/src/containers/Activity/index.tsx +++ b/frontend/src/containers/Activity/index.tsx @@ -8,13 +8,13 @@ import Footer from '@/components/Footer'; import { REGION } from '@/constants/region'; import { BRACKETS } from '@/constants/pvp-activity'; -import { getActivityFromUrl } from '@/utils/urlparts'; +import { getActivityFromUrl, getBracket, getRegion } from '@/utils/urlparts'; import { capitalizeFirstLetter } from '@/utils/common'; import { fetchBracketActivity } from '@/services/stats.service'; import MClassLeaderboard from '../MClassLeaderboard'; function Activity() { - const { region = REGION.eu, bracket = BRACKETS["3v3"] } = useParams(); + const { region = getRegion(), bracket = getBracket() } = useParams(); const activity = getActivityFromUrl(); const [bracketActivity, setBracketActivity] = useState>(); diff --git a/frontend/src/containers/Profile/PvpBrackets.tsx b/frontend/src/containers/Profile/PvpBrackets.tsx index 381f45a4..8963ffea 100644 --- a/frontend/src/containers/Profile/PvpBrackets.tsx +++ b/frontend/src/containers/Profile/PvpBrackets.tsx @@ -67,13 +67,13 @@ const PvpBracket = ({
{specIcon ? ( -
+
{title} - {zoloName} + {zoloName}
) : ( {title} diff --git a/frontend/src/utils/urlparts.ts b/frontend/src/utils/urlparts.ts index e7523683..f42fddfb 100644 --- a/frontend/src/utils/urlparts.ts +++ b/frontend/src/utils/urlparts.ts @@ -4,7 +4,7 @@ import { REGION } from '../constants/region'; export function getBracket(bracket?: string) { const validBracket = Object.values(BRACKETS).find((r) => bracket === r); - return validBracket ?? BRACKETS['3v3']; + return validBracket ?? BRACKETS.shuffle; } export function getRegion(region?: string) { @@ -14,7 +14,7 @@ export function getRegion(region?: string) { export function getActivityFromUrl() { const splitx = window.location.pathname.split('/'); - return splitx.length >= 4 ? splitx[2] : 'ladder'; + return splitx.length >= 4 ? splitx[2] : 'activity'; } export function capitalizeNickname(nickname?: string) {