5 files changed, 11 insertions, 11 deletions
diff --git a/modern/src/attributes/useDeviceAttributes.js b/modern/src/attributes/useDeviceAttributes.js
index 33213212..f33fc065 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 3c17755e..89908aa5 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 825ec363..7b33720a 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 bf8c95af..61c61899 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 b6ed75fa..8be4ec30 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,
   ]);
 };