Fix more conflicting dependencies

This commit is contained in:
Darren Clarke 2023-05-25 14:36:08 +00:00
parent 291395f8d3
commit 3ca903cf4f
11 changed files with 300 additions and 364 deletions

View file

@ -2,7 +2,7 @@ import { FC, useEffect, useState } from "react";
import { Admin, Resource } from "react-admin";
import { useApolloClient } from "@apollo/client";
import polyglotI18nProvider from "ra-i18n-polyglot";
import { ThemeProvider, createMuiTheme } from "@mui/material/styles";
import { ThemeProvider, createTheme } from "@mui/material";
import { metamigoDataProvider } from "../lib/dataprovider";
import { theme } from "./layout/themes";
import { Layout } from "./layout";
@ -18,12 +18,16 @@ import voiceProviders from "./voice/providers";
import webhooks from "./webhooks";
import { AdminLogin, authProvider } from "./AdminLogin";
const i18nProvider = polyglotI18nProvider((_locale) => englishMessages, "en");
const i18nProvider = polyglotI18nProvider(
(_locale: any) => englishMessages,
"en"
);
const MetamigoAdmin: FC = () => {
// eslint-disable-next-line unicorn/no-null
const [dataProvider, setDataProvider] = useState(null);
const client = useApolloClient();
const muiTheme = createTheme(theme);
useEffect(() => {
(async () => {
@ -34,7 +38,7 @@ const MetamigoAdmin: FC = () => {
}, [client]);
return (
dataProvider && (
<ThemeProvider theme={createMuiTheme(theme)}>
<ThemeProvider theme={muiTheme}>
<Admin
disableTelemetry
dataProvider={dataProvider}