Merged in feature/IO-1828-Beta-Updates-To-Test (pull request #1194)

Feature/IO-1828 Beta Updates To Test

client/src/App/App.jsx

@@ -54,17 +54,10 @@ export function App({
 }) {
   const client = useClient();
 
-  // Handle The Beta Switch.
-  useEffect(() => {
-    handleBeta();
-  }, [])
-
-
   useEffect(() => {
     if (!navigator.onLine) {
       setOnline(false);
     }
-
     checkUserSession();
   }, [checkUserSession, setOnline]);
 
@@ -80,6 +73,7 @@ export function App({
   window.addEventListener("online", function (e) {
     setOnline(true);
   });
+
   useEffect(() => {
     if (currentUser.authorized && bodyshop) {
       client.setAttribute("imexshopid", bodyshop.imexshopid);
@@ -114,6 +108,8 @@ export function App({
       />
     );
 
+  handleBeta();
+
   return (
     <Switch>
       <Suspense fallback={<LoadingSpinner message="ImEX Online" />}>

client/src/utils/handleBeta.js

@@ -24,12 +24,14 @@ export const handleBeta = () => {
 
     // Beta is enabled, but the current host name does start with beta.
     if (isBeta && !currentHostName.startsWith('beta')) {
-        window.location.href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        const href= `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
     }
 
     // Beta is not enabled, but the current host name does start with beta.
     else if (!isBeta && currentHostName.startsWith('beta')) {
-        window.location.href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        const href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
     }
 }
 export default handleBeta;