IO-3236 HasFeatureAccess Date

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/feature-wrapper/feature-wrapper.component.jsx

@@ -81,8 +81,9 @@ export function HasFeatureAccess({ featureName, bodyshop, bypass, debug = false
   }
   return (
     bodyshop?.features?.allAccess ||
-    bodyshop?.features?.[featureName] ||
-    dayjs(bodyshop?.features[featureName]).isAfter(dayjs())
+    (typeof bodyshop?.features?.[featureName] === "boolean"
+      ? bodyshop?.features?.[featureName]
+      : dayjs(bodyshop?.features?.[featureName]).isAfter(dayjs()))
   );
 }
 

client/src/redux/user/user.sagas.js

@@ -335,12 +335,20 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     }
 
     try {
-      window.$crisp.push(["set", "user:company", [payload.shopname]]);
-      window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
-      if (authRecord[0] && authRecord[0].user.validemail) {
-        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-      }
-
+      InstanceRenderManager({
+        executeFunction: true,
+        args: [],
+        imex: () => {
+          window.$crisp.push(["set", "user:company", [payload.shopname]]);
+          window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
+          if (authRecord[0] && authRecord[0].user.validemail) {
+            window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
+          }
+        },
+        rome: () => {
+          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
+        }
+      });
       payload.features?.allAccess === true
         ? window.$crisp.push(["set", "session:segments", [["allAccess"]]])
         : (() => {
@@ -351,14 +359,6 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
             );
             window.$crisp.push(["set", "session:segments", [["basic", ...featureKeys]]]);
           })();
-
-      InstanceRenderManager({
-        executeFunction: true,
-        args: [],
-        rome: () => {
-          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
-        }
-      });
     } catch (error) {
       console.warn("Couldnt find $crisp.", error.message);
     }