From f5ed35a51a570f0bf68754ef4141c40c9b6d4233 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 3 Sep 2021 10:01:34 -0700 Subject: Fix memo usages --- modern/src/attributes/useDeviceAttributes.js | 4 ++-- modern/src/attributes/useGeofenceAttributes.js | 4 ++-- modern/src/attributes/usePositionAttributes.js | 4 ++-- modern/src/attributes/useUserAttributes.js | 4 ++-- modern/src/settings/OptionsLayout/useRoutes.js | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modern/src/attributes/useDeviceAttributes.js b/modern/src/attributes/useDeviceAttributes.js index 3321321..f33fc06 100644 --- a/modern/src/attributes/useDeviceAttributes.js +++ b/modern/src/attributes/useDeviceAttributes.js @@ -1,6 +1,6 @@ import { useMemo } from 'react'; -export default (t) => useMemo({ +export default (t) => useMemo(() => ({ speedLimit: { name: t('attributeSpeedLimit'), type: 'string', @@ -9,4 +9,4 @@ export default (t) => useMemo({ name: t('attributeReportIgnoreOdometer'), type: 'boolean', }, -}, [t]); +}), [t]); diff --git a/modern/src/attributes/useGeofenceAttributes.js b/modern/src/attributes/useGeofenceAttributes.js index 3c17755..89908aa 100644 --- a/modern/src/attributes/useGeofenceAttributes.js +++ b/modern/src/attributes/useGeofenceAttributes.js @@ -1,8 +1,8 @@ import { useMemo } from 'react'; -export default (t) => useMemo({ +export default (t) => useMemo(() => ({ speedLimit: { name: t('attributeSpeedLimit'), type: 'string', }, -}, [t]); +}), [t]); diff --git a/modern/src/attributes/usePositionAttributes.js b/modern/src/attributes/usePositionAttributes.js index 825ec36..7b33720 100644 --- a/modern/src/attributes/usePositionAttributes.js +++ b/modern/src/attributes/usePositionAttributes.js @@ -1,6 +1,6 @@ import { useMemo } from 'react'; -export default (t) => useMemo({ +export default (t) => useMemo(() => ({ raw: { name: t('positionRaw'), type: 'string', @@ -18,4 +18,4 @@ export default (t) => useMemo({ type: 'number', dataType: 'distance', }, -}, [t]); +}), [t]); diff --git a/modern/src/attributes/useUserAttributes.js b/modern/src/attributes/useUserAttributes.js index bf8c95a..61c6189 100644 --- a/modern/src/attributes/useUserAttributes.js +++ b/modern/src/attributes/useUserAttributes.js @@ -1,6 +1,6 @@ import { useMemo } from 'react'; -export default (t) => useMemo({ +export default (t) => useMemo(() => ({ notificationTokens: { name: t('attributeNotificationTokens'), type: 'string', @@ -65,4 +65,4 @@ export default (t) => useMemo({ name: t('sharedTimezone'), type: 'string', }, -}, [t]); +}), [t]); diff --git a/modern/src/settings/OptionsLayout/useRoutes.js b/modern/src/settings/OptionsLayout/useRoutes.js index b6ed75f..8be4ec3 100644 --- a/modern/src/settings/OptionsLayout/useRoutes.js +++ b/modern/src/settings/OptionsLayout/useRoutes.js @@ -11,7 +11,7 @@ import BarChartIcon from '@material-ui/icons/BarChart'; import { getIsAdmin, getUserId } from '../../common/selectors'; import { useTranslation } from '../../LocalizationProvider'; -const useAdminRoutes = (t) => useMemo([ +const useAdminRoutes = (t) => useMemo(() => [ { subheader: t('userAdmin') }, { name: t('settingsServer'), @@ -30,7 +30,7 @@ const useAdminRoutes = (t) => useMemo([ }, ], [t]); -const useMainRoutes = (t, userId) => useMemo([ +const useMainRoutes = (t, userId) => useMemo(() => [ { name: t('settingsUser'), href: `/user/${userId}`, @@ -84,6 +84,6 @@ export default () => { const adminRoutes = useAdminRoutes(t); return useMemo(() => [...mainRoutes, ...(isAdmin ? adminRoutes : [])], [ - isAdmin, + mainRoutes, isAdmin, adminRoutes, ]); }; -- cgit v1.2.3