Progress Update.

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

client/src/App/App.jsx

@@ -1,7 +1,7 @@
 import {useSplitClient} from "@splitsoftware/splitio-react";
 import {Button, Result} from "antd";
 import LogRocket from "logrocket";
-import React, {lazy, Suspense, useEffect} from "react";
+import React, {lazy, Suspense, useEffect, useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
 import {Route, Routes} from "react-router-dom";
@@ -19,6 +19,7 @@ import {checkUserSession} from "../redux/user/user.actions";
 import {selectBodyshop, selectCurrentUser,} from "../redux/user/user.selectors";
 import PrivateRoute from "../components/PrivateRoute";
 import "./App.styles.scss";
+import handleBeta from "../utils/betaHandler";
 
 const ResetPassword = lazy(() =>
     import("../pages/reset-password/reset-password.component")
@@ -40,14 +41,16 @@ const mapDispatchToProps = (dispatch) => ({
     setOnline: (isOnline) => dispatch(setOnline(isOnline)),
 });
 
-export function App({
-                        bodyshop,
-                        checkUserSession,
-                        currentUser,
-                        online,
-                        setOnline,
-                    }) {
+export function App({bodyshop, checkUserSession, currentUser, online, setOnline}) {
+
     const client = useSplitClient().client;
+    const [listenersAdded, setListenersAdded] = useState(false)
+    const {t} = useTranslation();
+
+    // Handle The Beta Switch.
+    useEffect(() => {
+        handleBeta();
+    }, [])
 
     useEffect(() => {
         if (!navigator.onLine) {
@@ -60,15 +63,28 @@ export function App({
     //const b = Grid.useBreakpoint();
     // console.log("Breakpoints:", b);
 
-    const {t} = useTranslation();
-
-    window.addEventListener("offline", function (e) {
+    const offlineListener = (e) => {
         setOnline(false);
-    });
+    }
 
-    window.addEventListener("online", function (e) {
+    const onlineListener = (e) => {
         setOnline(true);
-    });
+    }
+
+    // Associate event listeners, memoize to prevent multiple listeners being added
+    useEffect(() => {
+        if (!listenersAdded) {
+            console.log('Added events for offline and online');
+            window.addEventListener("offline", offlineListener);
+            window.addEventListener("online", onlineListener);
+            setListenersAdded(true);
+        }
+
+        return () => {
+            window.removeEventListener("offline", offlineListener);
+            window.removeEventListener("online", onlineListener);
+        }
+    }, [listenersAdded]);
 
     useEffect(() => {
         if (currentUser.authorized && bodyshop) {