Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment

src/navigation/NavigationContainer.tsx

@@ -1,12 +1,11 @@
-import React, { PropsWithChildren } from "react";
 import Router from "./Router";
 
 export default function NavigationContainer() {
 
   return (
-    <React.Fragment>
+    <>
       {/* <NotificationBanner /> */}
       <Router />
-    </React.Fragment>
+    </>
   );
 }

src/navigation/Router.tsx

@@ -288,9 +288,9 @@ export default function Router() {
   }
 
   return (
-    <Suspense fallback={<LoadingScreen />}>
-      <BrowserRouter>
-        <Header />
+    <BrowserRouter>
+      <Header />
+      <Suspense fallback={<LoadingScreen message="Loading Page"/>}>
         <Routes>
           
           {/* Redirects */}
@@ -329,7 +329,7 @@ export default function Router() {
 
           <Route path="/logout" element={<Logout />} />
           <Route path="grainbags/:bagID" element={<GrainBag />} />
-{/* 
+  {/* 
           <ErrorBoundary FallbackComponent={ErrorFallback}>
             <Route path="*" element={<RelativeRoutes/>} />
           </ErrorBoundary> */}
@@ -337,7 +337,7 @@ export default function Router() {
           <Route path="*" element={<RelativeRoutes/>} />
           
         </Routes>
-      </BrowserRouter>
-    </Suspense>
+      </Suspense>
+    </BrowserRouter>
   )
 }