Merge branch 'develop' of https://github.com/AntlerVC/firetable into develop

This commit is contained in:
Shams mosowi
2020-11-25 17:29:24 +08:00
2 changed files with 4 additions and 2 deletions

View File

@@ -2,7 +2,7 @@ import React, { lazy, Suspense } from "react";
import { Route, Switch, Link } from "react-router-dom";
import _merge from "lodash/merge";
import { CssBaseline, Button } from "@material-ui/core";
import { Button } from "@material-ui/core";
import CustomBrowserRouter from "./utils/CustomBrowserRouter";
import PrivateRoute from "./utils/PrivateRoute";

View File

@@ -12,6 +12,8 @@ import {
} from "@material-ui/core";
import Themes from "Themes";
import ErrorBoundary from "components/ErrorBoundary";
const useThemeState = createPersistedState("_FT_THEME");
const useThemeOverriddenState = createPersistedState("_FT_THEME_OVERRIDDEN");
@@ -124,7 +126,7 @@ export const AppProvider: React.FC = ({ children }) => {
>
<MuiThemeProvider theme={generatedTheme}>
<CssBaseline />
{children}
<ErrorBoundary>{children}</ErrorBoundary>
</MuiThemeProvider>
</AppContext.Provider>
);