fix: standard filter backup

WatWowMap · Jan 10, 2024 · 5a0cdf5 · 5a0cdf5
1 parent 32df5e9
commit 5a0cdf5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/layout/dialogs/filters/Advanced.jsx b/src/components/layout/dialogs/filters/Advanced.jsx
@@ -37,7 +37,9 @@ export default function AdvancedFilter() {
   const isMobile = useStatic((s) => s.isMobile)
   const legacyFilter = useStore((s) => !!s.userSettings[category]?.legacyFilter)
   const standard = useStatic((s) =>
-    category === 'pokemon' ? s.filters[category].standard : STANDARD_BACKUP,
+    category === 'pokemon'
+      ? s.filters[category]?.standard || STANDARD_BACKUP
+      : STANDARD_BACKUP,
   )
   const [filters, setFilters] = useDeepStore(
     `filters.${category}.filter.${id}`,

diff --git a/src/services/filtering/applyToAll.js b/src/services/filtering/applyToAll.js
@@ -28,8 +28,8 @@ export function applyToAll(
   const userFilters = localFilters.filter ?? {}
 
   const serverFilters = useStatic.getState().filters[category]
-  const staticFilters = serverFilters.filter ?? {}
-  const refFilter = serverFilters.standard ?? STANDARD_BACKUP
+  const staticFilters = serverFilters?.filter ?? {}
+  const refFilter = serverFilters?.standard ?? STANDARD_BACKUP
 
   const idSet = new Set(selectedIds ?? [])