From 72a2366abe53451304118d78032d07cf3aab4bfa Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Fri, 19 Jul 2024 13:18:10 -0400
Subject: [PATCH] - Improve product fruits wrapper for extra checks

Signed-off-by: Dave Richer <dave@imexsystems.ca>
---
 client/src/App/App.jsx                  | 16 ++-------------
 client/src/App/ProductFruitsWrapper.jsx | 27 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 client/src/App/ProductFruitsWrapper.jsx

diff --git a/client/src/App/App.jsx b/client/src/App/App.jsx
index 4b80fb38e..88d32a870 100644
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -23,7 +23,7 @@ import "./App.styles.scss";
 import handleBeta from "../utils/betaHandler";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
-import { ProductFruits } from "react-product-fruits";
+import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
 
 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -147,19 +147,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
         />
       }
     >
-      <ProductFruits
-        workspaceCode={InstanceRenderMgr({
-          imex: null,
-          rome: "9BkbEseqNqxw8jUH",
-          promanager: "aoJoEifvezYI0Z0P"
-        })}
-        debug
-        language="en"
-        user={{
-          email: currentUser.email,
-          username: currentUser.email
-        }}
-      />
+      <ProductFruitsWrapper currentUser={currentUser} />
 
       <Routes>
         <Route
diff --git a/client/src/App/ProductFruitsWrapper.jsx b/client/src/App/ProductFruitsWrapper.jsx
new file mode 100644
index 000000000..0dfc59a04
--- /dev/null
+++ b/client/src/App/ProductFruitsWrapper.jsx
@@ -0,0 +1,27 @@
+import React from "react";
+import { ProductFruits } from "react-product-fruits";
+import InstanceRenderMgr from "../utils/instanceRenderMgr";
+
+const ProductFruitsWrapper = React.memo(({ currentUser }) => {
+  return (
+    currentUser?.authorized === true &&
+    currentUser?.email && (
+      <ProductFruits
+        lifeCycle="unmount"
+        workspaceCode={InstanceRenderMgr({
+          imex: null,
+          rome: "9BkbEseqNqxw8jUH",
+          promanager: "aoJoEifvezYI0Z0P"
+        })}
+        debug
+        language="en"
+        user={{
+          email: currentUser.email,
+          username: currentUser.email
+        }}
+      />
+    )
+  );
+});
+
+export default ProductFruitsWrapper;