- Merge client update into test-beta

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/index.js

@@ -1,11 +1,9 @@
 import * as Sentry from "@sentry/react";
-//import "antd/dist/antd.css";
-import "antd/dist/antd.less";
 import Dinero from "dinero.js";
 import React from "react";
-import ReactDOM from "react-dom";
+import ReactDOM from "react-dom/client";
 import { Provider } from "react-redux";
-import { BrowserRouter } from "react-router-dom";
+import {createBrowserRouter, createRoutesFromElements, Route, RouterProvider} from "react-router-dom";
 import { PersistGate } from "redux-persist/integration/react";
 import AppContainer from "./App/App.container";
 import LoadingSpinner from "./components/loading-spinner/loading-spinner.component";
@@ -14,7 +12,10 @@ import { persistor, store } from "./redux/store";
 import reportWebVitals from "./reportWebVitals";
 import "./translations/i18n";
 import "./utils/CleanAxios";
+import { ConfigProvider } from "antd";
 //import { BrowserTracing } from "@sentry/tracing";
+//import "antd/dist/antd.css";
+// import "antd/dist/antd.less";
 
 // Dinero.defaultCurrency = "CAD";
 // Dinero.globalLocale = "en-CA";
@@ -24,9 +25,7 @@ if (process.env.NODE_ENV !== "development") {
   Sentry.init({
     dsn: "https://a6acc91c073e414196014b8484627a61@o492140.ingest.sentry.io/4504561071161344",
     ignoreErrors: [
-      "ResizeObserver loop",
-      "Module specifier, 'fs' does not start",
-      "Module specifier, 'zlib' does not start with",
+
     ],
     integrations: [
       // new BrowserTracing(),
@@ -47,20 +46,31 @@ if (process.env.NODE_ENV !== "development") {
   });
 }
 
-ReactDOM.render(
-  <Provider store={store}>
-    <BrowserRouter>
-      <PersistGate
-        loading={<LoadingSpinner message="Restoring your settings..." />}
-        persistor={persistor}
-      >
-        <AppContainer />
-      </PersistGate>
-    </BrowserRouter>
-  </Provider>,
-  document.getElementById("root")
+const router = createBrowserRouter(
+    createRoutesFromElements(
+        <Route path="*" element={<AppContainer />} />
+    )
 );
 
+function App() {
+    return (
+        <PersistGate loading={<LoadingSpinner message="Restoring your settings..." />} persistor={persistor}>
+        <Provider store={store}>
+            <RouterProvider router={router} />
+        </Provider>
+        </PersistGate>
+    );
+}
+
+// Used for ANTD Component Tokens
+// https://ant.design/docs/react/migrate-less-variables
+ReactDOM.createRoot(document.getElementById('root')).render(
+    <ConfigProvider>
+        <App />
+    </ConfigProvider>
+);
+
+
 // const onServiceWorkerUpdate = (registration) => {
 //   console.log("onServiceWorkerUpdate", registration);