diff --git a/packages/website/src/components/TankSearch/components/FilterControl.tsx b/packages/website/src/components/TankSearch/components/FilterControl.tsx index ac7bde3b8..41400d365 100644 --- a/packages/website/src/components/TankSearch/components/FilterControl.tsx +++ b/packages/website/src/components/TankSearch/components/FilterControl.tsx @@ -789,6 +789,7 @@ function OwnershipFilterInternal(props: FlexProps) { onClick={() => { TankFilters.mutate((draft) => { draft.showOwned = !draft.showOwned; + if (draft.showOwned) draft.showUnowned = false; }); }} > @@ -808,6 +809,7 @@ function OwnershipFilterInternal(props: FlexProps) { onClick={() => { TankFilters.mutate((draft) => { draft.showUnowned = !draft.showUnowned; + if (draft.showUnowned) draft.showOwned = false; }); }} > @@ -834,6 +836,7 @@ function TestFilter() { onClick={() => { TankFilters.mutate((draft) => { draft.showNonTesting = !draft.showNonTesting; + if (draft.showNonTesting) draft.showTesting = false; }); }} > @@ -854,6 +857,7 @@ function TestFilter() { onClick={() => { TankFilters.mutate((draft) => { draft.showTesting = !draft.showTesting; + if (draft.showTesting) draft.showNonTesting = false; }); }} > diff --git a/packages/website/src/core/blitzkit/filterTank.ts b/packages/website/src/core/blitzkit/filterTank.ts index 91c808b56..48fc41a34 100644 --- a/packages/website/src/core/blitzkit/filterTank.ts +++ b/packages/website/src/core/blitzkit/filterTank.ts @@ -16,13 +16,15 @@ export async function filterTank( owned: number[] = [], ) { return ( - ((filters.showOwned && owned.includes(tank.id)) || + ((!filters.showOwned && !filters.showUnowned) || + (filters.showOwned && owned.includes(tank.id)) || (filters.showUnowned && !owned.includes(tank.id))) && (filters.tiers.length === 0 || filters.tiers.includes(tank.tier)) && (filters.nations.length === 0 || filters.nations.includes(tank.nation)) && (filters.classes.length === 0 || filters.classes.includes(tank.class)) && (filters.types.length === 0 || filters.types.includes(tank.type)) && - ((filters.showTesting && tank.testing) || + ((!filters.showTesting && !filters.showNonTesting) || + (filters.showTesting && tank.testing) || (filters.showNonTesting && !tank.testing)) && (filters.gunType.length === 0 || (filters.gunType.includes("regular") && diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx index 04e090b26..9d6d906db 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/playlist/_index.tsx @@ -17,7 +17,10 @@ export function Page({ }: Props & MaybeSkeletonComponentProps) { const generated = Playlist.use((state) => state.list !== undefined); - if (App.state.logins.wargaming) TankFilters.state.showUnowned = false; + if (App.state.logins.wargaming) { + TankFilters.state.showOwned = true; + TankFilters.state.showUnowned = false; + } return ( diff --git a/packages/website/src/stores/tankFilters.ts b/packages/website/src/stores/tankFilters.ts index 7d1c1dcdb..438d327ae 100644 --- a/packages/website/src/stores/tankFilters.ts +++ b/packages/website/src/stores/tankFilters.ts @@ -46,8 +46,8 @@ export const TankFilters = new Varuna({ abilities: [], powers: [], - showTesting: true, - showNonTesting: true, - showOwned: true, - showUnowned: true, + showTesting: false, + showNonTesting: false, + showOwned: false, + showUnowned: false, });