simplify traders with barters

the-hideout · Feb 16, 2024 · dabe249 · dabe249
1 parent b7d7e02
commit dabe249
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/features/traders/do-fetch-traders.mjs b/src/features/traders/do-fetch-traders.mjs
@@ -25,6 +25,9 @@ export default async function doFetchTraders(language, prebuild = false) {
                 insuranceRate
                 repairCostMultiplier
             }
+            barters {
+                id
+            }
         }
     }`;
 

diff --git a/src/pages/barters/index.js b/src/pages/barters/index.js
@@ -19,7 +19,6 @@ import {
 import useStateWithLocalStorage from '../../hooks/useStateWithLocalStorage.jsx';
 
 import useTradersData from '../../features/traders/index.js';
-import useBartersData from '../../features/barters/index.js';
 import { toggleHideDogtagBarters } from '../../features/settings/settingsSlice.js';
 
 import './index.css';
@@ -47,7 +46,6 @@ function Barters() {
 
     const dispatch = useDispatch();
     const { data: allTraders } = useTradersData();
-    const { data: barters } = useBartersData();
 
     const { t } = useTranslation();
 
@@ -56,8 +54,8 @@ function Barters() {
     }, [searchParams]);
 
     const traders = useMemo(() => {
-        return allTraders.filter(trader => barters.some(b => b.trader.id === trader.id));
-    }, [allTraders, barters]);
+        return allTraders.filter(trader => trader.barters?.length);
+    }, [allTraders]);
 
     return [
         <SEO